Fix null reference panic

phogolabs · Oct 7, 2019 · f88c8c5 · f88c8c5
1 parent af35b33
commit f88c8c5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/cmd/migration.go b/cmd/migration.go
@@ -128,8 +128,10 @@ func (m *SQLMigration) before(ctx *cli.Context) error {
 }
 
 func (m *SQLMigration) after(ctx *cli.Context) error {
-	if err := m.db.Close(); err != nil {
-		return cli.NewExitError(err.Error(), ErrCodeMigration)
+	if m.db != nil {
+		if err := m.db.Close(); err != nil {
+			return cli.NewExitError(err.Error(), ErrCodeMigration)
+		}
 	}
 
 	return nil

diff --git a/cmd/model.go b/cmd/model.go
@@ -156,8 +156,10 @@ func (m *SQLModel) builder(ctx *cli.Context) (sqlmodel.TagBuilder, error) {
 }
 
 func (m *SQLModel) after(ctx *cli.Context) error {
-	if err := m.executor.Provider.Close(); err != nil {
-		return cli.NewExitError(err.Error(), ErrCodeSchema)
+	if m.executor != nil {
+		if err := m.executor.Provider.Close(); err != nil {
+			return cli.NewExitError(err.Error(), ErrCodeSchema)
+		}
 	}
 	return nil
 }

diff --git a/cmd/repository.go b/cmd/repository.go
@@ -125,9 +125,12 @@ func (m *SQLRepository) before(ctx *cli.Context) error {
 }
 
 func (m *SQLRepository) after(ctx *cli.Context) error {
-	if err := m.executor.Provider.Close(); err != nil {
-		return cli.NewExitError(err.Error(), ErrCodeSchema)
+	if m.executor != nil {
+		if err := m.executor.Provider.Close(); err != nil {
+			return cli.NewExitError(err.Error(), ErrCodeSchema)
+		}
 	}
+
 	return nil
 }
 

diff --git a/cmd/routine.go b/cmd/routine.go
@@ -202,13 +202,12 @@ func (m *SQLRoutine) run(ctx *cli.Context) error {
 }
 
 func (m *SQLRoutine) after(ctx *cli.Context) error {
-	if m.executor == nil {
-		return nil
+	if m.executor != nil {
+		if err := m.executor.Provider.Close(); err != nil {
+			return cli.NewExitError(err.Error(), ErrCodeSchema)
+		}
 	}
 
-	if err := m.executor.Provider.Close(); err != nil {
-		return cli.NewExitError(err.Error(), ErrCodeSchema)
-	}
 	return nil
 }