Merge pull request #185 from AthennaIO/develop

feat(command): use finally to close db con

Author: jlenon7

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@athenna/database",
-  "version": "5.6.0",
+  "version": "5.7.0",
   "description": "The Athenna database handler for SQL/NoSQL.",
   "license": "MIT",
   "author": "João Lenon <lenon@athenna.io>",

src/commands/DbFreshCommand.ts

@@ -36,11 +36,24 @@ export class DbWipeCommand extends BaseCommand {
     await Artisan.call(`db:wipe --connection ${this.connection}`)
     console.log()
 
-    await Artisan.call(`migration:run --connection ${this.connection}`)
+    if (this.getConfig('driver') !== 'mongo') {
+      await Artisan.call(`migration:run --connection ${this.connection}`)
+    }
 
     if (this.withSeeders) {
       console.log()
       await Artisan.call(`db:seed --connection ${this.connection}`)
     }
   }
+
+  private getConfig(name: string, defaultValue?: any) {
+    return Config.get(
+      `database.connections.${
+        this.connection === 'default'
+          ? Config.get('database.default')
+          : this.connection
+      }.${name}`,
+      defaultValue
+    )
+  }
 }

src/commands/DbSeedCommand.ts

@@ -48,16 +48,16 @@ export class DbSeedCommand extends BaseCommand {
 
     await DB.runSeeders({ task, classes: this.classes })
 
-    await task.run().finally(async () => {
-      const dbName = await DB.getCurrentDatabase()
-
-      await DB.close()
-
-      console.log()
-      this.logger.success(
-        `Database ({yellow} "${dbName}") successfully seeded.`
-      )
-    })
+    await task
+      .run()
+      .then(async () => {
+        const dbName = await DB.getCurrentDatabase()
+        console.log()
+        this.logger.success(
+          `Database ({yellow} "${dbName}") successfully seeded.`
+        )
+      })
+      .finally(() => DB.close())
   }
 
   private getConfig(name: string, defaultValue?: any) {

src/commands/DbWipeCommand.ts

@@ -55,14 +55,17 @@ export class DbWipeCommand extends BaseCommand {
       )
     }
 
-    await task.run().finally(async () => {
-      const dbName = await DB.getCurrentDatabase()
+    await task
+      .run()
+      .then(async () => {
+        const dbName = await DB.getCurrentDatabase()
 
-      await DB.close()
-
-      console.log()
-      this.logger.success(`Database ({yellow} "${dbName}") successfully wiped.`)
-    })
+        console.log()
+        this.logger.success(
+          `Database ({yellow} "${dbName}") successfully wiped.`
+        )
+      })
+      .finally(() => DB.close())
   }
 
   private getConfig(name: string, defaultValue?: any) {

src/commands/MigrationRevertCommand.ts

@@ -38,12 +38,15 @@ export class MigrationRevertCommand extends BaseCommand {
     }
 
     const DB = Database.connection(this.connection)
-    const dbName = await DB.getCurrentDatabase()
 
-    await DB.revertMigrations().finally(() => DB.close())
+    await DB.revertMigrations()
+      .then(async () => {
+        const dbName = await DB.getCurrentDatabase()
 
-    this.logger.success(
-      `Successfully reverted migrations on ({yellow} "${dbName}") database.`
-    )
+        this.logger.success(
+          `Successfully reverted migrations on ({yellow} "${dbName}") database.`
+        )
+      })
+      .finally(() => DB.close())
   }
 }

src/commands/MigrationRunCommand.ts

@@ -38,12 +38,15 @@ export class MigrationRunCommand extends BaseCommand {
     }
 
     const DB = Database.connection(this.connection)
-    const dbName = await DB.getCurrentDatabase()
 
-    await DB.runMigrations().finally(() => DB.close())
+    await DB.runMigrations()
+      .then(async () => {
+        const dbName = await DB.getCurrentDatabase()
 
-    this.logger.success(
-      `Successfully ran migrations on ({yellow} "${dbName}") database.`
-    )
+        this.logger.success(
+          `Successfully ran migrations on ({yellow} "${dbName}") database.`
+        )
+      })
+      .finally(() => DB.close())
   }
 }