add dropIndex tests and fix addIndex

Author: parsgit

src/Schema.php

@@ -497,36 +497,7 @@ public function nullable()
     }
 
 
-    /**
-     * Generate a CREATE TABLE query for the current table and fields.
-     *
-     * @return string
-     */
-    public function create($engine = 'InnoDB', $charset = 'utf8mb4', $collate = 'utf8mb4_unicode_ci')
-    {
-        $this->addToFieldsAndResetFieldQuery();
-
-        $sql = "CREATE TABLE IF NOT EXISTS `{$this->table}` (";
-        $sql .= $this->generateFieldQueryString();
-        $sql .= ") ENGINE={$engine} DEFAULT CHARSET={$charset} COLLATE={$collate};";
-
-        // die("$sql\n");
-        return DB::query($sql);
-    }
 
-    /**
-     * Generate an ALTER TABLE query for the current table and fields.
-     *
-     * @return string
-     */
-    public function change()
-    {
-        $this->addToFieldsAndResetFieldQuery();
-        $sql = "ALTER TABLE `{$this->table}` ";
-        $sql .= $this->generateFieldQueryString();
-
-        return DB::query($sql);
-    }
 
 
     private function generateFieldQueryString(): string
@@ -600,6 +571,7 @@ public function dropColumn($name)
      */
     public function renameColumn($current_name)
     {
+        // $this->setFieldQuery('Action', "CHANGE IF EXISTS `$current_name`");
         $this->change_action = "CHANGE IF EXISTS `$current_name`";
         return $this;
     }
@@ -612,6 +584,51 @@ public function after($column_name)
     }
 
 
+        /**
+     * Drop an index from the table.
+     *
+     * @param string $name
+     * @return $this
+     */
+    public function dropIndex($name)
+    {
+        $this->setFieldQuery('Action', 'DROP INDEX');
+        $this->setFieldQuery('Field', "`$name`");
+        // $this->fields[] = " ";
+
+        return $this;
+    }
+
+    /**
+     * Add a foreign key constraint to the table.
+     *
+     * @param string $name
+     * @param string $column
+     * @param string $table
+     * @param string $references
+     * @param string $onDelete
+     * @param string $onUpdate
+     * @return $this
+     */
+    public function addForeign($name, $column, $table, $references, $onDelete = 'CASCADE', $onUpdate = 'CASCADE')
+    {
+        $this->fields[] = "CONSTRAINT `$name` FOREIGN KEY (`$column`) REFERENCES `$table` (`$references`) ON DELETE $onDelete ON UPDATE $onUpdate";
+        return $this;
+    }
+
+    /**
+     * Drop a foreign key constraint from the table.
+     *
+     * @param string $name
+     * @return $this
+     */
+    public function dropForeign($name)
+    {
+        $this->fields[] = "DROP FOREIGN KEY `$name`";
+        return $this;
+    }
+
+
     /**
      * Set the character set and collation of the last added column in the $fields array to utf8mb4.
      *
@@ -660,53 +677,48 @@ public function modifyColumn()
      */
     public function addIndex($name, array $columns, $type = 'INDEX')
     {
-        // $this->setFieldQuery('Action', 'ADD');
+
         $this->setFieldQuery('Action', "ADD $type");
         $this->setFieldQuery('Field', "`$name`");
         $this->setFieldQuery('Extra', "(" . implode(', ', $columns) . ")");
+        $this->setFieldQuery('Null', '');
 
-        // $this->fields[] = "ADD $type `$name` (" . implode(', ', $columns) . ")";
         return $this;
     }
 
-    /**
-     * Drop an index from the table.
-     *
-     * @param string $name
-     * @return $this
-     */
-    public function dropIndex($name)
-    {
-        $this->fields[] = "DROP INDEX `$name`";
-        return $this;
-    }
+
+
+
 
     /**
-     * Add a foreign key constraint to the table.
+     * Generate a CREATE TABLE query for the current table and fields.
      *
-     * @param string $name
-     * @param string $column
-     * @param string $table
-     * @param string $references
-     * @param string $onDelete
-     * @param string $onUpdate
-     * @return $this
+     * @return string
      */
-    public function addForeign($name, $column, $table, $references, $onDelete = 'CASCADE', $onUpdate = 'CASCADE')
+    public function create($engine = 'InnoDB', $charset = 'utf8mb4', $collate = 'utf8mb4_unicode_ci')
     {
-        $this->fields[] = "CONSTRAINT `$name` FOREIGN KEY (`$column`) REFERENCES `$table` (`$references`) ON DELETE $onDelete ON UPDATE $onUpdate";
-        return $this;
+        $this->addToFieldsAndResetFieldQuery();
+
+        $sql = "CREATE TABLE IF NOT EXISTS `{$this->table}` (";
+        $sql .= $this->generateFieldQueryString();
+        $sql .= ") ENGINE={$engine} DEFAULT CHARSET={$charset} COLLATE={$collate};";
+
+        $this->reset();
+        return DB::query($sql);
     }
 
     /**
-     * Drop a foreign key constraint from the table.
+     * Generate an ALTER TABLE query for the current table and fields.
      *
-     * @param string $name
-     * @return $this
+     * @return string
      */
-    public function dropForeign($name)
+    public function change()
     {
-        $this->fields[] = "DROP FOREIGN KEY `$name`";
-        return $this;
+        $this->addToFieldsAndResetFieldQuery();
+        $sql = "ALTER TABLE `{$this->table}` ";
+        $sql .= $this->generateFieldQueryString();
+
+        $this->reset();
+        return DB::query($sql);
     }
 }

tests/SchemaTest.php

@@ -125,6 +125,7 @@ public function testRenameColumn(){
     public function testAddIndex(){
         $table = new Schema('users');
         $table->addIndex('phone',['phone'], Schema::INDEX_UNIQUE)->change();
+        $table->addIndex('email',['email'])->change();
 
         $columns = DB::query('SHOW COLUMNS FROM `users`', [], true);
 
@@ -140,6 +141,38 @@ public function testAddIndex(){
         $this->assertTrue($status);
     }
 
+    public function testDropIndex(){
+        $table = new Schema('users');
+
+        $columns = DB::query('SHOW COLUMNS FROM `users`', [], true);
+
+        $status = false;
+
+        foreach($columns as $column){
+            if($column->Field == 'email' && $column->Key=='MUL'){
+                $status = true;
+                break;
+            }
+        }
+
+        $this->assertTrue($status);
+
+        $table->dropIndex('email')->change();
+
+        $columns = DB::query('SHOW COLUMNS FROM `users`', [], true);
+
+        $status = false;
+
+        foreach($columns as $column){
+            if($column->Field == 'email' && $column->Key=='MUL'){
+                $status = true;
+                break;
+            }
+        }
+
+        $this->assertFalse($status);
+    }
+
 }