mirror
/
gorm
mirror of https://github.com/go-gorm/gorm.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/use_standard_logger_in_callback_helpers

This commit is contained in:
Emir Beganović 2019-05-08 10:50:06 +04:00 committed by GitHub
parent 985c3a174e 451c3cca86
commit 746f522518
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scope.go
View File

@ -1194,7 +1194,7 @@ func (scope *Scope) createTable() *Scope {
} }
func (scope *Scope) dropTable() *Scope { func (scope *Scope) dropTable() *Scope {
scope.Raw(fmt.Sprintf("DROP TABLE %v%s", scope.QuotedTableName(), scope.getTableOptions())).Exec() scope.Raw(fmt.Sprintf("DROP TABLE %v", scope.QuotedTableName())).Exec()
return scope return scope
} }

13
scope_test.go
View File

@ -78,3 +78,16 @@ func TestFailedValuer(t *testing.T) {
t.Errorf("The error should be returned from Valuer, but get %v", err) t.Errorf("The error should be returned from Valuer, but get %v", err)
} }
} }
func TestDropTableWithTableOptions(t *testing.T) {
type UserWithOptions struct {
gorm.Model
}
DB.AutoMigrate(&UserWithOptions{})
DB = DB.Set("gorm:table_options", "CHARSET=utf8")
err := DB.DropTable(&UserWithOptions{}).Error
if err != nil {
t.Errorf("Table must be dropped, got error %s", err)
}
}