pgq: test upgrade from 2.1

6 files changed, 76 insertions, 2 deletions

diff --git a/sql/pgq/Makefile b/sql/pgq/Makefile
index 27cb6e12..b2fb16ce 100644
--- a/sql/pgq/Makefile
+++ b/sql/pgq/Makefile
@@ -6,10 +6,15 @@ EXT_OLD_VERSIONS = 3.1
 
 DOCS = README.pgq
 
+PGQ_TESTS = pgq_core pgq_perms logutriga sqltriga $(trunc_test)
+
+# comment it out if not wanted
+UPGRADE_TESTS = pgq_init_upgrade $(PGQ_TESTS) clean
+
 Contrib_data = structure/uninstall_pgq.sql
 
-Contrib_regress   = pgq_init_noext pgq_core pgq_perms logutriga sqltriga $(trunc_test)
-Extension_regress = pgq_init_ext   pgq_core pgq_perms logutriga sqltriga $(trunc_test)
+Contrib_regress   = $(UPGRADE_TESTS) pgq_init_noext $(PGQ_TESTS)
+Extension_regress = $(UPGRADE_TESTS) pgq_init_ext $(PGQ_TESTS)
 
 # MAJORVERSION was defined in 8.4
 trunc_test = $(if $(MAJORVERSION),trunctrg)
diff --git a/sql/pgq/expected/clean.out b/sql/pgq/expected/clean.out
new file mode 100644
index 00000000..7b4cdf9a
--- /dev/null
+++ b/sql/pgq/expected/clean.out
@@ -0,0 +1,18 @@
+\set VERBOSITY 'terse'
+set client_min_messages = 'warning';
+drop schema pgq cascade;
+drop sequence tmptest_seq;
+drop table custom_expr;
+drop table custom_expr2;
+drop table custom_fields;
+drop table custom_fields2;
+drop table custom_pkey;
+drop table deny_test;
+drop table nopkey;
+drop table nopkey2;
+drop table rtest;
+drop table if exists trunctrg1;
+drop table if exists trunctrg2;
+drop table ucustom_pkey;
+drop table udata;
+drop table when_test;
diff --git a/sql/pgq/expected/pgq_init_upgrade.out b/sql/pgq/expected/pgq_init_upgrade.out
new file mode 100644
index 00000000..65817072
--- /dev/null
+++ b/sql/pgq/expected/pgq_init_upgrade.out
@@ -0,0 +1,11 @@
+\set ECHO none
+ upgrade_schema 
+----------------
+              0
+(1 row)
+
+ upgrade_schema 
+----------------
+              0
+(1 row)
+
diff --git a/sql/pgq/expected/pgq_init_upgrade_1.out b/sql/pgq/expected/pgq_init_upgrade_1.out
new file mode 100644
index 00000000..71ce3a5c
--- /dev/null
+++ b/sql/pgq/expected/pgq_init_upgrade_1.out
@@ -0,0 +1,11 @@
+\set ECHO none
+ upgrade_schema 
+----------------
+              0
+(1 row)
+
+ upgrade_schema 
+----------------
+              3
+(1 row)
+
diff --git a/sql/pgq/sql/clean.sql b/sql/pgq/sql/clean.sql
new file mode 100644
index 00000000..51c95663
--- /dev/null
+++ b/sql/pgq/sql/clean.sql
@@ -0,0 +1,22 @@
+\set VERBOSITY 'terse'
+set client_min_messages = 'warning';
+
+drop schema pgq cascade;
+
+drop sequence tmptest_seq;
+
+drop table custom_expr;
+drop table custom_expr2;
+drop table custom_fields;
+drop table custom_fields2;
+drop table custom_pkey;
+drop table deny_test;
+drop table nopkey;
+drop table nopkey2;
+drop table rtest;
+drop table if exists trunctrg1;
+drop table if exists trunctrg2;
+drop table ucustom_pkey;
+drop table udata;
+drop table when_test;
+
diff --git a/sql/pgq/sql/pgq_init_upgrade.sql b/sql/pgq/sql/pgq_init_upgrade.sql
new file mode 100644
index 00000000..381d7c05
--- /dev/null
+++ b/sql/pgq/sql/pgq_init_upgrade.sql
@@ -0,0 +1,7 @@
+\set ECHO none
+\set VERBOSITY 'terse'
+\i ../../upgrade/final/pgq_core_2.1.13.sql
+\i ../../upgrade/final/v3.0_pgq_core.sql
+\i pgq.upgrade.sql
+\set ECHO all
+