Merge branch '1.1' into 1.2

silverstripe · Jan 27, 2019 · b4626ed · b4626ed
2 parents 16c11ae + a10cf78
commit b4626ed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -37,6 +37,10 @@ matrix:
       env: NPM_TEST=1
     - php: 5.6
       env: PHPCS_TEST=1
+    - php: 5.6
+      env:
+        - DB=PGSQL
+        - PHPUNIT_TEST=1
 
 before_script:
 # Extra $PATH
@@ -50,6 +54,7 @@ before_script:
 
 # Install composer
   - composer validate
+  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.0.x-dev --prefer-dist; fi
   - composer require silverstripe/recipe-testing:^1 silverstripe/recipe-cms 4.2.x-dev --no-update --prefer-dist
   - composer update
 

diff --git a/code/GraphQL/FolderTypeCreator.php b/code/GraphQL/FolderTypeCreator.php
@@ -13,6 +13,7 @@
 use SilverStripe\GraphQL\Pagination\Connection;
 use SilverStripe\ORM\DataQuery;
 use SilverStripe\ORM\DataList;
+use SilverStripe\ORM\DB;
 
 /**
  * @skipUpgrade