From a91f14371ab0278feba7d4719cb800b88dd31521 Mon Sep 17 00:00:00 2001 From: Raul Marin Date: Wed, 6 Nov 2019 17:25:10 +0100 Subject: [PATCH] Use always the modern notation for named parameters --- scripts-available/CDB_FederatedServer.sql | 10 ++-- .../CDB_FederatedServerListRemote.sql | 6 +- .../CDB_FederatedServerTables.sql | 4 +- test/CDB_FederatedServer.sql | 60 +++++++++---------- test/CDB_FederatedServerListRemote.sql | 28 ++++----- 5 files changed, 54 insertions(+), 54 deletions(-) diff --git a/scripts-available/CDB_FederatedServer.sql b/scripts-available/CDB_FederatedServer.sql index 4d9f5d1..32ec32a 100644 --- a/scripts-available/CDB_FederatedServer.sql +++ b/scripts-available/CDB_FederatedServer.sql @@ -215,7 +215,7 @@ CREATE OR REPLACE FUNCTION @extschema@.CDB_Federated_Server_Register_PG(server T RETURNS void AS $$ DECLARE - server_internal name := @extschema@.__CDB_FS_Generate_Server_Name(input_name := server, check_existence := false); + server_internal name := @extschema@.__CDB_FS_Generate_Server_Name(input_name => server, check_existence => false); final_config json := @extschema@.__CDB_FS_credentials_to_user_mapping(@extschema@.__CDB_FS_add_default_options(config)); role_name name := @extschema@.__CDB_FS_Generate_Server_Role_Name(server_internal); row record; @@ -287,13 +287,13 @@ CREATE OR REPLACE FUNCTION @extschema@.CDB_Federated_Server_Unregister(server TE RETURNS void AS $$ DECLARE - server_internal name := @extschema@.__CDB_FS_Generate_Server_Name(input_name := server, check_existence := true); + server_internal name := @extschema@.__CDB_FS_Generate_Server_Name(input_name => server, check_existence => true); role_name name := @extschema@.__CDB_FS_Generate_Server_Role_Name(server_internal); BEGIN SET client_min_messages = ERROR; BEGIN EXECUTE FORMAT ('DROP USER MAPPING FOR %I SERVER %I', role_name, server_internal); - EXECUTE FORMAT ('DROP OWNED BY %I CASCADE', role_name); + EXECUTE FORMAT ('DROP OWNED BY %I', role_name); EXECUTE FORMAT ('DROP ROLE %I', role_name); EXCEPTION WHEN OTHERS THEN RAISE EXCEPTION 'Not enough permissions to drop the server "%"', server; @@ -351,7 +351,7 @@ CREATE OR REPLACE FUNCTION @extschema@.CDB_Federated_Server_Grant_Access(server RETURNS void AS $$ DECLARE - server_internal name := @extschema@.__CDB_FS_Generate_Server_Name(input_name := server, check_existence := true); + server_internal name := @extschema@.__CDB_FS_Generate_Server_Name(input_name => server, check_existence => true); server_role_name name := @extschema@.__CDB_FS_Generate_Server_Role_Name(server_internal); BEGIN IF (db_role IS NULL) THEN @@ -376,7 +376,7 @@ CREATE OR REPLACE FUNCTION @extschema@.CDB_Federated_Server_Revoke_Access(server RETURNS void AS $$ DECLARE - server_internal name := @extschema@.__CDB_FS_Generate_Server_Name(input_name := server, check_existence := true); + server_internal name := @extschema@.__CDB_FS_Generate_Server_Name(input_name => server, check_existence => true); server_role_name name := @extschema@.__CDB_FS_Generate_Server_Role_Name(server_internal); BEGIN IF (db_role IS NULL) THEN diff --git a/scripts-available/CDB_FederatedServerListRemote.sql b/scripts-available/CDB_FederatedServerListRemote.sql index 115f360..f5a0aaf 100644 --- a/scripts-available/CDB_FederatedServerListRemote.sql +++ b/scripts-available/CDB_FederatedServerListRemote.sql @@ -201,7 +201,7 @@ CREATE OR REPLACE FUNCTION @extschema@.CDB_Federated_Server_List_Remote_Schemas( RETURNS TABLE(remote_schema name) AS $$ DECLARE - server_internal name := @extschema@.__CDB_FS_Generate_Server_Name(input_name := server, check_existence := true); + server_internal name := @extschema@.__CDB_FS_Generate_Server_Name(input_name => server, check_existence => true); server_type name := @extschema@.__CDB_FS_server_type(server_internal); BEGIN CASE server_type @@ -230,7 +230,7 @@ RETURNS TABLE( ) AS $$ DECLARE - server_internal name := @extschema@.__CDB_FS_Generate_Server_Name(input_name := server, check_existence := true); + server_internal name := @extschema@.__CDB_FS_Generate_Server_Name(input_name => server, check_existence => true); server_type name := @extschema@.__CDB_FS_server_type(server_internal); BEGIN CASE server_type @@ -275,7 +275,7 @@ CREATE OR REPLACE FUNCTION @extschema@.CDB_Federated_Server_List_Remote_Columns( RETURNS TABLE(column_n name, column_t text) AS $$ DECLARE - server_internal name := @extschema@.__CDB_FS_Generate_Server_Name(input_name := server, check_existence := true); + server_internal name := @extschema@.__CDB_FS_Generate_Server_Name(input_name => server, check_existence => true); server_type name := @extschema@.__CDB_FS_server_type(server_internal); BEGIN IF remote_table IS NULL THEN diff --git a/scripts-available/CDB_FederatedServerTables.sql b/scripts-available/CDB_FederatedServerTables.sql index 11497a3..c54cf06 100644 --- a/scripts-available/CDB_FederatedServerTables.sql +++ b/scripts-available/CDB_FederatedServerTables.sql @@ -196,7 +196,7 @@ CREATE OR REPLACE FUNCTION @extschema@.CDB_Federated_Table_Register( RETURNS void AS $$ DECLARE - server_internal name := @extschema@.__CDB_FS_Generate_Server_Name(input_name := server, check_existence := false); + server_internal name := @extschema@.__CDB_FS_Generate_Server_Name(input_name => server, check_existence => false); local_schema name := @extschema@.__CDB_FS_Create_Schema(server_internal, remote_schema); src_table REGCLASS; @@ -315,7 +315,7 @@ CREATE OR REPLACE FUNCTION @extschema@.CDB_Federated_Table_Unregister( RETURNS void AS $$ DECLARE - server_internal name := @extschema@.__CDB_FS_Generate_Server_Name(input_name := server, check_existence := false); + server_internal name := @extschema@.__CDB_FS_Generate_Server_Name(input_name => server, check_existence => false); local_schema name := @extschema@.__CDB_FS_Create_Schema(server_internal, remote_schema); BEGIN EXECUTE FORMAT ('DROP FOREIGN TABLE %I.%I CASCADE;', local_schema, remote_table); diff --git a/test/CDB_FederatedServer.sql b/test/CDB_FederatedServer.sql index 287fdb0..1f418c2 100644 --- a/test/CDB_FederatedServer.sql +++ b/test/CDB_FederatedServer.sql @@ -10,10 +10,10 @@ CREATE EXTENSION postgres_fdw; SELECT '1.1', cartodb.CDB_Federated_Server_List_Servers(); \echo '## List non-existent server shows nothing' -SELECT '1.2', cartodb.CDB_Federated_Server_List_Servers(server := 'doesNotExist'); +SELECT '1.2', cartodb.CDB_Federated_Server_List_Servers(server => 'doesNotExist'); \echo '## Create and list a server works' -SELECT '1.3', cartodb.CDB_Federated_Server_Register_PG(server := 'myRemote'::text, config := '{ +SELECT '1.3', cartodb.CDB_Federated_Server_Register_PG(server => 'myRemote'::text, config => '{ "server": { "host": "localhost", "port": @@PGPORT@@ @@ -26,7 +26,7 @@ SELECT '1.3', cartodb.CDB_Federated_Server_Register_PG(server := 'myRemote'::tex SELECT '1.4', cartodb.CDB_Federated_Server_List_Servers(); \echo '## Create and list a second server works' -SELECT '2.1', cartodb.CDB_Federated_Server_Register_PG(server := 'myRemote2'::text, config := '{ +SELECT '2.1', cartodb.CDB_Federated_Server_Register_PG(server => 'myRemote2'::text, config => '{ "server": { "dbname": "fdw_target", "host": "localhost", @@ -44,11 +44,11 @@ SELECT '2.1', cartodb.CDB_Federated_Server_Register_PG(server := 'myRemote2'::te SELECT '2.2', cartodb.CDB_Federated_Server_List_Servers(); \echo '## List server by name works' -SELECT '2.3', cartodb.CDB_Federated_Server_List_Servers(server := 'myRemote'); +SELECT '2.3', cartodb.CDB_Federated_Server_List_Servers(server => 'myRemote'); \echo '## Re-register a second server works' -SELECT '3.1', cartodb.CDB_Federated_Server_Register_PG(server := 'myRemote2'::text, config := '{ +SELECT '3.1', cartodb.CDB_Federated_Server_Register_PG(server => 'myRemote2'::text, config => '{ "server": { "dbname": "fdw_target", "host": "localhost", @@ -66,24 +66,24 @@ SELECT '3.1', cartodb.CDB_Federated_Server_Register_PG(server := 'myRemote2'::te SELECT '3.2', cartodb.CDB_Federated_Server_List_Servers(); \echo '## Unregister server 1 works' -SELECT '4.1', cartodb.CDB_Federated_Server_Unregister(server := 'myRemote'::text); +SELECT '4.1', cartodb.CDB_Federated_Server_Unregister(server => 'myRemote'::text); SELECT '4.2', cartodb.CDB_Federated_Server_List_Servers(); \echo '## Unregistering a server that does not exist fails' -SELECT '5.1', cartodb.CDB_Federated_Server_Unregister(server := 'doesNotExist'::text); +SELECT '5.1', cartodb.CDB_Federated_Server_Unregister(server => 'doesNotExist'::text); \echo '## Unregister the second server works' -SELECT '6.1', cartodb.CDB_Federated_Server_Unregister(server := 'myRemote2'::text); +SELECT '6.1', cartodb.CDB_Federated_Server_Unregister(server => 'myRemote2'::text); SELECT '6.2', cartodb.CDB_Federated_Server_List_Servers(); \echo '## Create a server with NULL name fails' -SELECT '7.0', cartodb.CDB_Federated_Server_Register_PG(server := NULL::text, config := '{ "server": {}, "credentials" : {}}'); +SELECT '7.0', cartodb.CDB_Federated_Server_Register_PG(server => NULL::text, config => '{ "server": {}, "credentials" : {}}'); \echo '## Create a server with NULL config fails' -SELECT '7.01', cartodb.CDB_Federated_Server_Register_PG(server := 'empty'::text, config := NULL::jsonb); +SELECT '7.01', cartodb.CDB_Federated_Server_Register_PG(server => 'empty'::text, config => NULL::jsonb); \echo '## Create a server with empty config fails' -SELECT '7.1', cartodb.CDB_Federated_Server_Register_PG(server := 'empty'::text, config := '{}'); +SELECT '7.1', cartodb.CDB_Federated_Server_Register_PG(server => 'empty'::text, config => '{}'); \echo '## Create a server without credentials fails' -SELECT '7.2', cartodb.CDB_Federated_Server_Register_PG(server := 'empty'::text, config := '{ +SELECT '7.2', cartodb.CDB_Federated_Server_Register_PG(server => 'empty'::text, config => '{ "server": { "dbname": "fdw_target", "host": "localhost", @@ -95,7 +95,7 @@ SELECT '7.2', cartodb.CDB_Federated_Server_Register_PG(server := 'empty'::text, } }'::jsonb); \echo '## Create a server with empty credentials works' -SELECT '7.3', cartodb.CDB_Federated_Server_Register_PG(server := 'empty'::text, config := '{ +SELECT '7.3', cartodb.CDB_Federated_Server_Register_PG(server => 'empty'::text, config => '{ "server": { "dbname": "fdw_target", "host": "localhost", @@ -108,9 +108,9 @@ SELECT '7.3', cartodb.CDB_Federated_Server_Register_PG(server := 'empty'::text, "credentials": { } }'::jsonb); SELECT '7.4', cartodb.CDB_Federated_Server_List_Servers(); -SELECT '7.5', cartodb.CDB_Federated_Server_Unregister(server := 'empty'::text); +SELECT '7.5', cartodb.CDB_Federated_Server_Unregister(server => 'empty'::text); \echo '## Create a server without options fails' -SELECT '7.6', cartodb.CDB_Federated_Server_Register_PG(server := 'empty'::text, config := '{ +SELECT '7.6', cartodb.CDB_Federated_Server_Register_PG(server => 'empty'::text, config => '{ "credentials": { "username": "other_remote_user", "password": "foobarino" @@ -118,7 +118,7 @@ SELECT '7.6', cartodb.CDB_Federated_Server_Register_PG(server := 'empty'::text, }'::jsonb); \echo '## Create a server with special characters works' -SELECT '8.1', cartodb.CDB_Federated_Server_Register_PG(server := 'myRemote" or''not'::text, config := '{ +SELECT '8.1', cartodb.CDB_Federated_Server_Register_PG(server => 'myRemote" or''not'::text, config => '{ "server": { "dbname": "fdw target", "host": "localhost", @@ -134,7 +134,7 @@ SELECT '8.1', cartodb.CDB_Federated_Server_Register_PG(server := 'myRemote" or'' } }'::jsonb); SELECT '8.2', cartodb.CDB_Federated_Server_List_Servers(); -SELECT '8.3', cartodb.CDB_Federated_Server_Unregister(server := 'myRemote" or''not'::text); +SELECT '8.3', cartodb.CDB_Federated_Server_Unregister(server => 'myRemote" or''not'::text); -- Test permissions \set QUIET on @@ -142,7 +142,7 @@ CREATE ROLE cdb_fs_tester LOGIN PASSWORD 'cdb_fs_passwd'; GRANT CONNECT ON DATABASE contrib_regression TO cdb_fs_tester; \set QUIET off -SELECT '9.1', cartodb.CDB_Federated_Server_Register_PG(server := 'myRemote3'::text, config := '{ +SELECT '9.1', cartodb.CDB_Federated_Server_Register_PG(server => 'myRemote3'::text, config => '{ "server": { "host": "localhost", "port": @@PGPORT@@ @@ -159,7 +159,7 @@ SELECT '9.1', cartodb.CDB_Federated_Server_Register_PG(server := 'myRemote3'::te SELECT '9.2', cartodb.CDB_Federated_Server_List_Servers(); \echo '## Only superadmins can create servers' -SELECT '9.3', cartodb.CDB_Federated_Server_Register_PG(server := 'myRemote4'::text, config := '{ +SELECT '9.3', cartodb.CDB_Federated_Server_Register_PG(server => 'myRemote4'::text, config => '{ "server": { "host": "localhost", "port": @@PGPORT@@ @@ -174,23 +174,23 @@ SELECT '9.3', cartodb.CDB_Federated_Server_Register_PG(server := 'myRemote4'::te \c contrib_regression postgres \echo '## Granting access to a user works' -SELECT '9.5', cartodb.CDB_Federated_Server_Grant_Access(server := 'myRemote3', db_role := 'cdb_fs_tester'::name); -SELECT '9.6', cartodb.CDB_Federated_Server_Grant_Access(server := 'does not exist', db_role := 'cdb_fs_tester'::name); -SELECT '9.7', cartodb.CDB_Federated_Server_Grant_Access(server := 'myRemote3', db_role := 'does not exist'::name); +SELECT '9.5', cartodb.CDB_Federated_Server_Grant_Access(server => 'myRemote3', db_role => 'cdb_fs_tester'::name); +SELECT '9.6', cartodb.CDB_Federated_Server_Grant_Access(server => 'does not exist', db_role => 'cdb_fs_tester'::name); +SELECT '9.7', cartodb.CDB_Federated_Server_Grant_Access(server => 'myRemote3', db_role => 'does not exist'::name); \echo '## Granting access again raises a notice' -SELECT '9.8', cartodb.CDB_Federated_Server_Grant_Access(server := 'myRemote3', db_role := 'cdb_fs_tester'::name); +SELECT '9.8', cartodb.CDB_Federated_Server_Grant_Access(server => 'myRemote3', db_role => 'cdb_fs_tester'::name); \echo '## Revoking access to a user works' -SELECT '9.9', cartodb.CDB_Federated_Server_Revoke_Access(server := 'myRemote3', db_role := 'cdb_fs_tester'::name); -SELECT '9.10', cartodb.CDB_Federated_Server_Grant_Access(server := 'myRemote3', db_role := 'cdb_fs_tester'::name); +SELECT '9.9', cartodb.CDB_Federated_Server_Revoke_Access(server => 'myRemote3', db_role => 'cdb_fs_tester'::name); +SELECT '9.10', cartodb.CDB_Federated_Server_Grant_Access(server => 'myRemote3', db_role => 'cdb_fs_tester'::name); \echo '## Unregistering a server with active grants works' -SELECT '9.11', cartodb.CDB_Federated_Server_Unregister(server := 'myRemote3'::text); +SELECT '9.11', cartodb.CDB_Federated_Server_Unregister(server => 'myRemote3'::text); \echo '## A user with granted access can not drop a server' -SELECT '10.1', cartodb.CDB_Federated_Server_Register_PG(server := 'myRemote4'::text, config := '{ +SELECT '10.1', cartodb.CDB_Federated_Server_Register_PG(server => 'myRemote4'::text, config => '{ "server": { "host": "localhost", "port": @@PGPORT@@ @@ -200,13 +200,13 @@ SELECT '10.1', cartodb.CDB_Federated_Server_Register_PG(server := 'myRemote4'::t "password": "foobarino" } }'::jsonb); -SELECT '10.2', cartodb.CDB_Federated_Server_Grant_Access(server := 'myRemote4', db_role := 'cdb_fs_tester'::name); +SELECT '10.2', cartodb.CDB_Federated_Server_Grant_Access(server => 'myRemote4', db_role => 'cdb_fs_tester'::name); \c contrib_regression cdb_fs_tester -SELECT '10.3', cartodb.CDB_Federated_Server_Unregister(server := 'myRemote4'::text); +SELECT '10.3', cartodb.CDB_Federated_Server_Unregister(server => 'myRemote4'::text); \c contrib_regression postgres -SELECT '10.4', cartodb.CDB_Federated_Server_Unregister(server := 'myRemote4'::text); +SELECT '10.4', cartodb.CDB_Federated_Server_Unregister(server => 'myRemote4'::text); -- Cleanup diff --git a/test/CDB_FederatedServerListRemote.sql b/test/CDB_FederatedServerListRemote.sql index 9c937e1..8114673 100644 --- a/test/CDB_FederatedServerListRemote.sql +++ b/test/CDB_FederatedServerListRemote.sql @@ -14,7 +14,7 @@ GRANT CONNECT ON DATABASE contrib_regression TO cdb_fs_tester2; -- Create database to be used as remote CREATE DATABASE cdb_fs_tester OWNER cdb_fs_tester; -SELECT 'C1', cartodb.CDB_Federated_Server_Register_PG(server := 'loopback'::text, config := '{ +SELECT 'C1', cartodb.CDB_Federated_Server_Register_PG(server => 'loopback'::text, config => '{ "server": { "host": "localhost", "port": @@PGPORT@@ @@ -25,7 +25,7 @@ SELECT 'C1', cartodb.CDB_Federated_Server_Register_PG(server := 'loopback'::text } }'::jsonb); -SELECT 'C2', cartodb.CDB_Federated_Server_Register_PG(server := 'loopback2'::text, config := '{ +SELECT 'C2', cartodb.CDB_Federated_Server_Register_PG(server => 'loopback2'::text, config => '{ "server": { "host": "localhost", "port": @@PGPORT@@ @@ -101,13 +101,13 @@ SELECT * FROM cartodb.CDB_Federated_Server_List_Remote_Schemas(server => 'loopba \c contrib_regression postgres \echo '## Test listing of remote schemas with permissions (sunny day)' -SELECT cartodb.CDB_Federated_Server_Grant_Access(server := 'loopback', db_role := 'cdb_fs_tester'::name); +SELECT cartodb.CDB_Federated_Server_Grant_Access(server => 'loopback', db_role => 'cdb_fs_tester'::name); \c contrib_regression cdb_fs_tester SELECT * FROM cartodb.CDB_Federated_Server_List_Remote_Schemas(server => 'loopback'); \c contrib_regression postgres \echo '## Test listing of remote schemas without permissions after revoking access (rainy day)' -SELECT cartodb.CDB_Federated_Server_Revoke_Access(server := 'loopback', db_role := 'cdb_fs_tester'::name); +SELECT cartodb.CDB_Federated_Server_Revoke_Access(server => 'loopback', db_role => 'cdb_fs_tester'::name); \c contrib_regression cdb_fs_tester SELECT * FROM cartodb.CDB_Federated_Server_List_Remote_Schemas(server => 'loopback'); \c contrib_regression postgres @@ -134,13 +134,13 @@ SELECT * FROM cartodb.CDB_Federated_Server_List_Remote_Tables(server => 'loopbac \c contrib_regression postgres \echo '## Test listing of remote tables with permissions (sunny day)' -SELECT cartodb.CDB_Federated_Server_Grant_Access(server := 'loopback', db_role := 'cdb_fs_tester'::name); +SELECT cartodb.CDB_Federated_Server_Grant_Access(server => 'loopback', db_role => 'cdb_fs_tester'::name); \c contrib_regression cdb_fs_tester SELECT * FROM cartodb.CDB_Federated_Server_List_Remote_Tables(server => 'loopback', remote_schema => 'S 1'); \c contrib_regression postgres \echo '## Test listing of remote tables without permissions after revoking access (rainy day)' -SELECT cartodb.CDB_Federated_Server_Revoke_Access(server := 'loopback', db_role := 'cdb_fs_tester'::name); +SELECT cartodb.CDB_Federated_Server_Revoke_Access(server => 'loopback', db_role => 'cdb_fs_tester'::name); \c contrib_regression cdb_fs_tester SELECT * FROM cartodb.CDB_Federated_Server_List_Remote_Tables(server => 'loopback', remote_schema => 'S 1'); \c contrib_regression postgres @@ -170,13 +170,13 @@ SELECT * FROM cartodb.CDB_Federated_Server_List_Remote_Columns(server => 'loopba \c contrib_regression postgres \echo '## Test listing of remote columns with permissions (sunny day)' -SELECT cartodb.CDB_Federated_Server_Grant_Access(server := 'loopback', db_role := 'cdb_fs_tester'::name); +SELECT cartodb.CDB_Federated_Server_Grant_Access(server => 'loopback', db_role => 'cdb_fs_tester'::name); \c contrib_regression cdb_fs_tester SELECT * FROM cartodb.CDB_Federated_Server_List_Remote_Columns(server => 'loopback', remote_schema => 'S 1', remote_table => 'T 1'); \c contrib_regression postgres \echo '## Test listing of remote columns without permissions after revoking access (rainy day)' -SELECT cartodb.CDB_Federated_Server_Revoke_Access(server := 'loopback', db_role := 'cdb_fs_tester'::name); +SELECT cartodb.CDB_Federated_Server_Revoke_Access(server => 'loopback', db_role => 'cdb_fs_tester'::name); \c contrib_regression cdb_fs_tester SELECT * FROM cartodb.CDB_Federated_Server_List_Remote_Columns(server => 'loopback', remote_schema => 'S 1', remote_table => 'T 1'); \c contrib_regression postgres @@ -201,7 +201,7 @@ SELECT * FROM cartodb.CDB_Federated_Server_List_Remote_Columns(server => 'loopba \echo '## Test listing of remote objects with permissions (sunny day)' -SELECT cartodb.CDB_Federated_Server_Grant_Access(server := 'loopback2', db_role := 'cdb_fs_tester2'::name); +SELECT cartodb.CDB_Federated_Server_Grant_Access(server => 'loopback2', db_role => 'cdb_fs_tester2'::name); \c contrib_regression cdb_fs_tester2 SELECT * FROM cartodb.CDB_Federated_Server_List_Remote_Schemas(server => 'loopback2'); SELECT * FROM cartodb.CDB_Federated_Server_List_Remote_Tables(server => 'loopback2', remote_schema => 'S 1'); @@ -213,7 +213,7 @@ REVOKE CONNECT ON DATABASE contrib_regression FROM cdb_fs_tester2; DROP ROLE cdb_fs_tester2; \echo '## Test listing of remote objects with other user still works (sunny day)' -SELECT cartodb.CDB_Federated_Server_Grant_Access(server := 'loopback2', db_role := 'cdb_fs_tester'::name); +SELECT cartodb.CDB_Federated_Server_Grant_Access(server => 'loopback2', db_role => 'cdb_fs_tester'::name); \c contrib_regression cdb_fs_tester SELECT * FROM cartodb.CDB_Federated_Server_List_Remote_Schemas(server => 'loopback2'); SELECT * FROM cartodb.CDB_Federated_Server_List_Remote_Tables(server => 'loopback2', remote_schema => 'S 1'); @@ -275,7 +275,7 @@ SELECT * FROM cartodb.CDB_Federated_Server_List_Remote_Columns(server => 'loopba -- =================================================================== \echo '## Check error message with invalid password (rainy day)' -SELECT cartodb.CDB_Federated_Server_Register_PG(server := 'loopback_invalid'::text, config := '{ +SELECT cartodb.CDB_Federated_Server_Register_PG(server => 'loopback_invalid'::text, config => '{ "server": { "host": "localhost", "port": @@PGPORT@@ @@ -288,7 +288,7 @@ SELECT cartodb.CDB_Federated_Server_Register_PG(server := 'loopback_invalid'::te SELECT * FROM cartodb.CDB_Federated_Server_List_Remote_Schemas(server => 'loopback_invalid'); -SELECT cartodb.CDB_Federated_Server_Unregister(server := 'loopback_invalid'::text); +SELECT cartodb.CDB_Federated_Server_Unregister(server => 'loopback_invalid'::text); -- =================================================================== -- Cleanup 2 @@ -305,8 +305,8 @@ DROP SCHEMA "S 1"; SET client_min_messages TO error; \set VERBOSITY terse -SELECT 'D1', cartodb.CDB_Federated_Server_Unregister(server := 'loopback'::text); -SELECT 'D2', cartodb.CDB_Federated_Server_Unregister(server := 'loopback2'::text); +SELECT 'D1', cartodb.CDB_Federated_Server_Unregister(server => 'loopback'::text); +SELECT 'D2', cartodb.CDB_Federated_Server_Unregister(server => 'loopback2'::text); DROP DATABASE cdb_fs_tester;