Migration and Schema fix

Author: Fredrick Peter

src/Collections/Traits/RelatedTrait.php

@@ -247,7 +247,8 @@ private function convertMapperOnInit(mixed $items = null)
     private function convertOnInit(mixed $items = null)
     {
         if ($this->unescapeIsObjectWithoutArray) {
-            return json_decode(json_encode($items), true);
+            if(!is_bool($items))
+                return json_decode(json_encode($items), true);
         } elseif ($this->isValidJson()) {
             return json_decode($items, true);
         } elseif (is_array($items) || is_string($items)) {

src/Migrations/Traits/SchemaConfigurationTrait.php

@@ -134,7 +134,7 @@ protected function queryForType_and_Length(?array $options = [])
         // for enum|set
         if(isset($options['values'])){
             array_walk($options['values'], function (&$value, $key){
-                $value = "'{$value}'";
+                $value = "\'{$value}\'";
             });
             $values = implode(', ', $options['values']);
             $columnDef .= "({$values})";
@@ -225,7 +225,12 @@ protected function queryForDefault(?array $options = [])
     {
         $columnDef = "";
         if (!is_null($options['default'])) {
-            $columnDef .= " DEFAULT '{$options['default']}'";
+            // for enum|set
+            if(isset($options['values'])){
+                $columnDef .= " DEFAULT \'{$options['default']}\'";
+            }else{
+                $columnDef .= " DEFAULT {$options['default']}";
+            }
         }
 
         return $columnDef;

src/Migrations/Traits/TableStructureTrait.php

@@ -329,28 +329,13 @@ private function createTriggers()
      */
     private function regixifyQuery(?string $formatted)
     {
-        $formattedQuery = '';
-        $indentationLevel = 0;
-        $keywords = ['SELECT', 'FROM', 'WHERE', 'JOIN', 'GROUP BY', 'ORDER BY', 'INSERT', 'UPDATE', 'DELETE'];
-        $lines = explode("\n", $formatted);
+        // clean string from begining and ending
+        $formatted = preg_replace("/^[ \t]+|[ \t]+$/m", "", $formatted);
 
-        foreach ($lines as $line) {
-            $trimmedLine = trim($line);
+        // replace back-slash
+        $formatted = str_replace('\\', '', $formatted);
 
-            if (!empty($trimmedLine)) {
-                if (in_array(strtoupper($trimmedLine), $keywords)) {
-                    $formattedQuery .= str_repeat('  ', $indentationLevel) . $trimmedLine . "\n";
-                    $indentationLevel++;
-                } elseif ($trimmedLine === ')') {
-                    $indentationLevel--;
-                    $formattedQuery .= str_repeat('  ', $indentationLevel) . $trimmedLine . "\n";
-                } else {
-                    $formattedQuery .= str_repeat('  ', $indentationLevel) . $trimmedLine . "\n";
-                }
-            }
-        }
-
-        return $formattedQuery;
+        return $formatted;
     }
 
 }