optimize unit test & add document

This commit is contained in:
anqiansong
2020-08-16 23:28:01 +08:00
parent 790b29b8eb
commit dbc034c9eb
46 changed files with 735 additions and 1855 deletions

View File

@@ -0,0 +1,22 @@
package config
import (
"github.com/tal-tech/go-zero/core/logx"
"github.com/tal-tech/go-zero/core/stores/cache"
"github.com/tal-tech/go-zero/core/stores/redis"
)
type (
Config struct {
logx.LogConf
Mysql struct {
DataSource string
Table struct {
User string
Course string
}
}
CacheRedis cache.CacheConf
Redis redis.RedisConf
}
)

View File

@@ -0,0 +1,23 @@
{
"ServiceName": "model.test",
"Mode": "console",
"Mysql": {
"DataSource": "root:AQS910422@(127.0.0.1:3306)/test?charset=utf8mb4&parseTime=true&loc=Asia%2FShanghai",
"Table": {
"User": "user",
"Course": "user_course"
}
},
"CacheRedis": [
{
"Host": "127.0.0.1:6379",
"Type": "node",
"Pass": ""
}
],
"Redis": {
"Host": "127.0.0.1:6379",
"Type": "node",
"Pass": ""
}
}

View File

@@ -1,2 +1,7 @@
#!/bin/bash
go run .
# generate usermodel with cache
goctl model -src ./sql/user.sql -dir ./model -c true
# generate usercoursemodel without cache
goctl model -src ./sql/course.sql -dir ./model

View File

@@ -1,17 +0,0 @@
package main
import (
"github.com/tal-tech/go-zero/core/lang"
"github.com/tal-tech/go-zero/tools/goctl/model/sql/gen"
)
// go run .
func main() {
// generating with cache
withCacheGenerator := gen.NewDefaultGenerator("./test.sql", "./withcachemodel")
lang.Must(withCacheGenerator.Start(true))
// generating without cache
withoutGenerator := gen.NewDefaultGenerator("./test.sql", "./withoutcachemodel")
lang.Must(withoutGenerator.Start(false))
}

View File

@@ -0,0 +1,100 @@
package model
import (
"database/sql"
"strings"
"time"
"github.com/tal-tech/go-zero/core/stores/sqlc"
"github.com/tal-tech/go-zero/core/stores/sqlx"
"github.com/tal-tech/go-zero/core/stringx"
"github.com/tal-tech/go-zero/tools/goctl/model/sql/builderx"
)
var (
userCourseFieldNames = builderx.FieldNames(&UserCourse{})
userCourseRows = strings.Join(userCourseFieldNames, ",")
userCourseRowsExpectAutoSet = strings.Join(stringx.Remove(userCourseFieldNames, "id", "create_time", "update_time"), ",")
userCourseRowsWithPlaceHolder = strings.Join(stringx.Remove(userCourseFieldNames, "id", "create_time", "update_time"), "=?,") + "=?"
)
type (
UserCourseModel struct {
conn sqlx.SqlConn
table string
}
UserCourse struct {
Id int64 `db:"id"`
UserId int64 `db:"user_id"` // 用户id
CourseName string `db:"course_name"` // 课程名称
CreateTime time.Time `db:"create_time"`
UpdateTime time.Time `db:"update_time"`
}
)
func NewUserCourseModel(conn sqlx.SqlConn, table string) *UserCourseModel {
return &UserCourseModel{
conn: conn,
table: table,
}
}
func (m *UserCourseModel) Insert(data UserCourse) (sql.Result, error) {
query := `insert into ` + m.table + `(` + userCourseRowsExpectAutoSet + `) value (?, ?)`
return m.conn.Exec(query, data.UserId, data.CourseName)
}
func (m *UserCourseModel) FindOne(id int64) (*UserCourse, error) {
query := `select ` + userCourseRows + ` from ` + m.table + ` where id = ? limit 1`
var resp UserCourse
err := m.conn.QueryRow(&resp, query, id)
switch err {
case nil:
return &resp, nil
case sqlc.ErrNotFound:
return nil, ErrNotFound
default:
return nil, err
}
}
func (m *UserCourseModel) FindOneByUserId(userId int64) (*UserCourse, error) {
var resp UserCourse
query := `select ` + userCourseRows + ` from ` + m.table + ` where user_id limit 1`
err := m.conn.QueryRow(&resp, query, userId)
switch err {
case nil:
return &resp, nil
case sqlc.ErrNotFound:
return nil, ErrNotFound
default:
return nil, err
}
}
func (m *UserCourseModel) FindOneByCourseName(courseName string) (*UserCourse, error) {
var resp UserCourse
query := `select ` + userCourseRows + ` from ` + m.table + ` where course_name limit 1`
err := m.conn.QueryRow(&resp, query, courseName)
switch err {
case nil:
return &resp, nil
case sqlc.ErrNotFound:
return nil, ErrNotFound
default:
return nil, err
}
}
func (m *UserCourseModel) Update(data UserCourse) error {
query := `update ` + m.table + ` set ` + userCourseRowsWithPlaceHolder + ` where id = ?`
_, err := m.conn.Exec(query, data.UserId, data.CourseName, data.Id)
return err
}
func (m *UserCourseModel) Delete(id int64) error {
query := `delete from ` + m.table + ` where id = ?`
_, err := m.conn.Exec(query, id)
return err
}

