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

Fixes scan when primary key is not defined in gorm (but is defined db-size). Useful in join tables

This commit is contained in:
Paolo Galeone 2014-12-08 19:00:02 +01:00
parent 21f4de584f
commit 907ea93b43
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
callback_create.go
View File

@ -35,9 +35,7 @@ func Create(scope *Scope) {
} }
returningKey := "*" returningKey := "*"
if scope.PrimaryKey() == "" { if scope.PrimaryKey() != "" {
returningKey = "*"
} else {
returningKey = scope.PrimaryKey() returningKey = scope.PrimaryKey()
} }
@ -68,12 +66,24 @@ func Create(scope *Scope) {
} }
} }
} else { } else {
if scope.Err(scope.DB().QueryRow(scope.Sql, scope.SqlVars...).Scan(&id)) == nil { if scope.PrimaryKey() == "" {
scope.db.RowsAffected = 1 if rows, err := scope.DB().Query(scope.Sql, scope.SqlVars...); err != nil {
//extract column name to get fields lenght
if names, columnsErr := rows.Columns(); columnsErr != nil {
ids := make([]interface{}, len(names))
if scope.Err(rows.Scan(ids...)) == nil {
scope.db.RowsAffected = int64(len(names))
}
}
}
} else {
if scope.Err(scope.DB().QueryRow(scope.Sql, scope.SqlVars...).Scan(&id)) == nil {
scope.db.RowsAffected = 1
}
} }
} }
if !scope.HasError() && scope.PrimaryKeyZero() { if scope.PrimaryKey() != "" && !scope.HasError() && scope.PrimaryKeyZero() {
scope.SetColumn(scope.PrimaryKey(), id) scope.SetColumn(scope.PrimaryKey(), id)
} }
} }