diff --git a/engine.go b/engine.go index 47c25b09..415191d7 100644 --- a/engine.go +++ b/engine.go @@ -1020,11 +1020,11 @@ func (engine *Engine) DropTableCols(bean interface{}, cols ...string) error { return err } - err = session.dropTableCols(bean, cols) - if err != nil { - session.Rollback() - return err - } + err = session.dropTableCols(bean, cols) + if err != nil { + session.Rollback() + return err + } return session.Commit() } diff --git a/integrations/session_schema_test.go b/integrations/session_schema_test.go index c17d9a1d..d50b0a23 100644 --- a/integrations/session_schema_test.go +++ b/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 - UserId int64 `xorm:"default(1)"` - ToDrop bool `xorm:"default(true)"` - Name string `xorm:"default('my_name')"` + Id int64 + UserId int64 `xorm:"default(1)"` + ToDrop bool `xorm:"default(true)"` + 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 -} \ No newline at end of file +} diff --git a/internal/utils/strings.go b/internal/utils/strings.go index b5dc37b7..72466705 100644 --- a/internal/utils/strings.go +++ b/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) } - diff --git a/session_schema.go b/session_schema.go index 8520d00b..e7b7a3df 100644 --- a/session_schema.go +++ b/session_schema.go @@ -8,9 +8,9 @@ import ( "bufio" "database/sql" "fmt" - "regexp" "io" "os" + "regexp" "strings" "xorm.io/xorm/internal/utils"