Recognize array and hstore options in SQL tag

focusonline · Sep 5, 2018 · 3ddf462 · 3ddf462
1 parent a0f6ccc
commit 3ddf462
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/db_test.go b/db_test.go
@@ -250,7 +250,7 @@ var _ = Describe("Time", func() {
 
 var _ = Describe("array model", func() {
 	type value struct {
-		Values []int16 `pg:",array"`
+		Values []int16 `sql:",array"`
 	}
 
 	var db *pg.DB

diff --git a/example_array_test.go b/example_array_test.go
@@ -9,8 +9,8 @@ import (
 func ExampleDB_Model_postgresArrayStructTag() {
 	type Item struct {
 		Id      int64
-		Emails  []string `pg:",array"` // marshalled as PostgreSQL array
-		Numbers [][]int  `pg:",array"` // marshalled as PostgreSQL array
+		Emails  []string `sql:",array"` // marshalled as PostgreSQL array
+		Numbers [][]int  `sql:",array"` // marshalled as PostgreSQL array
 	}
 
 	_, err := pgdb.Exec(`CREATE TEMP TABLE items (id serial, emails text[], numbers int[][])`)

diff --git a/example_hstore_test.go b/example_hstore_test.go
@@ -9,7 +9,7 @@ import (
 func ExampleDB_Model_hstoreStructTag() {
 	type Item struct {
 		Id    int64
-		Attrs map[string]string `pg:",hstore"` // marshalled as PostgreSQL hstore
+		Attrs map[string]string `sql:",hstore"` // marshalled as PostgreSQL hstore
 	}
 
 	_, err := pgdb.Exec(`CREATE TEMP TABLE items (id serial, attrs hstore)`)

diff --git a/orm/table.go b/orm/table.go
@@ -344,7 +344,10 @@ func (t *Table) newField(f reflect.StructField, index []int) *Field {
 	}
 
 	pgTag := parseTag(f.Tag.Get("pg"))
-	if _, ok := pgTag.Options["array"]; ok {
+
+	if _, ok := sqlTag.Options["array"]; ok {
+		field.SetFlag(ArrayFlag)
+	} else if _, ok := pgTag.Options["array"]; ok {
 		field.SetFlag(ArrayFlag)
 	}
 
@@ -367,6 +370,9 @@ func (t *Table) newField(f reflect.StructField, index []int) *Field {
 	} else if field.HasFlag(ArrayFlag) {
 		field.append = types.ArrayAppender(f.Type)
 		field.scan = types.ArrayScanner(f.Type)
+	} else if _, ok := sqlTag.Options["hstore"]; ok {
+		field.append = types.HstoreAppender(f.Type)
+		field.scan = types.HstoreScanner(f.Type)
 	} else if _, ok := pgTag.Options["hstore"]; ok {
 		field.append = types.HstoreAppender(f.Type)
 		field.scan = types.HstoreScanner(f.Type)

diff --git a/orm/table_create_test.go b/orm/table_create_test.go
@@ -32,9 +32,9 @@ type CreateTableModel struct {
 	NullInt64    sql.NullInt64
 	NullString   sql.NullString
 	Slice        []int
-	SliceArray   []int `pg:",array"`
+	SliceArray   []int `sql:",array"`
 	Map          map[int]int
-	MapHstore    map[int]int `pg:",hstore"`
+	MapHstore    map[int]int `sql:",hstore"`
 	Struct       struct{}
 	StructPtr    *struct{}
 	Unique       int `sql:",unique"`

diff --git a/pg.go b/pg.go
@@ -68,7 +68,7 @@ func InMulti(values ...interface{}) types.ValueAppender {
 //
 // For struct fields you can use array tag:
 //
-//    Emails  []string `pg:",array"`
+//    Emails  []string `sql:",array"`
 func Array(v interface{}) *types.Array {
 	return types.NewArray(v)
 }
@@ -79,7 +79,7 @@ func Array(v interface{}) *types.Array {
 //
 // For struct fields you can use hstore tag:
 //
-//    Attrs map[string]string `pg:",hstore"`
+//    Attrs map[string]string `sql:",hstore"`
 func Hstore(v interface{}) *types.Hstore {
 	return types.NewHstore(v)
 }