From f932aa4b0431a2cfbb42255703af9c53b5bdfed8 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Fri, 16 Oct 2015 11:30:00 +1300
Subject: [PATCH] Update master to 2.0 for 4.0 compatibility

---
 code/PostgreSQLDatabase.php | 4 +---
 composer.json               | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/code/PostgreSQLDatabase.php b/code/PostgreSQLDatabase.php
index e6b247a..71495f4 100644
--- a/code/PostgreSQLDatabase.php
+++ b/code/PostgreSQLDatabase.php
@@ -295,7 +295,6 @@ class PostgreSQLDatabase extends SS_Database {
 				'"Content"',
 				'"LastEdited"',
 				'"Created"',
-				'NULL AS "Filename"',
 				'NULL AS "Name"',
 				'"CanViewType"'
 			),
@@ -305,10 +304,9 @@ class PostgreSQLDatabase extends SS_Database {
 				'0 AS "ParentID"',
 				'"Title"',
 				'NULL AS "URLSegment"',
-				'"Content"',
+				'NULL "Content"',
 				'"LastEdited"',
 				'"Created"',
-				'"Filename"',
 				'"Name"',
 				'NULL AS "CanViewType"'
 			)
diff --git a/composer.json b/composer.json
index 6f13c52..ca49087 100644
--- a/composer.json
+++ b/composer.json
@@ -10,11 +10,11 @@
 		}
 	],
 	"require": {
-		"silverstripe/framework": ">=3.2"
+		"silverstripe/framework": "~4.0"
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "1.2.x-dev"
+			"dev-master": "2.0.x-dev"
 		}
 	}
 }