fixed generate code not correct when have global sql clause only in s…

…ql define file

core.go

@@ -179,25 +179,25 @@ type Generator interface {
 	Generate(dstPath string, pkgName string, query SQLQuery, opts ...option) error
 }
 
-type OptionFunc func(opt *generateOption)
+type OptFn func(opt *generateOption)
 
-func (f OptionFunc) apply(opt *generateOption) {
+func (f OptFn) apply(opt *generateOption) {
 	f(opt)
 }
 
-func DefaultStructNameOpt(name string) OptionFunc {
+func DefaultStructNameOpt(name string) OptFn {
 	return func(opt *generateOption) {
 		opt.defaultStructName = name
 	}
 }
 
-func GoFileNameOpt(name string) OptionFunc {
+func GoFileNameOpt(name string) OptFn {
 	return func(opt *generateOption) {
 		opt.goFileName = name
 	}
 }
 
-func SqlxPkgName(name string) OptionFunc {
+func SqlxPkgName(name string) OptFn {
 	return func(opt *generateOption) {
 		opt.sqlxPkgName = name
 	}

examples/gen.go

@@ -14,8 +14,12 @@ func main() {
 		query.Query = strings.TrimRight(query.Query, ";")
 		return query, nil
 	})
-	if err := yesql.Generate("yesql.sql", "auto", "yesql", yesql.SqlxPkgName("github.com/bitbus/sqlx")); err != nil {
-		log.Fatalf("generate code occurs error: %s", err)
+	opt := yesql.SqlxPkgName("github.com/bitbus/sqlx")
+	if err := yesql.Generate("yesql_ac.sql", "auto/ac", "ac", opt); err != nil {
+		log.Fatalf("generate ac code occurs error: %s", err)
+	}
+	if err := yesql.Generate("yesql_cc.sql", "auto/cc", "cc", opt); err != nil {
+		log.Fatalf("generate cc code occurs error: %s", err)
 	}
 	log.Println("[Yesql] generate code finish")
 }

examples/go.mod

@@ -3,7 +3,7 @@ module github.com/alimy/yesql/examples
 go 1.18
 
 require (
-	github.com/alimy/yesql v1.8.0
+	github.com/alimy/yesql v1.8.1
 	github.com/bitbus/sqlx v1.6.0
 )
 

examples/yesql_cc.sql

@@ -0,0 +1,37 @@
+----------------------
+-- default sql ddl --
+----------------------
+
+-- name: user_info_a
+-- prepare: stmt
+SELECT `username` FROM @user WHERE username=?
+
+-- name: user_info_b
+SELECT `username`, `nickname` FROM @user WHERE username=?
+
+-- name: user_info_c
+-- prepare: raw
+SELECT "username" FROM @user WHERE username=?
+
+-- name: user_info_d
+-- prepare: string
+SELECT "username", "nickname" FROM @user WHERE username=?
+
+-- name: login_info_a
+-- prepare: named_stmt
+SELECT * FROM @user WHERE username=?
+
+-- name: login_info_b
+SELECT * FROM @user WHERE username=?
+
+-- name: logout_info_c
+-- prepare: raw
+SELECT * FROM @user WHERE username=?
+
+-- name: login_info_d
+-- prepare: string
+SELECT * FROM @user WHERE username=?
+
+-- name: login_info_e
+-- prepare: named_stmt
+SELECT * FROM @user WHERE username=?

generator.go

@@ -77,6 +77,10 @@ func (t *tmplCtx) DefaultQueryMapNotEmpty() bool {
 	return len(t.DefaultQueryMap) != 0
 }
 
+func (t *tmplCtx) ScopeQueryNotEmpty() bool {
+	return len(t.ScopeQuery) != 0
+}
+
 func (s *sqlGenerator) Generate(dstPath string, pkgName string, query SQLQuery, opts ...option) (err error) {
 	opt := &generateOption{
 		goFileName:        "yesql.go",

template/sql.tmpl

@@ -8,7 +8,7 @@ import (
 	"context"
 	"database/sql"
 
-	"github.com/alimy/yesql"
+	{{if .ScopeQueryNotEmpty}}"github.com/alimy/yesql"{{end}}
 )
 
 const (

template/sqlx.tmpl

@@ -7,8 +7,8 @@ package {{ .PkgName }}
 import (
 	"context"
 
-	"github.com/alimy/yesql"
 	"{{ .SqlxPkgName }}"
+    {{if .ScopeQueryNotEmpty}}"github.com/alimy/yesql"{{end}}
 )
 
 const (

version.go

@@ -1,3 +1,3 @@
 package yesql
 
-var Version = "v1.8.0"
+var Version = "v1.8.1"