mirror
/
gorm
mirror of https://github.com/go-gorm/gorm.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jaytaylor-postgres-quoting'

This commit is contained in:
Jinzhu 2015-01-14 07:59:29 +08:00
parent e3327d0800 aa8bc02c11
commit 0d0e8d651d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
callback_create.go
View File

@ -36,7 +36,7 @@ func Create(scope *Scope) {
returningKey := "*" returningKey := "*"
if scope.PrimaryKey() != "" { if scope.PrimaryKey() != "" {
returningKey = scope.PrimaryKey() returningKey = scope.Quote(scope.PrimaryKey())
} }
if len(columns) == 0 { if len(columns) == 0 {

7
postgres.go
View File

@ -4,8 +4,9 @@ import (
"database/sql" "database/sql"
"database/sql/driver" "database/sql/driver"
"fmt" "fmt"
"github.com/lib/pq/hstore"
"reflect" "reflect"
"github.com/lib/pq/hstore"
) )
type postgres struct { type postgres struct {
@ -66,7 +67,7 @@ func (s *postgres) PrimaryKeyTag(value reflect.Value, size int) string {
} }
func (s *postgres) ReturningStr(tableName, key string) string { func (s *postgres) ReturningStr(tableName, key string) string {
return fmt.Sprintf("RETURNING \"%v\".%v", tableName, key) return fmt.Sprintf("RETURNING %v.%v", s.Quote(tableName), key)
} }
func (s *postgres) SelectFromDummyTable() string { func (s *postgres) SelectFromDummyTable() string {
@ -97,7 +98,7 @@ func (s *postgres) HasColumn(scope *Scope, tableName string, columnName string)
} }
func (s *postgres) RemoveIndex(scope *Scope, indexName string) { func (s *postgres) RemoveIndex(scope *Scope, indexName string) {
scope.Raw(fmt.Sprintf("DROP INDEX %v", indexName)).Exec() scope.Raw(fmt.Sprintf("DROP INDEX %v", s.Quote(indexName))).Exec()
} }
var hstoreType = reflect.TypeOf(Hstore{}) var hstoreType = reflect.TypeOf(Hstore{})