external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixup tests

pull/4396/head
Jeff Davis 2020-12-07 13:18:22 -08:00
parent 068af7f38e
commit 5b3c32eb38
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/backend/columnar/sql/downgrades/columnar--10.0-1--9.5-1.sql
View File

@ -1,6 +1,6 @@
/* columnar--10.0-1--9.5-1.sql */ /* columnar--10.0-1--9.5-1.sql */
SET search_path TO cstore; SET search_path TO columnar;
DO $proc$ DO $proc$
BEGIN BEGIN
@ -27,12 +27,12 @@ IF substring(current_Setting('server_version'), '\d+')::int >= 12 THEN
END IF; END IF;
END$proc$; END$proc$;
DROP TABLE cstore_skipnodes; DROP TABLE columnar_skipnodes;
DROP TABLE cstore_stripes; DROP TABLE columnar_stripes;
DROP TABLE options; DROP TABLE options;
DROP SEQUENCE storageid_seq; DROP SEQUENCE storageid_seq;
DROP FUNCTION citus_internal.cstore_ensure_objects_exist(); DROP FUNCTION citus_internal.columnar_ensure_objects_exist();
RESET search_path; RESET search_path;
DROP SCHEMA cstore; DROP SCHEMA columnar;

2
src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/10.0-1.sql generated
View File

@ -108,7 +108,7 @@ BEGIN
old_records naming, old_records naming,
pg_get_object_address(naming.type, naming.object_names, naming.object_args) address; pg_get_object_address(naming.type, naming.object_names, naming.object_args) address;
PERFORM citus_internal.cstore_ensure_objects_exist(); PERFORM citus_internal.columnar_ensure_objects_exist();
END; END;
$cppu$; $cppu$;

2
src/backend/distributed/sql/udfs/citus_finish_pg_upgrade/latest.sql
View File

@ -108,7 +108,7 @@ BEGIN
old_records naming, old_records naming,
pg_get_object_address(naming.type, naming.object_names, naming.object_args) address; pg_get_object_address(naming.type, naming.object_names, naming.object_args) address;
PERFORM citus_internal.cstore_ensure_objects_exist(); PERFORM citus_internal.columnar_ensure_objects_exist();
END; END;
$cppu$; $cppu$;

10
src/test/regress/expected/multi_extension.out
View File

@ -90,7 +90,7 @@ FROM pg_depend AS pgd,
WHERE pgd.refclassid = 'pg_extension'::regclass AND WHERE pgd.refclassid = 'pg_extension'::regclass AND
pgd.refobjid = pge.oid AND pgd.refobjid = pge.oid AND
pge.extname = 'citus' AND pge.extname = 'citus' AND
pgio.schema NOT IN ('pg_catalog', 'citus', 'citus_internal', 'test', 'cstore') pgio.schema NOT IN ('pg_catalog', 'citus', 'citus_internal', 'test', 'columnar')
ORDER BY 1, 2; ORDER BY 1, 2;
type | identity type | identity
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -481,12 +481,12 @@ SELECT * FROM print_extension_changes();
| access method columnar | access method columnar
| function alter_columnar_table_reset(regclass,boolean,boolean,boolean) | function alter_columnar_table_reset(regclass,boolean,boolean,boolean)
| function alter_columnar_table_set(regclass,integer,integer,name) | function alter_columnar_table_set(regclass,integer,integer,name)
| function citus_internal.cstore_ensure_objects_exist() | function citus_internal.columnar_ensure_objects_exist()
| function columnar.columnar_handler(internal) | function columnar.columnar_handler(internal)
| schema columnar | schema columnar
| sequence columnar.storageid_seq | sequence columnar.storageid_seq
| table columnar.cstore_skipnodes | table columnar.columnar_skipnodes
| table columnar.cstore_stripes | table columnar.columnar_stripes
| table columnar.options | table columnar.options
| view citus_tables | view citus_tables
(11 rows) (11 rows)
@ -507,7 +507,7 @@ FROM pg_depend AS pgd,
WHERE pgd.refclassid = 'pg_extension'::regclass AND WHERE pgd.refclassid = 'pg_extension'::regclass AND
pgd.refobjid = pge.oid AND pgd.refobjid = pge.oid AND
pge.extname = 'citus' AND pge.extname = 'citus' AND
pgio.schema NOT IN ('pg_catalog', 'citus', 'citus_internal', 'test', 'cstore') pgio.schema NOT IN ('pg_catalog', 'citus', 'citus_internal', 'test', 'columnar')
ORDER BY 1, 2; ORDER BY 1, 2;
type | identity type | identity
--------------------------------------------------------------------- ---------------------------------------------------------------------