CPgsqlColumnSchema can't parse default value for numeric field

fixes #2235
yiisoft · Jan 28, 2014 · e5f7eb2 · e5f7eb2
1 parent b7638c7
commit e5f7eb2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -7,6 +7,7 @@ Version 1.1.15 under development
 --------------------------------
 - Bug #268: Fixed Active Record count error when some field name starting from 'count' (nineinchnick)
 - Bug #788: createIndex is not using the recommended way to create unique indexes on Postgres (nineinchnick)
+- Bug #2235: CPgsqlColumnSchema can't parse default value for numeric field (cebe, pavimus)
 - Bug #2378: CActiveRecord::tableName() in namespaced model returned fully qualified class name (velosipedist, cebe)
 - Bug #2654: Allow CDbCommand to compose queries without 'from' clause (klimov-paul)
 - Bug #2658: CBaseListView, CGridView, CListView: added note about $itemsCssClass and $pagerCssClass properties, they must not contain empty string, null or false values (resurtm)

diff --git a/framework/db/schema/pgsql/CPgsqlColumnSchema.php b/framework/db/schema/pgsql/CPgsqlColumnSchema.php
@@ -50,8 +50,8 @@ protected function extractDefault($defaultValue)
 			$this->defaultValue=null;
 		elseif(preg_match('/^\'(.*)\'::/',$defaultValue,$matches))
 			$this->defaultValue=$this->typecast(str_replace("''","'",$matches[1]));
-		elseif(preg_match('/^-?\d+(\.\d*)?$/',$defaultValue,$matches))
-			$this->defaultValue=$this->typecast($defaultValue);
+		elseif(preg_match('/^(-?\d+(\.\d*)?)(::.*)?$/',$defaultValue,$matches))
+			$this->defaultValue=$this->typecast($matches[1]);
 		// else is null
 	}
 }