move err check to object

cmd/fn.code.go

@@ -41,7 +41,6 @@ func GenerateCode() {
 	confTpls := map[string]bool{
 		"orm": true,
 	}
-	utilTpls := make(map[string]bool)
 	i := 0
 	for _, yaml := range yamls {
 		objs, err := parser.ReadYaml(packageName, yaml)
@@ -60,7 +59,6 @@ func GenerateCode() {
 					metaObjs[obj.Name] = obj
 					for _, db := range obj.Dbs {
 						confTpls[db] = true
-						utilTpls[db] = true
 					}
 					goto GeneratePoint
 				}
@@ -71,7 +69,6 @@ func GenerateCode() {
 				metaObjs[obj.Name] = obj
 				for _, db := range obj.Dbs {
 					confTpls[db] = true
-					utilTpls[db] = true
 				}
 			}
 		}
@@ -91,11 +88,5 @@ GeneratePoint:
 			panic(err.Error())
 		}
 	}
-	for db := range utilTpls {
-		err = fs.ExecuteUtilTemplate(outputDir, db, packageName)
-		if err != nil {
-			panic(err.Error())
-		}
-	}
 
 }

example/model/gen.object.blog.go

@@ -473,6 +473,11 @@ func (m *_BlogDBMgr) Fetch(pk PrimaryKey) (*Blog, error) {
 	return nil, fmt.Errorf("Blog fetch record not found")
 }
 
+// err not found check
+func (m *_BlogDBMgr) IsErrNotFound(err error) bool {
+	return strings.Contains(err.Error(), "not found") || err == sql.ErrNoRows
+}
+
 // primary key
 func (m *_BlogDBMgr) FetchByPrimaryKey(id int32, userId int32) (*Blog, error) {
 	obj := BlogMgr.NewBlog()

example/model/gen.object.office.go

@@ -399,6 +399,11 @@ func (m *_OfficeDBMgr) Fetch(pk PrimaryKey) (*Office, error) {
 	return nil, fmt.Errorf("Office fetch record not found")
 }
 
+// err not found check
+func (m *_OfficeDBMgr) IsErrNotFound(err error) bool {
+	return strings.Contains(err.Error(), "not found") || err == sql.ErrNoRows
+}
+
 // primary key
 func (m *_OfficeDBMgr) FetchByPrimaryKey(officeId int32) (*Office, error) {
 	obj := OfficeMgr.NewOffice()

example/model/gen.object.user.blogs.go

@@ -376,6 +376,11 @@ func (m *_UserBlogsDBMgr) Fetch(pk PrimaryKey) (*UserBlogs, error) {
 	return nil, fmt.Errorf("UserBlogs fetch record not found")
 }
 
+// err not found check
+func (m *_UserBlogsDBMgr) IsErrNotFound(err error) bool {
+	return strings.Contains(err.Error(), "not found") || err == sql.ErrNoRows
+}
+
 // primary key
 func (m *_UserBlogsDBMgr) FetchByPrimaryKey(userId int32, blogId int32) (*UserBlogs, error) {
 	obj := UserBlogsMgr.NewUserBlogs()

example/model/gen.object.user.go

@@ -683,6 +683,11 @@ func (m *_UserDBMgr) Fetch(pk PrimaryKey) (*User, error) {
 	return nil, fmt.Errorf("User fetch record not found")
 }
 
+// err not found check
+func (m *_UserDBMgr) IsErrNotFound(err error) bool {
+	return strings.Contains(err.Error(), "not found") || err == sql.ErrNoRows
+}
+
 // primary key
 func (m *_UserDBMgr) FetchByPrimaryKey(id int32) (*User, error) {
 	obj := UserMgr.NewUser()

example/model/gen.view.user.base.info.go

@@ -474,6 +474,11 @@ func (m *_UserBaseInfoDBMgr) Fetch(pk PrimaryKey) (*UserBaseInfo, error) {
 	return nil, fmt.Errorf("UserBaseInfo fetch record not found")
 }
 
+// err not found check
+func (m *_UserBaseInfoDBMgr) IsErrNotFound(err error) bool {
+	return strings.Contains(err.Error(), "not found") || err == sql.ErrNoRows
+}
+
 // primary key
 func (m *_UserBaseInfoDBMgr) FetchByPrimaryKey(id int32) (*UserBaseInfo, error) {
 	obj := UserBaseInfoMgr.NewUserBaseInfo()

example/model/model_test.go

@@ -153,9 +153,6 @@ var _ = Describe("redis-orm.mysql", func() {
 			_, err = mgr.Fetch(user.GetPrimaryKey())
 			Ω(err).Should(HaveOccurred())
 
-			_, err = mgr.FetchByPrimaryKey(user.Id)
-			Ω(IsErrNotFound(err)).To(BeTrue())
-
 			//! save
 
 			user.HeadUrl = "ccc.png"

fs/template.go

@@ -86,25 +86,6 @@ func ExecuteConfigTemplate(output, db string, packageName string) error {
 	return nil
 }
 
-func ExecuteUtilTemplate(output, db, packageName string) error {
-	filename := filepath.Join(output, strings.Join([]string{"gen", "util", db, "go"}, "."))
-	fd, err := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
-	if err != nil {
-		return err
-	}
-	defer fd.Close()
-	if err := RedisOrmTemplate.ExecuteTemplate(fd, strings.Join([]string{"util", db}, "."), map[string]interface{}{
-		"GoPackage": packageName,
-	}); err != nil {
-		return err
-	}
-
-	oscmd := exec.Command("gofmt", "-w", filename)
-	oscmd.Run()
-	return nil
-
-}
-
 func init() {
 	funcMap := template.FuncMap{
 		"add":        Add,
@@ -121,10 +102,6 @@ func init() {
 		"tpl/conf.mongo.gogo",
 		"tpl/conf.mssql.gogo",
 		"tpl/conf.mysql.gogo",
-		"tpl/util.mysql.gogo",
-		"tpl/util.mssql.gogo",
-		"tpl/util.elastic.gogo",
-		"tpl/util.redis.gogo",
 		"tpl/conf.orm.gogo",
 		"tpl/conf.redis.gogo",
 		"tpl/object.db.gogo",

tpl/object.db.read.gogo

@@ -146,6 +146,11 @@ func (m *_{{$obj.Name}}DBMgr) Fetch(pk PrimaryKey) (*{{$obj.Name}}, error) {
 	return nil, fmt.Errorf("{{$obj.Name}} fetch record not found")
 }
 
+// err not found check
+func (m *_{{$obj.Name}}DBMgr) IsErrNotFound(err error) bool {
+	return strings.Contains(err.Error(), "not found") || err == sql.ErrNoRows
+}
+
 // primary key
 func (m *_{{$obj.Name}}DBMgr) FetchByPrimaryKey({{$primary.GetFuncParam}}) (*{{$obj.Name}}, error) {
 	obj := {{$obj.Name}}Mgr.New{{$obj.Name}}()