Split Rename, Add and remove collumns from MongoDB::setFields

Author: maab16

publishable/assets/js/app.js

@@ -10651,6 +10651,8 @@ __webpack_require__.r(__webpack_exports__);
           _this2.$Progress.finish();
         }
       })["catch"](function (err) {
+        console.log(err);
+
         _this2.$Progress.fail();
 
         _this2.displayError(err.response);

resources/assets/js/views/database/Builder.vue

@@ -210,6 +210,7 @@
                     
                 })
                 .catch(err => {
+                  console.log(err);
                   this.$Progress.fail()
                   this.displayError(err.response)
                 });

src/Database/Drivers/MongoDB.php

@@ -112,13 +112,10 @@ public function updateCollection($collection)
 
     }
 
-    public function setFields($collectionName, $fields)
+    public function renameColumns($collectionName, $fields)
     {
         $collection = $this->selectCollection($collectionName);
-        /*
-         * Rename Columns
-         */
-        $renames = [];
+        $renames    = [];
         foreach ($fields as $field) {
             if ($field->oldName != "") {
                 if ($field->oldName != $field->name) {
@@ -131,19 +128,23 @@ public function setFields($collectionName, $fields)
         if (count($renames) > 0) {
             $update['$rename'] = $renames;
             $collection->updateMany(array(), $update, array('upsert' => true));
+            $dbmCollection = DBM_Collection::where('name', $collectionName)->first();
             foreach ($renames as $oldName => $newName) {
-                $collection_field           = CollectionField::where('old_name', $oldName)->first();
+                $collection_field = CollectionField::where([
+                    'dbm_collection_id' => $dbmCollection->_id,
+                    'old_name'          => $oldName,
+                ])->first();
                 $collection_field->old_name = $newName;
                 $collection_field->update();
             }
         }
+    }
 
-        $newFields = $this->getColumnsName($collectionName);
-        $columns   = $this->getCollectionColumns($collectionName);
-
-        /*
-         * Add Columns
-         */
+    public function addColumns($collectionName)
+    {
+        $collection = $this->selectCollection($collectionName);
+        $newFields  = $this->getColumnsName($collectionName);
+        $update     = [];
 
         if ($collection->count() > 0) {
             foreach ($newFields as $newField) {
@@ -176,14 +177,16 @@ public function setFields($collectionName, $fields)
             }
 
         }
+    }
 
-        /*
-         * Remove Columns
-         */
-
-        $update = [];
+    public function removeColumns($collectionName)
+    {
+        $collection = $this->selectCollection($collectionName);
+        $newFields  = $this->getColumnsName($collectionName);
+        $columns    = $this->getCollectionColumns($collectionName);
+        $update     = [];
+        $unsets     = [];
 
-        $unsets = [];
         foreach ($columns as $column) {
             if (!in_array($column, $newFields)) {
                 $unsets[$column] = "";
@@ -194,7 +197,23 @@ public function setFields($collectionName, $fields)
             $update['$unset'] = $unsets;
             $collection->updateMany(array(), $update, array('upsert' => true));
         }
+    }
+
+    public function setFields($collectionName, $fields)
+    {
+        /*
+         * Rename Columns
+         */
+        $this->renameColumns($collectionName, $fields);
 
+        /*
+         * Add Columns
+         */
+        $this->addColumns($collectionName);
+        /*
+         * Remove Columns
+         */
+        $this->removeColumns($collectionName);
         return true;
     }
 

src/Database/Drivers/MongoDB/Index.php

@@ -31,32 +31,41 @@ public static function getIndexes(Collection $collection)
 
     public static function getType(IndexInfo $index)
     {
-        if ($index->isText()) {
-            return "TEXT";
-        }
+        $type = static::getCommonType($index);
 
         if ($index->isUnique() && !$index->isSparse() && !static::checkDescending($index)) {
-            return "UNIQUE";
+            $type = "UNIQUE";
         }
 
         if ($index->isUnique() && !$index->isSparse() && static::checkDescending($index)) {
-            return "UNIQUE_DESC";
+            $type = "UNIQUE_DESC";
         }
 
         if ($index->isSparse() && !static::checkDescending($index)) {
-            return "SPARSE";
+            $type = "SPARSE";
         }
 
         if ($index->isSparse() && $index->isUnique() && !static::checkDescending($index)) {
-            return "SPARSE_UNIQUE";
+            $type = "SPARSE_UNIQUE";
         }
 
         if ($index->isSparse() && $index->isUnique() && static::checkDescending($index)) {
-            return "SPARSE_UNIQUE_DESC";
+            $type = "SPARSE_UNIQUE_DESC";
         }
 
         if ($index->isSparse() && static::checkDescending($index)) {
-            return "SPARSE_DESC";
+            $type = "SPARSE_DESC";
+        }
+
+        $type = static::getDefaultType($index);
+
+        return $type;
+    }
+
+    protected static function getCommonType(IndexInfo $index)
+    {
+        if ($index->isText()) {
+            return "TEXT";
         }
 
         if ($index->is2dSphere()) {
@@ -70,8 +79,6 @@ public static function getType(IndexInfo $index)
         if ($index->isGeoHaystack()) {
             return "GEOHAYSTACK";
         }
-
-        return static::getDefaultType($index);
     }
 
     protected static function getDefaultType(IndexInfo $index)

src/Http/Controllers/DatabaseController.php

@@ -93,7 +93,7 @@ public function updateMongoDbTable($table)
 
                 if (in_array($column['oldName'], $fieldNames)) {
 
-                    $collection_field = $collection_field = CollectionField::where([
+                    $collection_field = CollectionField::where([
                         'dbm_collection_id' => $collection->_id,
                         'old_name'          => $column['oldName'],
                     ])->first();