Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(tmpl): Support arrays using pq.Array #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(tmpl): Support arrays using pq.Array #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 27 additions & 12 deletions scaneo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,9 @@ NOTES
)

type fieldToken struct {
Name string
Type string
Name string
Type string
IsArray bool
}

type structToken struct {
Expand Down Expand Up @@ -260,6 +261,7 @@ func parseCode(source string, commaList string) ([]structToken, error) {
}

var fieldType string
var isArray bool

// get field type
switch typeToken := fieldLine.Type.(type) {
Expand All @@ -272,6 +274,7 @@ func parseCode(source string, commaList string) ([]structToken, error) {
case *ast.ArrayType:
// arrays
fieldType = parseArray(typeToken)
isArray = true
case *ast.StarExpr:
// pointers
fieldType = parseStar(typeToken)
Expand All @@ -284,6 +287,7 @@ func parseCode(source string, commaList string) ([]structToken, error) {
// apply type to all variables declared in this line
for i := range fieldToks {
fieldToks[i].Type = fieldType
fieldToks[i].IsArray = isArray
}

structTok.Fields = append(structTok.Fields, fieldToks...)
Expand Down Expand Up @@ -362,18 +366,29 @@ func genFile(outFile, pkg string, unexport bool, toks []structToken, genFuncs bo
}
defer fout.Close()

hasArrays := false
for _, tok := range toks {
for _, field := range tok.Fields {
if field.IsArray {
hasArrays = true
}
}
}

data := struct {
PackageName string
Tokens []structToken
Visibility string
Funcs bool
ImportPkg string
PackageName string
Tokens []structToken
Visibility string
Funcs bool
ImportPkg string
NeedDriverPkg bool
}{
PackageName: pkg,
Visibility: "S",
Tokens: toks,
Funcs: genFuncs,
ImportPkg: pkgImport,
PackageName: pkg,
Visibility: "S",
Tokens: toks,
Funcs: genFuncs,
ImportPkg: pkgImport,
NeedDriverPkg: hasArrays,
}

if unexport {
Expand Down
114 changes: 69 additions & 45 deletions scaneo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,10 @@ var (
{
Name: "slices",
Fields: []fieldToken{
{Name: "a", Type: "[]bool"},
{Name: "b", Type: "[]time.Time"},
{Name: "c", Type: "[]*byte"},
{Name: "d", Type: "[]*sql.NullString"},
{Name: "a", Type: "[]bool", IsArray: true},
{Name: "b", Type: "[]time.Time", IsArray: true},
{Name: "c", Type: "[]*byte", IsArray: true},
{Name: "d", Type: "[]*sql.NullString", IsArray: true},
},
},
{
Expand Down Expand Up @@ -284,6 +284,13 @@ func TestParseCode(t *testing.T) {
t.FailNow()
}

if structToks[i].Fields[j].IsArray != toks[i].Fields[j].IsArray {
t.Error("unexpected isArray")
t.Error("file:", fPath)
t.Error("struct:", structToks[i].Name)
t.Errorf("expected: %v; found: %v\n", structToks[i].Fields[j].IsArray, toks[i].Fields[j].IsArray)
}

if structToks[i].Fields[j].Type != toks[i].Fields[j].Type {
t.Error("unexpected struct field type")
t.Error("file:", fPath)
Expand Down Expand Up @@ -319,66 +326,66 @@ func TestGenFile(t *testing.T) {
expectedFuncs []string
}{
{
"no tokens",
true,
[]structToken{},
true,
false,
"",
func(t *testing.T, err error) {
name: "no tokens",
outFile: true,
tokens: []structToken{},
unexport: true,
funcs: false,
pkgImport: "",
assert: func(t *testing.T, err error) {
if err == nil {
t.Error("no struct tokens passed")
t.Error("should be error")
t.FailNow()
}
},
expectedFuncNames,
expectedFuncs: expectedFuncNames,
},
{
"no output file",
false,
toks,
true,
false,
"",
func(t *testing.T, err error) {
name: "no output file",
outFile: false,
tokens: toks,
unexport: true,
funcs: false,
pkgImport: "",
assert: func(t *testing.T, err error) {
if err == nil {
t.Error("no output file path passed")
t.Error("should be error")
t.FailNow()
}
},
expectedFuncNames,
expectedFuncs: expectedFuncNames,
},
{
"scan funcs unexported",
true,
toks,
true,
false,
"",
func(t *testing.T, err error) {
name: "scan funcs unexported",
outFile: true,
tokens: toks,
unexport: true,
funcs: false,
pkgImport: "",
assert: func(t *testing.T, err error) {
if err != nil {
t.Error(err)
t.FailNow()
}
},
expectedFuncNames,
expectedFuncs: expectedFuncNames,
},
{
"sql helper funcs",
true,
toks,
true,
true,
"",
func(t *testing.T, err error) {
name: "sql helper funcs",
outFile: true,
tokens: toks,
unexport: true,
funcs: true,
pkgImport: "",
assert: func(t *testing.T, err error) {
if err != nil {
t.Error(err)
t.FailNow()
}
},
[]string{
expectedFuncs: []string{
"scanExported",
"scanExporteds",
"SelectExported",
Expand All @@ -396,22 +403,39 @@ func TestGenFile(t *testing.T) {
},
},
{
"pkg import",
true,
toks,
true,
false,
"testsvc/storage/user",
func(t *testing.T, err error) {
name: "pkg import",
outFile: true,
tokens: toks,
unexport: true,
funcs: false,
pkgImport: "testsvc/storage/user",
assert: func(t *testing.T, err error) {
if err != nil {
t.Error(err)
t.FailNow()
}
},
expectedFuncNames,
expectedFuncs: expectedFuncNames,
},
{
name: "arrays",
outFile: true,
tokens: fileStructsMap[testFiles[2]][4:5],
unexport: true,
funcs: false,
pkgImport: "",
assert: func(t *testing.T, err error) {
if err != nil {
t.Error(err)
t.FailNow()
}
},
expectedFuncs: []string{
"scanSlices",
"scanSlicess",
},
},
}

for _, tc := range tt {
t.Run(tc.name, func(t *testing.T) {
var outFile string
Expand Down
15 changes: 12 additions & 3 deletions tmpl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,18 @@ package {{.PackageName}}

import (
"database/sql"{{ if .ImportPkg }}
"{{.ImportPkg}}"{{end}}
"{{.ImportPkg}}"{{end}}{{ if .NeedDriverPkg }}
"github.com/lib/pq"{{end}}
)
{{range .Tokens}}
func {{$.Visibility}}can{{title .Name}}(r *sql.Row) (*{{pkg .Name}}, error) {
s := &{{pkg .Name}}{}
if err := r.Scan({{range .Fields}}
&s.{{.Name}},{{end}}
{{if .IsArray -}}
pq.Array(&s.{{.Name}})
{{- else -}}
&s.{{.Name}}
{{- end -}},{{end}}
); err != nil {
return &{{pkg .Name}}{}, err
}
Expand All @@ -26,7 +31,11 @@ func {{$.Visibility}}can{{title .Name}}s(rs *sql.Rows) ([]*{{pkg .Name}}, error)
for rs.Next() {
s := &{{pkg .Name}}{}
if err = rs.Scan({{range .Fields}}
&s.{{.Name}},{{end}}
{{if .IsArray -}}
pq.Array(&s.{{.Name}})
{{- else -}}
&s.{{.Name}}
{{- end -}},{{end}}
); err != nil {
return nil, err
}
Expand Down