Merge pull request #167 from d-tsuji/master

#10 do not import github.com/guregu/null, when there is no --guregu option
smallnest · Jul 12, 2021 · dcfa6a9 · dcfa6a9
2 parents ce87ebf + 13084ff
commit dcfa6a9
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 86 deletions.
diff --git a/dbmeta/codegen.go b/dbmeta/codegen.go
@@ -569,6 +569,8 @@ func (c *Config) WriteTemplate(genTemplate *GenTemplate, data map[string]interfa
 	data["daoFQPN"] = c.DaoFQPN
 	data["daoPackageName"] = c.DaoPackageName
 
+	data["UseGuregu"] = c.UseGureguTypes
+
 	data["apiFQPN"] = c.APIFQPN
 	data["apiPackageName"] = c.APIPackageName
 

diff --git a/packrd/packed-packr.go b/packrd/packed-packr.go
diff --git a/template/api.go.tmpl b/template/api.go.tmpl
@@ -7,7 +7,7 @@ import (
     "{{.daoFQPN}}"
 
 	"github.com/gin-gonic/gin"
-	"github.com/guregu/null"
+	{{if .UseGuregu}} "github.com/guregu/null" {{end}}
 	"github.com/julienschmidt/httprouter"
 )
 

diff --git a/template/dao_gorm.go.tmpl b/template/dao_gorm.go.tmpl
@@ -6,13 +6,13 @@ import (
 
 	"{{.modelFQPN}}"
 
-    "github.com/guregu/null"
+    {{if .UseGuregu}} "github.com/guregu/null" {{end}}
     "github.com/satori/go.uuid"
 )
 
 var (
     _ = time.Second
-    _ = null.Bool{}
+    {{if .UseGuregu}} _ = null.Bool{} {{end}}
     _ = uuid.UUID{}
 )
 

diff --git a/template/dao_sqlx.go.tmpl b/template/dao_sqlx.go.tmpl
@@ -8,13 +8,13 @@ import (
 
 	"{{.modelFQPN}}"
 
-    "github.com/guregu/null"
+    {{if .UseGuregu}} "github.com/guregu/null" {{end}}
 	"github.com/satori/go.uuid"
 )
 
 var (
     _ = time.Second
-    _ = null.Bool{}
+    {{if .UseGuregu}} _ = null.Bool{} {{end}}
     _ = uuid.UUID{}
 )
 

diff --git a/template/model.go.tmpl b/template/model.go.tmpl
@@ -5,7 +5,7 @@ import (
     "time"
 
     "github.com/satori/go.uuid"
-    "github.com/guregu/null"
+    {{if .UseGuregu}} "github.com/guregu/null" {{end}}
 	"gorm.io/gorm"
 )