feature model fix (#296)
* add raw stirng quote for sql field * remove unused code
This commit is contained in:
anqiansong
GitHub
235
tools/goctl/model/sql/test/model/model_test.go
Normal file
235
tools/goctl/model/sql/test/model/model_test.go
Normal file
@@ -0,0 +1,235 @@
|
||||
package model
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/DATA-DOG/go-sqlmock"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/tal-tech/go-zero/core/stores/cache"
|
||||
"github.com/tal-tech/go-zero/core/stores/redis"
|
||||
"github.com/tal-tech/go-zero/core/stores/redis/redistest"
|
||||
mocksql "github.com/tal-tech/go-zero/tools/goctl/model/sql/test"
|
||||
)
|
||||
|
||||
func TestStudentModel(t *testing.T) {
|
||||
var (
|
||||
testTimeValue = time.Now()
|
||||
testTable = "`student`"
|
||||
testUpdateName = "gozero1"
|
||||
testRowsAffected int64 = 1
|
||||
testInsertId int64 = 1
|
||||
)
|
||||
|
||||
var data Student
|
||||
data.Id = testInsertId
|
||||
data.Name = "gozero"
|
||||
data.Age = sql.NullInt64{
|
||||
Int64: 1,
|
||||
Valid: true,
|
||||
}
|
||||
data.Score = sql.NullFloat64{
|
||||
Float64: 100,
|
||||
Valid: true,
|
||||
}
|
||||
data.CreateTime = testTimeValue
|
||||
data.UpdateTime = sql.NullTime{
|
||||
Time: testTimeValue,
|
||||
Valid: true,
|
||||
}
|
||||
|
||||
err := mockStudent(func(mock sqlmock.Sqlmock) {
|
||||
mock.ExpectExec(fmt.Sprintf("insert into %s", testTable)).
|
||||
WithArgs(data.Name, data.Age, data.Score).
|
||||
WillReturnResult(sqlmock.NewResult(testInsertId, testRowsAffected))
|
||||
}, func(m StudentModel) {
|
||||
r, err := m.Insert(data)
|
||||
assert.Nil(t, err)
|
||||
|
||||
lastInsertId, err := r.LastInsertId()
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, testInsertId, lastInsertId)
|
||||
|
||||
rowsAffected, err := r.RowsAffected()
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, testRowsAffected, rowsAffected)
|
||||
})
|
||||
assert.Nil(t, err)
|
||||
|
||||
err = mockStudent(func(mock sqlmock.Sqlmock) {
|
||||
mock.ExpectQuery(fmt.Sprintf("select (.+) from %s", testTable)).
|
||||
WithArgs(testInsertId).
|
||||
WillReturnRows(sqlmock.NewRows([]string{"id", "name", "age", "score", "create_time", "update_time"}).AddRow(testInsertId, data.Name, data.Age, data.Score, testTimeValue, testTimeValue))
|
||||
}, func(m StudentModel) {
|
||||
result, err := m.FindOne(testInsertId)
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, *result, data)
|
||||
})
|
||||
assert.Nil(t, err)
|
||||
|
||||
err = mockStudent(func(mock sqlmock.Sqlmock) {
|
||||
mock.ExpectExec(fmt.Sprintf("update %s", testTable)).WithArgs(testUpdateName, data.Age, data.Score, testInsertId).WillReturnResult(sqlmock.NewResult(testInsertId, testRowsAffected))
|
||||
}, func(m StudentModel) {
|
||||
data.Name = testUpdateName
|
||||
err := m.Update(data)
|
||||
assert.Nil(t, err)
|
||||
})
|
||||
assert.Nil(t, err)
|
||||
|
||||
err = mockStudent(func(mock sqlmock.Sqlmock) {
|
||||
mock.ExpectQuery(fmt.Sprintf("select (.+) from %s ", testTable)).
|
||||
WithArgs(testInsertId).
|
||||
WillReturnRows(sqlmock.NewRows([]string{"id", "name", "age", "score", "create_time", "update_time"}).AddRow(testInsertId, data.Name, data.Age, data.Score, testTimeValue, testTimeValue))
|
||||
}, func(m StudentModel) {
|
||||
result, err := m.FindOne(testInsertId)
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, *result, data)
|
||||
})
|
||||
assert.Nil(t, err)
|
||||
|
||||
err = mockStudent(func(mock sqlmock.Sqlmock) {
|
||||
mock.ExpectExec(fmt.Sprintf("delete from %s where `id` = ?", testTable)).WithArgs(testInsertId).WillReturnResult(sqlmock.NewResult(testInsertId, testRowsAffected))
|
||||
}, func(m StudentModel) {
|
||||
err := m.Delete(testInsertId)
|
||||
assert.Nil(t, err)
|
||||
})
|
||||
assert.Nil(t, err)
|
||||
}
|
||||
|
||||
func TestUserModel(t *testing.T) {
|
||||
var (
|
||||
testTimeValue = time.Now()
|
||||
testTable = "`user`"
|
||||
testUpdateName = "gozero1"
|
||||
testUser = "gozero"
|
||||
testPassword = "test"
|
||||
testMobile = "test_mobile"
|
||||
testGender = "男"
|
||||
testNickname = "test_nickname"
|
||||
testRowsAffected int64 = 1
|
||||
testInsertId int64 = 1
|
||||
)
|
||||
|
||||
var data User
|
||||
data.Id = testInsertId
|
||||
data.User = testUser
|
||||
data.Name = "gozero"
|
||||
data.Password = testPassword
|
||||
data.Mobile = testMobile
|
||||
data.Gender = testGender
|
||||
data.Nickname = testNickname
|
||||
data.CreateTime = testTimeValue
|
||||
data.UpdateTime = testTimeValue
|
||||
|
||||
err := mockUser(func(mock sqlmock.Sqlmock) {
|
||||
mock.ExpectExec(fmt.Sprintf("insert into %s", testTable)).
|
||||
WithArgs(data.User, data.Name, data.Password, data.Mobile, data.Gender, data.Nickname).
|
||||
WillReturnResult(sqlmock.NewResult(testInsertId, testRowsAffected))
|
||||
}, func(m UserModel) {
|
||||
r, err := m.Insert(data)
|
||||
assert.Nil(t, err)
|
||||
|
||||
lastInsertId, err := r.LastInsertId()
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, testInsertId, lastInsertId)
|
||||
|
||||
rowsAffected, err := r.RowsAffected()
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, testRowsAffected, rowsAffected)
|
||||
})
|
||||
assert.Nil(t, err)
|
||||
|
||||
err = mockUser(func(mock sqlmock.Sqlmock) {
|
||||
mock.ExpectQuery(fmt.Sprintf("select (.+) from %s", testTable)).
|
||||
WithArgs(testInsertId).
|
||||
WillReturnRows(sqlmock.NewRows([]string{"id", "user", "name", "password", "mobile", "gender", "nickname", "create_time", "update_time"}).AddRow(testInsertId, data.User, data.Name, data.Password, data.Mobile, data.Gender, data.Nickname, testTimeValue, testTimeValue))
|
||||
}, func(m UserModel) {
|
||||
result, err := m.FindOne(testInsertId)
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, *result, data)
|
||||
})
|
||||
assert.Nil(t, err)
|
||||
|
||||
err = mockUser(func(mock sqlmock.Sqlmock) {
|
||||
mock.ExpectExec(fmt.Sprintf("update %s", testTable)).WithArgs(data.User, testUpdateName, data.Password, data.Mobile, data.Gender, data.Nickname, testInsertId).WillReturnResult(sqlmock.NewResult(testInsertId, testRowsAffected))
|
||||
}, func(m UserModel) {
|
||||
data.Name = testUpdateName
|
||||
err := m.Update(data)
|
||||
assert.Nil(t, err)
|
||||
})
|
||||
assert.Nil(t, err)
|
||||
|
||||
err = mockUser(func(mock sqlmock.Sqlmock) {
|
||||
mock.ExpectQuery(fmt.Sprintf("select (.+) from %s ", testTable)).
|
||||
WithArgs(testInsertId).
|
||||
WillReturnRows(sqlmock.NewRows([]string{"id", "user", "name", "password", "mobile", "gender", "nickname", "create_time", "update_time"}).AddRow(testInsertId, data.User, data.Name, data.Password, data.Mobile, data.Gender, data.Nickname, testTimeValue, testTimeValue))
|
||||
}, func(m UserModel) {
|
||||
result, err := m.FindOne(testInsertId)
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, *result, data)
|
||||
})
|
||||
assert.Nil(t, err)
|
||||
|
||||
err = mockUser(func(mock sqlmock.Sqlmock) {
|
||||
mock.ExpectExec(fmt.Sprintf("delete from %s where `id` = ?", testTable)).WithArgs(testInsertId).WillReturnResult(sqlmock.NewResult(testInsertId, testRowsAffected))
|
||||
}, func(m UserModel) {
|
||||
err := m.Delete(testInsertId)
|
||||
assert.Nil(t, err)
|
||||
})
|
||||
assert.Nil(t, err)
|
||||
}
|
||||
|
||||
// with cache
|
||||
func mockStudent(mockFn func(mock sqlmock.Sqlmock), fn func(m StudentModel)) error {
|
||||
db, mock, err := sqlmock.New()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
defer db.Close()
|
||||
|
||||
mock.ExpectBegin()
|
||||
mockFn(mock)
|
||||
mock.ExpectCommit()
|
||||
|
||||
conn := mocksql.NewMockConn(db)
|
||||
r, clean, err := redistest.CreateRedis()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
defer clean()
|
||||
|
||||
m := NewStudentModel(conn, cache.CacheConf{
|
||||
{
|
||||
RedisConf: redis.RedisConf{
|
||||
Host: r.Addr,
|
||||
Type: "node",
|
||||
},
|
||||
Weight: 100,
|
||||
},
|
||||
})
|
||||
fn(m)
|
||||
return nil
|
||||
}
|
||||
|
||||
// without cache
|
||||
func mockUser(mockFn func(mock sqlmock.Sqlmock), fn func(m UserModel)) error {
|
||||
db, mock, err := sqlmock.New()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
defer db.Close()
|
||||
|
||||
mock.ExpectBegin()
|
||||
mockFn(mock)
|
||||
mock.ExpectCommit()
|
||||
|
||||
conn := mocksql.NewMockConn(db)
|
||||
m := NewUserModel(conn)
|
||||
fn(m)
|
||||
return nil
|
||||
}
|
||||
105
tools/goctl/model/sql/test/model/studentmodel.go
Executable file
105
tools/goctl/model/sql/test/model/studentmodel.go
Executable file
@@ -0,0 +1,105 @@
|
||||
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 (
|
||||
studentFieldNames = builderx.FieldNames(&Student{})
|
||||
studentRows = strings.Join(studentFieldNames, ",")
|
||||
studentRowsExpectAutoSet = strings.Join(stringx.Remove(studentFieldNames, "`id`", "`create_time`", "`update_time`"), ",")
|
||||
studentRowsWithPlaceHolder = strings.Join(stringx.Remove(studentFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?"
|
||||
|
||||
cacheStudentIdPrefix = "cache#Student#id#"
|
||||
)
|
||||
|
||||
type (
|
||||
StudentModel interface {
|
||||
Insert(data Student) (sql.Result, error)
|
||||
FindOne(id int64) (*Student, error)
|
||||
Update(data Student) error
|
||||
Delete(id int64) error
|
||||
}
|
||||
|
||||
defaultStudentModel struct {
|
||||
sqlc.CachedConn
|
||||
table string
|
||||
}
|
||||
|
||||
Student struct {
|
||||
Id int64 `db:"id"`
|
||||
Name string `db:"name"`
|
||||
Age sql.NullInt64 `db:"age"`
|
||||
Score sql.NullFloat64 `db:"score"`
|
||||
CreateTime time.Time `db:"create_time"`
|
||||
UpdateTime sql.NullTime `db:"update_time"`
|
||||
}
|
||||
)
|
||||
|
||||
func NewStudentModel(conn sqlx.SqlConn, c cache.CacheConf) StudentModel {
|
||||
return &defaultStudentModel{
|
||||
CachedConn: sqlc.NewConn(conn, c),
|
||||
table: "`student`",
|
||||
}
|
||||
}
|
||||
|
||||
func (m *defaultStudentModel) Insert(data Student) (sql.Result, error) {
|
||||
query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?)", m.table, studentRowsExpectAutoSet)
|
||||
ret, err := m.ExecNoCache(query, data.Name, data.Age, data.Score)
|
||||
|
||||
return ret, err
|
||||
}
|
||||
|
||||
func (m *defaultStudentModel) FindOne(id int64) (*Student, error) {
|
||||
studentIdKey := fmt.Sprintf("%s%v", cacheStudentIdPrefix, id)
|
||||
var resp Student
|
||||
err := m.QueryRow(&resp, studentIdKey, func(conn sqlx.SqlConn, v interface{}) error {
|
||||
query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", studentRows, m.table)
|
||||
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 *defaultStudentModel) Update(data Student) error {
|
||||
studentIdKey := fmt.Sprintf("%s%v", cacheStudentIdPrefix, data.Id)
|
||||
_, err := m.Exec(func(conn sqlx.SqlConn) (result sql.Result, err error) {
|
||||
query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, studentRowsWithPlaceHolder)
|
||||
return conn.Exec(query, data.Name, data.Age, data.Score, data.Id)
|
||||
}, studentIdKey)
|
||||
return err
|
||||
}
|
||||
|
||||
func (m *defaultStudentModel) Delete(id int64) error {
|
||||
|
||||
studentIdKey := fmt.Sprintf("%s%v", cacheStudentIdPrefix, id)
|
||||
_, err := m.Exec(func(conn sqlx.SqlConn) (result sql.Result, err error) {
|
||||
query := fmt.Sprintf("delete from %s where `id` = ?", m.table)
|
||||
return conn.Exec(query, id)
|
||||
}, studentIdKey)
|
||||
return err
|
||||
}
|
||||
|
||||
func (m *defaultStudentModel) formatPrimary(primary interface{}) string {
|
||||
return fmt.Sprintf("%s%v", cacheStudentIdPrefix, primary)
|
||||
}
|
||||
|
||||
func (m *defaultStudentModel) queryPrimary(conn sqlx.SqlConn, v, primary interface{}) error {
|
||||
query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", studentRows, m.table)
|
||||
return conn.QueryRow(v, query, primary)
|
||||
}
|
||||
130
tools/goctl/model/sql/test/model/usermodel.go
Executable file
130
tools/goctl/model/sql/test/model/usermodel.go
Executable file
@@ -0,0 +1,130 @@
|
||||
package model
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"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 (
|
||||
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`"), "=?,") + "=?"
|
||||
)
|
||||
|
||||
type (
|
||||
UserModel interface {
|
||||
Insert(data User) (sql.Result, error)
|
||||
FindOne(id int64) (*User, error)
|
||||
FindOneByUser(user string) (*User, error)
|
||||
FindOneByName(name string) (*User, error)
|
||||
FindOneByMobile(mobile string) (*User, error)
|
||||
Update(data User) error
|
||||
Delete(id int64) error
|
||||
}
|
||||
|
||||
defaultUserModel struct {
|
||||
conn sqlx.SqlConn
|
||||
table string
|
||||
}
|
||||
|
||||
User struct {
|
||||
Id int64 `db:"id"`
|
||||
User string `db:"user"` // 用户
|
||||
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) UserModel {
|
||||
return &defaultUserModel{
|
||||
conn: conn,
|
||||
table: "`user`",
|
||||
}
|
||||
}
|
||||
|
||||
func (m *defaultUserModel) Insert(data User) (sql.Result, error) {
|
||||
query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?)", m.table, userRowsExpectAutoSet)
|
||||
ret, err := m.conn.Exec(query, data.User, data.Name, data.Password, data.Mobile, data.Gender, data.Nickname)
|
||||
return ret, err
|
||||
}
|
||||
|
||||
func (m *defaultUserModel) FindOne(id int64) (*User, error) {
|
||||
query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", userRows, m.table)
|
||||
var resp User
|
||||
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 *defaultUserModel) FindOneByUser(user string) (*User, error) {
|
||||
var resp User
|
||||
query := fmt.Sprintf("select %s from %s where `user` = ? limit 1", userRows, m.table)
|
||||
err := m.conn.QueryRow(&resp, query, user)
|
||||
switch err {
|
||||
case nil:
|
||||
return &resp, nil
|
||||
case sqlc.ErrNotFound:
|
||||
return nil, ErrNotFound
|
||||
default:
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
func (m *defaultUserModel) FindOneByName(name string) (*User, error) {
|
||||
var resp User
|
||||
query := fmt.Sprintf("select %s from %s where `name` = ? limit 1", userRows, m.table)
|
||||
err := m.conn.QueryRow(&resp, query, name)
|
||||
switch err {
|
||||
case nil:
|
||||
return &resp, nil
|
||||
case sqlc.ErrNotFound:
|
||||
return nil, ErrNotFound
|
||||
default:
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
func (m *defaultUserModel) FindOneByMobile(mobile string) (*User, error) {
|
||||
var resp User
|
||||
query := fmt.Sprintf("select %s from %s where `mobile` = ? limit 1", userRows, m.table)
|
||||
err := m.conn.QueryRow(&resp, query, mobile)
|
||||
switch err {
|
||||
case nil:
|
||||
return &resp, nil
|
||||
case sqlc.ErrNotFound:
|
||||
return nil, ErrNotFound
|
||||
default:
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
func (m *defaultUserModel) Update(data User) error {
|
||||
query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, userRowsWithPlaceHolder)
|
||||
_, err := m.conn.Exec(query, data.User, data.Name, data.Password, data.Mobile, data.Gender, data.Nickname, data.Id)
|
||||
return err
|
||||
}
|
||||
|
||||
func (m *defaultUserModel) Delete(id int64) error {
|
||||
query := fmt.Sprintf("delete from %s where `id` = ?", m.table)
|
||||
_, err := m.conn.Exec(query, id)
|
||||
return err
|
||||
}
|
||||
5
tools/goctl/model/sql/test/model/vars.go
Normal file
5
tools/goctl/model/sql/test/model/vars.go
Normal file
@@ -0,0 +1,5 @@
|
||||
package model
|
||||
|
||||
import "github.com/tal-tech/go-zero/core/stores/sqlx"
|
||||
|
||||
var ErrNotFound = sqlx.ErrNotFound
|
||||
Reference in New Issue
Block a user