Updates to tableStore

Author: ToxicTree

app/Http/Controllers/Controller.php

@@ -51,31 +51,12 @@ public function rowRemove_($tableName,$id)
         return TableController::tableGet($tableName);
     }
 
-    public function tableStore_(Request $request)
+    public function tableStore_()
     {
-        if (!$request->has('tablename'))
-            return abort(400, "No tablename given.");
-
-        $tableName = $request->tablename;
-
-        if (!$request->has('columns'))
-            return abort(400, "No columns given.");
-
-        $structure = array();
-        $structure['id'] = "increments";
-        
-        foreach ($request->columns as $column => $type) {
-
-            if ($column != "id")                        // Don´t use these
-                if ($type=="text" || $type=="integer")  // Enabled types
-                    $structure[$column] = $type;
-
-        }
-
-        return TableController::tableStore($tableName,$structure);
+        return TableController::tableStore();
     }
 
-    public function rowStore_($tableName, Request $request)
+    public function rowStore_($tableName)
     {
         if (!TableController::tableExists($tableName))
             return abort(404, "Table '$tableName' don´t exist.");
@@ -88,20 +69,19 @@ public function tableUpdate_($tableName, Request $request)
         if (!$request->has('columns'))
             return abort(400, "No columns given.");
 
-        $structure = array();
-        $structure[] = array('originalName' => 'id', 'originalType' => "increments");
-
-        $columns =  $request->input('columns');
+        $tableinfoNew = [ 'tablename' => $request->input('tablename'), 'originalTablename' => $tableName ];
 
-        foreach ($columns as $columnNew){
+        $tableinfoNew['columns'][] = array('originalName' => 'id', 'originalType' => "increments");
+
+        foreach ($request->input('columns') as $columnNew){
 
             if ($columnNew['originalName'] != "id")                                        // Don´t use these
                 if (strtoupper($columnNew['originalType'])=="TEXT" || strtoupper($columnNew['originalType'])=="INTEGER")  // Enabled types
-                    $structure[] = $columnNew;
+                    $tableinfoNew['columns'][] = $columnNew;
 
         }
 
-        return TableController::tableUpdate($tableName,$structure);
+        return TableController::tableUpdate($tableName,$tableinfoNew);
     }
 
     public function rowUpdate_($tableName, $id, Request $request)

app/Http/Controllers/TableController.php

@@ -30,7 +30,7 @@ public static function tableExists($tableName)
      */
     public static function tableInfo($tableName)
     {
-        $result = [ 'tablename' => $tableName ];
+        $result = [ 'tablename' => $tableName, 'originalTablename' => $tableName ];
 
         $tableInfo = DB::select( "PRAGMA table_info('$tableName')" );
 
@@ -95,30 +95,17 @@ public static function tableGet($tableName)
     /**
      * Create table.
      *
-     * @param  string $tableName
-     * @param  object $structure
      * @return array
      */
-    public static function tableStore($tableName,$structure)
+    public static function tableStore()
     {
-        if (TableController::tableExists($tableName))
-            return TableController::tableUpdate($tableName,$structure);
-
-        Schema::create($tableName, function($t) use ($structure){
-
-            foreach ($structure as $column => $type){
-
-                if ($column=="id")
-                    $t->$type($column);
-
-                else
-                    $t->$type($column)->nullable();
-
-            }
+        Schema::create('_temp_', function($table){
+            
+            $table->increments('id');
 
         });
 
-        return TableController::tableGet($tableName);
+        return TableController::tableGet('_temp_');
     }
 
     /**
@@ -128,15 +115,20 @@ public static function tableStore($tableName,$structure)
      * @param  object $structure
      * @return array
      */
-    public static function tableUpdate($tableName,$structureNew)
+    public static function tableUpdate($tableName,$tableInfoNew)
     {
         if (!TableController::tableExists($tableName))
-            return TableController::tableStore($tableName,$structureNew);
+            return TableController::tableStore();
 
-        $tableInfo = TableController::tableInfo($tableName);
+        // Get Current table
+        $tableInfoOld = TableController::tableInfo($tableName);
 
-        $structureOld = $tableInfo['columns'];
+        $structureOld = $tableInfoOld['columns'];
+
+        // Get New table
+        $structureNew = $tableInfoNew['columns'];
 
+
         // Check for new columns
         $addThese = array();
 
@@ -208,8 +200,12 @@ public static function tableUpdate($tableName,$structureNew)
 
         }
 
+        // Check for rename table
+        if ($tableInfoNew['originalTablename'] != $tableInfoNew['tablename'])
+            Schema::rename($tableInfoNew['originalTablename'], $tableInfoNew['tablename']);
+
 
-        return TableController::tableGet($tableName);
+        return TableController::tableGet($tableInfoNew['tablename']);
     }
 
 }