Merge branch '2' into master

.travis.yml

@@ -13,9 +13,6 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: 7.1
-      env:
-        - PHPUNIT_TEST=framework
     - php: 7.2
       env:
         - PHPUNIT_TEST=postgresql

code/PostgreSQLDatabase.php

@@ -448,7 +448,7 @@ class PostgreSQLDatabase extends Database
 
             // Could parameterise this, but convention is only to to so for where conditions
             $query->addFrom(array(
-                'tsearch' => ", to_tsquery('" . self::search_language() . "', $keywords) AS q"
+                'q' => ", to_tsquery('" . self::search_language() . "', $keywords)"
             ));
             $query->setSelect(array());