update

Author: tamedevelopers

src/Console/Commands/MigrationCommand.php

@@ -40,6 +40,8 @@ public function fresh()
         $force = $this->option('force');
         $seed  = $this->option('seed');
 
+        
+
         if($force){
             Artisan::call('db:wipe --force --drop-types --drop-views --response=0');
         }
@@ -69,10 +71,9 @@ public function refresh()
      */
     public function reset()
     {
-        // Require --force in production environments
         $this->forceChecker();
 
-        $force = (bool) $this->option('force'); 
+        $force = $this->force(); 
 
         $migration = new Migration();
         $response = $migration->drop($force);

src/Dummy/dummyJobsMigration.dum

@@ -9,10 +9,8 @@ return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return mixed
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('{{TABLE}}', function (Blueprint $table) {
             $table->id();
@@ -27,16 +25,11 @@ return new class extends Migration
 
     /**
      * Drop database table
-     *
-     * @param bool $force 
-     * [optional] Default is false
-     * Force drop all tables or throw an error on Foreign keys
-     * 
-     * @return mixed
+     * @param bool $force
      */
-    public function drop($force = false)
+    public function drop($force = false): void
     {
-        return Schema::dropTable('{{TABLE}}', $force);
+        Schema::dropTable('{{TABLE}}', $force);
     }
 
 };

src/Dummy/dummyMigration.dum

@@ -9,10 +9,8 @@ return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return mixed
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('{{TABLE}}', function (Blueprint $table) {
             $table->id();
@@ -22,16 +20,11 @@ return new class extends Migration
 
     /**
      * Drop database table
-     *
-     * @param bool $force 
-     * [optional] Default is false
-     * Force drop all tables or throw an error on Foreign keys
-     * 
-     * @return mixed
+     * @param bool $force
      */
-    public function drop($force = false)
+    public function drop($force = false): void
     {
-        return Schema::dropTable('{{TABLE}}', $force);
+        Schema::dropTable('{{TABLE}}', $force);
     }
 
 };

src/Dummy/dummyScheme.dum

@@ -8,10 +8,8 @@ return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return mixed
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('{{TABLE}}', function (Blueprint $table) {
             {{BODY}}
@@ -20,12 +18,10 @@ return new class extends Migration
 
     /**
      * Drop database table
-     *
-     * @param bool $force [optional] Default is false
-     * @return mixed
+     * @param bool $force
      */
-    public function drop($force = false)
+    public function drop($force = false): void
     {
-        return Schema::dropTable('{{TABLE}}', $force);
+        Schema::dropTable('{{TABLE}}', $force);
     }
 };

src/Dummy/dummySchemeLaravel.dum

@@ -8,10 +8,8 @@ return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('{{TABLE}}', function (Blueprint $table) {
             {{BODY}}
@@ -20,10 +18,8 @@ return new class extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function drop($force = false)
+    public function drop(): void
     {
         Schema::dropIfExists('{{TABLE}}');
     }

src/Dummy/dummySessionsMigration.dum

@@ -9,10 +9,8 @@ return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return mixed
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('{{TABLE}}', function (Blueprint $table) {
             $table->id();
@@ -29,16 +27,11 @@ return new class extends Migration
 
     /**
      * Drop database table
-     *
-     * @param bool $force 
-     * [optional] Default is false
-     * Force drop all tables or throw an error on Foreign keys
-     * 
-     * @return mixed
+     * @param bool $force
      */
-    public function drop($force = false)
+    public function drop($force = false): void
     {
-        return Schema::dropTable('{{TABLE}}', $force);
+        Schema::dropTable('{{TABLE}}', $force);
     }
 
 };

src/Migrations/Schema.php

@@ -92,8 +92,10 @@ public static function create($tableName, callable $callback)
     {
         $blueprint = new Blueprint($tableName);
         $callback($blueprint);
+
         $result = $blueprint->handleBlueprint();
         self::$lastResult = $result;
+
         return $result;
     }
 
@@ -191,11 +193,17 @@ public static function dropTable($tableName, $force = false)
 
         // Handle query
         try{
-            // DROP TABLE IF EXISTS
+            
             if($force){
-                self::$pdo->exec("SET FOREIGN_KEY_CHECKS = 0; "); // Disable foreign key checks temporarily
-                self::$pdo->exec("DROP TABLE {$tableName} CASCADE;"); // Drop the table with CASCADE option
-                self::$pdo->exec("SET FOREIGN_KEY_CHECKS = 1;"); // Enable foreign key checks again
+                // Disable foreign key checks temporarily
+                self::$pdo->exec("SET FOREIGN_KEY_CHECKS = 0; "); 
+
+                if(self::$db->tableExists($tableName)){
+                    // Drop the table with CASCADE option
+                    self::$pdo->exec("DROP TABLE {$tableName} CASCADE;"); 
+                }
+                // Enable foreign key checks again
+                self::$pdo->exec("SET FOREIGN_KEY_CHECKS = 1;"); 
             } else{
                 self::$pdo->query( "DROP TABLE {$tableName};" )->execute();
             }
@@ -227,11 +235,11 @@ public static function dropColumn($tableName, $columnName)
     {
         self::initSchemaDatabase();
 
-        // handle error
-        $handle = self::checkDBConnect();
-        if(is_array($handle)){
-            return $handle;
-        } 
+        $conn = self::checkDBConnect();
+        if($conn['status'] != Constant::STATUS_200){
+            self::$lastResult = $conn;
+            return $conn;
+        }
 
         // if empty
         if(empty($columnName)){