增加执行原始方法

chain.go

@@ -34,6 +34,7 @@ type Query struct {
 	conn      *sql.DB
 	debug     bool
 	dbtype    string
+	with      [][]string //[[临时表的sql语句,临时表的名称]]
 }
 
 func NewQuery(t ...string) *Query {
@@ -103,6 +104,14 @@ func (this *Query) Groupby(groupby string) *Query {
 	this.groupby = groupby
 	return this
 }
+func (this *Query) With(with []string) *Query {
+	this.with = append(this.with, with)
+	return this
+}
+func (this *Query) Withs(withs [][]string) *Query {
+	this.with = append(this.with, withs...)
+	return this
+}
 func (this *Query) Where(where string) *Query {
 	this.where = append(this.where, where)
 	return this
@@ -145,6 +154,27 @@ func (this *Query) Join(join []string) *Query {
 	this.join = append(this.join, join)
 	return this
 }
+
+/**
+ * 左连接
+ * 2023/08/10
+ * gz
+ */
+func (this *Query) LeftJoin(table_name string, condition string) *Query {
+	this.join = append(this.join, []string{table_name, condition, "left"})
+	return this
+}
+
+/**
+ * 右连接
+ * 2023/08/10
+ * gz
+ */
+func (this *Query) RightJoin(table_name string, condition string) *Query {
+	this.join = append(this.join, []string{table_name, condition, "right"})
+	return this
+}
+
 func (this *Query) Data(data string) *Query {
 	this.data = append(this.data, data)
 	return this
@@ -176,6 +206,8 @@ func (this *Query) Clean() *Query {
 	this.save_data = this.save_data[0:0]
 	this.upd_field = this.upd_field[0:0]
 	this.having = ""
+	this.alias = ""
+	this.with = this.with[0:0]
 	return this
 }
 
@@ -245,13 +277,41 @@ func (this *Query) GetTableInfo(table string) (map[string]interface{}, error) {
 	}, nil
 }
 
+// 返回表名
+func (this *Query) GetTableName(table string) string {
+	return getTableName(this.dbname, table)
+}
+
 // 构造子查询
 func (this *Query) BuildSelectSql() (map[string]interface{}, error) {
 	if this.dbname == "" && this.table == "" {
 		return nil, errors.New("参数错误，没有数据表")
 	}
 	var table = ""
-	if strings.Contains(this.table, "select ") {
+	withSql := ""
+	if len(this.with) > 0 {
+		var builder strings.Builder
+		builder.WriteString("WITH ")
+		boo := false
+		for k, v := range this.with {
+			if len(v) < 2 {
+				continue
+			}
+			if k != 0 {
+				builder.WriteString(", ")
+			}
+			builder.WriteString(v[1])
+			builder.WriteString(" as (")
+			builder.WriteString(v[0])
+			builder.WriteString(")")
+			boo = true
+		}
+		if boo {
+			builder.WriteString(" ")
+			withSql = builder.String()
+		}
+	}
+	if withSql != "" || strings.Contains(this.table, "select ") || strings.HasPrefix(this.table, "(") {
 		table = this.table
 	} else {
 		table = getTableName(this.dbname, this.table, this.dbtype)
@@ -269,15 +329,15 @@ func (this *Query) BuildSelectSql() (map[string]interface{}, error) {
 
 	if this.dbtype == "mssql" {
 		if this.page_size > 0 {
-			sql = helper.StringJoin("select top ", helper.ToStr(this.page_size), " ")
+			sql = helper.StringJoin(withSql, "select top ", helper.ToStr(this.page_size), " ")
 		} else {
-			sql = "select "
+			sql = helper.StringJoin(withSql, "select ")
 		}
 	} else {
 		if DB_PROVIDER == "TencentDB" {
-			sql = "/*slave*/ select "
+			sql = helper.StringJoin("/*slave*/ ", withSql, " select ")
 		} else {
-			sql = "select "
+			sql = helper.StringJoin(withSql, "select ")
 		}
 	}
 
@@ -290,15 +350,31 @@ func (this *Query) BuildSelectSql() (map[string]interface{}, error) {
 	sql = helper.StringJoin(sql, " from ", table)
 
 	if len(this.join) > 0 {
+		var builder strings.Builder
+		builder.WriteString(sql)
+		boo := false
 		for _, joinitem := range this.join {
 			if len(joinitem) < 2 {
 				continue
 			}
-			if len(joinitem) == 3 {
-				sql = helper.StringJoin(sql, " ", joinitem[2], " join ", getTableName(this.dbname, joinitem[0], this.dbtype), " on ", joinitem[1])
-			} else { //默认左连接
-				sql = helper.StringJoin(sql, " left join ", getTableName(this.dbname, joinitem[0], this.dbtype), " on ", joinitem[1])
+			builder.WriteString(" ")
+			if len(joinitem) >= 3 {
+				builder.WriteString(joinitem[2])
+			} else {
+				builder.WriteString("left")
+			}
+			builder.WriteString(" join ")
+			if withSql != "" || strings.Contains(joinitem[0], "select ") || strings.HasPrefix(joinitem[0], "(") {
+				builder.WriteString(joinitem[0])
+			} else {
+				builder.WriteString(getTableName(this.dbname, joinitem[0]))
 			}
+			builder.WriteString(" on ")
+			builder.WriteString(joinitem[1])
+			boo = true
+		}
+		if boo {
+			sql = builder.String()
 		}
 	}
 	if len(this.where) > 0 || len(this.where_or) > 0 {
@@ -743,7 +819,7 @@ func (this *Query) DeleteStmt() error {
  */
 func (this *Query) Select() ([]map[string]string, error) {
 
-	_, rows, err := FetchRows(this.dbname, this.table, this.alias, this.title, this.join,
+	_, rows, err := FetchRows(this.dbname, this.table, this.alias, this.title, this.with, this.join,
 		this.where, this.where_or, this.value, this.orderby, this.groupby, this.having, this.page, this.page_size, this.debug)
 
 	return rows, err
@@ -774,7 +850,7 @@ func (this *Query) List() ([]map[string]string, error) {
  */
 func (this *Query) Find() (map[string]string, error) {
 
-	_, row, err := GetRow(this.dbname, this.table, this.alias, this.title, this.join,
+	_, row, err := GetRow(this.dbname, this.table, this.alias, this.title, this.with, this.join,
 		this.where, this.where_or, this.value, this.orderby, this.groupby, this.having, this.debug)
 
 	return row, err

db.go

@@ -295,7 +295,7 @@ func GetData(dbName, table string, title string, where map[string]string, limit
  * @param dbName 数据表名
  * @param title  查询字段名
  */
-func GetRow(dbName, table_name, alias string, titles string, join [][]string, where, where_or []string, valueList []interface{}, orderby, groupby, having string, debug bool) (int, map[string]string, error) {
+func GetRow(dbName, table_name, alias string, titles string, with, join [][]string, where, where_or []string, valueList []interface{}, orderby, groupby, having string, debug bool) (int, map[string]string, error) {
 	var count int = 0
 	info := make(map[string]string)
 
@@ -304,7 +304,30 @@ func GetRow(dbName, table_name, alias string, titles string, join [][]string, wh
 	}
 
 	table := ""
-	if strings.Contains(table_name, "select ") {
+	withSql := ""
+	if len(with) > 0 {
+		var builder strings.Builder
+		builder.WriteString("WITH ")
+		boo := false
+		for k, v := range with {
+			if len(v) < 2 {
+				continue
+			}
+			if k != 0 {
+				builder.WriteString(", ")
+			}
+			builder.WriteString(v[1])
+			builder.WriteString(" as (")
+			builder.WriteString(v[0])
+			builder.WriteString(")")
+			boo = true
+		}
+		if boo {
+			builder.WriteString(" ")
+			withSql = builder.String()
+		}
+	}
+	if withSql != "" || strings.Contains(table_name, "select ") || strings.HasPrefix(table, "(") {
 		table = table_name
 	} else {
 		table = getTableName(dbName, table_name)
@@ -316,10 +339,11 @@ func GetRow(dbName, table_name, alias string, titles string, join [][]string, wh
 	} else {
 		title = "*"
 	}
+
 	if DB_PROVIDER == "TencentDB" {
-		sql_str = helper.StringJoin("/*slave*/ select ", title)
+		sql_str = helper.StringJoin("/*slave*/ ", withSql, " select ", title)
 	} else {
-		sql_str = helper.StringJoin("select ", title)
+		sql_str = helper.StringJoin(withSql, "select ", title)
 	}
 	if alias != "" {
 		table = helper.StringJoin(table, " as ", alias)
@@ -328,17 +352,31 @@ func GetRow(dbName, table_name, alias string, titles string, join [][]string, wh
 	sql_str = helper.StringJoin(sql_str, " from ", table)
 
 	if len(join) > 0 {
+		var builder strings.Builder
+		builder.WriteString(sql_str)
+		boo := false
 		for _, joinitem := range join {
 			if len(joinitem) < 2 {
 				continue
 			}
-			if len(joinitem) == 4 {
-				sql_str = helper.StringJoin(sql_str, " ", joinitem[2], " join ", joinitem[0], " on ", joinitem[1])
-			} else if len(joinitem) == 3 {
-				sql_str = helper.StringJoin(sql_str, " ", joinitem[2], " join ", getTableName(dbName, joinitem[0]), " on ", joinitem[1])
-			} else { //默认左连接
-				sql_str = helper.StringJoin(sql_str, " left join ", getTableName(dbName, joinitem[0]), " on ", joinitem[1])
+			builder.WriteString(" ")
+			if len(joinitem) >= 3 {
+				builder.WriteString(joinitem[2])
+			} else {
+				builder.WriteString("left")
 			}
+			builder.WriteString(" join ")
+			if withSql != "" || strings.Contains(joinitem[0], "select ") || strings.HasPrefix(joinitem[0], "(") || len(joinitem) > 4 {
+				builder.WriteString(joinitem[0])
+			} else {
+				builder.WriteString(getTableName(dbName, joinitem[0]))
+			}
+			builder.WriteString(" on ")
+			builder.WriteString(joinitem[1])
+			boo = true
+		}
+		if boo {
+			sql_str = builder.String()
 		}
 	}
 	if len(where) > 0 || len(where_or) > 0 {
@@ -406,6 +444,7 @@ func GetRow(dbName, table_name, alias string, titles string, join [][]string, wh
 	}
 
 	if err != nil {
+		log.Println("DB error:", err)
 		rows.Close()
 		return count, info, err
 	}
@@ -436,6 +475,7 @@ func GetRow(dbName, table_name, alias string, titles string, join [][]string, wh
 	}
 	rows.Close()
 	if rowerr != nil {
+		log.Println("DB row error:", rowerr)
 		return count, info, rowerr
 	}
 	return count, info, nil
@@ -447,7 +487,7 @@ func GetRow(dbName, table_name, alias string, titles string, join [][]string, wh
  * @param dbName 数据表名
  * @param title  查询字段名
  */
-func FetchRows(dbName, table_name, alias string, titles string, join [][]string, where, where_or []string, valueList []interface{}, orderby, groupby, having string, page int, page_size int, debug bool) (int, []map[string]string, error) {
+func FetchRows(dbName, table_name, alias string, titles string, with, join [][]string, where, where_or []string, valueList []interface{}, orderby, groupby, having string, page int, page_size int, debug bool) (int, []map[string]string, error) {
 	var count int = 0
 	list := make([]map[string]string, 0)
 
@@ -455,7 +495,30 @@ func FetchRows(dbName, table_name, alias string, titles string, join [][]string,
 		return count, list, errors.New("没有数据表")
 	}
 	table := ""
-	if strings.Contains(table_name, "select ") {
+	withSql := ""
+	if len(with) > 0 {
+		var builder strings.Builder
+		builder.WriteString("WITH ")
+		boo := false
+		for k, v := range with {
+			if len(v) < 2 {
+				continue
+			}
+			if k != 0 {
+				builder.WriteString(", ")
+			}
+			builder.WriteString(v[1])
+			builder.WriteString(" as (")
+			builder.WriteString(v[0])
+			builder.WriteString(")")
+			boo = true
+		}
+		if boo {
+			builder.WriteString(" ")
+			withSql = builder.String()
+		}
+	}
+	if withSql != "" || strings.Contains(table_name, "select ") || strings.HasPrefix(table, "(") {
 		table = table_name
 	} else {
 		table = getTableName(dbName, table_name)
@@ -468,10 +531,11 @@ func FetchRows(dbName, table_name, alias string, titles string, join [][]string,
 	} else {
 		title = "*"
 	}
+
 	if DB_PROVIDER == "TencentDB" {
-		sql_str = helper.StringJoin("/*slave*/ select ", title)
+		sql_str = helper.StringJoin("/*slave*/ ", withSql, " select ", title)
 	} else {
-		sql_str = helper.StringJoin("select ", title)
+		sql_str = helper.StringJoin(withSql, "select ", title)
 	}
 	if alias != "" {
 		table = helper.StringJoin(table, " as ", alias)
@@ -480,17 +544,31 @@ func FetchRows(dbName, table_name, alias string, titles string, join [][]string,
 	sql_str = helper.StringJoin(sql_str, " from ", table)
 
 	if len(join) > 0 {
+		var builder strings.Builder
+		builder.WriteString(sql_str)
+		boo := false
 		for _, joinitem := range join {
 			if len(joinitem) < 2 {
 				continue
 			}
-			if len(joinitem) == 4 {
-				sql_str = helper.StringJoin(sql_str, " ", joinitem[2], " join ", joinitem[0], " on ", joinitem[1])
-			} else if len(joinitem) == 3 {
-				sql_str = helper.StringJoin(sql_str, " ", joinitem[2], " join ", getTableName(dbName, joinitem[0]), " on ", joinitem[1])
-			} else { //默认左连接
-				sql_str = helper.StringJoin(sql_str, " left join ", getTableName(dbName, joinitem[0]), " on ", joinitem[1])
+			builder.WriteString(" ")
+			if len(joinitem) >= 3 {
+				builder.WriteString(joinitem[2])
+			} else {
+				builder.WriteString("left")
 			}
+			builder.WriteString(" join ")
+			if withSql != "" || strings.Contains(joinitem[0], "select ") || strings.HasPrefix(joinitem[0], "(") || len(joinitem) >= 4 {
+				builder.WriteString(joinitem[0])
+			} else {
+				builder.WriteString(getTableName(dbName, joinitem[0]))
+			}
+			builder.WriteString(" on ")
+			builder.WriteString(joinitem[1])
+			boo = true
+		}
+		if boo {
+			sql_str = builder.String()
 		}
 	}
 

transaction.go

@@ -25,7 +25,7 @@ func TxInsert(tx *sql.Tx, dbname, table string, data map[string]string) (int64,
 	if strings.Contains(table, "select ") {
 		dbName = table
 	} else {
-		dbName = getTableName(dbName, table)
+		dbName = getTableName(dbname, table)
 	}
 	if len(data) < 1 {
 		return 0, errors.New("参数错误，没有要写入的数据")
@@ -186,7 +186,7 @@ func TxPreUpdate(tx *sql.Tx, dbname, table string, data []string, where []string
 	if strings.Contains(table, "select ") {
 		dbName = table
 	} else {
-		dbName = getTableName(dbName, table)
+		dbName = getTableName(dbname, table)
 	}
 
 	if len(where) < 1 {
@@ -228,7 +228,7 @@ func TxDelete(tx *sql.Tx, dbname, table string, where map[string]string, del_cou
 	if strings.Contains(table, "select ") {
 		dbName = table
 	} else {
-		dbName = getTableName(dbName, table)
+		dbName = getTableName(dbname, table)
 	}
 	if len(where) < 1 {
 		return count, errors.New("参数错误，没有删除条件")

transaction_chain.go

@@ -34,6 +34,7 @@ type TxQuery struct {
 	conn      *sql.DB
 	tx        *sql.Tx
 	debug     bool
+	with      [][]string //[[临时表的sql语句,临时表的名称]]
 }
 
 func NewTxQuery(t ...string) *TxQuery {
@@ -109,6 +110,14 @@ func (this *TxQuery) Where(where string) *TxQuery {
 	this.where = append(this.where, where)
 	return this
 }
+func (this *TxQuery) With(with []string) *TxQuery {
+	this.with = append(this.with, with)
+	return this
+}
+func (this *TxQuery) Withs(withs [][]string) *TxQuery {
+	this.with = append(this.with, withs...)
+	return this
+}
 func (this *TxQuery) Wheres(wheres []string) *TxQuery {
 	if len(wheres) > 0 {
 		this.where = append(this.where, wheres...)
@@ -147,6 +156,26 @@ func (this *TxQuery) Join(join []string) *TxQuery {
 	this.join = append(this.join, join)
 	return this
 }
+
+/**
+ * 左连接
+ * 2023/08/10
+ * gz
+ */
+func (this *TxQuery) LeftJoin(table_name string, condition string) *TxQuery {
+	this.join = append(this.join, []string{table_name, condition, "left"})
+	return this
+}
+
+/**
+ * 右连接
+ * 2023/08/10
+ * gz
+ */
+func (this *TxQuery) RightJoin(table_name string, condition string) *TxQuery {
+	this.join = append(this.join, []string{table_name, condition, "right"})
+	return this
+}
 func (this *TxQuery) Data(data string) *TxQuery {
 	this.data = append(this.data, data)
 	return this
@@ -177,16 +206,46 @@ func (this *TxQuery) Clean() *TxQuery {
 	this.save_data = this.save_data[0:0]
 	this.upd_field = this.upd_field[0:0]
 	this.having = ""
+	this.alias = ""
+	this.with = this.with[0:0]
 	return this
 }
 
-//构造子查询
+// 返回表名
+func (this *TxQuery) GetTableName(table string) string {
+	return getTableName(this.dbname, table)
+}
+
+// 构造子查询
 func (this *TxQuery) BuildSelectSql() (map[string]interface{}, error) {
 	if this.dbname == "" && this.table == "" {
 		return nil, errors.New("参数错误，没有数据表")
 	}
 	var table = ""
-	if strings.Contains(this.table, "select ") {
+	withSql := ""
+	if len(this.with) > 0 {
+		var builder strings.Builder
+		builder.WriteString("WITH ")
+		boo := false
+		for k, v := range this.with {
+			if len(v) < 2 {
+				continue
+			}
+			if k != 0 {
+				builder.WriteString(", ")
+			}
+			builder.WriteString(v[1])
+			builder.WriteString(" as (")
+			builder.WriteString(v[0])
+			builder.WriteString(")")
+			boo = true
+		}
+		if boo {
+			builder.WriteString(" ")
+			withSql = builder.String()
+		}
+	}
+	if withSql != "" || strings.Contains(this.table, "select ") || strings.HasPrefix(this.table, "(") {
 		table = this.table
 	} else {
 		table = getTableName(this.dbname, this.table)
@@ -199,7 +258,8 @@ func (this *TxQuery) BuildSelectSql() (map[string]interface{}, error) {
 	} else {
 		title = "*"
 	}
-	sql = helper.StringJoin("select ", title)
+
+	sql = helper.StringJoin(withSql, "select ", title)
 
 	if this.alias != "" {
 		table = helper.StringJoin(table, " as ", this.alias)
@@ -208,15 +268,31 @@ func (this *TxQuery) BuildSelectSql() (map[string]interface{}, error) {
 	sql = helper.StringJoin(sql, " from ", table)
 
 	if len(this.join) > 0 {
+		var builder strings.Builder
+		builder.WriteString(sql)
+		boo := false
 		for _, joinitem := range this.join {
 			if len(joinitem) < 2 {
 				continue
 			}
-			if len(joinitem) == 3 {
-				sql = helper.StringJoin(sql, " ", joinitem[2], " join ", getTableName(this.dbname, joinitem[0]), " on ", joinitem[1])
-			} else { //默认左连接
-				sql = helper.StringJoin(sql, " left join ", getTableName(this.dbname, joinitem[0]), " on ", joinitem[1])
+			builder.WriteString(" ")
+			if len(joinitem) >= 3 {
+				builder.WriteString(joinitem[2])
+			} else {
+				builder.WriteString("left")
+			}
+			builder.WriteString(" join ")
+			if withSql != "" || strings.Contains(joinitem[0], "select ") || strings.HasPrefix(joinitem[0], "(") {
+				builder.WriteString(joinitem[0])
+			} else {
+				builder.WriteString(getTableName(this.dbname, joinitem[0]))
 			}
+			builder.WriteString(" on ")
+			builder.WriteString(joinitem[1])
+			boo = true
+		}
+		if boo {
+			sql = builder.String()
 		}
 	}
 	if len(this.where) > 0 || len(this.where_or) > 0 {
@@ -278,7 +354,7 @@ func (this *TxQuery) BuildSelectSql() (map[string]interface{}, error) {
 	}, nil
 }
 
-//获取表格信息
+// 获取表格信息
 func (this *TxQuery) GetTableInfo(table string) (map[string]interface{}, error) {
 	field := []string{
 		"COLUMN_NAME",    //字段名
@@ -801,6 +877,26 @@ func (this *TxQuery) CreateAll() (int64, error) {
 	return StmtForInsertExec(this.stmt, this.value)
 }
 
+/**
+ * 执行原生sql
+ * return error
+ */
+func (this *TxQuery) ExecSql(sql string) (int64, error) {
+	if this.debug {
+		log.Println("ExecSql sql:", sql)
+	}
+	stmt, err = this.tx.Prepare(sql)
+
+	if err != nil {
+		return 0, err
+	}
+	res, err := stmt.Exec()
+	if err != nil {
+		return 0, errors.New("执行失败：" + err.Error())
+	}
+	return res.RowsAffected()
+}
+
 /**
  * 提交
  */