From b6bab3561f1443cdd66ec9c967e5edb055a89618 Mon Sep 17 00:00:00 2001 From: Guy Marriott Date: Mon, 15 Apr 2019 11:11:50 +1200 Subject: [PATCH 1/4] Bump branch alias for 2.3.x-dev --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 38d8074..4167b2f 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ }, "extra": { "branch-alias": { - "2.x-dev": "2.2.x-dev" + "2.x-dev": "2.3.x-dev" } }, "autoload": { From 3d6920c121808d65c3e93848ec922a5f09e01f26 Mon Sep 17 00:00:00 2001 From: Guy Marriott Date: Mon, 15 Apr 2019 15:14:05 +1200 Subject: [PATCH 2/4] Remove branch alias --- composer.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/composer.json b/composer.json index 4167b2f..2118f59 100644 --- a/composer.json +++ b/composer.json @@ -21,11 +21,6 @@ "require-dev": { "phpunit/phpunit": "^5.7" }, - "extra": { - "branch-alias": { - "2.x-dev": "2.3.x-dev" - } - }, "autoload": { "psr-4": { "SilverStripe\\PostgreSQL\\": "code/", From 0ffaf9051256b373e8c3f0d89dfbda4c21974246 Mon Sep 17 00:00:00 2001 From: Serge Latyntcev Date: Mon, 6 May 2019 16:06:58 +1200 Subject: [PATCH 3/4] FIX Usage of a bug-feature around aliases Related https://github.com/silverstripe/silverstripe-postgresql/issues/95 --- code/PostgreSQLDatabase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/PostgreSQLDatabase.php b/code/PostgreSQLDatabase.php index 2f08b38..bc7f248 100644 --- a/code/PostgreSQLDatabase.php +++ b/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()); From 82f8a06afaba9f18046798050efe1b66c64bd3c1 Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Wed, 3 Jul 2019 13:58:50 +1200 Subject: [PATCH 4/4] NEW: Drop PHP 5.6 testing PostgreSQL 2.3+, like Framework 4.5+, is able to be PHP 7.1+. Updated the test matrix to reflect this. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f0da051..fb44e1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ cache: - $HOME/.composer/cache/files php: - - 5.6 + - 7.1 env: global: @@ -16,10 +16,10 @@ env: matrix: fast_finish: true include: - - php: 5.6 + - php: 7.1 env: - PHPUNIT_TEST=framework - - php: 5.6 + - php: 7.1 env: - PHPUNIT_TEST=postgresql - PHPCS_TEST=1