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

Merge remote-tracking branch 'origin/1.2'

Browse Source 
# Conflicts:
#	code/PostgreSQLSchemaManager.php
#	composer.json
This commit is contained in:
Damian Mooyman 2016-01-21 09:30:15 +13:00
commit 24caacbf3b
1 changed files with 1137 additions and 1137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/PostgreSQLSchemaManager.php
View File

@ -481,7 +481,7 @@ class PostgreSQLSchemaManager extends DBSchemaManager
// TODO: this returns an empty array for the following string: int(11) not null auto_increment // TODO: this returns an empty array for the following string: int(11) not null auto_increment
// on second thoughts, why is an auto_increment field being passed through? // on second thoughts, why is an auto_increment field being passed through?
$pattern = '/^([\w()]+)\s?((?:not\s)?null)?\s?(default\s[\w\']+)?\s?(check\s[\w()\'",\s]+)?$/i'; $pattern = '/^([\w(\,)]+)\s?((?:not\s)?null)?\s?(default\s[\w\.\']+)?\s?(check\s[\w()\'",\s]+)?$/i';
preg_match($pattern, $colSpec, $matches); preg_match($pattern, $colSpec, $matches);
if (sizeof($matches)==0) { if (sizeof($matches)==0) {
@ -648,7 +648,7 @@ class PostgreSQLSchemaManager extends DBSchemaManager
break; break;
case 'numeric': case 'numeric':
$output[$field['column_name']]='decimal(' . $field['numeric_precision'] . ',' . $field['numeric_scale'] . ') default ' . (int)$field['column_default']; $output[$field['column_name']]='decimal(' . $field['numeric_precision'] . ',' . $field['numeric_scale'] . ') default ' . floatval($field['column_default']);
break; break;
case 'integer': case 'integer':
@ -1093,7 +1093,7 @@ class PostgreSQLSchemaManager extends DBSchemaManager
$defaultValue = ''; $defaultValue = '';
if(isset($values['default']) && is_numeric($values['default'])) { if(isset($values['default']) && is_numeric($values['default'])) {
$defaultValue = ' default ' . $values['default']; $defaultValue = ' default ' . floatval($values['default']);
} }
if($asDbValue) { if($asDbValue) {