Merge pull request #2 from swiftcarrot/hotfix/testType

添加各类型的测试

Author: wangzuo

.gitattributes

@@ -1 +1,2 @@
-*.gotmpl linguist-language=Go
+*.go linguist-language=Go linguist-generated=false
+*.gotmpl linguist-language=Go linguist-generated=false

Makefile

@@ -20,7 +20,7 @@ test-postgresql: install
 	cd internal/integration && QUERYX_ENV=test queryx db:create --schema postgresql.hcl
 	cd internal/integration && QUERYX_ENV=test queryx db:migrate --schema postgresql.hcl
 	cd internal/integration && QUERYX_ENV=test queryx generate --schema postgresql.hcl
-	cd internal/integration && go test -v ./...
+	cd internal/integration && go test ./...
 	# cd internal/integration && QUERYX_ENV=test queryx db:drop --schema postgresql.hcl
 
 test-mysql: install mysql-drop

README.md

@@ -172,7 +172,21 @@ post, err := c.QueryPost().Where(c.PostTitle.EQ("post title")).First()
 
 Queryx supports association definition in the schema file. It also generates corresponding preload query methods to avoid "N+1" query.
 
-## has_one and belongs_to
+## belongs_to
+
+```hcl
+model "Post" {
+  belongs_to "Author" {
+    model_name = "User"
+  }
+}
+```
+
+```go
+c.QueryPost().PreloadAuthor().All()
+```
+
+## has_one
 
 ```hcl
 model "User" {
@@ -199,7 +213,7 @@ c.QueryUser().PreloadAccount().All()
 c.QueryAccount().PreloadUser().All()
 ```
 
