darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #229 from fudanchii/mysql-fix

Browse source 
sync mysql behavior with sqlite
This commit is contained in:
Brad Rydzewski 2014-03-28 12:23:19 -07:00
commit 965ac671a5
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/database/migrate/mysql.go
View file

@ -21,7 +21,8 @@ func MySQL(tx *sql.Tx) *MigrationDriver {
} }
func (m *mysqlDriver) CreateTable(tableName string, args []string) (sql.Result, error) { func (m *mysqlDriver) CreateTable(tableName string, args []string) (sql.Result, error) {
return m.Tx.Exec(fmt.Sprintf("CREATE TABLE %s (%s) ROW_FORMAT=DYNAMIC", tableName, strings.Join(args, ", "))) return m.Tx.Exec(fmt.Sprintf("CREATE TABLE IF NOT EXISTS %s (%s) ROW_FORMAT=DYNAMIC",
tableName, strings.Join(args, ", ")))
} }
func (m *mysqlDriver) RenameTable(tableName, newName string) (sql.Result, error) { func (m *mysqlDriver) RenameTable(tableName, newName string) (sql.Result, error) {
@ -41,6 +42,9 @@ func (m *mysqlDriver) ChangeColumn(tableName, columnName, newSpecs string) (sql.
} }
func (m *mysqlDriver) DropColumns(tableName string, columnsToDrop ...string) (sql.Result, error) { func (m *mysqlDriver) DropColumns(tableName string, columnsToDrop ...string) (sql.Result, error) {
if len(columnsToDrop) == 0 {
return nil, fmt.Errorf("No columns to drop.")
}
for k, v := range columnsToDrop { for k, v := range columnsToDrop {
columnsToDrop[k] = fmt.Sprintf("DROP %s", v) columnsToDrop[k] = fmt.Sprintf("DROP %s", v)
} }