View File

@@ -0,0 +1,146 @@
package model
import (
"database/sql"
"fmt"
"strings"
"time"
"github.com/tal-tech/go-zero/core/stores/cache"
"github.com/tal-tech/go-zero/core/stores/sqlc"
"github.com/tal-tech/go-zero/core/stores/sqlx"
"github.com/tal-tech/go-zero/core/stringx"
"github.com/tal-tech/go-zero/tools/goctl/model/sql/builderx"
)
var (
userFieldNames = builderx.FieldNames(&User{})
userRows = strings.Join(userFieldNames, ",")
userRowsExpectAutoSet = strings.Join(stringx.Remove(userFieldNames, "id", "create_time", "update_time"), ",")
userRowsWithPlaceHolder = strings.Join(stringx.Remove(userFieldNames, "id", "create_time", "update_time"), "=?,") + "=?"
cacheUserMobilePrefix = "cache#User#mobile#"
cacheUserIdPrefix = "cache#User#id#"
cacheUserNamePrefix = "cache#User#name#"
)
type (
UserModel struct {
sqlc.CachedConn
table string
}
User struct {
Id int64 `db:"id"`
Name string `db:"name"` // 用户名称
Password string `db:"password"` // 用户密码
Mobile string `db:"mobile"` // 手机号
Gender string `db:"gender"` // 男|女|未公开
Nickname string `db:"nickname"` // 用户昵称
CreateTime time.Time `db:"create_time"`
UpdateTime time.Time `db:"update_time"`
}
)
func NewUserModel(conn sqlx.SqlConn, c cache.CacheConf, table string) *UserModel {
return &UserModel{
CachedConn: sqlc.NewConn(conn, c),
table: table,
}
}
func (m *UserModel) Insert(data User) (sql.Result, error) {
query := `insert into ` + m.table + `(` + userRowsExpectAutoSet + `) value (?, ?, ?, ?, ?)`
return m.ExecNoCache(query, data.Name, data.Password, data.Mobile, data.Gender, data.Nickname)
}
func (m *UserModel) FindOne(id int64) (*User, error) {
userIdKey := fmt.Sprintf("%s%v", cacheUserIdPrefix, id)
var resp User
err := m.QueryRow(&resp, userIdKey, func(conn sqlx.SqlConn, v interface{}) error {
query := `select ` + userRows + ` from ` + m.table + ` where id = ? limit 1`
return conn.QueryRow(v, query, id)
})
switch err {
case nil:
return &resp, nil
case sqlc.ErrNotFound:
return nil, ErrNotFound
default:
return nil, err
}
}
func (m *UserModel) FindOneByName(name string) (*User, error) {
userNameKey := fmt.Sprintf("%s%v", cacheUserNamePrefix, name)
var resp User
err := m.QueryRowIndex(&resp, userNameKey, func(primary interface{}) string {
return fmt.Sprintf("%s%v", cacheUserIdPrefix, primary)
}, func(conn sqlx.SqlConn, v interface{}) (i interface{}, e error) {
query := `select ` + userRows + ` from ` + m.table + ` where name = ? limit 1`
if err := conn.QueryRow(&resp, query, name); err != nil {
return nil, err
}
return resp.Id, nil
}, func(conn sqlx.SqlConn, v, primary interface{}) error {
query := `select ` + userRows + ` from ` + m.table + ` where id = ? limit 1`
return conn.QueryRow(v, query, primary)
})
switch err {
case nil:
return &resp, nil
case sqlc.ErrNotFound:
return nil, ErrNotFound
default:
return nil, err
}
}
func (m *UserModel) FindOneByMobile(mobile string) (*User, error) {
userMobileKey := fmt.Sprintf("%s%v", cacheUserMobilePrefix, mobile)
var resp User
err := m.QueryRowIndex(&resp, userMobileKey, func(primary interface{}) string {
return fmt.Sprintf("%s%v", cacheUserIdPrefix, primary)
}, func(conn sqlx.SqlConn, v interface{}) (i interface{}, e error) {
query := `select ` + userRows + ` from ` + m.table + ` where mobile = ? limit 1`
if err := conn.QueryRow(&resp, query, mobile); err != nil {
return nil, err
}
return resp.Id, nil
}, func(conn sqlx.SqlConn, v, primary interface{}) error {
query := `select ` + userRows + ` from ` + m.table + ` where id = ? limit 1`
return conn.QueryRow(v, query, primary)
})
switch err {
case nil:
return &resp, nil
case sqlc.ErrNotFound:
return nil, ErrNotFound
default:
return nil, err
}
}
func (m *UserModel) Update(data User) error {
userIdKey := fmt.Sprintf("%s%v", cacheUserIdPrefix, data.Id)
_, err := m.Exec(func(conn sqlx.SqlConn) (result sql.Result, err error) {
query := `update ` + m.table + ` set ` + userRowsWithPlaceHolder + ` where id = ?`
return conn.Exec(query, data.Name, data.Password, data.Mobile, data.Gender, data.Nickname, data.Id)
}, userIdKey)
return err
}
func (m *UserModel) Delete(id int64) error {
data, err := m.FindOne(id)
if err != nil {
return err
}
userIdKey := fmt.Sprintf("%s%v", cacheUserIdPrefix, id)
userNameKey := fmt.Sprintf("%s%v", cacheUserNamePrefix, data.Name)
userMobileKey := fmt.Sprintf("%s%v", cacheUserMobilePrefix, data.Mobile)
_, err = m.Exec(func(conn sqlx.SqlConn) (result sql.Result, err error) {
query := `delete from ` + m.table + ` where id = ?`
return conn.Exec(query, id)
}, userIdKey, userNameKey, userMobileKey)
return err
}

