refactor: re-organize code

adonisjs · Apr 17, 2020 · f09f4f6 · f09f4f6
1 parent 40d528d
commit f09f4f6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/commands/Migration/Base.ts b/commands/Migration/Base.ts
@@ -78,6 +78,7 @@ export default abstract class MigrationsBase extends BaseCommand {
     if (compiledAt.isValid) {
       console.log(`${this.colors.magenta('Last compiled at:')} ${compiledAt.toLocaleString(DateTime.DATETIME_MED)}`)
     }
+    console.log('')
   }
 
   /**

diff --git a/commands/Migration/Rollback.ts b/commands/Migration/Rollback.ts
@@ -27,7 +27,7 @@ export default class Migrate extends MigrationsBase {
    * Custom connection for running migrations.
    */
   @flags.string({ description: 'Define a custom database connection' })
-  public connection: string = this.db.primaryConnectionName
+  public connection: string
 
   /**
    * Force run migrations in production
@@ -65,6 +65,7 @@ export default class Migrate extends MigrationsBase {
    * Handle command
    */
   public async handle (): Promise<void> {
+    this.connection = this.connection || this.db.primaryConnectionName
     const connection = this.db.getRawConnection(this.connection)
 
     const continueMigrations = !this.application.inProduction

diff --git a/commands/Migration/Run.ts b/commands/Migration/Run.ts
@@ -27,7 +27,7 @@ export default class Migrate extends MigrationsBase {
    * Custom connection for running migrations.
    */
   @flags.string({ description: 'Define a custom database connection' })
-  public connection: string = this.db.primaryConnectionName
+  public connection: string
 
   /**
    * Force run migrations in production
@@ -57,7 +57,9 @@ export default class Migrate extends MigrationsBase {
    * Handle command
    */
   public async handle (): Promise<void> {
+    this.connection = this.connection || this.db.primaryConnectionName
     const connection = this.db.getRawConnection(this.connection)
+
     const continueMigrations = !this.application.inProduction
       || this.force
       || await this.takeProductionConstent()

diff --git a/commands/Migration/Status.ts b/commands/Migration/Status.ts
@@ -60,7 +60,8 @@ export default class Status extends MigrationsBase {
    * Handle command
    */
   public async handle (): Promise<void> {
-    const connection = this.db.getRawConnection(this.connection || this.db.primaryConnectionName)
+    this.connection = this.connection || this.db.primaryConnectionName
+    const connection = this.db.getRawConnection(this.connection)
 
     /**
      * Ensure the define connection name does exists in the
-Original file line number
+Diff line change
@@ Expand Up @@
         if (compiledAt.isValid) {
           console.log(`${this.colors.magenta('Last compiled at:')} ${compiledAt.toLocaleString(DateTime.DATETIME_MED)}`)
         }
+        console.log('')
       }
       /**
@@ Expand Down @@