This commit is contained in:
6543 2020-06-27 16:26:22 +02:00
parent a5c3ebf418
commit e5ff26e652
No known key found for this signature in database
GPG Key ID: A1CA74D27FD13271
4 changed files with 12 additions and 13 deletions

View File

@ -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()
}

View File

@ -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
}
}

View File

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

View File

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