Commitab2e893

committed

Merge branch 'master' into stable

2 parents9b20e54 +6081a71 commitab2e893Copy full SHA for ab2e893

File tree

+16

-0

lines changed

+16

-0

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,9 @@ DATA = pg_tsparser--1.0.sql`
`8`	`8`	`PGFILEDESC = "pg_tsparser - parser for text search"`
`9`	`9`
`10`	`10`	`REGRESS = pg_tsparser`
	`11`	`+# We need a UTF8 database`
	`12`	`+ENCODING = UTF8`
	`13`	`+NO_LOCALE = 1`
`11`	`14`
`12`	`15`	`ifdefUSE_PGXS`
`13`	`16`	`PG_CONFIG = pg_config`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -237,6 +237,14 @@ SELECT to_tsvector('english_ts', 'test2.com');`
`237`	`237`	`(1 row)`
`238`	`238`
`239`	`239`	`-- Test non-ASCII symbols`
	`240`	`+-- must have a UTF8 database`
	`241`	`+SELECT getdatabaseencoding();`
	`242`	`+ getdatabaseencoding`
	`243`	`+---------------------`
	`244`	`+ UTF8`
	`245`	`+(1 row)`
	`246`	`+`
	`247`	`+SET client_encoding TO 'UTF8';`
`240`	`248`	`SELECT * from ts_parse('tsparser', 'аб_вгд 12_абв 12-абв абв.рф абв2.рф');`
`241`	`249`	`tokid \| token`
`242`	`250`	`-------+--------`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,9 @@ SELECT to_tsvector('english_ts', 'test.com');`
`28`	`28`	`SELECT to_tsvector('english_ts','test2.com');`
`29`	`29`
`30`	`30`	`-- Test non-ASCII symbols`
	`31`	`+`
	`32`	`+-- must have a UTF8 database`
	`33`	`+SELECT getdatabaseencoding();`
	`34`	`+SET client_encoding TO'UTF8';`
	`35`	`+`
`31`	`36`	`SELECT*from ts_parse('tsparser','аб_вгд 12_абв 12-абв абв.рф абв2.рф');`

Comments

(0)