Merge f4e9671baff4d5874babadef960480e5a548bd15 into f8377d80bf0d73b981c7ec39b7483776feedf79b

This commit is contained in:
Stephan Peijnik 2016-03-04 15:29:28 +00:00
commit 9601a99a25
5 changed files with 27 additions and 0 deletions

View File

@ -95,6 +95,13 @@ func (c commonDialect) HasIndex(scope *Scope, tableName string, indexName string
return count > 0 return count > 0
} }
func (c commonDialect) HasForeignKey(scope *Scope, tableName string, fkName string) bool {
// Checking if a foreign key constraint exists is DBMS specific. In order to preserve
// the previous logic of AddForeignKey, we are always returning false for dialects which do
// not implement this check.
return false
}
func (commonDialect) RemoveIndex(scope *Scope, indexName string) { func (commonDialect) RemoveIndex(scope *Scope, indexName string) {
scope.Err(scope.NewDB().Exec(fmt.Sprintf("DROP INDEX %v ON %v", indexName, scope.QuotedTableName())).Error) scope.Err(scope.NewDB().Exec(fmt.Sprintf("DROP INDEX %v ON %v", indexName, scope.QuotedTableName())).Error)
} }

View File

@ -16,6 +16,7 @@ type Dialect interface {
HasTable(scope *Scope, tableName string) bool HasTable(scope *Scope, tableName string) bool
HasColumn(scope *Scope, tableName string, columnName string) bool HasColumn(scope *Scope, tableName string, columnName string) bool
HasIndex(scope *Scope, tableName string, indexName string) bool HasIndex(scope *Scope, tableName string, indexName string) bool
HasForeignKey(scope *Scope, tableName string, fkName string) bool
RemoveIndex(scope *Scope, indexName string) RemoveIndex(scope *Scope, indexName string)
CurrentDatabase(scope *Scope) string CurrentDatabase(scope *Scope) string
} }

View File

@ -56,6 +56,13 @@ func (mysql) SqlTag(value reflect.Value, size int, autoIncrease bool) string {
panic(fmt.Sprintf("invalid sql type %s (%s) for mysql", value.Type().Name(), value.Kind().String())) panic(fmt.Sprintf("invalid sql type %s (%s) for mysql", value.Type().Name(), value.Kind().String()))
} }
func (s mysql) HasForeignKey(scope *Scope, tableName string, fkName string) bool {
var count int
s.RawScanInt(scope, &count, "SELECT count(*) FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS WHERE CONSTRAINT_SCHEMA=? AND TABLE_NAME=? AND CONSTRAINT_NAME=? AND CONSTRAINT_TYPE='FOREIGN KEY'",
s.CurrentDatabase(scope), tableName, fkName)
return count > 0
}
func (mysql) Quote(key string) string { func (mysql) Quote(key string) string {
return fmt.Sprintf("`%s`", key) return fmt.Sprintf("`%s`", key)
} }

View File

@ -103,6 +103,13 @@ func (s postgres) HasIndex(scope *Scope, tableName string, indexName string) boo
return count > 0 return count > 0
} }
func (s postgres) HasForeignKey(scope *Scope, tableName string, fkName string) bool {
var count int
s.RawScanInt(scope, &count, "SELECT count(con.conname) FROM pg_constraint con WHERE con.conname = ? AND con.contype='f' AND ?::regclass::oid = con.conrelid",
fkName, tableName)
return count > 0
}
func (s postgres) CurrentDatabase(scope *Scope) (name string) { func (s postgres) CurrentDatabase(scope *Scope) (name string) {
s.RawScanString(scope, &name, "SELECT CURRENT_DATABASE()") s.RawScanString(scope, &name, "SELECT CURRENT_DATABASE()")
return return

View File

@ -618,6 +618,11 @@ func (scope *Scope) addIndex(unique bool, indexName string, column ...string) {
func (scope *Scope) addForeignKey(field string, dest string, onDelete string, onUpdate string) { func (scope *Scope) addForeignKey(field string, dest string, onDelete string, onUpdate string) {
var keyName = fmt.Sprintf("%s_%s_%s_foreign", scope.TableName(), field, dest) var keyName = fmt.Sprintf("%s_%s_%s_foreign", scope.TableName(), field, dest)
keyName = regexp.MustCompile("(_*[^a-zA-Z]+_*|_+)").ReplaceAllString(keyName, "_") keyName = regexp.MustCompile("(_*[^a-zA-Z]+_*|_+)").ReplaceAllString(keyName, "_")
if scope.Dialect().HasForeignKey(scope, scope.TableName(), keyName) {
return
}
var query = `ALTER TABLE %s ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s ON DELETE %s ON UPDATE %s;` var query = `ALTER TABLE %s ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s ON DELETE %s ON UPDATE %s;`
scope.Raw(fmt.Sprintf(query, scope.QuotedTableName(), scope.QuoteIfPossible(keyName), scope.QuoteIfPossible(field), dest, onDelete, onUpdate)).Exec() scope.Raw(fmt.Sprintf(query, scope.QuotedTableName(), scope.QuoteIfPossible(keyName), scope.QuoteIfPossible(field), dest, onDelete, onUpdate)).Exec()
} }