fixed bug, where empty array for DynamicActiveRecord::dynColSqlMaria(…

…) creates invlid COLUMN_CREATE command
tom-- · Jun 7, 2015 · 5b70ba1 · 5b70ba1
1 parent df64ce2
commit 5b70ba1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,3 +11,7 @@
 ## 0.2.0 June 6 2015
 
 - Enh: New attribute name getter method DynamicActiveRecord::allAttributes()
+
+## 0.2.1 June 8 2015
+
+- Bug: Empty array in DynamicActiveRecord::dynColSqlMaria() creates invalid COLUMN_CREATE() command
diff --git a/DynamicActiveRecord.php b/DynamicActiveRecord.php
@@ -148,27 +148,31 @@ public static function find()
      * @return string SQL for a DB Expression
      * @throws \yii\base\Exception
      */
-    private static function dynColSqlMaria($attrs, & $params)
+    private static function dynColSqlMaria(array $attrs, & $params)
     {
         $sql = [];
         foreach ($attrs as $key => $value) {
-            if (!is_scalar($value) && empty($value)) {
+            if (is_object($value)) {
+                $value = (array)$value;
+            }
+            if ($value === [] || $value === null) {
                 continue;
             }
 
             $phKey = static::placeholder();
             $phValue = static::placeholder();
             $sql[] = $phKey;
             $params[$phKey] = $key;
-            if (is_scalar($value) || $value === null) {
+
+            if (is_scalar($value)) {
                 $sql[] = $phValue;
                 $params[$phValue] = $value;
-            } else {
-                $sql[] = static::dynColSqlMaria((array) $value, $params);
+            } elseif (is_array($value)) {
+                $sql[] = static::dynColSqlMaria($value, $params);
             }
         }
 
-        return 'COLUMN_CREATE(' . implode(',', $sql) . ')';
+        return $sql === [] ? 'null' : 'COLUMN_CREATE(' . implode(',', $sql) . ')';
     }
 
     /**