Reset standard_conforming_strings in strings test

After some tests relating to standard_conforming_strings behavior, the
value was not reset to the default value.  Therefore, the rest of the
tests in that file ran with the nondefault setting, which affected the
results of some tests.  For clarity, reset the value and run the rest
of the tests with the default setting again.

diff --git a/src/test/regress/expected/strings.out b/src/test/regress/expected/strings.out
index f751f0ca159d868474ae109e8acae0166da17266..afd84249c82d04b44c4cbe012681a47c4613414f 100644 (file)
--- a/src/test/regress/expected/strings.out
+++ b/src/test/regress/expected/strings.out
@@ -2027,6 +2027,7 @@ select 'a\\bcd' as f1, 'a\\b\'cd' as f2, 'a\\b\'''cd' as f3, 'abcd\\'   as f4, '
  a\bcd | a\b'cd | a\b''cd | abcd\ | ab\'cd | \\
 (1 row)
 
+reset standard_conforming_strings;
 --
 -- Additional string functions
 --
@@ -2230,6 +2231,6 @@ SELECT encode(overlay(E'Th\\000omas'::bytea placing E'\\002\\003'::bytea from 5
 SELECT bit_count('\x1234567890'::bytea);
  bit_count 
 -----------
-        31
+        15
 (1 row)
 

diff --git a/src/test/regress/sql/strings.sql b/src/test/regress/sql/strings.sql
index c043f0254171eac0e48e9014a5218a3d4437bb23..9aa1825f921b97e74c091d39298fc7da45c8807d 100644 (file)
--- a/src/test/regress/sql/strings.sql
+++ b/src/test/regress/sql/strings.sql
@@ -693,6 +693,8 @@ set standard_conforming_strings = off;
 
 select 'a\\bcd' as f1, 'a\\b\'cd' as f2, 'a\\b\'''cd' as f3, 'abcd\\'   as f4, 'ab\\\'cd' as f5, '\\\\' as f6;
 
+reset standard_conforming_strings;
+
 
 --
 -- Additional string functions