fix to allow Zend_Db_Expr as default for column

scottsb · web-flow · commit 230276544b18 · 2017-04-04T14:49:52.000-04:00
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -2422,7 +2422,7 @@ protected function _getColumnDefinition($options, $ddlType = null)
          *  where default value can be quoted already.
          *  We need to avoid "double-quoting" here
          */
-        if ($cDefault !== null && strlen($cDefault)) {
+        if ($cDefault !== null && is_string($cDefault) && strlen($cDefault)) {
             $cDefault = str_replace("'", '', $cDefault);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -2422,7 +2422,7 @@ protected function _getColumnDefinition($options, $ddlType = null)`
`2422`	`2422`	`* where default value can be quoted already.`
`2423`	`2423`	`* We need to avoid "double-quoting" here`
`2424`	`2424`	`*/`
`2425`		`- if ($cDefault !== null && strlen($cDefault)) {`
	`2425`	`+ if ($cDefault !== null && is_string($cDefault) && strlen($cDefault)) {`
`2426`	`2426`	`$cDefault = str_replace("'", '', $cDefault);`
`2427`	`2427`	`}`
`2428`	`2428`