View File

@@ -0,0 +1,164 @@
package example
// todo: In order to pass the go test on github,
// todo: the code is commented. If you need go test,
// todo: modify the configuration file and delete the comment and execute it.
//import (
// "flag"
// "fmt"
// "testing"
//
// "github.com/stretchr/testify/assert"
// "github.com/tal-tech/go-zero/core/conf"
// "github.com/tal-tech/go-zero/core/jsonx"
// "github.com/tal-tech/go-zero/core/logx"
// "github.com/tal-tech/go-zero/core/stores/redis"
// "github.com/tal-tech/go-zero/core/stores/sqlx"
// "github.com/tal-tech/go-zero/tools/goctl/model/sql/example/config"
// "github.com/tal-tech/go-zero/tools/goctl/model/sql/example/model"
//)
//
//var (
// userModel *model.UserModel
// courseModel *model.UserCourseModel
// // verify redis cache
// r *redis.Redis
//)
//var configFile = flag.String("f", "etc/config.json", "the config file")
//
//func TestMain(m *testing.M) {
// flag.Parse()
// var c config.Config
// conf.MustLoad(*configFile, &c)
//
// logx.MustSetup(c.LogConf)
// conn := sqlx.NewMysql(c.Mysql.DataSource)
// if conn == nil {
// return
// }
// userModel = model.NewUserModel(conn, c.CacheRedis, c.Mysql.Table.User)
// courseModel = model.NewUserCourseModel(conn, c.Mysql.Table.Course)
// r = redis.NewRedis(c.Redis.Host, c.Redis.Type, c.Redis.Pass)
// if userModel == nil || courseModel == nil || r == nil {
// return
// }
// m.Run()
//}
//
//// cache model
//func TestUser(t *testing.T) {
// var user model.User
// user.Name = "test"
// user.Password = "123456"
// user.Mobile = "136****0001"
// user.Gender = "男"
// user.Nickname = "Keson"
// insert, err := userModel.Insert(user)
// assert.Nil(t, err)
// id, err := insert.LastInsertId()
// assert.Nil(t, err)
//
// // select
// ret, err := userModel.FindOneByName("test")
// assert.Nil(t, err)
// assert.Equal(t, user.Mobile, ret.Mobile)
//
// // should cache
// // expected primary key
// var redisId int64
// err = get(&redisId, "cache#User#name#test")
// assert.Nil(t, err)
// assert.Equal(t, ret.Id, redisId)
//
// //expected user from cache
// var redisData model.User
// err = get(&redisData, fmt.Sprintf("cache#User#id#%v", redisId))
// assert.Nil(t, err)
// assert.Equal(t, redisData.Nickname, user.Nickname)
//
// // update
// ret.Nickname = "Keson after"
// err = userModel.Update(*ret)
// assert.Nil(t, err)
// // expected cache delete
// exist, err := r.Exists(fmt.Sprintf("cache#User#id#%v", ret.Id))
// assert.Nil(t, err)
// assert.Equal(t, false, exist)
//
// // select
// ret, err = userModel.FindOne(id)
// assert.Nil(t, err)
// assert.Equal(t, "Keson after", ret.Nickname)
//
// // delete
// err = userModel.Delete(ret.Id)
// assert.Nil(t, err)
// exist, err = r.Exists(fmt.Sprintf("cache#User#id#%v", ret.Id))
// assert.Nil(t, err)
// assert.Equal(t, false, exist)
//
// // verify
// _, err = userModel.FindOne(id)
// assert.Equal(t, model.ErrNotFound, err)
//
//}
//
//// no cache model
//func TestCourse(t *testing.T) {
// // new user
// insert, err := userModel.Insert(model.User{
// Name: "courseUser",
// Password: "123456",
// Mobile: "136****1111",
// Gender: "男",
// Nickname: "Keson",
// })
// assert.Nil(t, err)
// id, err := insert.LastInsertId()
// assert.Nil(t, err)
//
// var course model.UserCourse
// course.Id = id
// course.CourseName = "Java"
//
// courseInsert, err := courseModel.Insert(course)
// assert.Nil(t, err)
// courseId, err := courseInsert.LastInsertId()
// assert.Nil(t, err)
//
// // select
// ret, err := courseModel.FindOne(courseId)
// assert.Nil(t, err)
// assert.Equal(t, course.CourseName, ret.CourseName)
//
// // update
// ret.CourseName = "Golang"
// err = courseModel.Update(*ret)
// assert.Nil(t, err)
//
// // select
// ret, err = courseModel.FindOne(courseId)
// assert.Nil(t, err)
// assert.Equal(t, "Golang", ret.CourseName)
//
// // delete
// err = courseModel.Delete(ret.Id)
// assert.Nil(t, err)
//
// // verify
// _, err = courseModel.FindOne(courseId)
// assert.Equal(t, model.ErrNotFound, err)
//
// // clean user
// err = userModel.Delete(id)
// assert.Nil(t, err)
//}
//
//func get(data interface{}, key string) error {
// v, err := r.Get(key)
// if err != nil {
// return err
// }
// return jsonx.Unmarshal([]byte(v), data)
//}

