aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTeodor Sigaev <teodor@sigaev.ru>2017-12-12 14:59:27 +0300
committerTeodor Sigaev <teodor@sigaev.ru>2017-12-12 14:59:27 +0300
commitc28aa157b86f756d53f2a6b715e23ca56f219b4f (patch)
treeb029c8869364118369220014edfee113859e34ca
parent4034db215b92c68ce55cf1c658d4ef7599ccc45a (diff)
downloadpostgresql-c28aa157b86f756d53f2a6b715e23ca56f219b4f.tar.gz
postgresql-c28aa157b86f756d53f2a6b715e23ca56f219b4f.zip
Make pg_trgm tests independ from standard_conforming_string. Tests uses
regular expression which contains backslash.
-rw-r--r--contrib/pg_trgm/expected/pg_trgm.out3
-rw-r--r--contrib/pg_trgm/sql/pg_trgm.sql4
2 files changed, 7 insertions, 0 deletions
diff --git a/contrib/pg_trgm/expected/pg_trgm.out b/contrib/pg_trgm/expected/pg_trgm.out
index c3304b0ceb9..6efc54356a1 100644
--- a/contrib/pg_trgm/expected/pg_trgm.out
+++ b/contrib/pg_trgm/expected/pg_trgm.out
@@ -7,6 +7,9 @@ WHERE opc.oid >= 16384 AND NOT amvalidate(opc.oid);
--------+---------
(0 rows)
+--backslash is used in tests below, installcheck will fail if
+--standard_conforming_string is off
+set standard_conforming_strings=on;
select show_trgm('');
show_trgm
-----------
diff --git a/contrib/pg_trgm/sql/pg_trgm.sql b/contrib/pg_trgm/sql/pg_trgm.sql
index fe8d0a7495d..96ae542320d 100644
--- a/contrib/pg_trgm/sql/pg_trgm.sql
+++ b/contrib/pg_trgm/sql/pg_trgm.sql
@@ -5,6 +5,10 @@ SELECT amname, opcname
FROM pg_opclass opc LEFT JOIN pg_am am ON am.oid = opcmethod
WHERE opc.oid >= 16384 AND NOT amvalidate(opc.oid);
+--backslash is used in tests below, installcheck will fail if
+--standard_conforming_string is off
+set standard_conforming_strings=on;
+
select show_trgm('');
select show_trgm('(*&^$@%@');
select show_trgm('a b c');