Skip to content

Commit f5f8282

Browse files
authored
Merge pull request #1407 from phalcon/3.4.x
3.4.11
2 parents 71248b7 + 1e12d4f commit f5f8282

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

scripts/Phalcon/Devtools/Version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ class Version extends PhVersion
3939
*/
4040
protected static function _getVersion()
4141
{
42-
return [3, 4, 10, 0, 0];
42+
return [3, 4, 11, 0, 0];
4343
}
4444
}

scripts/Phalcon/Mvc/Model/Migration.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -930,13 +930,12 @@ public function getConnection()
930930
*/
931931
public static function columnHasSize($type)
932932
{
933-
$adapter = self::$databaseConfig->path('adapter');
934-
if ($adapter == 'Postgresql' &&
935-
in_array($type, [Column::TYPE_BOOLEAN, Column::TYPE_INTEGER, Column::TYPE_BIGINTEGER])) {
933+
$postgresTypes = [Column::TYPE_BOOLEAN, Column::TYPE_INTEGER, Column::TYPE_BIGINTEGER, Column::TYPE_DOUBLE];
934+
if (self::$databaseConfig->path('adapter') == 'Postgresql' && in_array($type, $postgresTypes)) {
936935
return false;
937936
}
938937

939-
if (in_array($type, [Column::TYPE_TEXT, Column::TYPE_DATE, Column::TYPE_DATETIME])) {
938+
if (in_array($type, [Column::TYPE_TEXT, Column::TYPE_DATE, Column::TYPE_DATETIME, Column::TYPE_DOUBLE])) {
940939
return false;
941940
}
942941

0 commit comments

Comments
 (0)