View File

@@ -0,0 +1,11 @@
-- 用户选修课 --
CREATE TABLE `user_course` (
`id` bigint(10) NOT NULL AUTO_INCREMENT,
`user_id` bigint(10) NOT NULL DEFAULT '0' COMMENT '用户id',
`course_name` varchar(255) COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '课程名称',
`create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
`update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`id`),
UNIQUE KEY `user_id_unique` (`user_id`),
KEY `course_name_index` (`course_name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;

View File

@@ -0,0 +1,15 @@
-- 用户表 --
CREATE TABLE `user` (
`id` bigint(10) NOT NULL AUTO_INCREMENT,
`name` varchar(255) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户名称',
`password` varchar(255) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户密码',
`mobile` varchar(255) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '手机号',
`gender` char(5) COLLATE utf8mb4_general_ci NOT NULL COMMENT '男|女|未公开',
`nickname` varchar(255) COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '用户昵称',
`create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
`update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`id`),
UNIQUE KEY `name_index` (`name`),
KEY `mobile_index` (`mobile`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;

View File

@@ -0,0 +1,4 @@
#!/bin/bash
cd .
go test -v

View File

@@ -1,30 +0,0 @@
-- user_snake
CREATE TABLE `user_snake` (
`id` bigint(10) NOT NULL AUTO_INCREMENT,
`name` varchar(255) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户名称',
`password` varchar(255) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户密码',
`mobile` varchar(255) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '手机号',
`gender` char(5) COLLATE utf8mb4_general_ci NOT NULL COMMENT '男|女|未公开',
`nickname` varchar(255) COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '用户昵称',
`create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
`update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`id`),
UNIQUE KEY `name_index` (`name`),
KEY `mobile_index` (`mobile`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
-- userCamel (disable AUTO_INCREMENT)
CREATE TABLE `userCamel` (
`id` bigint(10) NOT NULL,
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户名称',
`password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户密码',
`mobile` varchar(255) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '手机号',
`gender` char(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '男|女|未公开',
`nickname` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '用户昵称',
`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
`updateTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`id`),
UNIQUE KEY `nameIndex` (`name`),
KEY `mobile_index` (`mobile`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;

View File

@@ -1,147 +0,0 @@
package model
import (
"database/sql"
"fmt"
"strings"
"time"
"github.com/tal-tech/go-zero/core/stores/cache"
"github.com/tal-tech/go-zero/core/stores/sqlc"
"github.com/tal-tech/go-zero/core/stores/sqlx"
"github.com/tal-tech/go-zero/core/stringx"
"github.com/tal-tech/go-zero/tools/goctl/model/sql/builderx"
)
var (
userCamelFieldNames = builderx.FieldNames(&UserCamel{})
userCamelRows = strings.Join(userCamelFieldNames, ",")
userCamelRowsExpectAutoSet = strings.Join(stringx.Remove(userCamelFieldNames, "create_time", "update_time"), ",")
userCamelRowsWithPlaceHolder = strings.Join(stringx.Remove(userCamelFieldNames, "id", "create_time", "update_time"), "=?,") + "=?"
cacheUserCamelIdPrefix = "cache#UserCamel#id#"
cacheUserCamelNamePrefix = "cache#UserCamel#name#"
cacheUserCamelMobilePrefix = "cache#UserCamel#mobile#"
)
type (
UserCamelModel struct {
sqlc.CachedConn
table string
}
UserCamel struct {
Id int64 `db:"id"`
Name string `db:"name"` // 用户名称
Password string `db:"password"` // 用户密码
Mobile string `db:"mobile"` // 手机号
Gender string `db:"gender"` // 男|女|未公开
Nickname string `db:"nickname"` // 用户昵称
CreateTime time.Time `db:"createTime"`
UpdateTime time.Time `db:"updateTime"`
}
)
func NewUserCamelModel(conn sqlx.SqlConn, c cache.CacheConf, table string) *UserCamelModel {
return &UserCamelModel{
CachedConn: sqlc.NewConn(conn, c),
table: table,
}
}
func (m *UserCamelModel) Insert(data UserCamel) error {
query := `insert into ` + m.table + `(` + userCamelRowsExpectAutoSet + `) value (?, ?, ?, ?, ?, ?)`
_, err := m.ExecNoCache(query, data.Id, data.Name, data.Password, data.Mobile, data.Gender, data.Nickname)
return err
}
func (m *UserCamelModel) FindOne(id int64) (*UserCamel, error) {
userCamelIdKey := fmt.Sprintf("%s%v", cacheUserCamelIdPrefix, id)
var resp UserCamel
err := m.QueryRow(&resp, userCamelIdKey, func(conn sqlx.SqlConn, v interface{}) error {
query := `select ` + userCamelRows + ` from ` + m.table + ` where id = ? limit 1`
return conn.QueryRow(v, query, id)
})
switch err {
case nil:
return &resp, nil
case sqlc.ErrNotFound:
return nil, ErrNotFound
default:
return nil, err
}
}
func (m *UserCamelModel) FindOneByName(name string) (*UserCamel, error) {
userCamelNameKey := fmt.Sprintf("%s%v", cacheUserCamelNamePrefix, name)
var resp UserCamel
err := m.QueryRowIndex(&resp, userCamelNameKey, func(primary interface{}) string {
return fmt.Sprintf("%s%v", cacheUserCamelIdPrefix, primary)
}, func(conn sqlx.SqlConn, v interface{}) (i interface{}, e error) {
query := `select ` + userCamelRows + ` from ` + m.table + ` where name = ? limit 1`
if err := conn.QueryRow(&resp, query, name); err != nil {
return nil, err
}
return resp.Id, nil
}, func(conn sqlx.SqlConn, v, primary interface{}) error {
query := `select ` + userCamelRows + ` from ` + m.table + ` where id = ? limit 1`
return conn.QueryRow(v, query, primary)
})
switch err {
case nil:
return &resp, nil
case sqlc.ErrNotFound:
return nil, ErrNotFound
default:
return nil, err
}
}
func (m *UserCamelModel) FindOneByMobile(mobile string) (*UserCamel, error) {
userCamelMobileKey := fmt.Sprintf("%s%v", cacheUserCamelMobilePrefix, mobile)
var resp UserCamel
err := m.QueryRowIndex(&resp, userCamelMobileKey, func(primary interface{}) string {
return fmt.Sprintf("%s%v", cacheUserCamelIdPrefix, primary)
}, func(conn sqlx.SqlConn, v interface{}) (i interface{}, e error) {
query := `select ` + userCamelRows + ` from ` + m.table + ` where mobile = ? limit 1`
if err := conn.QueryRow(&resp, query, mobile); err != nil {
return nil, err
}
return resp.Id, nil
}, func(conn sqlx.SqlConn, v, primary interface{}) error {
query := `select ` + userCamelRows + ` from ` + m.table + ` where id = ? limit 1`
return conn.QueryRow(v, query, primary)
})
switch err {
case nil:
return &resp, nil
case sqlc.ErrNotFound:
return nil, ErrNotFound
default:
return nil, err
}
}
func (m *UserCamelModel) Update(data UserCamel) error {
userCamelIdKey := fmt.Sprintf("%s%v", cacheUserCamelIdPrefix, data.Id)
_, err := m.Exec(func(conn sqlx.SqlConn) (result sql.Result, err error) {
query := `update ` + m.table + ` set ` + userCamelRowsWithPlaceHolder + ` where id = ?`
return conn.Exec(query, data.Name, data.Password, data.Mobile, data.Gender, data.Nickname, data.Id)
}, userCamelIdKey)
return err
}
func (m *UserCamelModel) Delete(id int64) error {
data, err := m.FindOne(id)
if err != nil {
return err
}
userCamelIdKey := fmt.Sprintf("%s%v", cacheUserCamelIdPrefix, id)
userCamelNameKey := fmt.Sprintf("%s%v", cacheUserCamelNamePrefix, data.Name)
userCamelMobileKey := fmt.Sprintf("%s%v", cacheUserCamelMobilePrefix, data.Mobile)
_, err = m.Exec(func(conn sqlx.SqlConn) (result sql.Result, err error) {
query := `delete from ` + m.table + ` where id = ?`
return conn.Exec(query, id)
}, userCamelIdKey, userCamelNameKey, userCamelMobileKey)
return err
}

View File

@@ -1,147 +0,0 @@
package model
import (
"database/sql"
"fmt"
"strings"
"time"
"github.com/tal-tech/go-zero/core/stores/cache"
"github.com/tal-tech/go-zero/core/stores/sqlc"
"github.com/tal-tech/go-zero/core/stores/sqlx"
"github.com/tal-tech/go-zero/core/stringx"
"github.com/tal-tech/go-zero/tools/goctl/model/sql/builderx"
)
var (
userSnakeFieldNames = builderx.FieldNames(&UserSnake{})
userSnakeRows = strings.Join(userSnakeFieldNames, ",")
userSnakeRowsExpectAutoSet = strings.Join(stringx.Remove(userSnakeFieldNames, "id", "create_time", "update_time"), ",")
userSnakeRowsWithPlaceHolder = strings.Join(stringx.Remove(userSnakeFieldNames, "id", "create_time", "update_time"), "=?,") + "=?"
cacheUserSnakeIdPrefix = "cache#UserSnake#id#"
cacheUserSnakeNamePrefix = "cache#UserSnake#name#"
cacheUserSnakeMobilePrefix = "cache#UserSnake#mobile#"
)
type (
UserSnakeModel struct {
sqlc.CachedConn
table string
}
UserSnake struct {
Id int64 `db:"id"`
Name string `db:"name"` // 用户名称
Password string `db:"password"` // 用户密码
Mobile string `db:"mobile"` // 手机号
Gender string `db:"gender"` // 男|女|未公开
Nickname string `db:"nickname"` // 用户昵称
CreateTime time.Time `db:"create_time"`
UpdateTime time.Time `db:"update_time"`
}
)
func NewUserSnakeModel(conn sqlx.SqlConn, c cache.CacheConf, table string) *UserSnakeModel {
return &UserSnakeModel{
CachedConn: sqlc.NewConn(conn, c),
table: table,
}
}
func (m *UserSnakeModel) Insert(data UserSnake) error {
query := `insert into ` + m.table + `(` + userSnakeRowsExpectAutoSet + `) value (?, ?, ?, ?, ?)`
_, err := m.ExecNoCache(query, data.Name, data.Password, data.Mobile, data.Gender, data.Nickname)
return err
}
func (m *UserSnakeModel) FindOne(id int64) (*UserSnake, error) {
userSnakeIdKey := fmt.Sprintf("%s%v", cacheUserSnakeIdPrefix, id)
var resp UserSnake
err := m.QueryRow(&resp, userSnakeIdKey, func(conn sqlx.SqlConn, v interface{}) error {
query := `select ` + userSnakeRows + ` from ` + m.table + ` where id = ? limit 1`
return conn.QueryRow(v, query, id)
})
switch err {
case nil:
return &resp, nil
case sqlc.ErrNotFound:
return nil, ErrNotFound
default:
return nil, err
}
}
func (m *UserSnakeModel) FindOneByName(name string) (*UserSnake, error) {
userSnakeNameKey := fmt.Sprintf("%s%v", cacheUserSnakeNamePrefix, name)
var resp UserSnake
err := m.QueryRowIndex(&resp, userSnakeNameKey, func(primary interface{}) string {
return fmt.Sprintf("%s%v", cacheUserSnakeIdPrefix, primary)
}, func(conn sqlx.SqlConn, v interface{}) (i interface{}, e error) {
query := `select ` + userSnakeRows + ` from ` + m.table + ` where name = ? limit 1`
if err := conn.QueryRow(&resp, query, name); err != nil {
return nil, err
}
return resp.Id, nil
}, func(conn sqlx.SqlConn, v, primary interface{}) error {
query := `select ` + userSnakeRows + ` from ` + m.table + ` where id = ? limit 1`
return conn.QueryRow(v, query, primary)
})
switch err {
case nil:
return &resp, nil
case sqlc.ErrNotFound:
return nil, ErrNotFound
default:
return nil, err
}
}
func (m *UserSnakeModel) FindOneByMobile(mobile string) (*UserSnake, error) {
userSnakeMobileKey := fmt.Sprintf("%s%v", cacheUserSnakeMobilePrefix, mobile)
var resp UserSnake
err := m.QueryRowIndex(&resp, userSnakeMobileKey, func(primary interface{}) string {
return fmt.Sprintf("%s%v", cacheUserSnakeIdPrefix, primary)
}, func(conn sqlx.SqlConn, v interface{}) (i interface{}, e error) {
query := `select ` + userSnakeRows + ` from ` + m.table + ` where mobile = ? limit 1`
if err := conn.QueryRow(&resp, query, mobile); err != nil {
return nil, err
}
return resp.Id, nil
}, func(conn sqlx.SqlConn, v, primary interface{}) error {
query := `select ` + userSnakeRows + ` from ` + m.table + ` where id = ? limit 1`
return conn.QueryRow(v, query, primary)
})
switch err {
case nil:
return &resp, nil
case sqlc.ErrNotFound:
return nil, ErrNotFound
default:
return nil, err
}
}
func (m *UserSnakeModel) Update(data UserSnake) error {
userSnakeIdKey := fmt.Sprintf("%s%v", cacheUserSnakeIdPrefix, data.Id)
_, err := m.Exec(func(conn sqlx.SqlConn) (result sql.Result, err error) {
query := `update ` + m.table + ` set ` + userSnakeRowsWithPlaceHolder + ` where id = ?`
return conn.Exec(query, data.Name, data.Password, data.Mobile, data.Gender, data.Nickname, data.Id)
}, userSnakeIdKey)
return err
}
func (m *UserSnakeModel) Delete(id int64) error {
data, err := m.FindOne(id)
if err != nil {
return err
}
userSnakeIdKey := fmt.Sprintf("%s%v", cacheUserSnakeIdPrefix, id)
userSnakeNameKey := fmt.Sprintf("%s%v", cacheUserSnakeNamePrefix, data.Name)
userSnakeMobileKey := fmt.Sprintf("%s%v", cacheUserSnakeMobilePrefix, data.Mobile)
_, err = m.Exec(func(conn sqlx.SqlConn) (result sql.Result, err error) {
query := `delete from ` + m.table + ` where id = ?`
return conn.Exec(query, id)
}, userSnakeMobileKey, userSnakeIdKey, userSnakeNameKey)
return err
}

View File

@@ -1,7 +0,0 @@
package model
import "github.com/tal-tech/go-zero/core/stores/sqlx"
var (
ErrNotFound = sqlx.ErrNotFound
)

View File

@@ -1,104 +0,0 @@
package model
import (
"strings"
"time"
"github.com/tal-tech/go-zero/core/stores/cache"
"github.com/tal-tech/go-zero/core/stores/sqlc"
"github.com/tal-tech/go-zero/core/stores/sqlx"
"github.com/tal-tech/go-zero/core/stringx"
"github.com/tal-tech/go-zero/tools/goctl/model/sql/builderx"
)
var (
userCamelFieldNames = builderx.FieldNames(&UserCamel{})
userCamelRows = strings.Join(userCamelFieldNames, ",")
userCamelRowsExpectAutoSet = strings.Join(stringx.Remove(userCamelFieldNames, "create_time", "update_time"), ",")
userCamelRowsWithPlaceHolder = strings.Join(stringx.Remove(userCamelFieldNames, "id", "create_time", "update_time"), "=?,") + "=?"
)
type (
UserCamelModel struct {
sqlc.CachedConn
table string
}
UserCamel struct {
Id int64 `db:"id"`
Name string `db:"name"` // 用户名称
Password string `db:"password"` // 用户密码
Mobile string `db:"mobile"` // 手机号
Gender string `db:"gender"` // 男|女|未公开
Nickname string `db:"nickname"` // 用户昵称
CreateTime time.Time `db:"createTime"`
UpdateTime time.Time `db:"updateTime"`
}
)
func NewUserCamelModel(conn sqlx.SqlConn, c cache.CacheConf, table string) *UserCamelModel {
return &UserCamelModel{
CachedConn: sqlc.NewConn(conn, c),
table: table,
}
}
func (m *UserCamelModel) Insert(data UserCamel) error {
query := `insert into ` + m.table + `(` + userCamelRowsExpectAutoSet + `) value (?, ?, ?, ?, ?, ?)`
_, err := m.ExecNoCache(query, data.Id, data.Name, data.Password, data.Mobile, data.Gender, data.Nickname)
return err
}
func (m *UserCamelModel) FindOne(id int64) (*UserCamel, error) {
query := `select ` + userCamelRows + ` from ` + m.table + ` where id = ? limit 1`
var resp UserCamel
err := m.QueryRowNoCache(&resp, query, id)
switch err {
case nil:
return &resp, nil
case sqlc.ErrNotFound:
return nil, ErrNotFound
default:
return nil, err
}
}
func (m *UserCamelModel) FindOneByName(name string) (*UserCamel, error) {
var resp UserCamel
query := `select ` + userCamelRows + ` from ` + m.table + ` where name limit 1`
err := m.QueryRowNoCache(&resp, query, name)
switch err {
case nil:
return &resp, nil
case sqlc.ErrNotFound:
return nil, ErrNotFound
default:
return nil, err
}
}
func (m *UserCamelModel) FindOneByMobile(mobile string) (*UserCamel, error) {
var resp UserCamel
query := `select ` + userCamelRows + ` from ` + m.table + ` where mobile limit 1`
err := m.QueryRowNoCache(&resp, query, mobile)
switch err {
case nil:
return &resp, nil
case sqlc.ErrNotFound:
return nil, ErrNotFound
default:
return nil, err
}
}
func (m *UserCamelModel) Update(data UserCamel) error {
query := `update ` + m.table + ` set ` + userCamelRowsWithPlaceHolder + ` where id = ?`
_, err := m.ExecNoCache(query, data.Name, data.Password, data.Mobile, data.Gender, data.Nickname, data.Id)
return err
}
func (m *UserCamelModel) Delete(id int64) error {
query := `delete from ` + m.table + ` where id = ?`
_, err := m.ExecNoCache(query, id)
return err
}

View File

@@ -1,104 +0,0 @@
package model
import (
"strings"
"time"
"github.com/tal-tech/go-zero/core/stores/cache"
"github.com/tal-tech/go-zero/core/stores/sqlc"
"github.com/tal-tech/go-zero/core/stores/sqlx"
"github.com/tal-tech/go-zero/core/stringx"
"github.com/tal-tech/go-zero/tools/goctl/model/sql/builderx"
)
var (
userSnakeFieldNames = builderx.FieldNames(&UserSnake{})
userSnakeRows = strings.Join(userSnakeFieldNames, ",")
userSnakeRowsExpectAutoSet = strings.Join(stringx.Remove(userSnakeFieldNames, "id", "create_time", "update_time"), ",")
userSnakeRowsWithPlaceHolder = strings.Join(stringx.Remove(userSnakeFieldNames, "id", "create_time", "update_time"), "=?,") + "=?"
)
type (
UserSnakeModel struct {
sqlc.CachedConn
table string
}
UserSnake struct {
Id int64 `db:"id"`
Name string `db:"name"` // 用户名称
Password string `db:"password"` // 用户密码
Mobile string `db:"mobile"` // 手机号
Gender string `db:"gender"` // 男|女|未公开
Nickname string `db:"nickname"` // 用户昵称
CreateTime time.Time `db:"create_time"`
UpdateTime time.Time `db:"update_time"`
}
)
func NewUserSnakeModel(conn sqlx.SqlConn, c cache.CacheConf, table string) *UserSnakeModel {
return &UserSnakeModel{
CachedConn: sqlc.NewConn(conn, c),
table: table,
}
}
func (m *UserSnakeModel) Insert(data UserSnake) error {
query := `insert into ` + m.table + `(` + userSnakeRowsExpectAutoSet + `) value (?, ?, ?, ?, ?)`
_, err := m.ExecNoCache(query, data.Name, data.Password, data.Mobile, data.Gender, data.Nickname)
return err
}
func (m *UserSnakeModel) FindOne(id int64) (*UserSnake, error) {
query := `select ` + userSnakeRows + ` from ` + m.table + ` where id = ? limit 1`
var resp UserSnake
err := m.QueryRowNoCache(&resp, query, id)
switch err {
case nil:
return &resp, nil
case sqlc.ErrNotFound:
return nil, ErrNotFound
default:
return nil, err
}
}
func (m *UserSnakeModel) FindOneByName(name string) (*UserSnake, error) {
var resp UserSnake
query := `select ` + userSnakeRows + ` from ` + m.table + ` where name limit 1`
err := m.QueryRowNoCache(&resp, query, name)
switch err {
case nil:
return &resp, nil
case sqlc.ErrNotFound:
return nil, ErrNotFound
default:
return nil, err
}
}
func (m *UserSnakeModel) FindOneByMobile(mobile string) (*UserSnake, error) {
var resp UserSnake
query := `select ` + userSnakeRows + ` from ` + m.table + ` where mobile limit 1`
err := m.QueryRowNoCache(&resp, query, mobile)
switch err {
case nil:
return &resp, nil
case sqlc.ErrNotFound:
return nil, ErrNotFound
default:
return nil, err
}
}
func (m *UserSnakeModel) Update(data UserSnake) error {
query := `update ` + m.table + ` set ` + userSnakeRowsWithPlaceHolder + ` where id = ?`
_, err := m.ExecNoCache(query, data.Name, data.Password, data.Mobile, data.Gender, data.Nickname, data.Id)
return err
}
func (m *UserSnakeModel) Delete(id int64) error {
query := `delete from ` + m.table + ` where id = ?`
_, err := m.ExecNoCache(query, id)
return err
}