fmt

engine.go

@@ -1020,11 +1020,11 @@ func (engine *Engine) DropTableCols(bean interface{}, cols ...string) error {
 		return err
 	}
 
-		err = session.dropTableCols(bean, cols)
+	err = session.dropTableCols(bean, cols)
-		if err != nil {
+	if err != nil {
-			session.Rollback()
+		session.Rollback()
-			return err
+		return err
-		}
+	}
 	return session.Commit()
 }
 

integrations/session_schema_test.go

@@ -333,14 +333,14 @@ func TestSync2_Default(t *testing.T) {
 
 func TestDropTableCols(t *testing.T) {
 	type TestDropTableCols struct {
-		Id       int64
+		Id     int64
-		UserId   int64  `xorm:"default(1)"`
+		UserId int64  `xorm:"default(1)"`
-		ToDrop   bool   `xorm:"default(true)"`
+		ToDrop bool   `xorm:"default(true)"`
-		Name     string `xorm:"default('my_name')"`
+		Name   string `xorm:"default('my_name')"`
 	}
 
 	assert.NoError(t, prepareEngine())
 	assert.NoError(t, testEngine.Sync2(new(TestDropTableCols)))
-	assert.NoError(t, testEngine.DropTableCols(new(TestDropTableCols),"name", "to_drop"))
+	assert.NoError(t, testEngine.DropTableCols(new(TestDropTableCols), "name", "to_drop"))
 	//ToDo: TEST if cols still exist
-}
+}

internal/utils/strings.go

@@ -27,4 +27,3 @@ func SplitNNoCase(s, sep string, n int) []string {
 	}
 	return strings.SplitN(s, s[idx:idx+len(sep)], n)
 }
-

session_schema.go

@@ -8,9 +8,9 @@ import (
 	"bufio"
 	"database/sql"
 	"fmt"
-	"regexp"
 	"io"
 	"os"
+	"regexp"
 	"strings"
 
 	"xorm.io/xorm/internal/utils"