tonyair/silverstripe-mssql
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-mssql synced 2024-10-22 08:05:53 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Fixed alterations to existing tables - SQL server requires a single "ADD" clause followed by a list of columns instead of individual ADD clauses.

Browse Source
This commit is contained in:
Sean Harvey 2009-04-08 22:11:38 +00:00
parent 87419c77f1
commit 0159e3c5fb
1 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
code/MSSQLDatabase.php
View File

@ -139,6 +139,7 @@ class MSSQLDatabase extends Database {
//Debug::backtrace(); //Debug::backtrace();
//if($sql!='') //if($sql!='')
$handle = mssql_query($sql, $this->dbConn); $handle = mssql_query($sql, $this->dbConn);
//else //else
// $handle=null; // $handle=null;
@ -252,23 +253,24 @@ class MSSQLDatabase extends Database {
public function alterTable($tableName, $newFields = null, $newIndexes = null, $alteredFields = null, $alteredIndexes = null) { public function alterTable($tableName, $newFields = null, $newIndexes = null, $alteredFields = null, $alteredIndexes = null) {
$fieldSchemas = $indexSchemas = ""; $fieldSchemas = $indexSchemas = "";
$alterList = array(); $newFieldsList = array();
if($newFields) foreach($newFields as $k => $v) $alterList[] .= "ADD \"$k\" $v"; if($newFields) foreach($newFields as $k => $v) {
$newFieldsList[] .= "$k $v";
}
$indexList=$this->IndexList($tableName); $indexList = $this->IndexList($tableName);
$existingFieldList = array();
if($alteredFields) { if($alteredFields) {
foreach($alteredFields as $k => $v) { foreach($alteredFields as $k => $v) {
$val = $this->alterTableAlterColumn($tableName, $k, $v, $indexList);
$val=$this->alterTableAlterColumn($tableName, $k, $v, $indexList); if($val != '') $existingFieldList[] .= $val;
if($val!='')
$alterList[] .= $val;
} }
} }
//DB ABSTRACTION: we need to change the constraints to be a separate 'add' command, //DB ABSTRACTION: we need to change the constraints to be a separate 'add' command,
//see http://www.postgresql.org/docs/8.1/static/sql-altertable.html //see http://www.postgresql.org/docs/8.1/static/sql-altertable.html
$alterIndexList=Array(); $alterIndexList = array();
if($alteredIndexes) foreach($alteredIndexes as $v) { if($alteredIndexes) foreach($alteredIndexes as $v) {
//TODO: I don't think that these drop index commands will work: //TODO: I don't think that these drop index commands will work:
if($v['type']!='fulltext'){ if($v['type']!='fulltext'){
@ -285,21 +287,29 @@ class MSSQLDatabase extends Database {
} }
} }
//Add the new indexes: //Add the new indexes:
if($newIndexes) foreach($newIndexes as $k=>$v){ if($newIndexes) foreach($newIndexes as $k=>$v){
$alterIndexList[] = $this->getIndexSqlDefinition($tableName, $k, $v); $alterIndexList[] = $this->getIndexSqlDefinition($tableName, $k, $v);
} }
if($alterList) { // ADD needs to be added before the columns to add, rather than multiple ADD statements
$alterations = implode(",\n", $alterList); $alterations = '';
//echo 'the alterations are ' . $alterList . '<br>'; if($newFieldsList) {
//$this->query("ALTER TABLE \"$tableName\" " . $alterations); $alterations .= "ALTER TABLE \"$tableName\" ADD ";
$this->query($alterations); $alterations .= implode(",\n", $newFieldsList);
} }
foreach($alterIndexList as $alteration) if($existingFieldList) {
if($alteration!='') $alterations .= implode(",\n", $existingFieldList);
$this->query($alteration); }
if($alterIndexList) {
$alterations .= "ALTER TABLE \"$tableName\" ";
$alterations .= implode(",\n", $alterIndexList);
}
$this->query($alterations);
} }
/* /*
@ -352,11 +362,12 @@ class MSSQLDatabase extends Database {
//drop the index if it exists: //drop the index if it exists:
$alterCol=''; $alterCol='';
$prefix="ALTER TABLE \"" . $tableName . "\" ";
if(isset($indexList[$colName])){ if(isset($indexList[$colName])){
$alterCol = "\nDROP INDEX \"$tableName\".ix_{$tableName}_{$colName}"; $alterCol = "\n$prefix DROP INDEX \"$tableName\".ix_{$tableName}_{$colName}";
} }
$prefix="ALTER TABLE \"" . $tableName . "\" ";
if(isset($matches[1])) { if(isset($matches[1])) {
$alterCol .= "\n$prefix ALTER COLUMN \"$colName\" $matches[1]\n"; $alterCol .= "\n$prefix ALTER COLUMN \"$colName\" $matches[1]\n";
@ -723,7 +734,11 @@ class MSSQLDatabase extends Database {
//Enums are a bit different. We'll be creating a varchar(255) with a constraint of all the usual enum options. //Enums are a bit different. We'll be creating a varchar(255) with a constraint of all the usual enum options.
//NOTE: In this one instance, we are including the table name in the values array //NOTE: In this one instance, we are including the table name in the values array
return "varchar(255) not null default '" . $values['default'] . "' check (\"" . $values['name'] . "\" in ('" . implode('\', \'', $values['enums']) . "'))"; $name = $values['name'];
$default = $values['default'];
$enums = implode('\', \'', $values['enums']);
return "varchar(255) not null check(\"$name\" in ('$enums'))";
} }