Skip to content

Commit 880db79

Browse files
committed
sync test outputs and pg_partman with 1.4.4
1 parent 53d79c3 commit 880db79

File tree

3 files changed

+8
-33
lines changed

3 files changed

+8
-33
lines changed

nix/tests/expected/extensions_sql_interface.out

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1346,6 +1346,8 @@ order by
13461346
pgmq | pgmq | _belongs_to_pgmq | table_name text | boolean
13471347
pgmq | pgmq | _ensure_pg_partman_installed | | void
13481348
pgmq | pgmq | _get_partition_col | partition_interval text | text
1349+
pgmq | pgmq | _get_pg_partman_major_version | | integer
1350+
pgmq | pgmq | _get_pg_partman_schema | | text
13491351
pgmq | pgmq | archive | queue_name text, msg_id bigint | boolean
13501352
pgmq | pgmq | archive | queue_name text, msg_ids bigint[] | SETOF bigint
13511353
pgmq | pgmq | convert_archive_partitioned | table_name text, partition_interval text, retention_interval text, leading_partition integer | void
@@ -5175,23 +5177,7 @@ order by
51755177
xml2 | public | xpath_table | text, text, text, text, text | SETOF record
51765178
xml2 | public | xslt_process | text, text | text
51775179
xml2 | public | xslt_process | text, text, text | text
5178-
<<<<<<< HEAD
5179-
<<<<<<< HEAD
5180-
<<<<<<< HEAD
5181-
(4957 rows)
5182-
=======
5183-
<<<<<<< HEAD
5184-
(4953 rows)
5185-
=======
5186-
(4966 rows)
5187-
>>>>>>> 95a20bc (add public interface test coverage)
5188-
>>>>>>> 21f844d (add public interface test coverage)
5189-
=======
5190-
(4979 rows)
5191-
>>>>>>> fe3449e (update to pgmq 1.4.2)
5192-
=======
5193-
(5018 rows)
5194-
>>>>>>> 29ef673 (add pg_partman)
5180+
(5024 rows)
51955181

51965182
/*
51975183

nix/tests/expected/pgmq.out

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -117,21 +117,11 @@ select
117117
'5 seconds',
118118
'10 seconds'
119119
);
120-
ERROR: 5 seconds is not a valid partitioning type for pg_partman
121-
CONTEXT: PL/pgSQL function create_parent(text,text,text,text,text,integer,text,boolean,text,text[],text,boolean,text) line 119 at RAISE
122-
SQL statement "SELECT public.create_parent(
123-
fq_qtable,
124-
partition_col, 'native', partition_interval
125-
)"
126-
PL/pgSQL function pgmq.create_partitioned(text,text,text) line 33 at PERFORM
127-
DETAIL:
128-
HINT:
129-
CONTEXT: PL/pgSQL function create_parent(text,text,text,text,text,integer,text,boolean,text,text[],text,boolean,text) line 647 at RAISE
130-
SQL statement "SELECT public.create_parent(
131-
fq_qtable,
132-
partition_col, 'native', partition_interval
133-
)"
134-
PL/pgSQL function pgmq.create_partitioned(text,text,text) line 33 at PERFORM
120+
create_partitioned
121+
--------------------
122+
123+
(1 row)
124+
135125
-- Make sure SQLI enabling characters are blocked
136126
select pgmq.create('F--oo');
137127
ERROR: queue name contains invalid characters: $, ;, --, or \'

nix/tests/prime.sql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ create extension pg_net;
4242
create extension pg_graphql;
4343
create extension pg_freespacemap;
4444
create extension pg_hashids;
45-
create extension pg_partman;
4645
create extension pg_prewarm;
4746
create extension pg_partman;
4847
create extension pg_jsonschema;

0 commit comments

Comments
 (0)