From d6c3fa77249d34e7627104369eae9d02340e647e Mon Sep 17 00:00:00 2001
From: Jason Stephenson <jason@sigio.com>
Date: Tue, 6 Nov 2018 07:01:24 -0500
Subject: [PATCH] Lp 1730726: Fix a number of PgTap tests for PostgreSQL 10.
A number of tests disabled output via "\set ECHO". In PostgreSQL 10,
the lack of a value in \set is an error. We change these lines to
"\set ECHO none".
Signed-off-by: Jason Stephenson <jason@sigio.com>
Signed-off-by: Ben Shum <ben@evergreener.net>
---
Open-ILS/src/sql/Pg/live_t/0824.item_import_defaults.pg | 2 +-
Open-ILS/src/sql/Pg/live_t/0847.auth_overlay_generator.pg | 2 +-
Open-ILS/src/sql/Pg/live_t/0852.prox_adjust.pg | 2 +-
Open-ILS/src/sql/Pg/make-pgtap-tests.pl | 2 +-
Open-ILS/src/sql/Pg/t/0799.state_field_required_toggle.pg | 2 +-
Open-ILS/src/sql/Pg/t/dewey.pg | 2 +-
Open-ILS/src/sql/Pg/t/lp1198475-lost-and-paid-status.pg | 2 +-
Open-ILS/src/sql/Pg/t/lp1533329-restrict-opt-in-setting.pg | 2 +-
..._report_able_to_show_bibs_where_the_last_copy_was_deleted_cancels.pg | 2 +-
...34_Circulation_report_source_to_include_in-house_and_non_cat_circ.pg | 2 +-
Open-ILS/src/sql/Pg/t/lp980296-void-lost-lo-claims-returned.pg | 2 +-
.../src/sql/Pg/t/regress/lp1272074_0858_fixed_field_enhancements.pg | 2 +-
Open-ILS/src/sql/Pg/t/schema.pg | 2 +-
Open-ILS/src/sql/Pg/t/versions.pg | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Open-ILS/src/sql/Pg/live_t/0824.item_import_defaults.pg b/Open-ILS/src/sql/Pg/live_t/0824.item_import_defaults.pg
index 3872d2c86d..e4fdad65c1 100644
--- a/Open-ILS/src/sql/Pg/live_t/0824.item_import_defaults.pg
+++ b/Open-ILS/src/sql/Pg/live_t/0824.item_import_defaults.pg
@@ -1,4 +1,4 @@
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
diff --git a/Open-ILS/src/sql/Pg/live_t/0847.auth_overlay_generator.pg b/Open-ILS/src/sql/Pg/live_t/0847.auth_overlay_generator.pg
index c7e7f83f7e..c841f533d6 100644
--- a/Open-ILS/src/sql/Pg/live_t/0847.auth_overlay_generator.pg
+++ b/Open-ILS/src/sql/Pg/live_t/0847.auth_overlay_generator.pg
@@ -1,4 +1,4 @@
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
diff --git a/Open-ILS/src/sql/Pg/live_t/0852.prox_adjust.pg b/Open-ILS/src/sql/Pg/live_t/0852.prox_adjust.pg
index 683be42c3e..0872da6680 100644
--- a/Open-ILS/src/sql/Pg/live_t/0852.prox_adjust.pg
+++ b/Open-ILS/src/sql/Pg/live_t/0852.prox_adjust.pg
@@ -1,4 +1,4 @@
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
diff --git a/Open-ILS/src/sql/Pg/make-pgtap-tests.pl b/Open-ILS/src/sql/Pg/make-pgtap-tests.pl
index e26fd81755..ad2d21b782 100755
--- a/Open-ILS/src/sql/Pg/make-pgtap-tests.pl
+++ b/Open-ILS/src/sql/Pg/make-pgtap-tests.pl
@@ -80,7 +80,7 @@ exit 0;
sub pgtap_sql_header {
return q^
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
diff --git a/Open-ILS/src/sql/Pg/t/0799.state_field_required_toggle.pg b/Open-ILS/src/sql/Pg/t/0799.state_field_required_toggle.pg
index 4e9a8e4cbb..20c32aa379 100644
--- a/Open-ILS/src/sql/Pg/t/0799.state_field_required_toggle.pg
+++ b/Open-ILS/src/sql/Pg/t/0799.state_field_required_toggle.pg
@@ -1,4 +1,4 @@
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
diff --git a/Open-ILS/src/sql/Pg/t/dewey.pg b/Open-ILS/src/sql/Pg/t/dewey.pg
index 50f42ba372..df05f541ad 100644
--- a/Open-ILS/src/sql/Pg/t/dewey.pg
+++ b/Open-ILS/src/sql/Pg/t/dewey.pg
@@ -1,4 +1,4 @@
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
diff --git a/Open-ILS/src/sql/Pg/t/lp1198475-lost-and-paid-status.pg b/Open-ILS/src/sql/Pg/t/lp1198475-lost-and-paid-status.pg
index 9c5e664840..7f7de76807 100644
--- a/Open-ILS/src/sql/Pg/t/lp1198475-lost-and-paid-status.pg
+++ b/Open-ILS/src/sql/Pg/t/lp1198475-lost-and-paid-status.pg
@@ -1,4 +1,4 @@
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
diff --git a/Open-ILS/src/sql/Pg/t/lp1533329-restrict-opt-in-setting.pg b/Open-ILS/src/sql/Pg/t/lp1533329-restrict-opt-in-setting.pg
index 1bd365e7c1..e2e01810f3 100644
--- a/Open-ILS/src/sql/Pg/t/lp1533329-restrict-opt-in-setting.pg
+++ b/Open-ILS/src/sql/Pg/t/lp1533329-restrict-opt-in-setting.pg
@@ -1,4 +1,4 @@
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
diff --git a/Open-ILS/src/sql/Pg/t/lp1582354_report_able_to_show_bibs_where_the_last_copy_was_deleted_cancels.pg b/Open-ILS/src/sql/Pg/t/lp1582354_report_able_to_show_bibs_where_the_last_copy_was_deleted_cancels.pg
index b3f0a394c4..bbbc9aa2d9 100644
--- a/Open-ILS/src/sql/Pg/t/lp1582354_report_able_to_show_bibs_where_the_last_copy_was_deleted_cancels.pg
+++ b/Open-ILS/src/sql/Pg/t/lp1582354_report_able_to_show_bibs_where_the_last_copy_was_deleted_cancels.pg
@@ -1,4 +1,4 @@
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
diff --git a/Open-ILS/src/sql/Pg/t/lp1599634_Circulation_report_source_to_include_in-house_and_non_cat_circ.pg b/Open-ILS/src/sql/Pg/t/lp1599634_Circulation_report_source_to_include_in-house_and_non_cat_circ.pg
index 27957199e4..f74d636db6 100644
--- a/Open-ILS/src/sql/Pg/t/lp1599634_Circulation_report_source_to_include_in-house_and_non_cat_circ.pg
+++ b/Open-ILS/src/sql/Pg/t/lp1599634_Circulation_report_source_to_include_in-house_and_non_cat_circ.pg
@@ -1,4 +1,4 @@
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
diff --git a/Open-ILS/src/sql/Pg/t/lp980296-void-lost-lo-claims-returned.pg b/Open-ILS/src/sql/Pg/t/lp980296-void-lost-lo-claims-returned.pg
index 33695f1712..b7ccea01d4 100644
--- a/Open-ILS/src/sql/Pg/t/lp980296-void-lost-lo-claims-returned.pg
+++ b/Open-ILS/src/sql/Pg/t/lp980296-void-lost-lo-claims-returned.pg
@@ -1,4 +1,4 @@
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
diff --git a/Open-ILS/src/sql/Pg/t/regress/lp1272074_0858_fixed_field_enhancements.pg b/Open-ILS/src/sql/Pg/t/regress/lp1272074_0858_fixed_field_enhancements.pg
index d48c4a0cda..c6ef973af2 100644
--- a/Open-ILS/src/sql/Pg/t/regress/lp1272074_0858_fixed_field_enhancements.pg
+++ b/Open-ILS/src/sql/Pg/t/regress/lp1272074_0858_fixed_field_enhancements.pg
@@ -1,4 +1,4 @@
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
diff --git a/Open-ILS/src/sql/Pg/t/schema.pg b/Open-ILS/src/sql/Pg/t/schema.pg
index 7d4feca854..bfa5f7b7a5 100644
--- a/Open-ILS/src/sql/Pg/t/schema.pg
+++ b/Open-ILS/src/sql/Pg/t/schema.pg
@@ -1,4 +1,4 @@
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
diff --git a/Open-ILS/src/sql/Pg/t/versions.pg b/Open-ILS/src/sql/Pg/t/versions.pg
index b611cbc868..4db53b1aef 100644
--- a/Open-ILS/src/sql/Pg/t/versions.pg
+++ b/Open-ILS/src/sql/Pg/t/versions.pg
@@ -1,4 +1,4 @@
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
--
2.11.0