update template file, fixed examples

cosiner · Apr 7, 2016 · de9d382 · de9d382
1 parent 65931a8
commit de9d382
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 gomodel.iml
+vendor
diff --git a/cmd/gomodel/model.tmpl b/cmd/gomodel/model.tmpl
@@ -24,7 +24,7 @@ const (
 )
 
 var (
-    {{$unexport}}Instance = new({{$normal}})
+    {{$normal}}Instance = new({{$normal}})
 )
 
 func {{$recv}} Table() string {
@@ -73,7 +73,7 @@ func {{$recv}} Ptrs(fields uint64, ptrs []interface{}) {
     }
 }
 
-func {{$recv}} txDo(db *gomodel.DB, do func(*gomodel.Tx, *{{$normal}}) error) error {
+func {{$recv}} txDo(exec gomodel.Executor, do func(*gomodel.Tx, *{{$normal}}) error) error {
     var (
         tx *gomodel.Tx
         err error
@@ -83,10 +83,10 @@ func {{$recv}} txDo(db *gomodel.DB, do func(*gomodel.Tx, *{{$normal}}) error) er
         tx = r
     case *gomodel.DB:
         tx, err = r.Begin()
-        if err != nil {
-            return err
-        }
-        defer tx.Close()
+    	if err != nil {
+    		return err
+    	}
+    	defer tx.Close()
     default:
         panic("unexpected underlay type of gomodel.Executor")
     }

diff --git a/example/userfollow/follow.go b/example/userfollow/follow.go
@@ -43,9 +43,9 @@ func (f *Follow) Delete() error {
 
 func (f *Follow) updateFollowInfo(tx *gomodel.Tx, err error, c int) error {
 	if err == nil {
-		_, err = tx.ArgsIncrBy(userInstance, USER_FOLLOWINGS, USER_ID, c, f.UserId)
+		_, err = tx.ArgsIncrBy(UserInstance, USER_FOLLOWINGS, USER_ID, c, f.UserId)
 		if err == nil {
-			_, err = tx.ArgsIncrBy(userInstance, USER_FOLLOWERS, USER_ID, c, f.FollowUserId)
+			_, err = tx.ArgsIncrBy(UserInstance, USER_FOLLOWERS, USER_ID, c, f.FollowUserId)
 		}
 	}
 	return err

diff --git a/example/userfollow/model_gen.go b/example/userfollow/model_gen.go
@@ -28,7 +28,7 @@ const (
 )
 
 var (
-	userInstance = new(User)
+	UserInstance = new(User)
 )
 
 func (u *User) Table() string {
@@ -111,7 +111,7 @@ func (u *User) Ptrs(fields uint64, ptrs []interface{}) {
 	}
 }
 
-func (u *User) txDo(db *gomodel.DB, do func(*gomodel.Tx, *User) error) error {
+func (u *User) txDo(exec gomodel.Executor, do func(*gomodel.Tx, *User) error) error {
 	var (
 		tx  *gomodel.Tx
 		err error
@@ -193,7 +193,7 @@ const (
 )
 
 var (
-	followInstance = new(Follow)
+	FollowInstance = new(Follow)
 )
 
 func (f *Follow) Table() string {
@@ -246,7 +246,7 @@ func (f *Follow) Ptrs(fields uint64, ptrs []interface{}) {
 	}
 }
 
-func (f *Follow) txDo(db *gomodel.DB, do func(*gomodel.Tx, *Follow) error) error {
+func (f *Follow) txDo(exec gomodel.Executor, do func(*gomodel.Tx, *Follow) error) error {
 	var (
 		tx  *gomodel.Tx
 		err error

diff --git a/example/userfollow/user.go b/example/userfollow/user.go
@@ -34,7 +34,7 @@ func (u *User) Add() error {
 }
 
 func DeleteUserById(id int64) error {
-	c, err := DB.ArgsDelete(userInstance, USER_ID, id)
+	c, err := DB.ArgsDelete(UserInstance, USER_ID, id)
 
 	return dberrs.NoAffects(c, err, ErrNoUser)
 }
@@ -56,7 +56,7 @@ func UsersByAge(age, start, count int) ([]User, error) {
 		Fields: userFieldsAll,
 	}
 
-	err := DB.ArgsLimit(&users, userInstance, userFieldsAll, USER_AGE, age, start, count)
+	err := DB.ArgsLimit(&users, UserInstance, userFieldsAll, USER_AGE, age, start, count)
 	return users.Values, dberrs.NoRows(err, ErrNoUser)
 }
 
@@ -65,6 +65,6 @@ func AllUsersByAge(age int) ([]User, error) {
 		Fields: userFieldsAll,
 	}
 
-	err := DB.ArgsAll(&users, userInstance, userFieldsAll, USER_AGE, age)
+	err := DB.ArgsAll(&users, UserInstance, userFieldsAll, USER_AGE, age)
 	return users.Values, dberrs.NoRows(err, ErrNoUser)
 }