tonyair/silverstripe-postgresql
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-postgresql synced 2024-06-26 14:39:20 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '2' into master

Browse Source
This commit is contained in:
Aaron Carlino 2019-07-13 21:52:59 +12:00
commit 72b47428a4
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -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

2
code/PostgreSQLDatabase.php
View File

@ -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());