go/db
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: go:master
Branches Tags
go:master
go:v1.0
..
compare: go:v1.0
Branches Tags
go:master
go:v1.0

No commits in common. "master" and "v1.0" have entirely different histories.
master ... v1.0

8 changed files with 84 additions and 239 deletions
Show Stats Expand all files Collapse all files

73
builder.go
View File

@ -323,8 +323,10 @@ func Clone(original *Builder) *Builder {
}
} else if original.Connection.Config.Driver == DriverSqlite3 {
newBuilder.Grammar = &Sqlite3Grammar{
MysqlGrammar: &MysqlGrammar{
Prefix: original.Grammar.GetTablePrefix(),
Builder: &newBuilder,
},
}
} else {
panic("不支持的数据库类型")
@ -336,8 +338,7 @@ func (b *Builder) Clone() *Builder {
return Clone(b)
}
/*
CloneWithout
/*CloneWithout
CloneWithoutClone the query without the given properties.
*/
func CloneWithout(original *Builder, without ...string) *Builder {
@ -393,7 +394,7 @@ func (b *Builder) Select(columns ...interface{}) *Builder {
return b
}
// SelectSub Add a subselect expression to the query.
//SelectSub Add a subselect expression to the query.
func (b *Builder) SelectSub(query interface{}, as string) *Builder {
qStr, bindings := b.CreateSub(query)
queryStr := fmt.Sprintf("( %s ) as %s", qStr, b.Grammar.Wrap(as))
@ -432,33 +433,31 @@ func (b *Builder) SelectRaw(expression string, bindings ...[]interface{}) *Build
return b
}
// CreateSub Creates a subquery and parse it.
//CreateSub Creates a subquery and parse it.
func (b *Builder) CreateSub(query interface{}) (string, []interface{}) {
switch v := query.(type) {
case func(builder *Builder):
builder := CloneBuilderWithTable(b)
v(builder)
return b.ParseSub(builder)
case string, Expression, *Builder:
return b.ParseSub(v)
}
var builder *Builder
if bT, ok := query.(*Builder); ok {
builder = bT
} else if function, ok := query.(func(builder *Builder)); ok {
builder = CloneBuilderWithTable(b)
function(builder)
} else if str, ok := query.(string); ok {
return b.ParseSub(str)
} else {
panic("can not create sub")
}
return b.ParseSub(builder)
}
/*
ParseSub Parse the subquery into SQL and bindings.
*/
func (b *Builder) ParseSub(query interface{}) (string, []interface{}) {
switch v := query.(type) {
case string:
return v, []interface{}{}
case Expression:
return string(v), []interface{}{}
case *Builder:
return v.ToSql(), v.GetBindings()
if s, ok := query.(string); ok {
return s, []interface{}{}
} else if builder, ok := query.(*Builder); ok {
return builder.ToSql(), builder.GetBindings()
}
panic("A subquery must be a query builder instance, a Closure, or a string.")
}
@ -900,7 +899,7 @@ func (b *Builder) RightJoinSub(query interface{}, as string, first interface{},
return b.join(Raw(expr), first, operator, second, joinType, false)
}
// AddBinding Add a binding to the query.
//AddBinding Add a binding to the query.
func (b *Builder) AddBinding(value []interface{}, bindingType string) *Builder {
if _, ok := Bindings[bindingType]; !ok {
log.Panicf("invalid binding type:%s\n", bindingType)
@ -915,7 +914,7 @@ func (b *Builder) AddBinding(value []interface{}, bindingType string) *Builder {
return b
}
// GetBindings Get the current query value bindings in a flattened slice.
//GetBindings Get the current query value bindings in a flattened slice.
func (b *Builder) GetBindings() (res []interface{}) {
for _, key := range BindingKeysInOrder {
if bindings, ok := b.Bindings[key]; ok {
@ -1245,7 +1244,7 @@ func (b *Builder) OrWhereIn(params ...interface{}) *Builder {
return b.WhereIn(params...)
}
// column values [ boolean ]
//column values [ boolean ]
func (b *Builder) WhereNotIn(params ...interface{}) *Builder {
params = append(params, BOOLEAN_AND, true)
return b.WhereIn(params...)
@ -1262,7 +1261,6 @@ func (b *Builder) OrWhereNotIn(params ...interface{}) *Builder {
/*
WhereNull Add a "where null" clause to the query.
params takes in below order:
1. column string
2. boolean string in [2]string{"and","or"}
@ -1353,6 +1351,7 @@ WhereBetween Add a where between statement to the query.
1. WhereBetween(column string,values []interface{"min","max"})
2. WhereBetween(column string,values []interface{"min","max"},"and/or")
3. WhereBetween(column string,values []interface{"min","max","and/or",true/false})
*/
func (b *Builder) WhereBetween(params ...interface{}) *Builder {
paramsLength := len(params)
@ -1433,9 +1432,9 @@ func (b *Builder) WhereBetweenColumns(column string, values []interface{}, param
return b
}
// AddTimeBasedWhere Add a time based (year, month, day, time) statement to the query.
// params order : timefuncionname column operator value boolean
// minimum : timefuncionname column value
//AddTimeBasedWhere Add a time based (year, month, day, time) statement to the query.
//params order : timefuncionname column operator value boolean
//minimum : timefuncionname column value
func (b *Builder) AddTimeBasedWhere(params ...interface{}) *Builder {
paramsLength := len(params)
var timeType = params[0]
@ -1491,7 +1490,7 @@ func (b *Builder) AddTimeBasedWhere(params ...interface{}) *Builder {
return b
}
// column operator value boolean
//column operator value boolean
func (b *Builder) WhereDate(params ...interface{}) *Builder {
p := append([]interface{}{CONDITION_TYPE_DATE}, params...)
return b.AddTimeBasedWhere(p...)
@ -1568,7 +1567,7 @@ func (b *Builder) WhereSub(column string, operator string, value func(builder *B
return b
}
// WhereExists Add an exists clause to the query.
//WhereExists Add an exists clause to the query.
// 1. WhereExists(cb,"and",false)
// 2. WhereExists(cb,"and")
// 3. WhereExists(cb)
@ -1898,7 +1897,7 @@ func (b *Builder) WhereMap(params map[string]interface{}) *Builder {
return b
}
// AddNestedWhereQuery Add another query builder as a nested where to the query builder.
//AddNestedWhereQuery Add another query builder as a nested where to the query builder.
func (b *Builder) AddNestedWhereQuery(builder *Builder, boolean string) *Builder {
if len(builder.Wheres) > 0 {
@ -1995,6 +1994,7 @@ func (b *Builder) DoesntExist() (notExists bool, err error) {
/*
Aggregate Execute an aggregate function on the database.
*/
func (b *Builder) Aggregate(dest interface{}, fn string, column ...string) (result sql.Result, err error) {
b.Dest = dest
@ -2308,6 +2308,7 @@ When Apply the callback if the given "value" is truthy.
1. When(true,func(builder *Builder))
2. When(true,func(builder *Builder),func(builder *Builder)) //with default callback
*/
func (b *Builder) When(boolean bool, cb ...func(builder *Builder)) *Builder {
if boolean {
@ -2322,8 +2323,7 @@ func (b *Builder) Value(dest interface{}, column string) (sql.Result, error) {
return b.First(dest, column)
}
/*
Reset
/*Reset
reset bindings and components
*/
func (b *Builder) Reset(targets ...string) *Builder {
@ -2353,10 +2353,6 @@ func (b *Builder) Reset(targets ...string) *Builder {
delete(b.Bindings, TYPE_COLUMN)
delete(b.Components, TYPE_COLUMN)
b.Columns = nil
case TYPE_JOIN:
delete(b.Bindings, TYPE_JOIN)
delete(b.Components, TYPE_JOIN)
b.Joins = nil
}
}
return b
@ -2386,8 +2382,7 @@ func (b *Builder) After(callback func(builder *Builder, t string, res sql.Result
return b
}
/*
ApplyBeforeQueryCallBacks
/*ApplyBeforeQueryCallBacks
Invoke the "before query" modification callbacks.
*/
func (b *Builder) ApplyBeforeQueryCallBacks(t string, items ...map[string]any) {

10
builder_test.go
View File

@ -1,10 +0,0 @@
package db
import "testing"
func TestJoinSub(t *testing.T) {
b := NewBuilder(conn)
b.Grammar = &Sqlite3Grammar{}
t.Log(b.On("Select 1 as a, 2 as b", "t1", "true").ToSql())
}

22
db.go
View File

@ -17,20 +17,24 @@ func (d *DB) SetLogger(f func(log Log)) *DB {
}
func Open(config map[string]DBConfig) *DB {
if Engine == nil {
Engine = &DB{
DatabaseManager: DatabaseManager{
Configs: make(map[string]*DBConfig),
Connections: make(map[string]*Connection),
},
}
}
var configP = make(map[string]*DBConfig)
for name := range config {
c := config[name]
Engine.Configs[name] = &c
configP[name] = &c
}
db := DB{
DatabaseManager: DatabaseManager{
Configs: configP,
Connections: make(map[string]*Connection),
},
}
db.Connection("default")
Engine = &db
return Engine
}

85
scan.go
View File

@ -4,14 +4,11 @@ import (
"database/sql"
"encoding/json"
"errors"
"fmt"
"reflect"
"github.com/samber/lo"
)
type RowScan struct {
count int
Count int
}
func (RowScan) LastInsertId() (int64, error) {
@ -19,7 +16,7 @@ func (RowScan) LastInsertId() (int64, error) {
}
func (v RowScan) RowsAffected() (int64, error) {
return int64(v.count), nil
return int64(v.Count), nil
}
// 入口
@ -49,7 +46,7 @@ func ScanResult(rows *sql.Rows, dest any) (result RowScan) {
return sMap(rows, dest)
} else {
for rows.Next() {
result.count++
result.Count++
err := rows.Scan(dest)
if err != nil {
panic(err.Error())
@ -91,12 +88,8 @@ func sStructSlice(rows *sql.Rows, dest any) (result RowScan) {
keys[kFiled] = i
}
// 提取 json 字段, json 字段, 不能直接赋值,
// 先赋值给 uint8, 再通过 json.Unmarshal 赋值给字段
var jFields map[int]reflect.Value
for rows.Next() {
result.count++
result.Count++
var v, vp reflect.Value
if itemIsPtr {
vp = reflect.New(sliceItem.Elem())
@ -108,21 +101,10 @@ func sStructSlice(rows *sql.Rows, dest any) (result RowScan) {
scanArgs := make([]any, len(columns))
jFields = map[int]reflect.Value{}
// 初始化 map 字段
for i, k := range columns {
if f, ok := keys[k]; ok {
switch v.Field(f).Kind() {
case reflect.Slice, reflect.Struct, reflect.Map:
scanArgs[i] = &[]uint8{}
jFields[i] = v.Field(f)
case reflect.String:
scanArgs[i] = &sql.NullString{}
jFields[i] = v.Field(f)
default:
scanArgs[i] = v.Field(f).Addr().Interface()
}
} else {
scanArgs[i] = new(any)
}
@ -132,21 +114,6 @@ func sStructSlice(rows *sql.Rows, dest any) (result RowScan) {
panic(err)
}
// json 字符串 反序列化
for i, rv := range jFields {
switch rv.Kind() {
case reflect.String:
rv.SetString(scanArgs[i].(*sql.NullString).String)
default:
if data := *scanArgs[i].(*[]uint8); len(data) > 0 {
v := rv.Addr().Interface()
if err := json.Unmarshal(data, &v); err != nil {
panic(fmt.Sprintf("[%s:%s:%s] => %s", lo.Must1(lo.FindKey(keys, i)), rv.Kind(), scanArgs[i], err))
}
}
}
}
if itemIsPtr {
realDest.Set(reflect.Append(realDest, vp))
} else {
@ -174,29 +141,14 @@ func sStruct(rows *sql.Rows, dest any) (result RowScan) {
keys[kFiled] = i
}
// 提取 json 字段, json 字段, 不能直接赋值,
// 先赋值给 uint8, 再通过 json.Unmarshal 赋值给字段
var jFields map[int]reflect.Value
for rows.Next() {
if result.count == 0 {
if result.Count == 0 {
scanArgs := make([]any, len(columns))
jFields = map[int]reflect.Value{}
// 初始化 map 字段
for i, k := range columns {
if f, ok := keys[k]; ok {
switch v.Field(f).Kind() {
case reflect.Slice, reflect.Struct, reflect.Map:
scanArgs[i] = &[]uint8{}
jFields[i] = v.Field(f)
case reflect.String:
scanArgs[i] = &sql.NullString{}
jFields[i] = v.Field(f)
default:
scanArgs[i] = v.Field(f).Addr().Interface()
}
} else {
scanArgs[i] = new(any)
}
@ -206,21 +158,6 @@ func sStruct(rows *sql.Rows, dest any) (result RowScan) {
panic(err)
}
// json 字符串 反序列化
for i, rv := range jFields {
switch rv.Kind() {
case reflect.String:
rv.SetString(scanArgs[i].(*sql.NullString).String)
default:
if data := *scanArgs[i].(*[]uint8); len(data) > 0 {
v := rv.Addr().Interface()
if err := json.Unmarshal(data, &v); err != nil {
panic(fmt.Sprintf("[%s:%s:%s] => %s", lo.Must1(lo.FindKey(keys, i)), rv.Kind(), scanArgs[i], err))
}
}
}
}
if realDest.Kind() == reflect.Ptr {
realDest.Set(vp)
} else {
@ -228,7 +165,7 @@ func sStruct(rows *sql.Rows, dest any) (result RowScan) {
}
}
result.count++
result.Count++
}
return result
@ -243,7 +180,7 @@ func sMapSlice(rows *sql.Rows, dest any) (result RowScan) {
scanArgs := make([]any, len(columns))
element := make(map[string]any)
result.count++
result.Count++
// 初始化 map 字段
for i := 0; i < len(columns); i++ {
@ -260,7 +197,7 @@ func sMapSlice(rows *sql.Rows, dest any) (result RowScan) {
switch v := (*scanArgs[i].(*any)).(type) {
case []uint8:
data := string(v)
if len(v) > 2 && (data[0:1] == "{" || data[0:1] == "[") {
if len(data) > 2 && (data[0:1] == "{" || data[0:1] == "[") {
jData := new(any)
if err := json.Unmarshal(v, jData); err == nil {
element[column] = *jData
@ -286,7 +223,7 @@ func sMap(rows *sql.Rows, dest any) (result RowScan) {
realDest := reflect.Indirect(reflect.ValueOf(dest))
for rows.Next() {
if result.count == 0 {
if result.Count == 0 {
scanArgs := make([]interface{}, len(columns))
// 初始化 map 字段
for i := 0; i < len(columns); i++ {
@ -318,7 +255,7 @@ func sMap(rows *sql.Rows, dest any) (result RowScan) {
}
}
result.count++
result.Count++
}
return result
@ -330,7 +267,7 @@ func sValues(rows *sql.Rows, dest any) (result RowScan) {
realDest := reflect.Indirect(reflect.ValueOf(dest))
scanArgs := make([]interface{}, len(columns))
for rows.Next() {
result.count++
result.Count++
scanArgs[0] = reflect.New(realDest.Type().Elem()).Interface()
err := rows.Scan(scanArgs...)
if err != nil {

47
scan_test.go
View File

@ -4,11 +4,11 @@ import (
"testing"
)
var myConn *Connection
var oDB *DB
func init() {
database := Open(map[string]DBConfig{
"mysql": {
oDB = Open(map[string]DBConfig{
"default": {
Driver: "mysql",
Host: "localhost",
Port: "3366",
@ -20,14 +20,12 @@ func init() {
// ParseTime: true,
},
})
myConn = database.Connection("mysql")
}
func TestScanMapSlice(t *testing.T) {
dest := []map[string]any{}
myConn.Select("select * from fsm", []any{}, &dest)
oDB.Select("select * from fsm", []any{}, &dest)
t.Log(dest)
}
@ -36,7 +34,7 @@ func TestScanValues(t *testing.T) {
dest := []int{}
myConn.Select("select 1 as id", []any{}, &dest)
oDB.Select("select id from fsm", []any{}, &dest)
t.Log(dest)
}
@ -45,32 +43,19 @@ func TestScanMap(t *testing.T) {
dest := map[string]any{}
myConn.Select("select 0 as id, 'test' as code", []any{}, &dest)
oDB.Select("select * from fsm where id = 3", []any{}, &dest)
t.Log(dest)
}
func TestScanStruct(t *testing.T) {
dest := struct {
Id int `db:"id"`
Code string `db:"code"`
}{}
myConn.Select(`select 0 as id, 'test' as code`, []any{}, &dest)
t.Log(dest)
}
func TestScanJsonFieldStruct(t *testing.T) {
dest := struct {
Id int `db:"id"`
Code string `db:"code"`
Map map[string]any `db:"map"`
Arr []int64 `db:"arr"`
}{}
myConn.Select(`select 0 as id, NULL as code, '{"a":1}' as map, '[3, 4]' as arr`, []any{}, &dest)
oDB.Select("select * from fsm", []any{}, &dest)
t.Log(dest)
}
@ -82,21 +67,7 @@ func TestScanStructSlice(t *testing.T) {
Code string `db:"code"`
}{}
myConn.Select("select * from ((select 0 as id, 'test' as code) union (select 1 as id, 'test1' as code)) as t", []any{}, &dest)
t.Log(dest)
}
func TestScanJsonFieldStructSlice(t *testing.T) {
dest := []struct {
Id int `db:"id"`
Code string `db:"code"`
Map map[string]any `db:"map"`
Arr []any `db:"arr"`
}{}
myConn.Select(`select * from ((select 0 as id, 'test' as code, '{"a":1}' as map, '[1, 2]' as arr) union (select 1 as id, 'test1' as code, '{"a":2}' as map, '[1, 2]' as arr)) as t`, []any{}, &dest)
oDB.Select("select * from fsm", []any{}, &dest)
t.Log(dest)
}

4
sqlite3_grammar.go
View File

@ -1,3 +1,5 @@
package db
type Sqlite3Grammar = MysqlGrammar
type Sqlite3Grammar struct {
*MysqlGrammar
}

36
sqlite3_test.go
View File

@ -1,36 +0,0 @@
package db
import (
"os"
"testing"
)
var conn *Connection
func TestMain(m *testing.M) {
database := Open(map[string]DBConfig{
"sqlite3": {
Driver: "sqlite3",
File: ":memory:",
},
})
conn = database.Connection("sqlite3")
// 执行测试
code := m.Run()
// 退出测试
os.Exit(code)
}
func TestSqliteQuery(t *testing.T) {
dest := []map[string]any{}
t.Log(conn.Select("select 1 as a, 2 as b", nil, &dest))
t.Log("result: ", dest)
}
func TestSqliteBuilder(t *testing.T) {
t.Log(conn.Query().FromSub("select 1 as a, 2 as b", "tb").ToSql())
}

18
util.go
View File

@ -75,21 +75,3 @@ func Stripslashes(str string) string {
}
return string(dstRune)
}
func MysqlRealEscapeString(value string) string {
var sb strings.Builder
for i := 0; i < len(value); i++ {
c := value[i]
switch c {
case '\\', 0, '\n', '\r', '\'', '"':
sb.WriteByte('\\')
sb.WriteByte(c)
case '\032':
sb.WriteByte('\\')
sb.WriteByte('Z')
default:
sb.WriteByte(c)
}
}
return sb.String()
}