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

Revert "Fixing use of "bigint" and "decimal" for pure integer types."

Browse Source 
This reverts commit aa3b934712.
This commit is contained in:
Sean Harvey 2014-07-15 10:42:21 +12:00
parent 14bd3016b9
commit 54bd44a03b
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
code/MSSQLDatabase.php
View File

@ -713,13 +713,12 @@ class MSSQLDatabase extends SS_Database {
// Update the data_type field to be a complete column definition string for use by // Update the data_type field to be a complete column definition string for use by
// SS_Database::requireField() // SS_Database::requireField()
switch($field['data_type']){ switch($field['data_type']){
case 'int':
case 'bigint': case 'bigint':
case 'numeric': case 'numeric':
case 'float': case 'float':
case 'bit': case 'bit':
if($field['data_type'] != 'bigint' && $field['data_type'] != 'int' && $sizeSuffix = $field['numeric_precision']) { if($field['data_type'] != 'bigint' && $sizeSuffix = $field['numeric_precision']) {
$field['data_type'] .= "($sizeSuffix)"; $field['data_type'] .= "($sizeSuffix)";
} }
if($field['is_nullable'] == 'YES') { if($field['is_nullable'] == 'YES') {
@ -1157,7 +1156,8 @@ class MSSQLDatabase extends SS_Database {
* @return string * @return string
*/ */
public function int($values) { public function int($values) {
return 'int not null default ' . (int) $values['default']; //We'll be using an 8 digit precision to keep it in line with the serial8 datatype for ID columns
return 'numeric(8) not null default ' . (int) $values['default'];
} }
/** /**
@ -1213,17 +1213,17 @@ class MSSQLDatabase extends SS_Database {
/** /**
* This returns the column which is the primary key for each table * This returns the column which is the primary key for each table
* In Postgres, it is a SERIAL8, which is the equivalent of an auto_increment
*
* @return string * @return string
*/ */
function IdColumn($asDbValue=false, $hasAutoIncPK=true){ function IdColumn($asDbValue=false, $hasAutoIncPK=true){
if($asDbValue) { if($asDbValue)
return 'int not null'; return 'bigint not null';
} else { else {
if($hasAutoIncPK) { if($hasAutoIncPK)
return 'int identity(1,1)'; return 'bigint identity(1,1)';
} else { else return 'bigint not null';
return 'int not null';
}
} }
} }