tonyair
/
silverstripe-postgresql
mirror of https://github.com/silverstripe/silverstripe-postgresql
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update master to 2.0 for 4.0 compatibility

This commit is contained in:
Damian Mooyman 2015-10-16 11:30:00 +13:00
parent 750f4a9d9f
commit f932aa4b04
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/PostgreSQLDatabase.php
View File

@ -295,7 +295,6 @@ class PostgreSQLDatabase extends SS_Database {
'"Content"', '"Content"',
'"LastEdited"', '"LastEdited"',
'"Created"', '"Created"',
'NULL AS "Filename"',
'NULL AS "Name"', 'NULL AS "Name"',
'"CanViewType"' '"CanViewType"'
), ),
@ -305,10 +304,9 @@ class PostgreSQLDatabase extends SS_Database {
'0 AS "ParentID"', '0 AS "ParentID"',
'"Title"', '"Title"',
'NULL AS "URLSegment"', 'NULL AS "URLSegment"',
'"Content"', 'NULL "Content"',
'"LastEdited"', '"LastEdited"',
'"Created"', '"Created"',
'"Filename"',
'"Name"', '"Name"',
'NULL AS "CanViewType"' 'NULL AS "CanViewType"'
) )

4
composer.json
View File

@ -10,11 +10,11 @@
} }
], ],
"require": { "require": {
"silverstripe/framework": ">=3.2" "silverstripe/framework": "~4.0"
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.2.x-dev" "dev-master": "2.0.x-dev"
} }
} }
} }