Merge branch 'master' into stable

Author: za-arthur

Makefile

@@ -8,6 +8,9 @@ DATA = pg_tsparser--1.0.sql
 PGFILEDESC = "pg_tsparser - parser for text search"
 
 REGRESS = pg_tsparser
+# We need a UTF8 database
+ENCODING = UTF8
+NO_LOCALE = 1
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config

expected/pg_tsparser.out

@@ -237,6 +237,14 @@ SELECT to_tsvector('english_ts', 'test2.com');
 (1 row)
 
 -- Test non-ASCII symbols
+-- must have a UTF8 database
+SELECT getdatabaseencoding();
+ getdatabaseencoding 
+---------------------
+ UTF8
+(1 row)
+
+SET client_encoding TO 'UTF8';
 SELECT * from ts_parse('tsparser', 'аб_вгд 12_абв 12-абв абв.рф абв2.рф');
  tokid | token  
 -------+--------

sql/pg_tsparser.sql

@@ -28,4 +28,9 @@ SELECT to_tsvector('english_ts', 'test.com');
 SELECT to_tsvector('english_ts', 'test2.com');
 
 -- Test non-ASCII symbols
+
+-- must have a UTF8 database
+SELECT getdatabaseencoding();
+SET client_encoding TO 'UTF8';
+
 SELECT * from ts_parse('tsparser', 'аб_вгд 12_абв 12-абв абв.рф абв2.рф');