Merge branch '1.0' into 1.1

.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 1.1.x-dev --no-update --prefer-dist
   - composer update
 

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
@@ -161,7 +162,10 @@ public function resolveChildrenConnection(
         $list = $list->alterDataQuery(function (DataQuery $query, DataList $list) {
             $existingOrderBys = $query->query()->getOrderBy();
             $query->sort(
-                '(CASE WHEN "ClassName"=\'SilverStripe\\\\Assets\\\\Folder\' THEN 1 ELSE 0 END)',
+                sprintf(
+                    '(CASE WHEN "ClassName"=%s THEN 1 ELSE 0 END)',
+                    DB::get_conn()->quoteString('SilverStripe\Assets\Folder')
+                ),
                 'DESC',
                 true
             );