-## has_many and belongs_to
+## has_many
 
 ```hcl
 model "User" {

generator/client/golang/templates/[model].gotmpl

@@ -16,10 +16,10 @@ type {{ $.model.Name }} struct {
     {{ $b.Name | pascal }} *{{ $b.ModelName }} `json:"{{ camel $b.Name }}"`
   {{- end }}
 	{{- range $h := $.model.HasMany }}
-		{{ $h.Name | pascal }} []*{{ $h.ModelName }}
+		{{ $h.Name | pascal }} []*{{ $h.ModelName }} `json:"{{ $h.Name | camel }}"`
 	{{- end }}
 	{{- range $h := $.model.HasOne }}
-		{{ $h.Name | pascal }} *{{ $h.ModelName }}
+		{{ $h.Name | pascal }} *{{ $h.ModelName }} `json:"{{ $h.Name | camel }}"`
 	{{- end }}
 
 	schema *queryx.Schema

generator/client/golang/templates/[model]_query.gotmpl

@@ -193,8 +193,8 @@ func (q *{{ $.model.Name }}Query) Preload{{ pascal $b.Name }}() *{{ $.model.Name
 func (q *{{ $.model.Name }}Query) preload{{ pascal $b.Name }}(rows []*{{ $.model.Name }}) error {
 	ids := []int64{}
 	for _, r := range rows {
-		if !r.{{ $b.ModelName }}ID.Null {
-			ids = append(ids, r.{{ $b.ModelName }}ID.Val)
+		if !r.{{ $b.ForeignKey | pascal }}.Null {
+			ids = append(ids, r.{{ $b.ForeignKey | pascal }}.Val)
 		}
 	}
 	rows1, err := q.queries.Query{{ $b.ModelName }}().Where(q.schema.{{ $b.ModelName }}ID.In(ids)).All()
@@ -207,8 +207,8 @@ func (q *{{ $.model.Name }}Query) preload{{ pascal $b.Name }}(rows []*{{ $.model
 		m[r.ID] = r
 	}
 	for _, r := range rows {
-		if !r.{{ $b.ModelName }}ID.Null {
-			r.{{ $b.ModelName }} = m[r.{{ $b.ModelName }}ID.Val]
+		if !r.{{ $b.ForeignKey | pascal }}.Null {
+			r.{{ $b.Name | pascal }} = m[r.{{ $b.ForeignKey | pascal }}.Val]
 		}
 	}
 
@@ -240,7 +240,11 @@ func (q *{{ $.model.Name }}Query) preload{{ pascal $h.Name }}(rows []*{{ $.model
 		m1[r.{{ $.model.Name }}ID.Val] = append(m1[r.{{ $.model.Name }}ID.Val], r)
 	}
 	for _, r := range rows {
-		r.{{ $h.Through | pascal }} = m1[r.ID]
+		if m1[r.ID] != nil {
+			r.{{ $h.Through | pascal }} = m1[r.ID]
+		} else {
+			r.{{ $h.Through | pascal }} = make([]*{{ $m }}, 0)
+		}
 	}
 
 	ids1 := []int64{}
@@ -264,7 +268,11 @@ func (q *{{ $.model.Name }}Query) preload{{ pascal $h.Name }}(rows []*{{ $.model
 		m3[r.{{ $.model.Name }}ID.Val] = append(m3[r.{{ $.model.Name }}ID.Val], r.{{ $h.ModelName }})
 	}
 	for _, r := range rows {
-		r.{{ $h.Name | pascal }} = m3[r.ID]
+		if m3[r.ID] != nil {
+			r.{{ $h.Name | pascal }} = m3[r.ID]
+		} else {
+			r.{{ $h.Name | pascal }} = make([]*{{ $h.ModelName }},0)
+		}
 	}
 	{{- else }}
 	rows1, err := q.queries.Query{{ $h.ModelName }}().Where(q.schema.{{ $h.ModelName }}{{ $.model.Name }}ID.In(ids)).All()
@@ -277,7 +285,11 @@ func (q *{{ $.model.Name }}Query) preload{{ pascal $h.Name }}(rows []*{{ $.model
 		m[r.{{ $.model.Name }}ID.Val] = append(m[r.{{ $.model.Name }}ID.Val], r)
 	}
 	for _, r := range rows {
-		r.{{ $h.Name | pascal }} = m[r.ID]
+		if m[r.ID] != nil {
+			r.{{ $h.Name | pascal }} = m[r.ID]
+		} else {
+			r.{{ $h.Name | pascal }} = make([]*{{ $h.ModelName }}, 0)
+		}
 	}
 	{{- end }}
 
@@ -320,15 +332,15 @@ func (q *{{.model.Name}}Query) All() ([]*{{.model.Name}}, error) {
   }
   var rows []{{ $.model.Name }}
 	{{- $var1 := $.model.Name | camel | plural }}
-	var {{ $var1 }} []*{{ $.model.Name }}
+	{{ $var1 }} := make([]*{{ $.model.Name }}, 0)
   query, args := q.selectStatement.ToSQL()
   err := q.adapter.Query(query, args...).Scan(&rows)
 	if err != nil {
 		return nil, err
 	}
 
 	if len(rows) == 0 {
-		return nil, err
+		return {{ $var1 }}, nil
 	}
 
 	for i := range rows {

generator/client/golang/templates/queryx/bigint.go

@@ -5,6 +5,7 @@ package queryx
 import (
 	"database/sql"
 	"database/sql/driver"
+	"encoding/json"
 )
 
 type BigInt struct {
@@ -43,10 +44,22 @@ func (b BigInt) Value() (driver.Value, error) {
 	return b.Val, nil
 }
 
+// MarshalJSON implements the json.Marshaler interface.
 func (b BigInt) MarshalJSON() ([]byte, error) {
-	return nil, nil
+	if b.Null {
+		return json.Marshal(nil)
+	}
+	return json.Marshal(b.Val)
 }
 
-func (b *BigInt) UnmarshalJSON(text []byte) error {
+// UnmarshalJSON implements the json.Unmarshaler interface.
+func (b *BigInt) UnmarshalJSON(data []byte) error {
+	if string(data) == "null" {
+		b.Null = true
+		return nil
+	}
+	if err := json.Unmarshal(data, &b.Val); err != nil {
+		return err
+	}
 	return nil
 }

generator/client/golang/templates/queryx/bigint_column.go

@@ -59,6 +59,11 @@ func (c *BigIntColumn) GE(v int64) *Clause {
 }
 
 func (c *BigIntColumn) In(v []int64) *Clause {
+	if len(v) == 0 {
+		return &Clause{
+			fragment: fmt.Sprintf("1=0"),
+		}
+	}
 	return &Clause{
 		fragment: fmt.Sprintf("%s.%s IN (?)", c.Table.Name, c.Name),
 		args:     []interface{}{v},

generator/client/golang/templates/queryx/bigint_test.go

@@ -0,0 +1,40 @@
+// Code generated by queryx, DO NOT EDIT.
+
+package queryx
+
+import (
+	"encoding/json"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestNewBigInt(t *testing.T) {
+	b1 := NewBigInt(2)
+	require.Equal(t, int64(2), b1.Val)
+	require.Equal(t, false, b1.Null)
+
+	b2 := NewNullableBigInt(nil)
+	require.Equal(t, true, b2.Null)
+}
+
+func TestBigIntJSON(t *testing.T) {
+	type Foo struct {
+		X BigInt `json:"x"`
+		Y BigInt `json:"y"`
+	}
+	x := NewBigInt(2)
+	y := NewNullableBigInt(nil)
+	s := `{"x":2,"y":null}`
+
+	f1 := Foo{X: x, Y: y}
+	b, err := json.Marshal(f1)
+	require.NoError(t, err)
+	require.Equal(t, s, string(b))
+
+	var f2 Foo
+	err = json.Unmarshal([]byte(s), &f2)
+	require.NoError(t, err)
+	require.Equal(t, x, f2.X)
+	require.Equal(t, y, f2.Y)
+}

generator/client/golang/templates/queryx/boolean.go

@@ -5,6 +5,7 @@ package queryx
 import (
 	"database/sql"
 	"database/sql/driver"
+	"encoding/json"
 )
 
 type Boolean struct {
@@ -42,3 +43,23 @@ func (b Boolean) Value() (driver.Value, error) {
 	}
 	return b.Val, nil
 }
+
+// MarshalJSON implements the json.Marshaler interface.
+func (b Boolean) MarshalJSON() ([]byte, error) {
+	if b.Null {
+		return json.Marshal(nil)
+	}
+	return json.Marshal(b.Val)
+}
+
+// UnmarshalJSON implements the json.Unmarshaler interface.
+func (b *Boolean) UnmarshalJSON(data []byte) error {
+	if string(data) == "null" {
+		b.Null = true
+		return nil
+	}
+	if err := json.Unmarshal(data, &b.Val); err != nil {
+		return err
+	}
+	return nil
+}

generator/client/golang/templates/queryx/boolean_column.go

@@ -29,3 +29,11 @@ func (c *BooleanColumn) NE(v bool) *Clause {
 		args:     []interface{}{v},
 	}
 }
+
+func (b *BooleanColumn) Asc() string {
+	return fmt.Sprintf("%s.%s ASC", b.Table.Name, b.Name)
+}
+
+func (b *BooleanColumn) Desc() string {
+	return fmt.Sprintf("%s.%s DESC", b.Table.Name, b.Name)
+}