Test around NULLs and invalids arguments

2019-11-05 16:32:07 +01:00
parent 73ee4107d4
commit e2beefdb53
7 changed files with 177 additions and 8 deletions
--- a/test/CDB_FederatedServerListRemote.sql
+++ b/test/CDB_FederatedServerListRemote.sql
@@ -200,6 +200,9 @@ SELECT * FROM cartodb.CDB_Federated_Server_List_Remote_Columns(server => 'loopba
 \echo '## Test listing of remote columns (rainy day): Remote table does not exist'
 SELECT * FROM cartodb.CDB_Federated_Server_List_Remote_Columns(server => 'loopback', remote_schema => 'S 1', remote_table => 'Does Not Exist');

+\echo '## Test listing of remote columns (rainy day): Remote table is NULL'
+SELECT * FROM cartodb.CDB_Federated_Server_List_Remote_Columns(server => 'loopback', remote_schema => 'S 1', remote_table => NULL::text);
+

 -- ===================================================================
 -- Test that using a different user to list tables and dropping it
--- a/test/CDB_FederatedServerListRemote_expect
+++ b/test/CDB_FederatedServerListRemote_expect
@@ -97,6 +97,8 @@ You are now connected to database "contrib_regression" as user "postgres".
 ERROR:  Server "Does Not Exist" does not exist
 ## Test listing of remote columns (rainy day): Remote schema does not exist
 ## Test listing of remote columns (rainy day): Remote table does not exist
+## Test listing of remote columns (rainy day): Remote table is NULL
+ERROR:  Remote table name cannot be NULL
 ## Test listing of remote objects with permissions (sunny day)

 You are now connected to database "contrib_regression" as user "cdb_fs_tester2".
--- a/test/CDB_FederatedServerTables.sql
+++ b/test/CDB_FederatedServerTables.sql
@@ -4,6 +4,7 @@
 \set QUIET on
 SET client_min_messages TO error;
 \set VERBOSITY terse
+
 SET SESSION AUTHORIZATION postgres;
 CREATE EXTENSION postgres_fdw;
 CREATE ROLE cdb_fs_tester SUPERUSER LOGIN PASSWORD 'cdb_fs_passwd';
@@ -121,9 +122,126 @@ Select 'list_remotes3', CDB_Federated_Server_List_Registered_Tables(
    remote_schema => 'remote_schema'
 );

-- Try to register with invalid / NULL server
-- Try to register with invalid / NULL schema
-- Try to register with invalid / NULL table
+\echo '## Registering a table: Invalid server fails'
+SELECT cartodb.CDB_Federated_Table_Register(
+    server => 'Does not exist',
+    remote_schema => 'remote_schema',
+    remote_table => 'remote_geom',
+    id_column => 'id',
+    geom_column => 'geom'
+    );
+
+\echo '## Registering a table: NULL server fails'
+SELECT cartodb.CDB_Federated_Table_Register(
+    server => NULL::text,
+    remote_schema => 'remote_schema',
+    remote_table => 'remote_geom',
+    id_column => 'id',
+    geom_column => 'geom'
+    );
+
+\echo '## Registering a table: Invalid schema fails'
+SELECT cartodb.CDB_Federated_Table_Register(
+    server => 'loopback',
+    remote_schema => 'Does not exist',
+    remote_table => 'remote_geom',
+    id_column => 'id',
+    geom_column => 'geom'
+    );
+
+\echo '## Registering a table: NULL schema fails'
+SELECT cartodb.CDB_Federated_Table_Register(
+    server => 'loopback',
+    remote_schema => NULL::text,
+    remote_table => 'remote_geom',
+    id_column => 'id',
+    geom_column => 'geom'
+    );
+
+\echo '## Registering a table: Invalid table fails'
+SELECT cartodb.CDB_Federated_Table_Register(
+    server => 'loopback',
+    remote_schema => 'remote_schema',
+    remote_table => 'Does not exist',
+    id_column => 'id',
+    geom_column => 'geom'
+    );
+
+\echo '## Registering a table: NULL table fails'
+SELECT cartodb.CDB_Federated_Table_Register(
+    server => 'loopback',
+    remote_schema => 'remote_schema',
+    remote_table => NULL::text,
+    id_column => 'id',
+    geom_column => 'geom'
+    );
+
+\echo '## Registering a table: Invalid id fails'
+SELECT cartodb.CDB_Federated_Table_Register(
+    server => 'loopback',
+    remote_schema => 'remote_schema',
+    remote_table => 'remote_geom',
+    id_column => 'Does not exist',
+    geom_column => 'geom'
+    );
+
+\echo '## Registering a table: NULL id fails'
+SELECT cartodb.CDB_Federated_Table_Register(
+    server => 'loopback',
+    remote_schema => 'remote_schema',
+    remote_table => 'remote_geom',
+    id_column =>  NULL::text,
+    geom_column => 'geom'
+    );
+
+\echo '## Registering a table: Invalid geom_column fails'
+SELECT cartodb.CDB_Federated_Table_Register(
+    server => 'loopback',
+    remote_schema => 'remote_schema',
+    remote_table => 'remote_geom',
+    id_column => 'id',
+    geom_column => 'Does not exists'
+    );
+
+\echo '## Registering a table: NULL geom_column is OK'
+SELECT cartodb.CDB_Federated_Table_Register(
+    server => 'loopback',
+    remote_schema => 'remote_schema',
+    remote_table => 'remote_geom',
+    id_column =>  'id',
+    geom_column => NULL::text
+    );
+SELECT cartodb.CDB_Federated_Table_Unregister(
+    server => 'loopback',
+    remote_schema => 'remote_schema',
+    remote_table => 'remote_geom'
+    );
+
+\echo '## Registering a table: Invalid webmercator_column fails'
+SELECT cartodb.CDB_Federated_Table_Register(
+    server => 'loopback',
+    remote_schema => 'remote_schema',
+    remote_table => 'remote_geom',
+    id_column => 'id',
+    geom_column => 'geom',
+    webmercator_column => 'Does not exists'
+    );
+
+\echo '## Registering a table: NULL webmercator_column is OK'
+SELECT cartodb.CDB_Federated_Table_Register(
+    server => 'loopback',
+    remote_schema => 'remote_schema',
+    remote_table => 'remote_geom',
+    id_column =>  'id',
+    geom_column => 'geom',
+    webmercator_column => NULL::text
+    );
+SELECT cartodb.CDB_Federated_Table_Unregister(
+    server => 'loopback',
+    remote_schema => 'remote_schema',
+    remote_table => 'remote_geom'
+    );
+
 -- Try to register with invalid / NULL id
 -- Try to register with invalid / NULL geom_column
 -- Try to register with invalid / NULL webmercator_column
@@ -132,6 +250,12 @@ Select 'list_remotes3', CDB_Federated_Server_List_Registered_Tables(

 -- Try permissions tricks

+-- Try registering and accessing a table as normal user
+
+-- Try register with one user and reading it with other
+-- Try register with one user and deleting it with another
+
+

 -- ===================================================================
 -- Cleanup
--- a/test/CDB_FederatedServerTables_expect
+++ b/test/CDB_FederatedServerTables_expect
@@ -27,4 +27,30 @@ S3_new|3|POINT(3 3)|patata
 U1|
 ERROR:  relation "remote_geom" does not exist at character 71
 list_remotes3|(remote_geom2,public.different_name)
+## Registering a table: Invalid server fails
+ERROR:  Server "Does not exist" does not exist
+## Registering a table: NULL server fails
+ERROR:  Server name cannot be NULL
+## Registering a table: Invalid schema fails
+ERROR:  schema "Does not exist" is not present on foreign server "cdb_fs_loopback"
+## Registering a table: NULL schema fails
+ERROR:  Schema name cannot be NULL
+## Registering a table: Invalid table fails
+ERROR:  relation "cdb_fs_schema_b904664b5208433cd85a1693ba4f7570.Does not exist" does not exist
+## Registering a table: NULL table fails
+ERROR:  Remote table name cannot be NULL
+## Registering a table: Invalid id fails
+ERROR:  non integer id_column "Does not exist"
+## Registering a table: NULL id fails
+ERROR:  non integer id_column "<NULL>"
+## Registering a table: Invalid geom_column fails
+ERROR:  non geometry column "Does not exists"
+## Registering a table: NULL geom_column is OK
+
+
+## Registering a table: Invalid webmercator_column fails
+ERROR:  non geometry column "Does not exists"
+## Registering a table: NULL webmercator_column is OK
+
+
 D1|