From 78077a6ec100967b4bb4e8192c4c2e9277ba8cff Mon Sep 17 00:00:00 2001
From: Raul Marin <git@rmr.ninja>
Date: Fri, 31 May 2019 15:33:01 +0200
Subject: [PATCH] Bash tests improvements

- Stop loading sql files manually.
- Make tests independent.
- Single DB setup (not once per test)
---
 test/extension/test.sh    | 129 ++++++++++--------------------
 test/organization/test.sh | 160 +++++++++++++++++++++++---------------
 2 files changed, 139 insertions(+), 150 deletions(-)

diff --git a/test/extension/test.sh b/test/extension/test.sh
index fee5667..54c2c50 100755
--- a/test/extension/test.sh
+++ b/test/extension/test.sh
@@ -13,7 +13,6 @@ DATABASE=test_extension
 CMD='echo psql'
 CMD=psql
 SED=sed
-PG_PARALLEL=$(pg_config --version | awk '{$2*=1000; if ($2 >= 9600) print 1; else print 0;}' 2> /dev/null || echo 0)
 
 OK=0
 PARTIALOK=0
@@ -28,30 +27,6 @@ function clear_partial_result() {
     PARTIALOK=0
 }
 
-function load_sql_file() {
-    if [[ $PG_PARALLEL -eq 0 ]]
-    then
-        tmp_file=/tmp/$(basename $1)_no_parallel
-        ${SED} $1 -e 's/PARALLEL \= [A-Z]*/''/g' -e 's/PARALLEL [A-Z]*/''/g' > $tmp_file
-        ${CMD} -d ${DATABASE} -f $tmp_file
-        rm $tmp_file
-    else
-        ${CMD} -d ${DATABASE} -f $1
-    fi
-}
-
-function load_sql_file_schema() {
-    if [[ $PG_PARALLEL -eq 0 ]]
-    then
-        tmp_file=/tmp/$(basename $1)_no_parallel
-        ${SED} $1 -e 's/PARALLEL \= [A-Z]*/''/g' -e 's/PARALLEL [A-Z]*/''/g' > $tmp_file
-        PGOPTIONS="$PGOPTIONS --search_path=\"$2\"" ${CMD} -d ${DATABASE} -f $tmp_file
-        rm $tmp_file
-    else
-        PGOPTIONS="$PGOPTIONS --search_path=\"$2\"" ${CMD} -d ${DATABASE} -f $1
-    fi
-}
-
 
 function sql() {
     local ROLE
@@ -143,12 +118,15 @@ function create_role_and_schema() {
     sql "CREATE ROLE ${ROLE} LOGIN;"
     sql "GRANT CONNECT ON DATABASE \"${DATABASE}\" TO ${ROLE};"
     sql "CREATE SCHEMA ${ROLE} AUTHORIZATION ${ROLE};"
+    sql "GRANT USAGE ON SCHEMA cartodb TO ${ROLE};"
     sql "SELECT cartodb.CDB_Organization_Create_Member('${ROLE}');"
+    sql "ALTER ROLE ${ROLE} SET search_path TO ${ROLE},cartodb,public;"
 }
 
 
 function drop_role_and_schema() {
     local ROLE=$1
+    sql "REVOKE USAGE ON SCHEMA cartodb FROM ${ROLE};"
     sql "DROP SCHEMA \"${ROLE}\" CASCADE;"
     sql "REVOKE CONNECT ON DATABASE \"${DATABASE}\" FROM \"${ROLE}\";"
     sql "DROP ROLE \"${ROLE}\";"
@@ -200,21 +178,17 @@ function drop_raster_table() {
 
 function setup_database() {
     ${CMD} -c "CREATE DATABASE ${DATABASE}"
-    sql "CREATE SCHEMA cartodb;"
-    sql "GRANT USAGE ON SCHEMA cartodb TO public;"
     sql "CREATE EXTENSION postgis;"
-    sql "CREATE EXTENSION plpythonu;"
-
-    log_info "########################### BOOTSTRAP ###########################"
-    load_sql_file scripts-available/CDB_Organizations.sql
-    load_sql_file scripts-available/CDB_OverviewsSupport.sql
-    load_sql_file scripts-available/CDB_AnalysisSupport.sql
-
-    load_sql_file_schema scripts-available/CDB_Quota.sql cartodb
-    load_sql_file_schema scripts-available/CDB_TableMetadata.sql cartodb
-    load_sql_file_schema scripts-available/CDB_ColumnNames.sql cartodb
-    load_sql_file_schema scripts-available/CDB_ColumnType.sql cartodb
-    load_sql_file_schema scripts-available/CDB_AnalysisCatalog.sql cartodb
+    sql postgres "DO
+\$\$
+BEGIN
+    IF substring(postgis_lib_version() FROM 1 FOR 1) = '3' THEN
+        CREATE EXTENSION postgis_raster;
+    END IF;
+END
+\$\$;"
+    sql "CREATE EXTENSION cartodb CASCADE;"
+    ${CMD} -c "ALTER DATABASE ${DATABASE} SET search_path = public, cartodb;"
 }
 
 function setup() {
@@ -258,7 +232,6 @@ function tear_down() {
     sql 'DROP ROLE cdb_testmember_2;'
 
     tear_down_database
-    DATABASE=postgres sql postgres 'DROP ROLE IF EXISTS publicuser';
 }
 
 
@@ -277,6 +250,7 @@ function run_tests() {
     else
         TESTS=`cat $0 | perl -n -e'/function (test.*)\(\)/ && print "$1\n"'`
     fi
+    setup
     for t in ${TESTS}
     do
         echo "####################################################################"
@@ -284,15 +258,15 @@ function run_tests() {
         echo "# Running: ${t}"
         echo "#"
         echo "####################################################################"
+
         clear_partial_result
-        setup
         eval ${t}
         if [[ ${PARTIALOK} -ne 0 ]]
         then
             FAILED_TESTS+=(${t})
         fi
-        tear_down
     done
+    tear_down
     if [[ ${OK} -ne 0 ]]
     then
         echo
@@ -333,20 +307,20 @@ function test_quota_for_each_user() {
 }
 
 function test_cdb_tablemetadatatouch() {
-    sql "CREATE TABLE touch_example (a int)"
+    sql postgres "CREATE TABLE touch_example (a int)"
     sql postgres "SELECT updated_at FROM CDB_TableMetadata WHERE tabname = 'touch_example'::regclass;" should ''
-    sql "SELECT CDB_TableMetadataTouch('touch_example');"
+    sql postgres "SELECT CDB_TableMetadataTouch('touch_example');"
     sql postgres "SELECT updated_at FROM CDB_TableMetadata WHERE tabname = 'touch_example'::regclass;" should-not ''
 
     # Another call doesn't fail
-    sql "SELECT CDB_TableMetadataTouch('touch_example');"
+    sql postgres "SELECT CDB_TableMetadataTouch('touch_example');"
     sql postgres "SELECT updated_at FROM CDB_TableMetadata WHERE tabname = 'touch_example'::regclass;" should-not ''
 
     # Works with qualified tables
-    sql "SELECT CDB_TableMetadataTouch('public.touch_example');"
-    sql "SELECT CDB_TableMetadataTouch('public.\"touch_example\"');"
-    sql "SELECT CDB_TableMetadataTouch('\"public\".touch_example');"
-    sql "SELECT CDB_TableMetadataTouch('\"public\".\"touch_example\"');"
+    sql postgres "SELECT CDB_TableMetadataTouch('public.touch_example');"
+    sql postgres "SELECT CDB_TableMetadataTouch('public.\"touch_example\"');"
+    sql postgres "SELECT CDB_TableMetadataTouch('\"public\".touch_example');"
+    sql postgres "SELECT CDB_TableMetadataTouch('\"public\".\"touch_example\"');"
 
     # Works with OID
     sql postgres "SELECT tabname from CDB_TableMetadata;" should 'touch_example'
@@ -354,25 +328,25 @@ function test_cdb_tablemetadatatouch() {
     TABLE_OID=`${CMD} -U postgres ${DATABASE} -c "SELECT attrelid FROM pg_attribute WHERE attrelid = 'touch_example'::regclass limit 1;" -A -t`
 
     # quoted OID works
-    sql "SELECT CDB_TableMetadataTouch('${TABLE_OID}');"
+    sql postgres "SELECT CDB_TableMetadataTouch('${TABLE_OID}');"
     sql postgres "SELECT tabname from CDB_TableMetadata;" should 'touch_example'
     sql postgres "SELECT count(*) from CDB_TableMetadata;" should 1
 
     # non quoted OID works
-    sql "SELECT CDB_TableMetadataTouch(${TABLE_OID});"
+    sql postgres "SELECT CDB_TableMetadataTouch(${TABLE_OID});"
     sql postgres "SELECT tabname from CDB_TableMetadata;" should 'touch_example'
     sql postgres "SELECT count(*) from CDB_TableMetadata;" should 1
 
     #### test tear down
-    sql 'DROP TABLE touch_example;'
+    sql postgres 'DROP TABLE touch_example;'
 }
 
 function test_cdb_tablemetadatatouch_fails_for_unexistent_table() {
-    sql postgres "SELECT CDB_TableMetadataTouch('unexistent_example');" fails
+    sql cdb_testmember_1 "SELECT CDB_TableMetadataTouch('unexistent_example');" fails
 }
 
 function test_cdb_tablemetadatatouch_fails_from_user_without_permission() {
-    sql "CREATE TABLE touch_example (a int);"
+    sql postgres "CREATE TABLE touch_example (a int);"
     sql postgres "SELECT CDB_TableMetadataTouch('touch_example');"
 
     sql cdb_testmember_1 "SELECT CDB_TableMetadataTouch('touch_example');" fails
@@ -381,6 +355,9 @@ function test_cdb_tablemetadatatouch_fails_from_user_without_permission() {
     sql cdb_testmember_1 "SELECT CDB_TableMetadataTouch('touch_example');"
 
     sql postgres "REVOKE ALL ON CDB_TableMetadata FROM cdb_testmember_1;"
+
+    #### test tear down
+    sql postgres 'DROP TABLE touch_example;'
 }
 
 function test_cdb_tablemetadatatouch_fully_qualifies_names() {
@@ -421,9 +398,9 @@ function test_cdb_tablemetadatatouch_fully_qualifies_names() {
 function test_cdb_tablemetadata_text() {
 
     #create and touch tables
-    sql "CREATE TABLE touch_ex_a (id int);"
-    sql "CREATE TABLE touch_ex_b (id int);"
-    sql "CREATE TABLE touch_ex_c (id int);"
+    sql postgres "CREATE TABLE touch_ex_a (id int);"
+    sql postgres "CREATE TABLE touch_ex_b (id int);"
+    sql postgres "CREATE TABLE touch_ex_c (id int);"
     sql postgres "SELECT CDB_TableMetadataTouch('touch_ex_a');"
     sql postgres "SELECT CDB_TableMetadataTouch('touch_ex_b');"
     sql postgres "SELECT CDB_TableMetadataTouch('touch_ex_c');"
@@ -442,9 +419,9 @@ function test_cdb_tablemetadata_text() {
     sql postgres "$QUERY" should "t"
 
     #cleanup
-    sql "DROP TABLE touch_ex_a;"
-    sql "DROP TABLE touch_ex_b;"
-    sql "DROP TABLE touch_ex_c;"
+    sql postgres "DROP TABLE touch_ex_a;"
+    sql postgres "DROP TABLE touch_ex_b;"
+    sql postgres "DROP TABLE touch_ex_c;"
 
 }
 
@@ -483,9 +460,6 @@ function test_cdb_column_type() {
 }
 
 function test_cdb_querytables_schema_and_table_names_with_dots() {
-    load_sql_file scripts-available/CDB_QueryStatements.sql
-    load_sql_file scripts-available/CDB_QueryTables.sql
-
     sql postgres 'CREATE SCHEMA "foo.bar";'
     sql postgres 'CREATE TABLE "foo.bar"."c.a.r.t.o.d.b" (a int);'
     sql postgres 'INSERT INTO "foo.bar"."c.a.r.t.o.d.b" values (1);'
@@ -499,9 +473,6 @@ function test_cdb_querytables_schema_and_table_names_with_dots() {
 }
 
 function test_cdb_querytables_table_name_with_dots() {
-    load_sql_file scripts-available/CDB_QueryStatements.sql
-    load_sql_file scripts-available/CDB_QueryTables.sql
-
     sql postgres 'CREATE TABLE "w.a.d.u.s" (a int);';
 
     sql postgres 'SELECT CDB_QueryTablesText($q$select * from "w.a.d.u.s"$q$);' should '{"public.\"w.a.d.u.s\""}'
@@ -511,9 +482,6 @@ function test_cdb_querytables_table_name_with_dots() {
 }
 
 function test_cdb_querytables_happy_cases() {
-    load_sql_file scripts-available/CDB_QueryStatements.sql
-    load_sql_file scripts-available/CDB_QueryTables.sql
-
     sql postgres 'CREATE TABLE wadus (a int);';
     sql postgres 'CREATE TABLE "FOOBAR" (a int);';
     sql postgres 'CREATE SCHEMA foo;'
@@ -535,18 +503,8 @@ function test_cdb_querytables_happy_cases() {
 }
 
 function test_foreign_tables() {
-    load_sql_file scripts-available/CDB_QueryStatements.sql
-    load_sql_file scripts-available/CDB_QueryTables.sql
-    load_sql_file scripts-available/CDB_TableMetadata.sql
-    load_sql_file scripts-available/CDB_Conf.sql
-    load_sql_file scripts-available/CDB_ForeignTable.sql
-
 
     DATABASE=fdw_target setup_database
-    load_sql_file scripts-available/CDB_QueryStatements.sql
-    load_sql_file scripts-available/CDB_QueryTables.sql
-    load_sql_file scripts-available/CDB_TableMetadata.sql
-
     DATABASE=fdw_target sql postgres "DO
 \$\$
 BEGIN
@@ -559,6 +517,7 @@ BEGIN
    END IF;
 END
 \$\$;"
+
     DATABASE=fdw_target sql postgres 'CREATE SCHEMA test_fdw;'
     DATABASE=fdw_target sql postgres 'CREATE TABLE test_fdw.foo (a int);'
     DATABASE=fdw_target sql postgres 'INSERT INTO test_fdw.foo (a) values (42);'
@@ -583,15 +542,9 @@ END
 
     sql postgres "SELECT cartodb._CDB_Setup_FDW('test_fdw')"
 
-    sql postgres "SHOW server_version_num"
-    if [ "$RESULT" -gt 90499 ]
-    then
-        sql postgres "SELECT cartodb.CDB_Add_Remote_Table('test_fdw', 'foo')"
-        sql postgres "SELECT * from test_fdw.foo;"
-    else
-        echo "NOTICE: PostgreSQL version is less than 9.5 ($RESULT). Skipping CDB_Add_Remote_Table."
-        sql postgres "CREATE FOREIGN TABLE test_fdw.foo (a int) SERVER test_fdw OPTIONS (table_name 'foo', schema_name 'test_fdw')"
-    fi
+    sql postgres "SELECT cartodb.CDB_Add_Remote_Table('test_fdw', 'foo')"
+    sql postgres "SELECT * from test_fdw.foo;"
+
 
     sql postgres "SELECT n.nspname,
   c.relname,
diff --git a/test/organization/test.sh b/test/organization/test.sh
index 859cbb0..141c9f8 100644
--- a/test/organization/test.sh
+++ b/test/organization/test.sh
@@ -10,7 +10,6 @@
 DATABASE=test_organizations
 CMD=psql
 SED=sed
-PG_PARALLEL=$(pg_config --version | awk '{$2*=1000; if ($2 >= 9600) print 1; else print 0;}' 2> /dev/null || echo 0)
 
 OK=0
 PARTIALOK=0
@@ -25,19 +24,6 @@ function clear_partial_result() {
     PARTIALOK=0
 }
 
-function load_sql_file() {
-    if [[ $PG_PARALLEL -eq 0 ]]
-    then
-        tmp_file=/tmp/$(basename $1)_no_parallel
-        ${SED} $1 -e 's/PARALLEL \= [A-Z]*/''/g' -e 's/PARALLEL [A-Z]*/''/g' > $tmp_file
-        ${CMD} -d ${DATABASE} -f $tmp_file
-        rm $tmp_file
-    else
-        ${CMD} -d ${DATABASE} -f $1
-    fi
-}
-
-
 function sql() {
     local ROLE
     local QUERY
@@ -146,6 +132,7 @@ function create_role_and_schema() {
     sql "GRANT CONNECT ON DATABASE \"${DATABASE}\" TO ${ROLE};"
     sql "CREATE SCHEMA ${ROLE} AUTHORIZATION ${ROLE};"
     sql "SELECT cartodb.CDB_Organization_Create_Member('${ROLE}')"
+    sql "ALTER ROLE ${ROLE} SET search_path TO ${ROLE},cartodb,public;"
 }
 
 
@@ -168,34 +155,46 @@ function create_table() {
     sql ${ROLE} "CREATE TABLE ${ROLE}.${TABLENAME} ( a int );"
 }
 
+function truncate_table() {
+    if [[ $# -ne 2 ]]
+    then
+        log_error "truncate_table requires two arguments: role and table_name"
+        exit 1
+    fi
+    local ROLE="$1"
+    local TABLENAME="$2"
+    sql ${ROLE} "TRUNCATE TABLE ${ROLE}.${TABLENAME};"
+}
+
 
 function setup() {
     ${CMD} -c "CREATE DATABASE ${DATABASE}"
-    sql "CREATE SCHEMA cartodb;"
-    sql "CREATE EXTENSION plpythonu;"
-    sql "GRANT USAGE ON SCHEMA cartodb TO public;"
+    ${CMD} -c "ALTER DATABASE ${DATABASE} SET search_path = public, cartodb;"
+    sql "CREATE EXTENSION cartodb CASCADE;"
+    ${CMD} -c "ALTER DATABASE ${DATABASE} SET search_path = public, cartodb;"
 
-    log_info "########################### BOOTSTRAP ###########################"
-    load_sql_file scripts-available/CDB_Organizations.sql
-    load_sql_file scripts-available/CDB_Conf.sql
-    load_sql_file scripts-available/CDB_Groups.sql
-    load_sql_file scripts-available/CDB_Groups_API.sql
 
     log_info "############################# SETUP #############################"
     create_role_and_schema cdb_org_admin
     sql "SELECT cartodb.CDB_Organization_AddAdmin('cdb_org_admin');"
     create_role_and_schema cdb_testmember_1
     create_role_and_schema cdb_testmember_2
-    sql "CREATE ROLE publicuser LOGIN;"
+    sql postgres "DO
+\$\$
+BEGIN
+   IF NOT EXISTS (
+      SELECT *
+      FROM   pg_catalog.pg_user
+      WHERE  usename = 'publicuser') THEN
+
+      CREATE ROLE publicuser LOGIN;
+   END IF;
+END
+\$\$;"
     sql "GRANT CONNECT ON DATABASE \"${DATABASE}\" TO publicuser;"
 
     create_table cdb_testmember_1 foo
-    sql cdb_testmember_1 'INSERT INTO cdb_testmember_1.foo VALUES (1), (2), (3), (4), (5);'
-    sql cdb_testmember_1 'SELECT * FROM cdb_testmember_1.foo;'
-
     create_table cdb_testmember_2 bar
-    sql cdb_testmember_2 'INSERT INTO bar VALUES (1), (2), (3), (4), (5);'
-    sql cdb_testmember_2 'SELECT * FROM cdb_testmember_2.bar;'
 
     sql "SELECT cartodb.CDB_Group_CreateGroup('group_a_tmp')"
     sql "SELECT cartodb.CDB_Group_RenameGroup('group_a_tmp', 'group_a')"
@@ -235,7 +234,6 @@ function tear_down() {
 
     sql 'DROP ROLE cdb_testmember_1;'
     sql 'DROP ROLE cdb_testmember_2;'
-    sql 'DROP ROLE publicuser;'
     sql 'DROP ROLE cdb_org_admin;'
 
     ${CMD} -c "DROP DATABASE ${DATABASE}"
@@ -251,23 +249,28 @@ function run_tests() {
     else
         TESTS=`cat $0 | perl -n -e'/function (test.*)\(\)/ && print "$1\n"'`
     fi
+
+    setup
     for t in ${TESTS}
     do
+#         if [[ ${t} != "test_cdb_usertables_should_work_with_orgusers" ]]; then
+#             continue;
+#         fi
         echo "####################################################################"
         echo "#"
         echo "# Running: ${t}"
         echo "#"
         echo "####################################################################"
         clear_partial_result
-        setup
         log_info "############################# TESTS #############################"
         eval ${t}
         if [[ ${PARTIALOK} -ne 0 ]]
         then
             FAILED_TESTS+=(${t})
         fi
-        tear_down
     done
+    tear_down
+
     if [[ ${OK} -ne 0 ]]
     then
         echo
@@ -289,9 +292,14 @@ function test_member_1_cannot_grant_read_permission_to_other_schema_than_its_one
 }
 
 function test_member_1_grants_read_permission_and_member_2_can_read() {
+    sql cdb_testmember_1 'INSERT INTO cdb_testmember_1.foo VALUES (5), (6), (7), (8), (9);'
     sql cdb_testmember_1 "SELECT * FROM cartodb.CDB_Organization_Add_Table_Read_Permission('cdb_testmember_1', 'foo', 'cdb_testmember_2')"
     sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' should 5
     sql cdb_testmember_1 'SELECT count(*) FROM cdb_testmember_2.bar;' fails
+
+    # Cleanup
+    truncate_table cdb_testmember_1 foo
+    sql cdb_testmember_1 "SELECT * FROM cartodb.CDB_Organization_Remove_Access_Permission('cdb_testmember_1', 'foo', 'cdb_testmember_2')"
 }
 
 function test_member_2_cannot_add_table_to_member_1_schema_after_table_permission_added() {
@@ -300,10 +308,18 @@ function test_member_2_cannot_add_table_to_member_1_schema_after_table_permissio
 }
 
 function test_grant_read_permission_between_two_members() {
+    sql cdb_testmember_1 'INSERT INTO cdb_testmember_1.foo VALUES (5), (6), (7), (8), (9);'
+    sql cdb_testmember_2 'INSERT INTO cdb_testmember_2.bar VALUES (5), (6), (7), (8), (9);'
     sql cdb_testmember_1 "SELECT * FROM cartodb.CDB_Organization_Add_Table_Read_Permission('cdb_testmember_1', 'foo', 'cdb_testmember_2')"
     sql cdb_testmember_2 "SELECT * FROM cartodb.CDB_Organization_Add_Table_Read_Permission('cdb_testmember_2', 'bar', 'cdb_testmember_1')"
     sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' should 5
     sql cdb_testmember_1 'SELECT count(*) FROM cdb_testmember_2.bar;' should 5
+
+    # Cleanup
+    truncate_table cdb_testmember_1 foo
+    truncate_table cdb_testmember_2 bar
+    sql cdb_testmember_1 "SELECT * FROM cartodb.CDB_Organization_Remove_Access_Permission('cdb_testmember_1', 'foo', 'cdb_testmember_2')"
+    sql cdb_testmember_2 "SELECT * FROM cartodb.CDB_Organization_Remove_Access_Permission('cdb_testmember_2', 'bar', 'cdb_testmember_1')"
 }
 
 function test_member_2_cannot_write_to_member_1_table() {
@@ -317,11 +333,15 @@ function test_member_1_cannot_grant_read_write_permission_to_other_schema_than_i
 function test_member_2_can_write_to_member_1_table_after_write_permission_is_added() {
     sql cdb_testmember_1 "SELECT * FROM cartodb.CDB_Organization_Add_Table_Read_Write_Permission('cdb_testmember_1', 'foo', 'cdb_testmember_2')"
     sql cdb_testmember_2 'INSERT INTO cdb_testmember_1.foo VALUES (5), (6), (7), (8), (9);'
-    sql cdb_testmember_1 'SELECT count(*) FROM cdb_testmember_1.foo;' should 10
-    sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' should 10
+    sql cdb_testmember_1 'SELECT count(*) FROM cdb_testmember_1.foo;' should 5
+    sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' should 5
     sql cdb_testmember_2 'DELETE FROM cdb_testmember_1.foo where a = 9;'
-    sql cdb_testmember_1 'SELECT count(*) FROM cdb_testmember_1.foo;' should 9
-    sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' should 9
+    sql cdb_testmember_1 'SELECT count(*) FROM cdb_testmember_1.foo;' should 4
+    sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' should 4
+
+    # Cleanup
+    truncate_table cdb_testmember_1 foo
+    sql cdb_testmember_1 "SELECT * FROM cartodb.CDB_Organization_Remove_Access_Permission('cdb_testmember_1', 'foo', 'cdb_testmember_2')"
 }
 
 function test_member_2_can_write_to_member_1_table_and_sequence_after_write_permission_is_added() {
@@ -329,13 +349,17 @@ function test_member_2_can_write_to_member_1_table_and_sequence_after_write_perm
 
     sql cdb_testmember_1 "SELECT * FROM cartodb.CDB_Organization_Add_Table_Read_Write_Permission('cdb_testmember_1', 'foo', 'cdb_testmember_2')"
     sql cdb_testmember_2 'INSERT INTO cdb_testmember_1.foo VALUES (5), (6), (7), (8), (9);'
-    sql cdb_testmember_1 'SELECT count(*) FROM cdb_testmember_1.foo;' should 10
-    sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' should 10
+    sql cdb_testmember_1 'SELECT count(*) FROM cdb_testmember_1.foo;' should 5
+    sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' should 5
     sql cdb_testmember_2 'DELETE FROM cdb_testmember_1.foo where a = 9;'
-    sql cdb_testmember_1 'SELECT count(*) FROM cdb_testmember_1.foo;' should 9
-    sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' should 9
+    sql cdb_testmember_1 'SELECT count(*) FROM cdb_testmember_1.foo;' should 4
+    sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' should 4
 
     sql cdb_testmember_1 "ALTER TABLE cdb_testmember_1.foo DROP cartodb_id;"
+
+    # Cleanup
+    truncate_table cdb_testmember_1 foo
+    sql cdb_testmember_1 "SELECT * FROM cartodb.CDB_Organization_Remove_Access_Permission('cdb_testmember_1', 'foo', 'cdb_testmember_2')"
 }
 
 function test_member_2_can_write_to_member_1_table_with_non_sequence_cartodb_id_after_write_permission_is_added() {
@@ -343,20 +367,28 @@ function test_member_2_can_write_to_member_1_table_with_non_sequence_cartodb_id_
 
     sql cdb_testmember_1 "SELECT * FROM cartodb.CDB_Organization_Add_Table_Read_Write_Permission('cdb_testmember_1', 'foo', 'cdb_testmember_2')"
     sql cdb_testmember_2 'INSERT INTO cdb_testmember_1.foo VALUES (5), (6), (7), (8), (9);'
-    sql cdb_testmember_1 'SELECT count(*) FROM cdb_testmember_1.foo;' should 10
-    sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' should 10
+    sql cdb_testmember_1 'SELECT count(*) FROM cdb_testmember_1.foo;' should 5
+    sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' should 5
     sql cdb_testmember_2 'DELETE FROM cdb_testmember_1.foo where a = 9;'
-    sql cdb_testmember_1 'SELECT count(*) FROM cdb_testmember_1.foo;' should 9
-    sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' should 9
+    sql cdb_testmember_1 'SELECT count(*) FROM cdb_testmember_1.foo;' should 4
+    sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' should 4
 
     sql cdb_testmember_1 "ALTER TABLE cdb_testmember_1.foo DROP cartodb_id;"
+
+    # Cleanup
+    truncate_table cdb_testmember_1 foo
+    sql cdb_testmember_1 "SELECT * FROM cartodb.CDB_Organization_Remove_Access_Permission('cdb_testmember_1', 'foo', 'cdb_testmember_2')"
 }
 
 function test_member_1_removes_access_and_member_2_can_no_longer_query_the_table() {
+    sql cdb_testmember_1 'INSERT INTO cdb_testmember_1.foo VALUES (5), (6), (7), (8), (9), (10);'
     sql cdb_testmember_1 "SELECT * FROM cartodb.CDB_Organization_Add_Table_Read_Permission('cdb_testmember_1', 'foo', 'cdb_testmember_2')"
-    sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' should 5
+    sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' should 6
     sql cdb_testmember_1 "SELECT * FROM cartodb.CDB_Organization_Remove_Access_Permission('cdb_testmember_1', 'foo', 'cdb_testmember_2')"
     sql cdb_testmember_2 'SELECT * FROM cdb_testmember_1.foo;' fails
+
+    # Cleanup
+    truncate_table cdb_testmember_1 foo
 }
 
 function test_member_1_removes_access_and_member_2_can_no_longer_write_to_the_table() {
@@ -364,12 +396,16 @@ function test_member_1_removes_access_and_member_2_can_no_longer_write_to_the_ta
     sql cdb_testmember_2 'INSERT INTO cdb_testmember_1.foo VALUES (5), (6), (7), (8), (9);'
     sql cdb_testmember_1 "SELECT * FROM cartodb.CDB_Organization_Remove_Access_Permission('cdb_testmember_1', 'foo', 'cdb_testmember_2')"
     sql cdb_testmember_2 'INSERT INTO cdb_testmember_1.foo VALUES (5), (6), (7), (8), (9);' fails
+
+    # Cleanup
+    truncate_table cdb_testmember_1 foo
 }
 
 function test_giving_permissions_to_two_tables_and_removing_from_first_table_should_not_remove_from_second() {
     #### test setup
     # create an extra table for cdb_testmember_1
     create_table cdb_testmember_1 foo_2
+    sql cdb_testmember_1 'INSERT INTO cdb_testmember_1.foo VALUES (1), (2), (3), (4);'
     sql cdb_testmember_1 'INSERT INTO cdb_testmember_1.foo_2 VALUES (1), (2), (3), (4), (5);'
     sql cdb_testmember_1 'SELECT * FROM cdb_testmember_1.foo_2;'
 
@@ -378,7 +414,7 @@ function test_giving_permissions_to_two_tables_and_removing_from_first_table_sho
     sql cdb_testmember_1 "SELECT * FROM cartodb.CDB_Organization_Add_Table_Read_Permission('cdb_testmember_1', 'foo_2', 'cdb_testmember_2')"
 
     # cdb_testmember_2 has access to both tables
-    sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' should 5
+    sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' should 4
     sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo_2;' should 5
 
     # cdb_testmember_1 removes access to foo table
@@ -390,57 +426,60 @@ function test_giving_permissions_to_two_tables_and_removing_from_first_table_sho
 
 
     #### test tear down
+    truncate_table cdb_testmember_1 foo
     sql cdb_testmember_1 'DROP TABLE cdb_testmember_1.foo_2;'
 }
 
 function test_cdb_org_member_role_allows_reading_to_all_users_without_explicit_permission() {
+    sql cdb_testmember_1 'INSERT INTO cdb_testmember_1.foo VALUES (1), (2), (3), (4);'
+
     sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' fails
     sql cdb_testmember_1 "SELECT cartodb.CDB_Organization_Add_Table_Organization_Read_Permission('cdb_testmember_1', 'foo');"
-    sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' should 5
+    sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' should 4
+
+    # Cleanup
+    sql cdb_testmember_1 "SELECT cartodb.CDB_Organization_Remove_Organization_Access_Permission('cdb_testmember_1', 'foo');"
+    truncate_table cdb_testmember_1 foo
 }
 
 function test_user_can_read_when_it_has_permission_after_organization_permission_is_removed() {
     create_role_and_schema cdb_testmember_3
+    sql cdb_testmember_1 'INSERT INTO cdb_testmember_1.foo VALUES (1), (2), (3), (4);'
 
     # shares with cdb_testmember_2 and can read but cdb_testmember_3 cannot
     sql cdb_testmember_1 "SELECT * FROM cartodb.CDB_Organization_Add_Table_Read_Permission('cdb_testmember_1', 'foo', 'cdb_testmember_2')"
-    sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' should 5
+    sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' should 4
     sql cdb_testmember_3 'SELECT count(*) FROM cdb_testmember_1.foo;' fails
 
     # granting to organization allows to read to both: cdb_testmember_2 and cdb_testmember_3
     sql cdb_testmember_1 "SELECT cartodb.CDB_Organization_Add_Table_Organization_Read_Permission('cdb_testmember_1', 'foo');"
-    sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' should 5
-    sql cdb_testmember_3 'SELECT count(*) FROM cdb_testmember_1.foo;' should 5
+    sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' should 4
+    sql cdb_testmember_3 'SELECT count(*) FROM cdb_testmember_1.foo;' should 4
 
     # removing access from organization should keep permission on cdb_testmember_2 but drop it to cdb_testmember_3
     sql cdb_testmember_1 "SELECT cartodb.CDB_Organization_Remove_Organization_Access_Permission('cdb_testmember_1', 'foo');"
-    sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' should 5
+    sql cdb_testmember_2 'SELECT count(*) FROM cdb_testmember_1.foo;' should 4
     sql cdb_testmember_3 'SELECT count(*) FROM cdb_testmember_1.foo;' fails
 
+    # Cleanup
+    sql cdb_testmember_1 "SELECT * FROM cartodb.CDB_Organization_Remove_Access_Permission('cdb_testmember_1', 'foo', 'cdb_testmember_2')"
+    truncate_table cdb_testmember_1 foo
     drop_role_and_schema cdb_testmember_3
 }
 
 function test_cdb_querytables_returns_schema_and_table_name() {
-    load_sql_file scripts-available/CDB_QueryStatements.sql
-    load_sql_file scripts-available/CDB_QueryTables.sql
     sql cdb_testmember_1 "select * from CDB_QueryTables('select * from foo');" should "{cdb_testmember_1.foo}"
 }
 
 function test_cdb_querytables_works_with_parentheses() {
-    load_sql_file scripts-available/CDB_QueryStatements.sql
-    load_sql_file scripts-available/CDB_QueryTables.sql
     sql cdb_testmember_1 "select * from CDB_QueryTables('(select * from foo)');" should "{cdb_testmember_1.foo}"
 }
 
 function test_cdb_querytables_returns_schema_and_table_name_for_several_schemas() {
-    load_sql_file scripts-available/CDB_QueryStatements.sql
-    load_sql_file scripts-available/CDB_QueryTables.sql
     sql postgres "select * from CDB_QueryTables('select * from cdb_testmember_1.foo, cdb_testmember_2.bar');" should "{cdb_testmember_1.foo,cdb_testmember_2.bar}"
 }
 
 function test_cdb_querytables_does_not_return_functions_as_part_of_the_resultset() {
-    load_sql_file scripts-available/CDB_QueryStatements.sql
-    load_sql_file scripts-available/CDB_QueryTables.sql
     sql postgres "select * from CDB_QueryTables('select * from cdb_testmember_1.foo, cdb_testmember_2.bar, plainto_tsquery(''foo'')');" should "{cdb_testmember_1.foo,cdb_testmember_2.bar}"
 }
 
@@ -464,10 +503,6 @@ function test_cdb_usertables_should_work_with_orgusers() {
     # this is required to enable select from other schema
     sql postgres "GRANT USAGE ON SCHEMA cdb_testmember_1 TO publicuser";
 
-
-    # test CDB_UserTables with publicuser
-    load_sql_file scripts-available/CDB_UserTables.sql
-
     sql publicuser "SELECT count(*) FROM CDB_UserTables('all')" should 1
     sql publicuser "SELECT count(*) FROM CDB_UserTables('public')" should 1
     sql publicuser "SELECT count(*) FROM CDB_UserTables('private')" should 0
@@ -483,6 +518,7 @@ function test_cdb_usertables_should_work_with_orgusers() {
     # test cdb_testmember_2 can select from cdb_testmember_1's public table
     sql cdb_testmember_2 "SELECT * FROM cdb_testmember_1.test_perms_pub" should 1
 
+    sql postgres 'REVOKE USAGE ON SCHEMA cdb_testmember_1 FROM publicuser;'
     sql cdb_testmember_1 "DROP TABLE test_perms_pub"
     sql cdb_testmember_1 "DROP TABLE test_perms_priv"
 }