xorm/xorm
xorm/xorm
64
359
Fork 208
Code Issues 373 Pull Requests 18 Actions Releases 35 Activity

WIP: Add dropTableCols from gitea (dropTableColumns at migrations.go) #1523

Closed
6543 wants to merge 7 commits from DropTableCols_fromGitea into master
pull from: DropTableCols_fromGitea
merge into: xorm:master
Conversation 6 Commits 7 Files Changed 5 +5 -2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0f8d350393 - Show all commits

2
integrations/session_schema_test.go
View File

@ -340,8 +340,8 @@ func TestDropTableCols(t *testing.T) {
}
assert.NoError(t, PrepareEngine())
assertSync(t, new(TestDropTableCols))
assert.NoError(t, testEngine.Sync2(new(TestDropTableCols)))
schema, err := testEngine.TableInfo(new(TestDropTableCols))
assert.NoError(t, err)
assert.NotNil(t, schema.GetColumn("to_drop"))

5
session_schema.go
View File

@ -216,6 +216,7 @@ func (session *Session) dropTableCols(beanOrTableName interface{}, cols []string
if _, err := session.Exec(fmt.Sprintf("ALTER TABLE `new_%s_new` RENAME TO `%s`", tableName, tableName)); err != nil {
return err
}
case schemas.POSTGRES:
columns := ""
for _, col := range cols {
@ -227,6 +228,7 @@ func (session *Session) dropTableCols(beanOrTableName interface{}, cols []string
if _, err := session.Exec(fmt.Sprintf("ALTER TABLE `%s` %s", tableName, columns)); err != nil {
return fmt.Errorf("Drop table `%s` columns %v: %v", tableName, cols, err)
}
case schemas.MYSQL:
// Drop indexes on columns first
sql := fmt.Sprintf("SHOW INDEX FROM %s WHERE column_name IN ('%s')", tableName, strings.Join(cols, "','"))
@ -255,6 +257,7 @@ func (session *Session) dropTableCols(beanOrTableName interface{}, cols []string
if _, err := session.Exec(fmt.Sprintf("ALTER TABLE `%s` %s", tableName, columns)); err != nil {
return fmt.Errorf("Drop table `%s` columns %v: %v", tableName, cols, err)
}
case schemas.MSSQL:
columns := ""
for _, col := range cols {
@ -281,9 +284,9 @@ func (session *Session) dropTableCols(beanOrTableName interface{}, cols []string
return fmt.Errorf("Drop table `%s` columns %v: %v", tableName, cols, err)
}
return session.Commit()
case schemas.ORACLE:
return fmt.Errorf("not implemented for oracle")
default:
return fmt.Errorf("unrecognized DB")
}