From a98093540d952bcab18889cfeff1f9b7ebb03ff3 Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Mon, 29 Aug 2016 14:38:38 +0200 Subject: [PATCH] Fix table level tests for server --- server/extension/test/expected/00_install_test.out | 1 - .../test/expected/100_data_observatory_tables_test.out | 8 ++++---- server/extension/test/sql/00_install_test.sql | 1 - .../test/sql/100_data_observatory_tables_test.sql | 8 ++++---- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/server/extension/test/expected/00_install_test.out b/server/extension/test/expected/00_install_test.out index 9a9bba2..2f68fdd 100644 --- a/server/extension/test/expected/00_install_test.out +++ b/server/extension/test/expected/00_install_test.out @@ -4,7 +4,6 @@ CREATE EXTENSION plpythonu; CREATE EXTENSION plproxy; CREATE EXTENSION cartodb; CREATE EXTENSION cdb_geocoder; -CREATE EXTENSION observatory VERSION 'dev'; -- Install the extension CREATE EXTENSION cdb_dataservices_server; -- Mock the redis server connection to point to this very test db diff --git a/server/extension/test/expected/100_data_observatory_tables_test.out b/server/extension/test/expected/100_data_observatory_tables_test.out index 6a3a063..cea6734 100644 --- a/server/extension/test/expected/100_data_observatory_tables_test.out +++ b/server/extension/test/expected/100_data_observatory_tables_test.out @@ -2,7 +2,7 @@ SELECT exists(SELECT * FROM pg_proc p INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid) WHERE ns.nspname = 'cdb_dataservices_server' - AND proname = '_obs_connectusertable' + AND proname = '_dst_connectusertable' AND oidvectortypes(p.proargtypes) = 'text, text, text, text, text, text'); exists -------- @@ -13,7 +13,7 @@ SELECT exists(SELECT * FROM pg_proc p INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid) WHERE ns.nspname = 'cdb_dataservices_server' - AND proname = '_obs_getreturnmetadata' + AND proname = '_dst_getreturnmetadata' AND oidvectortypes(p.proargtypes) = 'text, text, text, json'); exists -------- @@ -24,7 +24,7 @@ SELECT exists(SELECT * FROM pg_proc p INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid) WHERE ns.nspname = 'cdb_dataservices_server' - AND proname = '_obs_fetchjoinfdwtabledata' + AND proname = '_dst_fetchjoinfdwtabledata' AND oidvectortypes(p.proargtypes) = 'text, text, text, text, text, json'); exists -------- @@ -35,7 +35,7 @@ SELECT exists(SELECT * FROM pg_proc p INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid) WHERE ns.nspname = 'cdb_dataservices_server' - AND proname = '_obs_disconnectusertable' + AND proname = '_dst_disconnectusertable' AND oidvectortypes(p.proargtypes) = 'text, text, text, text, text'); exists -------- diff --git a/server/extension/test/sql/00_install_test.sql b/server/extension/test/sql/00_install_test.sql index 7d48197..31b8660 100644 --- a/server/extension/test/sql/00_install_test.sql +++ b/server/extension/test/sql/00_install_test.sql @@ -4,7 +4,6 @@ CREATE EXTENSION plpythonu; CREATE EXTENSION plproxy; CREATE EXTENSION cartodb; CREATE EXTENSION cdb_geocoder; -CREATE EXTENSION observatory VERSION 'dev'; -- Install the extension CREATE EXTENSION cdb_dataservices_server; diff --git a/server/extension/test/sql/100_data_observatory_tables_test.sql b/server/extension/test/sql/100_data_observatory_tables_test.sql index cb63e1a..74a7b2c 100644 --- a/server/extension/test/sql/100_data_observatory_tables_test.sql +++ b/server/extension/test/sql/100_data_observatory_tables_test.sql @@ -2,27 +2,27 @@ SELECT exists(SELECT * FROM pg_proc p INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid) WHERE ns.nspname = 'cdb_dataservices_server' - AND proname = '_obs_connectusertable' + AND proname = '_dst_connectusertable' AND oidvectortypes(p.proargtypes) = 'text, text, text, text, text, text'); SELECT exists(SELECT * FROM pg_proc p INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid) WHERE ns.nspname = 'cdb_dataservices_server' - AND proname = '_obs_getreturnmetadata' + AND proname = '_dst_getreturnmetadata' AND oidvectortypes(p.proargtypes) = 'text, text, text, json'); SELECT exists(SELECT * FROM pg_proc p INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid) WHERE ns.nspname = 'cdb_dataservices_server' - AND proname = '_obs_fetchjoinfdwtabledata' + AND proname = '_dst_fetchjoinfdwtabledata' AND oidvectortypes(p.proargtypes) = 'text, text, text, text, text, json'); SELECT exists(SELECT * FROM pg_proc p INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid) WHERE ns.nspname = 'cdb_dataservices_server' - AND proname = '_obs_disconnectusertable' + AND proname = '_dst_disconnectusertable' AND oidvectortypes(p.proargtypes) = 'text, text, text, text, text');