lifeeka / jsql

src/Extractor/JsonExtractor.php

Braces +7 added lines, -6 removed lines

@@ -194,12 +194,13 @@
             foreach ($data ?? [] as $Column => $Value) {
                 if (!is_array($Value) && !is_object($Value) && !empty($Column) && !is_numeric($Column)) {
 
-                    if (isset($ForeignKeys[JsonExtractor::snakeCase($table)]) && $ForeignKeys[JsonExtractor::snakeCase($table)]['name'] == JsonExtractor::snakeCase($Column))
-                        $Columns[] = ['name' => $Column, 'type' => 'foreign_key', 'ref' => $ForeignKeys[JsonExtractor::snakeCase($table)]['ref']];
-                    elseif ($Column == 'id')
-                        $Columns[] = ['name' => $Column, 'type' => 'primary_key'];
-                    else
-                        $Columns[] = ['name' => $Column, 'type' => gettype($this->getActualDataType($Value, ""))];
+                    if (isset($ForeignKeys[JsonExtractor::snakeCase($table)]) && $ForeignKeys[JsonExtractor::snakeCase($table)]['name'] == JsonExtractor::snakeCase($Column)) {
+                                            $Columns[] = ['name' => $Column, 'type' => 'foreign_key', 'ref' => $ForeignKeys[JsonExtractor::snakeCase($table)]['ref']];
+                    } elseif ($Column == 'id') {
+                                            $Columns[] = ['name' => $Column, 'type' => 'primary_key'];
+                    } else {
+                                            $Columns[] = ['name' => $Column, 'type' => gettype($this->getActualDataType($Value, ""))];
+                    }
                 }
             }
         } elseif (is_array($data)) {

src/Helpers/Json.php

Braces +19 added lines, -11 removed lines

@@ -81,18 +81,22 @@ 
     private function addID($array, $parent_table = false, $last_increment = false)
     {
 
-        if (!is_array($array))
-            $array = json_decode($array, true);//if this is not the first time decode the text
+        if (!is_array($array)) {
+                    $array = json_decode($array, true);
+        }
+        //if this is not the first time decode the text
 
         $return_array = $array;//return array
 
         foreach ($array ?? [] as $key => $array_item) {
 
-            if (!is_numeric($key) && $parent_table)//single array table, no column
+            if (!is_numeric($key) && $parent_table) {
+             //single array table, no column
                 $table_name = $parent_table . '_' . $key;
-            elseif ($parent_table)//multiple array items
+            } elseif ($parent_table) {
+             //multiple array items
                 $table_name = $parent_table;
-            else {//first time loop
+            } else {//first time loop
                 $table_name = $this->main_table_name;
             }
 
@@ -129,21 +133,25 @@ 
      */
     private function addForeign($array, $parent_table = null, $parent_key = false)
     {
-        if (!is_array($array))
-            $array = json_decode($array, true);
+        if (!is_array($array)) {
+                    $array = json_decode($array, true);
+        }
 
         $return_array = $array;
         foreach ($array ?? [] as $key => $array_item) {
 
 
 
-            if (!is_numeric($key) && $parent_table)//single array table, no column
+            if (!is_numeric($key) && $parent_table) {
+             //single array table, no column
                 $table_name = $parent_table . '_' . $key;
-            elseif ($parent_table)//multiple array items
+            } elseif ($parent_table) {
+             //multiple array items
                 $table_name = $parent_table;
-            elseif (!is_numeric($key))  //first time loop
+            } elseif (!is_numeric($key)) {
+             //first time loop
                 $table_name = $key;
-            else {//first time loop
+            } else {//first time loop
                 $table_name = $this->main_table_name;
             }