mirror of
https://github.com/silverstripe/silverstripe-postgresql
synced 2024-06-18 02:31:34 +02:00
Merge branch '2' into master
This commit is contained in:
commit
72b47428a4
|
@ -13,9 +13,6 @@ env:
|
||||||
matrix:
|
matrix:
|
||||||
fast_finish: true
|
fast_finish: true
|
||||||
include:
|
include:
|
||||||
- php: 7.1
|
|
||||||
env:
|
|
||||||
- PHPUNIT_TEST=framework
|
|
||||||
- php: 7.2
|
- php: 7.2
|
||||||
env:
|
env:
|
||||||
- PHPUNIT_TEST=postgresql
|
- PHPUNIT_TEST=postgresql
|
||||||
|
|
|
@ -448,7 +448,7 @@ class PostgreSQLDatabase extends Database
|
||||||
|
|
||||||
// Could parameterise this, but convention is only to to so for where conditions
|
// Could parameterise this, but convention is only to to so for where conditions
|
||||||
$query->addFrom(array(
|
$query->addFrom(array(
|
||||||
'tsearch' => ", to_tsquery('" . self::search_language() . "', $keywords) AS q"
|
'q' => ", to_tsquery('" . self::search_language() . "', $keywords)"
|
||||||
));
|
));
|
||||||
$query->setSelect(array());
|
$query->setSelect(array());
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user