Dev: 334366c Child

Dev: potential issue with something like DECIMAL (30,10) not null
LimeSurvey · Aug 28, 2015 · 77e5aec · 77e5aec
1 parent 334366c
commit 77e5aec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/application/core/db/MysqlSchema.php b/application/core/db/MysqlSchema.php
@@ -38,7 +38,8 @@ public function getColumnType($type)
             }
             else
             { // Else join the yii type and the param ( decimal don't have params, other ?)
-                $result = $baseType.$param;
+                preg_match('/^([[:alpha:]]+)\s*(.*)$/', $baseType, $baseMatches);
+                $result = join(" ",array($baseMatches[1],$param,$baseMatches[2]));
             }
         }
         else

diff --git a/application/core/db/PgsqlSchema.php b/application/core/db/PgsqlSchema.php
@@ -34,7 +34,8 @@ public function getColumnType($type)
             }
             else
             { // Else join the yii type and the param ( decimal don't have params, other ?)
-                $result = $baseType.$param;
+                preg_match('/^([[:alpha:]]+)\s*(.*)$/', $baseType, $baseMatches);
+                $result = join(" ",array($baseMatches[1],$param,$baseMatches[2]));
             }
         }
         else