tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

API CHANGE: 'ID' columns now no longer appear as being changed in Postgres

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71943 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Geoff Munn 2009-02-17 03:54:39 +00:00
parent 57dcdaa8be
commit 0c5e363a68
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/model/Database.php
View File

@ -333,6 +333,7 @@ abstract class Database extends Object {
//Convert the $spec array into a database-specific string //Convert the $spec array into a database-specific string
$spec=DB::getConn()->$spec['type']($spec['parts'], true); $spec=DB::getConn()->$spec['type']($spec['parts'], true);
} }
// Collations didn't come in until MySQL 4.1. Anything earlier will throw a syntax error if you try and use // Collations didn't come in until MySQL 4.1. Anything earlier will throw a syntax error if you try and use
// collations. // collations.
if(!$this->supportsCollations()) { if(!$this->supportsCollations()) {
@ -355,6 +356,10 @@ abstract class Database extends Object {
if(is_array($spec_orig)) if(is_array($spec_orig))
$spec_orig=DB::getConn()->$spec_orig['type']($spec_orig['parts']); $spec_orig=DB::getConn()->$spec_orig['type']($spec_orig['parts']);
if($spec_orig==DB::getConn()->IdColumn()){
$specValue=DB::getConn()->IdColumn(true);
}
if($newTable || $fieldValue=='') { if($newTable || $fieldValue=='') {
Profiler::mark('createField'); Profiler::mark('createField');