fix select sqlbuilder, so it can copy the condition

Author: free1139

qsql.go

@@ -260,7 +260,7 @@ func queryPageArr(db Queryer, ctx context.Context, querySql string, args ...inte
 	}
 
 	for rows.Next() {
-		r := makeDBData(len(titles))
+		r := MakeDBData(len(titles))
 		if err := rows.Scan(r...); err != nil {
 			return titles, result, errors.As(err, args)
 		}
@@ -287,7 +287,7 @@ func queryPageMap(db Queryer, ctx context.Context, querySql string, args ...inte
 
 	result := []map[string]interface{}{}
 	for rows.Next() {
-		r := makeDBData(len(titles))
+		r := MakeDBData(len(titles))
 		if err := rows.Scan(r...); err != nil {
 			return titles, []map[string]interface{}{}, errors.As(err, args)
 		}

reflect.go

@@ -1,120 +1,15 @@
 package qsql
 
 import (
-	"database/sql"
 	"database/sql/driver"
 	"fmt"
 	"reflect"
-	"strconv"
 	"strings"
-	"time"
 
 	"github.com/gwaylib/errors"
 	"github.com/jmoiron/sqlx/reflectx"
 )
 
-// Bool type
-type Bool bool
-
-func (v *Bool) Scan(i interface{}) error {
-	b := sql.NullBool{}
-	if err := b.Scan(i); err != nil {
-		return err
-	}
-	*v = Bool(b.Bool)
-	return nil
-}
-func (v *Bool) Value() (driver.Value, error) {
-	return v, nil
-}
-
-// Int64 type
-type Int64 int64
-
-func (v *Int64) Scan(i interface{}) error {
-	b := sql.NullInt64{}
-	if err := b.Scan(i); err != nil {
-		return err
-	}
-	*v = Int64(b.Int64)
-	return nil
-}
-func (v Int64) Value() (driver.Value, error) {
-	return int64(v), nil
-}
-
-// Float64 type
-type Float64 float64
-
-func (v *Float64) Scan(i interface{}) error {
-	b := sql.NullFloat64{}
-	if err := b.Scan(i); err != nil {
-		return err
-	}
-	*v = Float64(b.Float64)
-	return nil
-}
-func (v Float64) Value() (driver.Value, error) {
-	return float64(v), nil
-}
-
-// String type
-type String string
-
-func (v *String) Scan(i interface{}) error {
-	b := sql.NullString{}
-	if err := b.Scan(i); err != nil {
-		return err
-	}
-	*v = String(b.String)
-	return nil
-}
-func (v String) Value() (driver.Value, error) {
-	return string(v), nil
-}
-func (v *String) String() string {
-	return string(*v)
-}
-
-// 通用的字符串查询
-type DBData string
-
-func (d *DBData) Scan(i interface{}) error {
-	if i == nil {
-		*d = ""
-		return nil
-	}
-	switch i.(type) {
-	case int64:
-		*d = DBData(strconv.FormatInt(i.(int64), 10))
-	case float64:
-		*d = DBData(strconv.FormatFloat(i.(float64), 'f', -1, 64))
-	case []byte:
-		*d = DBData(string(i.([]byte)))
-	case string:
-		*d = DBData(i.(string))
-	case bool:
-		*d = DBData(fmt.Sprintf("%t", i))
-	case time.Time:
-		*d = DBData(i.(time.Time).Format(time.RFC3339))
-	default:
-		*d = DBData(fmt.Sprint(i))
-	}
-	return nil
-}
-func (d *DBData) String() string {
-	return string(*d)
-}
-
-func makeDBData(l int) []interface{} {
-	r := make([]interface{}, l)
-	for i := 0; i < l; i++ {
-		d := DBData("")
-		r[i] = &d
-	}
-	return r
-}
-
 var refxM = reflectx.NewMapperTagFunc("db", func(in string) string {
 	// for tag name
 	return in

sqlbuilder.go

@@ -20,13 +20,6 @@ func NewSqlBuilder(drvName ...string) *SqlBuilder {
 	return b
 }
 
-func (b *SqlBuilder) String() string {
-	return b.buff.String()
-}
-func (b *SqlBuilder) Args() []interface{} {
-	return b.args
-}
-
 func (b *SqlBuilder) Add(key string, args ...interface{}) *SqlBuilder {
 	if len(key) > 0 {
 		b.buff.WriteString(key)
@@ -42,7 +35,7 @@ func (b *SqlBuilder) AddTab(key string, args ...interface{}) *SqlBuilder {
 	b.buff.WriteString("  ")
 	return b.Add(key, args)
 }
-func (b *SqlBuilder) AddTabOk(ok bool, key string, args ...interface{}) *SqlBuilder {
+func (b *SqlBuilder) AddTabOK(ok bool, key string, args ...interface{}) *SqlBuilder {
 	if !ok {
 		return b
 	}
@@ -57,17 +50,23 @@ func (b *SqlBuilder) In(in []interface{}) string {
 	return stmtIn(len(b.args)-1, len(in), b.drvName)
 }
 
+func (b *SqlBuilder) Args() []interface{} {
+	return b.args
+}
+
 func (b *SqlBuilder) Select(column ...string) string {
+	selectStr := "SELECT\n  "
 	if len(column) > 0 {
-		return strings.Join(column, ", ")
+		selectStr += strings.Join(column, ", ")
 	} else {
-		return "*"
+		selectStr += "*"
 	}
+	return selectStr + "\n" + b.buff.String()
 }
 func (b *SqlBuilder) SelectStruct(obj interface{}) string {
 	fields, err := reflectInsertStruct(obj, b.drvName)
 	if err != nil {
 		panic(err)
 	}
-	return fields.Names
+	return "SELECT\n  " + fields.Names + "\n" + b.buff.String()
 }

sqlbuilder_test.go

@@ -7,23 +7,23 @@ import (
 
 func TestSqlBuilder(t *testing.T) {
 	sb := NewSqlBuilder(DRV_NAME_POSTGRES)
-	sb.Add("SELECT")
-	sb.AddTab(sb.Select("tb1.id", "count(*)"))
 	sb.Add("FROM")
 	sb.AddTab("tmp tb1")
 	sb.AddTab("INNER JOIN tmp1 tb2 ON tb2.id=tb2.tmp_id")
 	sb.Add("WHERE")
 	sb.AddTab("1=1")
-	sb.AddTabOk(false, "AND (1=?)", 0)
-	sb.AddTab("OR (tb1 IN (" + sb.In([]interface{}{1, 2}) + "))")
+	sb.AddTabOK(false, "AND (1=?)", 0)
+	sb.AddTabOK(true, "OR (tb1 IN ("+sb.In([]interface{}{1, 2})+"))")
 	sb.Add("GROUP BY tb1.id")
 	sb.Add("HAVING count(*)>?", 1)
+	fmt.Println(sb.Select("count(*)"))
+
 	sb.Add("ORDER BY tb1.id DESC")
 	sb.Add("OFFSET ?", 1)
 	sb.Add("LIMIT ?", 1)
-	fmt.Println(sb)
+	fmt.Println(sb.Select("tb1.id", "count(*)"))
 
 	sb1 := NewSqlBuilder(DRV_NAME_POSTGRES)
-	sb1.Add("SELECT * FROM ("+sb.String()+") tmp", sb1.Args())
-	fmt.Println(sb1)
+	sb1.Add("FROM ("+sb.Select("tb1.id", "count(*)")+") tmp", sb.Args())
+	fmt.Println(sb1.Select("*"))
 }

type.go

@@ -0,0 +1,111 @@
+package qsql
+
+import (
+	"database/sql"
+	"database/sql/driver"
+	"fmt"
+	"strconv"
+	"time"
+)
+
+// Bool type
+type Bool bool
+
+func (v *Bool) Scan(i interface{}) error {
+	b := sql.NullBool{}
+	if err := b.Scan(i); err != nil {
+		return err
+	}
+	*v = Bool(b.Bool)
+	return nil
+}
+func (v *Bool) Value() (driver.Value, error) {
+	return v, nil
+}
+
+// Int64 type
+type Int64 int64
+
+func (v *Int64) Scan(i interface{}) error {
+	b := sql.NullInt64{}
+	if err := b.Scan(i); err != nil {
+		return err
+	}
+	*v = Int64(b.Int64)
+	return nil
+}
+func (v Int64) Value() (driver.Value, error) {
+	return int64(v), nil
+}
+
+// Float64 type
+type Float64 float64
+
+func (v *Float64) Scan(i interface{}) error {
+	b := sql.NullFloat64{}
+	if err := b.Scan(i); err != nil {
+		return err
+	}
+	*v = Float64(b.Float64)
+	return nil
+}
+func (v Float64) Value() (driver.Value, error) {
+	return float64(v), nil
+}
+
+// String type
+type String string
+
+func (v *String) Scan(i interface{}) error {
+	b := sql.NullString{}
+	if err := b.Scan(i); err != nil {
+		return err
+	}
+	*v = String(b.String)
+	return nil
+}
+func (v String) Value() (driver.Value, error) {
+	return string(v), nil
+}
+func (v *String) String() string {
+	return string(*v)
+}
+
+// 通用的字符串查询
+type DBData string
+
+func (d *DBData) Scan(i interface{}) error {
+	if i == nil {
+		*d = ""
+		return nil
+	}
+	switch i.(type) {
+	case int64:
+		*d = DBData(strconv.FormatInt(i.(int64), 10))
+	case float64:
+		*d = DBData(strconv.FormatFloat(i.(float64), 'f', -1, 64))
+	case []byte:
+		*d = DBData(string(i.([]byte)))
+	case string:
+		*d = DBData(i.(string))
+	case bool:
+		*d = DBData(fmt.Sprintf("%t", i))
+	case time.Time:
+		*d = DBData(i.(time.Time).Format(time.RFC3339))
+	default:
+		*d = DBData(fmt.Sprint(i))
+	}
+	return nil
+}
+func (d *DBData) String() string {
+	return string(*d)
+}
+
+func MakeDBData(l int) []interface{} {
+	r := make([]interface{}, l)
+	for i := 0; i < l; i++ {
+		d := DBData("")
+		r[i] = &d
+	}
+	return r
+}