diff --git a/extension/sql/common/errors.sql b/extension/sql/common/errors.sql index 4d3644a3d..95658b1e8 100644 --- a/extension/sql/common/errors.sql +++ b/extension/sql/common/errors.sql @@ -9,7 +9,8 @@ --IO101 - operation not supported --IO102 - no partitioning column for hypertable --IO103 - unknown index type ---IO104 - illegal name/identifier. +--IO104 - illegal name/identifier +--IO110 - hypertable already exists --IO500 - GROUP: internal error --IO501 - unexpected state/event diff --git a/extension/sql/main/ddl.sql b/extension/sql/main/ddl.sql index 070e03886..a7a6c2342 100644 --- a/extension/sql/main/ddl.sql +++ b/extension/sql/main/ddl.sql @@ -42,22 +42,28 @@ BEGIN FROM pg_attribute WHERE attrelid = main_table AND attname = time_column_name; - SELECT * - INTO hypertable_row - FROM _iobeamdb_meta_api.create_hypertable( - schema_name, - table_name, - time_column_name, - time_column_type, - partitioning_column, - replication_factor, - number_partitions, - associated_schema_name, - associated_table_prefix, - hypertable_name, - placement, - chunk_size_bytes - ); + BEGIN + SELECT * + INTO hypertable_row + FROM _iobeamdb_meta_api.create_hypertable( + schema_name, + table_name, + time_column_name, + time_column_type, + partitioning_column, + replication_factor, + number_partitions, + associated_schema_name, + associated_table_prefix, + hypertable_name, + placement, + chunk_size_bytes + ); + EXCEPTION + WHEN unique_violation THEN + RAISE EXCEPTION 'hypertable already exists: %', hypertable_name + USING ERRCODE = 'IO110'; + END; FOR att_row IN SELECT * FROM pg_attribute att diff --git a/extension/sql/main/hypertable_triggers.sql b/extension/sql/main/hypertable_triggers.sql index 2805cc42f..b2f63c2ee 100644 --- a/extension/sql/main/hypertable_triggers.sql +++ b/extension/sql/main/hypertable_triggers.sql @@ -81,6 +81,7 @@ BEGIN END $BODY$ +SET client_min_messages = WARNING --suppress NOTICE on IF EXISTS schema SET SEARCH_PATH = 'public'; diff --git a/extension/sql/main/setup_kafka.sql b/extension/sql/main/setup_kafka.sql index ebb5b9eed..5210e9bb0 100644 --- a/extension/sql/main/setup_kafka.sql +++ b/extension/sql/main/setup_kafka.sql @@ -16,4 +16,6 @@ BEGIN FOR EACH ROW EXECUTE PROCEDURE _sysinternal.on_create_kafka_offset_node(); END -$BODY$; +$BODY$ +SET client_min_messages = WARNING --suppress if trigger does not exist on drop notices +; diff --git a/extension/sql/main/setup_main.sql b/extension/sql/main/setup_main.sql index 81cfe0776..73e6dbdc6 100644 --- a/extension/sql/main/setup_main.sql +++ b/extension/sql/main/setup_main.sql @@ -101,4 +101,6 @@ BEGIN EXECUTE PROCEDURE _sysinternal.ddl_process_drop_table(); END -$BODY$; +$BODY$ +SET client_min_messages = WARNING --supress notices for trigger drops +; diff --git a/extension/sql/main/table_creation.sql b/extension/sql/main/table_creation.sql index ce1800e20..4b95b77d3 100644 --- a/extension/sql/main/table_creation.sql +++ b/extension/sql/main/table_creation.sql @@ -13,7 +13,9 @@ BEGIN CREATE SCHEMA IF NOT EXISTS %I $$, schema_name); END -$BODY$; +$BODY$ +SET client_min_messages = WARNING --suppress NOTICE on IF EXISTS +; -- Creates a table for a hypertable (e.g. main table or root table) CREATE OR REPLACE FUNCTION _sysinternal.create_table( @@ -289,4 +291,6 @@ BEGIN _sysinternal.time_literal_sql(end_time, time_col_type)); END IF; END -$BODY$; +$BODY$ +SET client_min_messages = WARNING --supress notice by drop constraint if exists. +; diff --git a/extension/sql/meta/ddl.sql b/extension/sql/meta/ddl.sql index 0bb967ef3..779ee880b 100644 --- a/extension/sql/meta/ddl.sql +++ b/extension/sql/meta/ddl.sql @@ -66,7 +66,7 @@ BEGIN time_column_name, time_column_type, created_on ) - ON CONFLICT DO NOTHING RETURNING * INTO hypertable_row; + RETURNING * INTO hypertable_row; IF number_partitions != 0 THEN PERFORM add_equi_partition_epoch(hypertable_name, number_partitions, partitioning_column); diff --git a/extension/sql/meta/node_triggers.sql b/extension/sql/meta/node_triggers.sql index dbfcae6aa..360a7a57e 100644 --- a/extension/sql/meta/node_triggers.sql +++ b/extension/sql/meta/node_triggers.sql @@ -28,7 +28,9 @@ BEGIN END IF; RETURN NEW; END -$BODY$; +$BODY$ +SET client_min_messages = WARNING --supress schema if exists notice. +; CREATE OR REPLACE FUNCTION _meta.sync_node() RETURNS TRIGGER LANGUAGE PLPGSQL AS diff --git a/extension/sql/meta/setup_meta.sql b/extension/sql/meta/setup_meta.sql index 4eaaa3690..5bc3b0a76 100644 --- a/extension/sql/meta/setup_meta.sql +++ b/extension/sql/meta/setup_meta.sql @@ -73,4 +73,6 @@ BEGIN END LOOP; END -$BODY$; +$BODY$ +SET client_min_messages = WARNING --supress notices for trigger drops +; diff --git a/extension/sql/tests/regression/cluster.sql b/extension/sql/tests/regression/cluster.sql index 59028a440..089f1ccc5 100644 --- a/extension/sql/tests/regression/cluster.sql +++ b/extension/sql/tests/regression/cluster.sql @@ -1,4 +1,6 @@ \set ON_ERROR_STOP 1 +\set VERBOSITY verbose +\set SHOW_CONTEXT never \ir include/create_clustered_db.sql @@ -29,6 +31,11 @@ CREATE INDEX ON PUBLIC."testNs" (time DESC NULLS LAST, really_long_column_goes_o SELECT * FROM create_hypertable('"public"."testNs"', 'time', 'Device_id', hypertable_name=>'testNs'); + +\set ON_ERROR_STOP 0 +SELECT * FROM create_hypertable('"public"."testNs"', 'time', 'Device_id', hypertable_name=>'testNs'); +\set ON_ERROR_STOP 1 + SELECT set_is_distinct_flag('"public"."testNs"', 'Device_id', TRUE); \c meta diff --git a/extension/sql/tests/regression/ddl.sql b/extension/sql/tests/regression/ddl.sql index 4aad9d4c7..db50bdc81 100644 --- a/extension/sql/tests/regression/ddl.sql +++ b/extension/sql/tests/regression/ddl.sql @@ -1,4 +1,6 @@ \set ON_ERROR_STOP 1 +\set VERBOSITY verbose +\set SHOW_CONTEXT never \o /dev/null \ir include/create_clustered_db.sql diff --git a/extension/sql/tests/regression/ddl_single.sql b/extension/sql/tests/regression/ddl_single.sql index 79ad24e59..cde94d77d 100644 --- a/extension/sql/tests/regression/ddl_single.sql +++ b/extension/sql/tests/regression/ddl_single.sql @@ -1,4 +1,6 @@ \set ON_ERROR_STOP 1 +\set VERBOSITY verbose +\set SHOW_CONTEXT never \o /dev/null \ir include/create_single_db.sql diff --git a/extension/sql/tests/regression/expected/cluster.out b/extension/sql/tests/regression/expected/cluster.out index 0766e2467..fb8e4751b 100644 --- a/extension/sql/tests/regression/expected/cluster.out +++ b/extension/sql/tests/regression/expected/cluster.out @@ -1,13 +1,31 @@ +psql:include/create_clustered_db.sql:12: NOTICE: 00000: installing required extension "dblink" +LOCATION: CreateExtensionInternal, extension.c:1441 +psql:include/create_clustered_db.sql:12: NOTICE: 00000: installing required extension "postgres_fdw" +LOCATION: CreateExtensionInternal, extension.c:1441 +psql:include/create_clustered_db.sql:12: NOTICE: 00000: installing required extension "hstore" +LOCATION: CreateExtensionInternal, extension.c:1441 setup_meta ------------ (1 row) +psql:include/create_clustered_db.sql:16: NOTICE: 00000: installing required extension "dblink" +LOCATION: CreateExtensionInternal, extension.c:1441 +psql:include/create_clustered_db.sql:16: NOTICE: 00000: installing required extension "postgres_fdw" +LOCATION: CreateExtensionInternal, extension.c:1441 +psql:include/create_clustered_db.sql:16: NOTICE: 00000: installing required extension "hstore" +LOCATION: CreateExtensionInternal, extension.c:1441 setup_main ------------ (1 row) +psql:include/create_clustered_db.sql:20: NOTICE: 00000: installing required extension "dblink" +LOCATION: CreateExtensionInternal, extension.c:1441 +psql:include/create_clustered_db.sql:20: NOTICE: 00000: installing required extension "postgres_fdw" +LOCATION: CreateExtensionInternal, extension.c:1441 +psql:include/create_clustered_db.sql:20: NOTICE: 00000: installing required extension "hstore" +LOCATION: CreateExtensionInternal, extension.c:1441 setup_main ------------ @@ -47,16 +65,31 @@ CREATE TABLE PUBLIC."testNs" ( latitude BIGINT NULL, really_long_column_goes_on_and_on_and_on_and_on_and_on_and_on_and_on_and_on BIGINT NULL ); +psql:cluster.sql:25: NOTICE: 42622: identifier "really_long_column_goes_on_and_on_and_on_and_on_and_on_and_on_and_on_and_on" will be truncated to "really_long_column_goes_on_and_on_and_on_and_on_and_on_and_on_a" +LOCATION: truncate_identifier, scansup.c:205 CREATE INDEX ON PUBLIC."testNs" ("Device_id", time DESC NULLS LAST) WHERE "Device_id" IS NOT NULL; CREATE INDEX ON PUBLIC."testNs" (temp, time DESC NULLS LAST) WHERE temp IS NOT NULL; CREATE INDEX ON PUBLIC."testNs" (really_long_column_goes_on_and_on_and_on_and_on_and_on_and_on_and_on_and_on, time DESC NULLS LAST) WHERE really_long_column_goes_on_and_on_and_on_and_on_and_on_and_on_and_on_and_on IS NOT NULL; +psql:cluster.sql:29: NOTICE: 42622: identifier "really_long_column_goes_on_and_on_and_on_and_on_and_on_and_on_and_on_and_on" will be truncated to "really_long_column_goes_on_and_on_and_on_and_on_and_on_and_on_a" +LOCATION: truncate_identifier, scansup.c:205 +psql:cluster.sql:29: NOTICE: 42622: identifier "really_long_column_goes_on_and_on_and_on_and_on_and_on_and_on_and_on_and_on" will be truncated to "really_long_column_goes_on_and_on_and_on_and_on_and_on_and_on_a" +LOCATION: truncate_identifier, scansup.c:205 CREATE INDEX ON PUBLIC."testNs" (time DESC NULLS LAST, really_long_column_goes_on_and_on_and_on_and_on_and_on_and_on_and_on_and_on) WHERE really_long_column_goes_on_and_on_and_on_and_on_and_on_and_on_and_on_and_on IS NOT NULL; +psql:cluster.sql:30: NOTICE: 42622: identifier "really_long_column_goes_on_and_on_and_on_and_on_and_on_and_on_and_on_and_on" will be truncated to "really_long_column_goes_on_and_on_and_on_and_on_and_on_and_on_a" +LOCATION: truncate_identifier, scansup.c:205 +psql:cluster.sql:30: NOTICE: 42622: identifier "really_long_column_goes_on_and_on_and_on_and_on_and_on_and_on_and_on_and_on" will be truncated to "really_long_column_goes_on_and_on_and_on_and_on_and_on_and_on_a" +LOCATION: truncate_identifier, scansup.c:205 SELECT * FROM create_hypertable('"public"."testNs"', 'time', 'Device_id', hypertable_name=>'testNs'); name | main_schema_name | main_table_name | associated_schema_name | associated_table_prefix | root_schema_name | root_table_name | distinct_schema_name | distinct_table_name | replication_factor | placement | time_column_name | time_column_type | created_on | chunk_size_bytes --------+------------------+-----------------+------------------------+-------------------------+------------------+-----------------+----------------------+---------------------+--------------------+-----------+------------------+------------------+------------+------------------ testNs | public | testNs | _sysinternal | _hyper_1 | _sysinternal | _hyper_1_root | _sysinternal | _hyper_1_distinct | 1 | STICKY | time | bigint | Test1 | 1073741824 (1 row) +\set ON_ERROR_STOP 0 +SELECT * FROM create_hypertable('"public"."testNs"', 'time', 'Device_id', hypertable_name=>'testNs'); +psql:cluster.sql:36: ERROR: IO110: hypertable already exists: testNs +LOCATION: exec_stmt_raise, pl_exec.c:3165 +\set ON_ERROR_STOP 1 SELECT set_is_distinct_flag('"public"."testNs"', 'Device_id', TRUE); set_is_distinct_flag ---------------------- @@ -576,6 +609,8 @@ Child tables: _sysinternal._hyper_1_0_replica \c meta SELECT _meta.close_chunk_end(1); +psql:cluster.sql:117: WARNING: 01000: Cannot close an empty chunk table +LOCATION: exec_stmt_raise, pl_exec.c:3165 close_chunk_end ----------------- diff --git a/extension/sql/tests/regression/expected/ddl.out b/extension/sql/tests/regression/expected/ddl.out index a1dbf4d8e..6a628d1a7 100644 --- a/extension/sql/tests/regression/expected/ddl.out +++ b/extension/sql/tests/regression/expected/ddl.out @@ -1,3 +1,21 @@ +psql:include/create_clustered_db.sql:12: NOTICE: 00000: installing required extension "dblink" +LOCATION: CreateExtensionInternal, extension.c:1441 +psql:include/create_clustered_db.sql:12: NOTICE: 00000: installing required extension "postgres_fdw" +LOCATION: CreateExtensionInternal, extension.c:1441 +psql:include/create_clustered_db.sql:12: NOTICE: 00000: installing required extension "hstore" +LOCATION: CreateExtensionInternal, extension.c:1441 +psql:include/create_clustered_db.sql:16: NOTICE: 00000: installing required extension "dblink" +LOCATION: CreateExtensionInternal, extension.c:1441 +psql:include/create_clustered_db.sql:16: NOTICE: 00000: installing required extension "postgres_fdw" +LOCATION: CreateExtensionInternal, extension.c:1441 +psql:include/create_clustered_db.sql:16: NOTICE: 00000: installing required extension "hstore" +LOCATION: CreateExtensionInternal, extension.c:1441 +psql:include/create_clustered_db.sql:20: NOTICE: 00000: installing required extension "dblink" +LOCATION: CreateExtensionInternal, extension.c:1441 +psql:include/create_clustered_db.sql:20: NOTICE: 00000: installing required extension "postgres_fdw" +LOCATION: CreateExtensionInternal, extension.c:1441 +psql:include/create_clustered_db.sql:20: NOTICE: 00000: installing required extension "hstore" +LOCATION: CreateExtensionInternal, extension.c:1441 \c meta SELECT add_cluster_user('postgres', NULL); add_cluster_user @@ -74,7 +92,11 @@ VALUES(1257894000000000000, 'dev1', 30, 70, 1, 2, 3, 100); --expect error cases \set ON_ERROR_STOP 0 UPDATE "Hypertable_1" SET time = 0 WHERE TRUE; +psql:include/ddl_ops_1.sql:27: ERROR: IO101: UPDATEs not supported on hypertables +LOCATION: exec_stmt_raise, pl_exec.c:3165 DELETE FROM "Hypertable_1" WHERE "Device_id" = 'dev1'; +psql:include/ddl_ops_1.sql:28: ERROR: IO101: DELETEs not currently supported on hypertables +LOCATION: exec_stmt_raise, pl_exec.c:3165 \set ON_ERROR_STOP 1 SELECT * FROM PUBLIC."Hypertable_1"; time | Device_id | temp_c | humidity | sensor_1 | sensor_2 | sensor_3 | sensor_4 @@ -229,7 +251,11 @@ DROP INDEX "ind_sensor_1"; --expect error cases \set ON_ERROR_STOP 0 ALTER TABLE PUBLIC."Hypertable_1" ALTER COLUMN sensor_2_renamed SET DATA TYPE int; +psql:include/ddl_ops_2.sql:17: ERROR: IO101: ALTER TABLE ... ALTER COLUMN SET DATA TYPE not supported on hypertable "Hypertable_1" +LOCATION: exec_stmt_raise, pl_exec.c:3165 ALTER INDEX "ind_humidity" RENAME TO "ind_humdity2"; +psql:include/ddl_ops_2.sql:18: ERROR: IO101: ALTER INDEX not supported on hypertable "Hypertable_1" +LOCATION: exec_stmt_raise, pl_exec.c:3165 \set ON_ERROR_STOP 1 --create column with same name as previously renamed one ALTER TABLE PUBLIC."Hypertable_1" ADD COLUMN sensor_3 BIGINT NOT NULL DEFAULT 131; diff --git a/extension/sql/tests/regression/expected/ddl_single.out b/extension/sql/tests/regression/expected/ddl_single.out index c90810f69..bba56df11 100644 --- a/extension/sql/tests/regression/expected/ddl_single.out +++ b/extension/sql/tests/regression/expected/ddl_single.out @@ -1,3 +1,9 @@ +psql:include/create_single_db.sql:7: NOTICE: 00000: installing required extension "dblink" +LOCATION: CreateExtensionInternal, extension.c:1441 +psql:include/create_single_db.sql:7: NOTICE: 00000: installing required extension "postgres_fdw" +LOCATION: CreateExtensionInternal, extension.c:1441 +psql:include/create_single_db.sql:7: NOTICE: 00000: installing required extension "hstore" +LOCATION: CreateExtensionInternal, extension.c:1441 \c single SELECT add_cluster_user('postgres', NULL); add_cluster_user @@ -67,7 +73,11 @@ VALUES(1257894000000000000, 'dev1', 30, 70, 1, 2, 3, 100); --expect error cases \set ON_ERROR_STOP 0 UPDATE "Hypertable_1" SET time = 0 WHERE TRUE; +psql:include/ddl_ops_1.sql:27: ERROR: IO101: UPDATEs not supported on hypertables +LOCATION: exec_stmt_raise, pl_exec.c:3165 DELETE FROM "Hypertable_1" WHERE "Device_id" = 'dev1'; +psql:include/ddl_ops_1.sql:28: ERROR: IO101: DELETEs not currently supported on hypertables +LOCATION: exec_stmt_raise, pl_exec.c:3165 \set ON_ERROR_STOP 1 SELECT * FROM PUBLIC."Hypertable_1"; time | Device_id | temp_c | humidity | sensor_1 | sensor_2 | sensor_3 | sensor_4 @@ -117,7 +127,11 @@ DROP INDEX "ind_sensor_1"; --expect error cases \set ON_ERROR_STOP 0 ALTER TABLE PUBLIC."Hypertable_1" ALTER COLUMN sensor_2_renamed SET DATA TYPE int; +psql:include/ddl_ops_2.sql:17: ERROR: IO101: ALTER TABLE ... ALTER COLUMN SET DATA TYPE not supported on hypertable "Hypertable_1" +LOCATION: exec_stmt_raise, pl_exec.c:3165 ALTER INDEX "ind_humidity" RENAME TO "ind_humdity2"; +psql:include/ddl_ops_2.sql:18: ERROR: IO101: ALTER INDEX not supported on hypertable "Hypertable_1" +LOCATION: exec_stmt_raise, pl_exec.c:3165 \set ON_ERROR_STOP 1 --create column with same name as previously renamed one ALTER TABLE PUBLIC."Hypertable_1" ADD COLUMN sensor_3 BIGINT NOT NULL DEFAULT 131; diff --git a/extension/sql/tests/regression/expected/drop_hypertable.out b/extension/sql/tests/regression/expected/drop_hypertable.out index bfdb29d7b..eee7fbb6c 100644 --- a/extension/sql/tests/regression/expected/drop_hypertable.out +++ b/extension/sql/tests/regression/expected/drop_hypertable.out @@ -1,3 +1,12 @@ +psql:include/create_clustered_db.sql:12: NOTICE: installing required extension "dblink" +psql:include/create_clustered_db.sql:12: NOTICE: installing required extension "postgres_fdw" +psql:include/create_clustered_db.sql:12: NOTICE: installing required extension "hstore" +psql:include/create_clustered_db.sql:16: NOTICE: installing required extension "dblink" +psql:include/create_clustered_db.sql:16: NOTICE: installing required extension "postgres_fdw" +psql:include/create_clustered_db.sql:16: NOTICE: installing required extension "hstore" +psql:include/create_clustered_db.sql:20: NOTICE: installing required extension "dblink" +psql:include/create_clustered_db.sql:20: NOTICE: installing required extension "postgres_fdw" +psql:include/create_clustered_db.sql:20: NOTICE: installing required extension "hstore" \c Test1 \d+ "_sysinternal".* Index "_sysinternal.1-testNs_device_id_timeCustom_idx" diff --git a/extension/sql/tests/regression/expected/insert.out b/extension/sql/tests/regression/expected/insert.out index c5dc97a5e..4822ddfdf 100644 --- a/extension/sql/tests/regression/expected/insert.out +++ b/extension/sql/tests/regression/expected/insert.out @@ -1,14 +1,19 @@ \ir include/insert.sql \set ON_ERROR_STOP 1 \ir create_clustered_db.sql +SET client_min_messages = WARNING; DROP DATABASE IF EXISTS meta; DROP DATABASE IF EXISTS "Test1"; DROP DATABASE IF EXISTS test2; +SET client_min_messages = NOTICE; CREATE DATABASE meta; CREATE DATABASE "Test1"; CREATE DATABASE test2; \c meta CREATE EXTENSION IF NOT EXISTS iobeamdb CASCADE; +psql:include/create_clustered_db.sql:12: NOTICE: installing required extension "dblink" +psql:include/create_clustered_db.sql:12: NOTICE: installing required extension "postgres_fdw" +psql:include/create_clustered_db.sql:12: NOTICE: installing required extension "hstore" select setup_meta(); setup_meta ------------ @@ -17,6 +22,9 @@ select setup_meta(); \c Test1 CREATE EXTENSION IF NOT EXISTS iobeamdb CASCADE; +psql:include/create_clustered_db.sql:16: NOTICE: installing required extension "dblink" +psql:include/create_clustered_db.sql:16: NOTICE: installing required extension "postgres_fdw" +psql:include/create_clustered_db.sql:16: NOTICE: installing required extension "hstore" select setup_main(); setup_main ------------ @@ -25,6 +33,9 @@ select setup_main(); \c test2 CREATE EXTENSION IF NOT EXISTS iobeamdb CASCADE; +psql:include/create_clustered_db.sql:20: NOTICE: installing required extension "dblink" +psql:include/create_clustered_db.sql:20: NOTICE: installing required extension "postgres_fdw" +psql:include/create_clustered_db.sql:20: NOTICE: installing required extension "hstore" select setup_main(); setup_main ------------ diff --git a/extension/sql/tests/regression/expected/insert_single.out b/extension/sql/tests/regression/expected/insert_single.out index bb597f58a..23413caa5 100644 --- a/extension/sql/tests/regression/expected/insert_single.out +++ b/extension/sql/tests/regression/expected/insert_single.out @@ -1,10 +1,15 @@ \ir include/insert_single.sql \set ON_ERROR_STOP 1 \ir create_single_db.sql +SET client_min_messages = WARNING; DROP DATABASE IF EXISTS single; +SET client_min_messages = NOTICE; CREATE DATABASE single; \c single CREATE EXTENSION IF NOT EXISTS iobeamdb CASCADE; +psql:include/create_single_db.sql:7: NOTICE: installing required extension "dblink" +psql:include/create_single_db.sql:7: NOTICE: installing required extension "postgres_fdw" +psql:include/create_single_db.sql:7: NOTICE: installing required extension "hstore" SELECT setup_meta(); setup_meta ------------ diff --git a/extension/sql/tests/regression/expected/ioql_query.out b/extension/sql/tests/regression/expected/ioql_query.out index a0fa5ecf3..3cb40220a 100644 --- a/extension/sql/tests/regression/expected/ioql_query.out +++ b/extension/sql/tests/regression/expected/ioql_query.out @@ -1,4 +1,23 @@ +psql:include/create_clustered_db.sql:12: NOTICE: 00000: installing required extension "dblink" +LOCATION: CreateExtensionInternal, extension.c:1441 +psql:include/create_clustered_db.sql:12: NOTICE: 00000: installing required extension "postgres_fdw" +LOCATION: CreateExtensionInternal, extension.c:1441 +psql:include/create_clustered_db.sql:12: NOTICE: 00000: installing required extension "hstore" +LOCATION: CreateExtensionInternal, extension.c:1441 +psql:include/create_clustered_db.sql:16: NOTICE: 00000: installing required extension "dblink" +LOCATION: CreateExtensionInternal, extension.c:1441 +psql:include/create_clustered_db.sql:16: NOTICE: 00000: installing required extension "postgres_fdw" +LOCATION: CreateExtensionInternal, extension.c:1441 +psql:include/create_clustered_db.sql:16: NOTICE: 00000: installing required extension "hstore" +LOCATION: CreateExtensionInternal, extension.c:1441 +psql:include/create_clustered_db.sql:20: NOTICE: 00000: installing required extension "dblink" +LOCATION: CreateExtensionInternal, extension.c:1441 +psql:include/create_clustered_db.sql:20: NOTICE: 00000: installing required extension "postgres_fdw" +LOCATION: CreateExtensionInternal, extension.c:1441 +psql:include/create_clustered_db.sql:20: NOTICE: 00000: installing required extension "hstore" +LOCATION: CreateExtensionInternal, extension.c:1441 \c Test1 +SET client_min_messages = WARNING; SELECT * FROM ioql_exec_query(new_ioql_query(hypertable_name => 'testNs')); json @@ -18,6 +37,8 @@ FROM ioql_exec_query(new_ioql_query(hypertable_name => 'testNs')); \set ON_ERROR_STOP 0 SELECT * FROM ioql_exec_query(new_ioql_query(hypertable_name => 'DoesNotExist')); +psql:ioql_query.sql:18: ERROR: IO001: Hypertable 'DoesNotExist' does not exist +LOCATION: exec_stmt_raise, pl_exec.c:3165 \set ON_ERROR_STOP 1 SELECT * FROM ioql_exec_query(new_ioql_query(hypertable_name => 'testNs', diff --git a/extension/sql/tests/regression/expected/kafka.out b/extension/sql/tests/regression/expected/kafka.out index 525d0228b..d3ab93532 100644 --- a/extension/sql/tests/regression/expected/kafka.out +++ b/extension/sql/tests/regression/expected/kafka.out @@ -1,3 +1,12 @@ +psql:include/create_clustered_db.sql:12: NOTICE: installing required extension "dblink" +psql:include/create_clustered_db.sql:12: NOTICE: installing required extension "postgres_fdw" +psql:include/create_clustered_db.sql:12: NOTICE: installing required extension "hstore" +psql:include/create_clustered_db.sql:16: NOTICE: installing required extension "dblink" +psql:include/create_clustered_db.sql:16: NOTICE: installing required extension "postgres_fdw" +psql:include/create_clustered_db.sql:16: NOTICE: installing required extension "hstore" +psql:include/create_clustered_db.sql:20: NOTICE: installing required extension "dblink" +psql:include/create_clustered_db.sql:20: NOTICE: installing required extension "postgres_fdw" +psql:include/create_clustered_db.sql:20: NOTICE: installing required extension "hstore" setup_kafka ------------- diff --git a/extension/sql/tests/regression/expected/sql_query.out b/extension/sql/tests/regression/expected/sql_query.out index 6177eeb43..030e1d7b2 100644 --- a/extension/sql/tests/regression/expected/sql_query.out +++ b/extension/sql/tests/regression/expected/sql_query.out @@ -1,3 +1,12 @@ +psql:include/create_clustered_db.sql:12: NOTICE: installing required extension "dblink" +psql:include/create_clustered_db.sql:12: NOTICE: installing required extension "postgres_fdw" +psql:include/create_clustered_db.sql:12: NOTICE: installing required extension "hstore" +psql:include/create_clustered_db.sql:16: NOTICE: installing required extension "dblink" +psql:include/create_clustered_db.sql:16: NOTICE: installing required extension "postgres_fdw" +psql:include/create_clustered_db.sql:16: NOTICE: installing required extension "hstore" +psql:include/create_clustered_db.sql:20: NOTICE: installing required extension "dblink" +psql:include/create_clustered_db.sql:20: NOTICE: installing required extension "postgres_fdw" +psql:include/create_clustered_db.sql:20: NOTICE: installing required extension "hstore" \c Test1 SELECT * FROM "testNs"; timeCustom | device_id | series_0 | series_1 | series_2 | series_bool diff --git a/extension/sql/tests/regression/expected/timestamp.out b/extension/sql/tests/regression/expected/timestamp.out index 4dd7cb0f0..530ddc826 100644 --- a/extension/sql/tests/regression/expected/timestamp.out +++ b/extension/sql/tests/regression/expected/timestamp.out @@ -1,3 +1,12 @@ +psql:include/create_clustered_db.sql:12: NOTICE: installing required extension "dblink" +psql:include/create_clustered_db.sql:12: NOTICE: installing required extension "postgres_fdw" +psql:include/create_clustered_db.sql:12: NOTICE: installing required extension "hstore" +psql:include/create_clustered_db.sql:16: NOTICE: installing required extension "dblink" +psql:include/create_clustered_db.sql:16: NOTICE: installing required extension "postgres_fdw" +psql:include/create_clustered_db.sql:16: NOTICE: installing required extension "hstore" +psql:include/create_clustered_db.sql:20: NOTICE: installing required extension "dblink" +psql:include/create_clustered_db.sql:20: NOTICE: installing required extension "postgres_fdw" +psql:include/create_clustered_db.sql:20: NOTICE: installing required extension "hstore" \c meta SELECT add_cluster_user('postgres', NULL); add_cluster_user @@ -71,6 +80,7 @@ SELECT * FROM PUBLIC."testNs"; 2009-11-10 23:00:00 | dev2 | 1.5 | 2 | | (5 rows) +SET client_min_messages = WARNING; SELECT * FROM ioql_exec_query(new_ioql_query(hypertable_name => 'testNs')); json diff --git a/extension/sql/tests/regression/include/create_clustered_db.sql b/extension/sql/tests/regression/include/create_clustered_db.sql index d51064144..5aee19237 100644 --- a/extension/sql/tests/regression/include/create_clustered_db.sql +++ b/extension/sql/tests/regression/include/create_clustered_db.sql @@ -1,6 +1,9 @@ +SET client_min_messages = WARNING; DROP DATABASE IF EXISTS meta; DROP DATABASE IF EXISTS "Test1"; DROP DATABASE IF EXISTS test2; +SET client_min_messages = NOTICE; + CREATE DATABASE meta; CREATE DATABASE "Test1"; CREATE DATABASE test2; diff --git a/extension/sql/tests/regression/include/create_single_db.sql b/extension/sql/tests/regression/include/create_single_db.sql index 8f2aaf131..c62dd4434 100644 --- a/extension/sql/tests/regression/include/create_single_db.sql +++ b/extension/sql/tests/regression/include/create_single_db.sql @@ -1,4 +1,6 @@ +SET client_min_messages = WARNING; DROP DATABASE IF EXISTS single; +SET client_min_messages = NOTICE; CREATE DATABASE single; \c single diff --git a/extension/sql/tests/regression/ioql_query.sql b/extension/sql/tests/regression/ioql_query.sql index 07e4fc117..4d8bf0a0c 100644 --- a/extension/sql/tests/regression/ioql_query.sql +++ b/extension/sql/tests/regression/ioql_query.sql @@ -1,4 +1,6 @@ \set ON_ERROR_STOP 1 +\set VERBOSITY verbose +\set SHOW_CONTEXT never \o /dev/null \ir include/insert.sql @@ -6,6 +8,7 @@ \o \set ECHO ALL \c Test1 +SET client_min_messages = WARNING; SELECT * FROM ioql_exec_query(new_ioql_query(hypertable_name => 'testNs')); diff --git a/extension/sql/tests/regression/kafka.sql b/extension/sql/tests/regression/kafka.sql index 0d4d3f02f..07ef72ede 100644 --- a/extension/sql/tests/regression/kafka.sql +++ b/extension/sql/tests/regression/kafka.sql @@ -5,10 +5,8 @@ \o \c Test1 -\ir ../../setup/sql/load_kafka.sql select setup_kafka(); \c test2 -\ir ../../setup/sql/load_kafka.sql select setup_kafka(); \set ECHO ALL diff --git a/extension/sql/tests/regression/run.sh b/extension/sql/tests/regression/run.sh index 112a6b57e..de29f74a5 100755 --- a/extension/sql/tests/regression/run.sh +++ b/extension/sql/tests/regression/run.sh @@ -4,7 +4,7 @@ set -e UPDATE=${UPDATE:-false} golden_test() { - psql -h localhost -U postgres -q -X -f $1 > actual/$2 + psql -h localhost -U postgres -q -X -f $1 > actual/$2 2>&1 if diff expected/$2 actual/$2; then diff --git a/extension/sql/tests/regression/timestamp.sql b/extension/sql/tests/regression/timestamp.sql index c892f0bda..7f3ec4df2 100644 --- a/extension/sql/tests/regression/timestamp.sql +++ b/extension/sql/tests/regression/timestamp.sql @@ -44,6 +44,7 @@ INSERT INTO "testNs"("timeCustom", device_id, series_0, series_1) VALUES SELECT * FROM PUBLIC."testNs"; +SET client_min_messages = WARNING; SELECT * FROM ioql_exec_query(new_ioql_query(hypertable_name => 'testNs'));