re
/
gorm
forked from mirror/gorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ReturningStr when with schema name, fixes #650

This commit is contained in:
Jinzhu 2015-09-11 06:36:17 +08:00
parent 447885d98f
commit b46ca62c18
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
callback_create.go
View File

@ -54,7 +54,7 @@ func Create(scope *Scope) {
if len(columns) == 0 { if len(columns) == 0 {
scope.Raw(fmt.Sprintf("INSERT INTO %v DEFAULT VALUES %v", scope.Raw(fmt.Sprintf("INSERT INTO %v DEFAULT VALUES %v",
scope.QuotedTableName(), scope.QuotedTableName(),
scope.Dialect().ReturningStr(scope.TableName(), returningKey), scope.Dialect().ReturningStr(scope.QuotedTableName(), returningKey),
)) ))
} else { } else {
scope.Raw(fmt.Sprintf( scope.Raw(fmt.Sprintf(
@ -62,7 +62,7 @@ func Create(scope *Scope) {
scope.QuotedTableName(), scope.QuotedTableName(),
strings.Join(columns, ","), strings.Join(columns, ","),
strings.Join(sqls, ","), strings.Join(sqls, ","),
scope.Dialect().ReturningStr(scope.TableName(), returningKey), scope.Dialect().ReturningStr(scope.QuotedTableName(), returningKey),
)) ))
} }

2
foundation.go
View File

@ -52,7 +52,7 @@ func (foundation) SqlTag(value reflect.Value, size int, autoIncrease bool) strin
} }
func (s foundation) ReturningStr(tableName, key string) string { func (s foundation) ReturningStr(tableName, key string) string {
return fmt.Sprintf("RETURNING %v.%v", s.Quote(tableName), key) return fmt.Sprintf("RETURNING %v.%v", tableName, key)
} }
func (s foundation) HasTable(scope *Scope, tableName string) bool { func (s foundation) HasTable(scope *Scope, tableName string) bool {

2
postgres.go
View File

@ -60,7 +60,7 @@ func (postgres) SqlTag(value reflect.Value, size int, autoIncrease bool) string
} }
func (s postgres) ReturningStr(tableName, key string) string { func (s postgres) ReturningStr(tableName, key string) string {
return fmt.Sprintf("RETURNING %v.%v", s.Quote(tableName), key) return fmt.Sprintf("RETURNING %v.%v", tableName, key)
} }
func (s postgres) HasTable(scope *Scope, tableName string) bool { func (s postgres) HasTable(scope *Scope, tableName string) bool {