[fix] join sub raw() error

builder.go

@@ -323,10 +323,8 @@ func Clone(original *Builder) *Builder {
 		}
 	} else if original.Connection.Config.Driver == DriverSqlite3 {
 		newBuilder.Grammar = &Sqlite3Grammar{
-			MysqlGrammar: &MysqlGrammar{
+			Prefix:  original.Grammar.GetTablePrefix(),
-				Prefix:  original.Grammar.GetTablePrefix(),
+			Builder: &newBuilder,
-				Builder: &newBuilder,
-			},
 		}
 	} else {
 		panic("不支持的数据库类型")
@@ -338,7 +336,8 @@ func (b *Builder) Clone() *Builder {
 	return Clone(b)
 }
 
-/*CloneWithout
+/*
+CloneWithout
 CloneWithoutClone the query without the given properties.
 */
 func CloneWithout(original *Builder, without ...string) *Builder {
@@ -394,7 +393,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))
@@ -433,31 +432,33 @@ 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{}) {
-	var builder *Builder
+	switch v := query.(type) {
-	if bT, ok := query.(*Builder); ok {
+	case func(builder *Builder):
-		builder = bT
+		builder := CloneBuilderWithTable(b)
-	} else if function, ok := query.(func(builder *Builder)); ok {
+		v(builder)
-		builder = CloneBuilderWithTable(b)
+		return b.ParseSub(builder)
-		function(builder)
+	case string, Expression, *Builder:
-	} else if str, ok := query.(string); ok {
+		return b.ParseSub(v)
-		return b.ParseSub(str)
-	} else {
-		panic("can not create sub")
 	}
-	return b.ParseSub(builder)
+
+	panic("can not create sub")
 }
 
 /*
 ParseSub Parse the subquery into SQL and bindings.
 */
 func (b *Builder) ParseSub(query interface{}) (string, []interface{}) {
-	if s, ok := query.(string); ok {
+	switch v := query.(type) {
-		return s, []interface{}{}
+	case string:
-	} else if builder, ok := query.(*Builder); ok {
+		return v, []interface{}{}
-		return builder.ToSql(), builder.GetBindings()
+	case Expression:
+		return string(v), []interface{}{}
+	case *Builder:
+		return v.ToSql(), v.GetBindings()
 	}
+
 	panic("A subquery must be a query builder instance, a Closure, or a string.")
 }
 
@@ -899,7 +900,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)
@@ -914,7 +915,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 {
@@ -1244,7 +1245,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...)
@@ -1261,10 +1262,11 @@ func (b *Builder) OrWhereNotIn(params ...interface{}) *Builder {
 
 /*
 WhereNull Add a "where null" clause to the query.
-   params takes in below order:
+
-   1. column string
+	params takes in below order:
-   2. boolean string in [2]string{"and","or"}
+	1. column string
-   3. type string "not"
+	2. boolean string in [2]string{"and","or"}
+	3. type string "not"
 */
 func (b *Builder) WhereNull(column interface{}, params ...interface{}) *Builder {
 	paramsLength := len(params)
@@ -1347,11 +1349,10 @@ func (b *Builder) OrWhereNotNull(column interface{}) *Builder {
 /*
 WhereBetween Add a where between statement to the query.
 
-   params takes in below order:
+	params takes in below order:
-   1. WhereBetween(column string,values []interface{"min","max"})
+	1. WhereBetween(column string,values []interface{"min","max"})
-   2. WhereBetween(column string,values []interface{"min","max"},"and/or")
+	2. WhereBetween(column string,values []interface{"min","max"},"and/or")
-   3. WhereBetween(column string,values []interface{"min","max","and/or",true/false})
+	3. WhereBetween(column string,values []interface{"min","max","and/or",true/false})
-
 */
 func (b *Builder) WhereBetween(params ...interface{}) *Builder {
 	paramsLength := len(params)
@@ -1432,9 +1433,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.
+// AddTimeBasedWhere Add a time based (year, month, day, time) statement to the query.
-//params order : timefuncionname column operator value boolean
+// params order : timefuncionname column operator value boolean
-//minimum : timefuncionname column value
+// minimum : timefuncionname column value
 func (b *Builder) AddTimeBasedWhere(params ...interface{}) *Builder {
 	paramsLength := len(params)
 	var timeType = params[0]
@@ -1490,7 +1491,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...)
@@ -1567,7 +1568,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)
@@ -1897,7 +1898,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 {
@@ -1994,7 +1995,6 @@ 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
@@ -2306,9 +2306,8 @@ func (b *Builder) Pluck(dest interface{}, params interface{}) (sql.Result, error
 /*
 When Apply the callback if the given "value" is truthy.
 
-	1. When(true,func(builder *Builder))
+ 1. When(true,func(builder *Builder))
-	2. When(true,func(builder *Builder),func(builder *Builder)) //with default callback
+ 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 {
@@ -2323,7 +2322,8 @@ 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,6 +2353,10 @@ 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
@@ -2382,7 +2386,8 @@ 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) {

builder_test.go

@@ -0,0 +1,10 @@
+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())
+}

db.go

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

scan.go

@@ -4,11 +4,14 @@ import (
 	"database/sql"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"reflect"
+
+	"github.com/samber/lo"
 )
 
 type RowScan struct {
-	Count int
+	count int
 }
 
 func (RowScan) LastInsertId() (int64, error) {
@@ -16,7 +19,7 @@ func (RowScan) LastInsertId() (int64, error) {
 }
 
 func (v RowScan) RowsAffected() (int64, error) {
-	return int64(v.Count), nil
+	return int64(v.count), nil
 }
 
 // 入口
@@ -46,7 +49,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())
@@ -88,8 +91,12 @@ 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())
@@ -101,10 +108,21 @@ 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 {
-				scanArgs[i] = v.Field(f).Addr().Interface()
+				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)
 			}
@@ -114,6 +132,21 @@ 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 {
@@ -141,14 +174,29 @@ 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 {
-					scanArgs[i] = v.Field(f).Addr().Interface()
+					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)
 				}
@@ -158,6 +206,21 @@ 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 {
@@ -165,7 +228,7 @@ func sStruct(rows *sql.Rows, dest any) (result RowScan) {
 			}
 		}
 
-		result.Count++
+		result.count++
 	}
 
 	return result
@@ -180,7 +243,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++ {
@@ -197,7 +260,7 @@ func sMapSlice(rows *sql.Rows, dest any) (result RowScan) {
 			switch v := (*scanArgs[i].(*any)).(type) {
 			case []uint8:
 				data := string(v)
-				if len(data) > 2 && (data[0:1] == "{" || data[0:1] == "[") {
+				if len(v) > 2 && (data[0:1] == "{" || data[0:1] == "[") {
 					jData := new(any)
 					if err := json.Unmarshal(v, jData); err == nil {
 						element[column] = *jData
@@ -223,7 +286,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++ {
@@ -255,7 +318,7 @@ func sMap(rows *sql.Rows, dest any) (result RowScan) {
 			}
 		}
 
-		result.Count++
+		result.count++
 	}
 
 	return result
@@ -267,7 +330,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 {

scan_test.go

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

sqlite3_grammar.go

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

sqlite3_test.go

@@ -0,0 +1,36 @@
+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())
+}

util.go

@@ -75,3 +75,21 @@ 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()
+}