From aa162958c42a83a894b527bd5afeb89ae98a2c6d Mon Sep 17 00:00:00 2001
From: abs3ntdev <abs3ntdev@users.noreply.github.com>
Date: Wed, 8 Mar 2023 17:08:50 -0800
Subject: [PATCH] printing wrong error, removed empty else

---
 main.go            | 12 ++++++------
 migrate/migrate.go | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/main.go b/main.go
index 37cd986..2baac9d 100644
--- a/main.go
+++ b/main.go
@@ -584,14 +584,14 @@ func InstallCode(cmd *cobra.Command, args []string) {
 
 	err = migrate.LockExecTx(ctx, conn, sql)
 	if err != nil {
-		if err, ok := err.(migrate.MigrationPgError); ok {
-			fmt.Fprintln(os.Stderr, err)
-			if err.Detail != "" {
-				fmt.Fprintln(os.Stderr, "DETAIL:", err.Detail)
+		if migrationpgError, ok := err.(migrate.MigrationPgError); ok {
+			fmt.Fprintln(os.Stderr, migrationpgError)
+			if migrationpgError.Detail != "" {
+				fmt.Fprintln(os.Stderr, "DETAIL:", migrationpgError.Detail)
 			}
 
-			if err.Position != 0 {
-				ele, err := migrate.ExtractErrorLine(err.Sql, int(err.Position))
+			if migrationpgError.Position != 0 {
+				ele, err := migrate.ExtractErrorLine(migrationpgError.Sql, int(migrationpgError.Position))
 				if err != nil {
 					fmt.Fprintln(os.Stderr, err)
 					os.Exit(1)
diff --git a/migrate/migrate.go b/migrate/migrate.go
index 49ed631..619a022 100644
--- a/migrate/migrate.go
+++ b/migrate/migrate.go
@@ -18,8 +18,10 @@ import (
 	"github.com/jackc/tern/v2/migrate/internal/sqlsplit"
 )
 
-var migrationPattern = regexp.MustCompile(`\A(\d+)_.+\.sql\z`)
-var disableTxPattern = regexp.MustCompile(`(?m)^---- tern: disable-tx ----$`)
+var (
+	migrationPattern = regexp.MustCompile(`\A(\d+)_.+\.sql\z`)
+	disableTxPattern = regexp.MustCompile(`(?m)^---- tern: disable-tx ----$`)
+)
 
 var ErrNoFwMigration = errors.New("no sql in forward migration step")
 
@@ -37,8 +39,7 @@ func (e IrreversibleMigrationError) Error() string {
 	return fmt.Sprintf("Irreversible migration: %d - %s", e.m.Sequence, e.m.Name)
 }
 
-type NoMigrationsFoundError struct {
-}
+type NoMigrationsFoundError struct{}
 
 func (e NoMigrationsFoundError) Error() string {
 	return "migrations not found"
@@ -331,7 +332,6 @@ func (m *Migrator) MigrateTo(ctx context.Context, targetVersion int32) (err erro
 		if disableTxPattern.MatchString(sql) {
 			useTx = false
 			sql = disableTxPattern.ReplaceAllLiteralString(sql, "")
-		} else {
 		}
 
 		if useTx {