BuildSelectSql子查询兼容pgsql

README.md

@@ -1,3 +1,32 @@
 # dbquery
 
-数据库操作
+数据库操作
+
+## 链式查询使用
+```
+查询单条记录
+map,err := new(Query).Db(dbname).Table(tablename).Where("id=?").Where("name=?").Value(1).Value("test").Find()
+
+
+查询列表
+list,err := new(Query).Db(dbname).Table(tablename).Where("id=?").Where("name=?").Value(1).Value("test").Select()
+
+条件"或"
+list,err := new(Query).Db(dbname).Table(tablename).Where("id=?").Where("name=?").WhereOr("mobile=?").Value(1).Value("test").Value("22").Select()
+
+
+联表查
+使用Join 
+
+list,err := new(Query).Db(dbname).Table(tablename).Join([]string{jointable,tablename.id=jointable.cid,"LEFT"}).Where("id=?").Where("name=?").Value(1).Value("test").Select()
+
+更新
+ret,err := new(Query).Db(dbname).Table(tablename).Data("name=?").Data("depart=?").Value("xxx").Value("test").Update()
+
+
+插入
+ret,err := new(Query).Db(dbname).Table(tablename).Data("name=?").Data("depart=?").Value("xxx").Value("test").Create()
+
+删除
+ret,err := new(Query).Db(dbname).Table(tablename).Where("name=?").Where("depart=?").Value("xxx").Value("test").Delete()
+```

chain_test.go

@@ -0,0 +1,154 @@
+package dbquery
+
+import (
+	"fmt"
+	"testing"
+)
+
+// 测试各数据库下各种情况
+func Test_Chain(t *testing.T) {
+	//测试数据库连接
+	//err := Connect("127.0.0.1", "root", "root", "canyin", "3306")
+	err := PgConnect("192.168.233.151", "bin", "Bin123456", "canyin", "5432")
+	//err := DmConnect("192.168.233.148", "SHOPV2", "Bin123456", "", "5236")
+	//err := DmConnect("10.33.0.91", "ZYSG", "Zysg!#2025", "", "5236")
+	//err := DmConnect("10.33.0.91", "dbck", "dskk!#555", "", "5236")
+
+	if err != nil {
+		t.Log(err)
+	}
+	db_name := ""
+	table_name := "ttl_user_log"
+	//time := time.Now().Unix()
+
+	//================查询表结构===========
+	ret, err := new(Query).Db(db_name).GetTableInfo(table_name)
+	if err != nil {
+		t.Log(err)
+	}
+	fmt.Println("===GetTableInfo:", ret)
+
+	//==========获取信息=================
+	query := new(Query).Db(db_name).Clean().Table("ttl_dorm_goods_reserve").Alias("a").
+		Join([]string{"ttl_dorm_goods_reserve_detail b", "a.id=b.reserve_id", "left"}).
+		Join([]string{"ttl_dorm_goods c", "c.id=b.goods_id", "left"}).
+		Join([]string{"ttl_dorm_room d", "d.id=a.room_id", "left"}).
+		Join([]string{"dorm_room_item e", "e.id=a.room_item_id", "left"}).
+		Where("a.user_id =?").Value(6006)
+	info, err := query.Groupby("a.id").Title("a.id").BuildSelectSql()
+	//info, err := new(Query).Db(db_name).Clean().Table(table_name).Where("id=?").Value("3").Title("*").Find()
+	//info, err := new(Query).Db(db_name).Clean().Table(table_name).Clean().Alias("user").Join([]string{"ttl_user u", "u.id = user.user_id", "inner"}).Where("user.id=?").Value("3").Title("user.id,user.user_id,u.nickname").Find()
+	//info, err := GetDataByStmt(db_name, table_name, "*", []string{"id = ?"}, []interface{}{3}, nil)
+	if err != nil {
+		t.Log(err)
+	}
+	fmt.Println("===Find:", info)
+
+	//============获取列表==================
+	list, err := new(Query).Db(db_name).Clean().Table(table_name).Alias("u").Join([]string{"ttl_user user", "user.id = u.user_id", "inner"}).Where("user.id=?").Value(1).Title("user.id,user.nickname,user.status").Orderby("user.id desc").Page(1).PageSize(10).Select()
+	//list, err := DoQuery("select user.nickname,log.* from ttl_user user left join ttl_user_log log on user.id = log.user_id where user.id = ?", "1")
+	//list, err := GetListByStmt(db_name, table_name, "*", []string{"id = ?"}, []interface{}{3}, map[string]string{"id": "id asc"})
+	//list, err := QueryByStmt("select * from "+table_name+" where id < ?", []interface{}{10})
+	if err != nil {
+		t.Log(err)
+	}
+	fmt.Println("===List:", list)
+
+	//===========添加数据============
+	//insert_res, err := new(Query).Db(db_name).Clean().Table(table_name).Data("user_id=?").Value("1").Data("createtime=?").Value(time).Create()
+	//insert_res, err := InsertByStmt(db_name, table_name, []string{"user_id=?", "createtime=?"}, []interface{}{"1", time})
+	//insert_res, err := Insert(db_name, table_name, map[string]string{"user_id": "1", "createtime": helper.ToStr(time)})
+	//if err != nil {
+	//	t.Log(err)
+	//}
+	//fmt.Println("===Insert:", insert_res)
+
+	//================更新数据=====================
+	//update_res, err := new(Query).Db(db_name).Clean().Table(table_name).Data("user_id=?").Value("2").Data("createtime=?").Value(time).Where("id=?").Value("6").Update()
+	//update_res, err := UpdateByStmt(db_name, table_name, []string{"createtime=?", "user_id=?"}, []string{"id=?"}, []interface{}{time, 3, 6})
+	//if err != nil {
+	//	t.Log(err)
+	//}
+	//fmt.Println("===Update:", update_res)
+
+	//=============事务================
+	/*fmt.Println("================开启事务============")
+	tx, err := DB.Begin()
+	if err != nil {
+		t.Log(err)
+	}
+	update_log, err := TxPreUpdate(tx, db_name, table_name, []string{"createtime= ?"}, []string{"id=?"}, []interface{}{time, 2})
+	if err != nil {
+		tx.Rollback()
+		t.Log(err)
+	}
+	fmt.Println("===========事务执行:==================")
+	fmt.Println("===事务update：", update_log)
+
+	insert_log, err := TxPreInsert(tx, db_name, table_name, map[string]interface{}{"user_id": "1", "createtime": helper.ToStr(time)})
+	if err != nil {
+		tx.Rollback()
+		t.Log(err)
+	}
+	fmt.Println("===事务insert：", insert_log)
+
+	del_log, err := TxDelete(tx, db_name, table_name, map[string]string{"id": "2"})
+	if err != nil {
+		tx.Rollback()
+		t.Log(err)
+	}
+	fmt.Println("====事务delete:", del_log)
+
+	err = tx.Commit()
+	if err != nil {
+		t.Log(err)
+		tx.Rollback()
+	}
+	fmt.Println("=======事务执行完成==========")*/
+
+	/*fmt.Println("====================执行事务trans============")
+	trans := NewTxQuery().Db(db_name)
+
+	info_trans, err := trans.Clean().Table(table_name).Where("id = ?").Value(5).Find()
+	if err != nil {
+		trans.Rollback()
+		t.Log(err)
+	}
+	fmt.Println("===事务Find_trans:", info_trans)
+
+	list_trans, err := trans.Clean().Table(table_name).Title("*").Select()
+	if err != nil {
+		trans.Rollback()
+		t.Log(err)
+	}
+	fmt.Println("=========事务List_trans:", list_trans)
+
+	data := map[string]interface{}{
+		"user_id":    5,
+		"memo":       "test",
+		"createtime": time,
+	}
+
+	add_trans, err := trans.Clean().Table(table_name).SaveData(data).CreateAll()
+	if err != nil {
+		trans.Rollback()
+		t.Log(err)
+	}
+
+	fmt.Println("======事务Add_trans:", add_trans)
+
+	data["id"] = 15
+
+	update_trans_res, err := trans.Clean().Table(table_name).SaveData(data).UpdateAll()
+	if err != nil {
+		trans.Rollback()
+		t.Log(err)
+	}
+	fmt.Println("=======事务update_trans", update_trans_res)
+	err = trans.Commit()
+	if err != nil {
+		trans.Rollback()
+		t.Log(err)
+	}
+	fmt.Println("====================执行事务结束==================")*/
+}

common.go

@@ -0,0 +1,130 @@
+package dbquery
+
+import (
+	"fmt"
+	"git.tetele.net/tgo/helper"
+	"log"
+	"reflect"
+	"regexp"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// ===================达梦兼容===============
+// 非关键字可以不添加标识符，关键字须添加
+// 日期函数的使用TO_CHAR(TO_DATE('1970-01-01','yyyy-mm-dd') + (createtime / 86400), 'yyyy-mm-dd')
+// group_concat替换成LISTAGG
+// ========================================
+
+// 关键字替换-支持达梦和高斯
+func ReplaeByOtherSql(sql, sql_type, action string) string {
+	sql_type_arr := []string{"DmSql", "PgsqlDb"}
+	if !helper.IsInStringArray(sql_type_arr, sql_type) {
+		log.Println("sql_type error", sql_type)
+		return ""
+	}
+	// PgsqlDb用
+	if action == "add" {
+		sql = helper.StringJoin(sql, " RETURNING id")
+	}
+	// 定义需要处理的关键字列表
+	keywords := []string{"user", "order", "group", "table", "view", "admin", "new"}
+	if sql_type == "PgsqlDb" {
+		keywords = []string{"user", "order", "group"}
+	}
+
+	// 移除所有反引号
+	sql = strings.ReplaceAll(sql, "`", "")
+
+	// 使用单词边界 \b 确保只匹配完整单词
+	pattern := `\b(` + strings.Join(keywords, "|") + `)\b`
+	re := regexp.MustCompile(pattern)
+
+	//设置保护词组
+	excludePhrases := []string{
+		"order by", "group by",
+	}
+	//保护排除短语
+	phraseMap := make(map[string]string)
+	for i, phrase := range excludePhrases {
+		placeholder := fmt.Sprintf("__EXCLUDE_%d__", i)
+		phraseMap[placeholder] = phrase
+		sql = strings.Replace(sql, phrase, placeholder, -1)
+	}
+
+	// 执行替换
+	sql = re.ReplaceAllStringFunc(sql, func(match string) string {
+		// 检查匹配是否在字符串常量中
+		if isInStringLiteral(sql, match) {
+			return match
+		}
+
+		if sql_type == "DmSql" {
+			return "`" + match + "`"
+		} else {
+			return `"` + match + `"`
+		}
+	})
+
+	// 恢复排除短语
+	for placeholder, phrase := range phraseMap {
+		sql = strings.Replace(sql, placeholder, phrase, -1)
+	}
+
+	return sql
+}
+
+// 检查匹配是否在字符串常量中
+func isInStringLiteral(sql, match string) bool {
+	index := strings.Index(sql, match)
+	if index == -1 {
+		return false
+	}
+
+	// 检查匹配前的单引号数量
+	prefix := sql[:index]
+	singleQuotes := strings.Count(prefix, "'") - strings.Count(prefix, "\\'")
+
+	// 奇数表示在字符串常量中
+	return singleQuotes%2 != 0
+}
+
+// 字段值类型转换--针对达梦用
+func ToString(value interface{}) string {
+	switch v := value.(type) {
+	case string:
+		return v
+	case []byte:
+		return string(v)
+	case int, int8, int16, int32, int64:
+		return strconv.FormatInt(reflect.ValueOf(value).Int(), 10)
+	case uint, uint8, uint16, uint32, uint64:
+		return strconv.FormatUint(reflect.ValueOf(value).Uint(), 10)
+	case float32, float64:
+		return strconv.FormatFloat(reflect.ValueOf(value).Float(), 'f', -1, 64)
+	case bool:
+		return strconv.FormatBool(v)
+	case time.Time:
+		return v.Format("2006-01-02 15:04:05")
+	default:
+		return fmt.Sprintf("%v", v)
+	}
+}
+
+// 字符串切片元素追加前缀
+func addPrefixInField(slice []string, prefix string) []string {
+	new_slice := make([]string, len(slice))
+	for i, v := range slice {
+		new_slice[i] = prefix + v
+	}
+
+	return new_slice
+}
+
+func DmFieldDeal(fields string) string {
+	//移除所有反引号
+	title := strings.Replace(fields, "`", "", -1)
+
+	return title
+}

conn.go

@@ -2,46 +2,110 @@ package dbquery
 
 import (
 	"database/sql"
+	"fmt"
 	"log"
+	"net/url"
 
 	"errors"
 	"strings"
 	"time"
 
+	_ "dm"
 	"git.tetele.net/tgo/helper"
 
+	_ "gitee.com/opengauss/openGauss-connector-go-pq" // 高斯驱动（推荐）或 "github.com/lib/pq"
 	_ "github.com/go-sql-driver/mysql"
+	//_ "github.com/lib/pq" // 关键驱动导入
 )
 
 var DB *sql.DB
 
+var SLAVER_DB *sql.DB
+
+// db类型,默认空，如TencentDB（腾讯）,
+var DB_PROVIDER string
+
 func Connect(DBHOST, DBUSER, DBPWD, DBNAME, DBPORT string, conns ...int) error {
+	log.Println("mysql database connectting...")
 
-	log.Println("database connectting...")
 	var dbConnErr error
-	if DBHOST != "" && DBUSER != "" && DBPWD != "" && DBPORT != "" { //&& DBNAME != ""
+	const maxRetries = 10
 
-		for i := 0; i < 10; i++ {
+	if DBHOST == "" || DBUSER == "" || DBPWD == "" || DBPORT == "" {
+		return errors.New("mysql DBconnection params errors")
+	}
+
+	dsn := DBUSER + ":" + DBPWD + "@tcp(" + DBHOST + ":" + DBPORT + ")/" + DBNAME + "?charset=utf8mb4"
+
+	for i := 0; i < maxRetries; i++ {
+		//Open并不真正建立连接，它只是创建一个连接对象，实际的连接是延迟建立的。通过ping来检测（账号密码和网络问题）
+		// 每次尝试创建新连接对象
+		DB, dbConnErr = sql.Open("mysql", dsn)
+		if dbConnErr != nil {
+			log.Println("sql open failed:", i+1, dbConnErr)
 			time.Sleep(time.Second * 5)
-			DB, dbConnErr = sql.Open("mysql", DBUSER+":"+DBPWD+"@tcp("+DBHOST+":"+DBPORT+")/"+DBNAME+"?charset=utf8")
+			continue
+		}
+
+		// 验证连接有效性
+		if pingErr := DB.Ping(); pingErr != nil {
+			DB.Close()
+			// 记录真实错误信息
+			dbConnErr = pingErr
+			log.Println("ping failed:", i+1, pingErr)
+			time.Sleep(time.Second * 5)
+			continue
+		}
+
+		if len(conns) > 0 {
+			DB.SetMaxOpenConns(conns[0]) //用于设置最大打开的连接数，默认值为0表示不限制
+		} else {
+			DB.SetMaxOpenConns(200) //默认值为0表示不限制
+		}
+		if len(conns) > 1 {
+			DB.SetMaxIdleConns(conns[1]) //用于设置闲置的连接数
+		} else {
+			DB.SetMaxIdleConns(50)
+		}
+
+		log.Println("mysql database connected")
+		DB.SetConnMaxLifetime(time.Minute * 2)
+		return nil
+	}
+	return fmt.Errorf("after %d attempts: %w", maxRetries, dbConnErr)
+}
+
+func CloseConn() error {
+	return DB.Close()
+}
+
+func ConnectSlaver(DBHOST, DBUSER_SLAVER, DBPWD_SLAVER, DBNAME, DBPORT string, conns ...int) error {
+
+	log.Println("database connectting with slaver...")
+	var dbConnErr error
+	if DBHOST != "" && DBUSER_SLAVER != "" && DBPWD_SLAVER != "" && DBPORT != "" { //&& DBNAME != ""
+
+		for i := 0; i < 10; i++ {
+			SLAVER_DB, dbConnErr = sql.Open("mysql", DBUSER_SLAVER+":"+DBPWD_SLAVER+"@tcp("+DBHOST+":"+DBPORT+")/"+DBNAME+"?charset=utf8mb4")
 			if dbConnErr != nil {
 				log.Println("ERROR", "can not connect to Database, ", dbConnErr)
+				time.Sleep(time.Second * 5)
 			} else {
 				if len(conns) > 0 {
-					DB.SetMaxOpenConns(conns[0]) //用于设置最大打开的连接数，默认值为0表示不限制
+					SLAVER_DB.SetMaxOpenConns(conns[0]) //用于设置最大打开的连接数，默认值为0表示不限制
 				} else {
-					DB.SetMaxOpenConns(200) //默认值为0表示不限制
+					SLAVER_DB.SetMaxOpenConns(200) //默认值为0表示不限制
 				}
 				if len(conns) > 1 {
-					DB.SetMaxIdleConns(conns[1]) //用于设置闲置的连接数
+					SLAVER_DB.SetMaxIdleConns(conns[1]) //用于设置闲置的连接数
 				} else {
-					DB.SetMaxIdleConns(50)
+					SLAVER_DB.SetMaxIdleConns(50)
 				}
 
-				DB.Ping()
+				SLAVER_DB.Ping()
 
 				log.Println("database connected")
-				DB.SetConnMaxLifetime(time.Minute * 2)
+				SLAVER_DB.SetConnMaxLifetime(time.Minute * 2)
 				break
 			}
 		}
@@ -51,23 +115,56 @@ func Connect(DBHOST, DBUSER, DBPWD, DBNAME, DBPORT string, conns ...int) error {
 	return dbConnErr
 }
 
-func CloseConn() error {
-	return DB.Close()
+func CloseSlaverConn() error {
+	return SLAVER_DB.Close()
 }
 
 /**
  * 检测表名
  */
-func getTableName(dbName, table string) string {
+func getTableName(dbName, table string, dbtype ...string) string {
 
-	if strings.Contains(table, ".") {
-		return table
+	var db_type string = "mysql"
+	if DB_PROVIDER == "PgsqlDb" {
+		dbName = ""
+	} else if DB_PROVIDER == "DmSql" {
+		dbName = ""
 	}
-	if dbName != "" {
-		return helper.StringJoin(dbName, ".", table)
-	} else {
-		return table
+	if len(dbtype) > 0 {
+		if dbtype[0] != "" {
+			db_type = dbtype[0]
+		}
+	}
+
+	var ret string
+
+	switch db_type {
+
+	case "mysql":
+
+		if strings.Contains(table, ".") {
+			ret = table
+		}
+		if dbName != "" {
+			if strings.Contains(table, ",") {
+				arr := strings.Split(table, ",")
+				arrStrs := make([]string, 0, len(arr))
+				for _, v := range arr {
+					arrStrs = append(arrStrs, helper.StringJoin(dbName, ".", v))
+				}
+				ret = strings.Join(arrStrs, ",")
+			} else {
+				ret = helper.StringJoin(dbName, ".", table)
+			}
+		} else {
+			ret = table
+		}
+
+	case "mssql":
+		ret = helper.StringJoin(dbName, ".", table)
+
 	}
+	return ret
 }
 
 func GetDbTableName(dbName, table string) string {
@@ -77,3 +174,112 @@ func GetDbTableName(dbName, table string) string {
 func judg() []string {
 	return []string{"=", ">", "<", "!=", "<=", ">="}
 }
+
+// pgsql连接
+func PgConnect(DBHOST, DBUSER, DBPWD, DBNAME, DBPORT string, conns ...int) error {
+	log.Println("pg database connectting...")
+
+	var dbConnErr error
+	const maxRetries = 10
+	DB_PROVIDER = "PgsqlDb"
+
+	if DBHOST == "" || DBUSER == "" || DBPWD == "" || DBPORT == "" {
+		return errors.New("pgsql DBconnection params errors")
+	}
+
+	dsn := "host=" + DBHOST + " port=" + DBPORT + " user=" + DBUSER + " password=" + DBPWD + " dbname=" + DBNAME + " sslmode=disable search_path=public"
+	log.Println("database dsn", dsn)
+
+	for i := 0; i < maxRetries; i++ {
+		//Open并不真正建立连接，它只是创建一个连接对象，实际的连接是延迟建立的。通过ping来检测（账号密码和网络问题）
+		// 每次尝试创建新连接对象
+		DB, dbConnErr = sql.Open("opengauss", dsn)
+		if dbConnErr != nil {
+			log.Println("sql open failed:", i+1, dbConnErr)
+			time.Sleep(time.Second * 5)
+			continue
+		}
+
+		// 验证连接有效性
+		if pingErr := DB.Ping(); pingErr != nil {
+			DB.Close()
+			// 记录真实错误信息
+			dbConnErr = pingErr
+			log.Println("ping failed:", i+1, pingErr)
+			time.Sleep(time.Second * 5)
+			continue
+		}
+
+		if len(conns) > 0 {
+			DB.SetMaxOpenConns(conns[0]) //用于设置最大打开的连接数，默认值为0表示不限制
+		} else {
+			DB.SetMaxOpenConns(200) //默认值为0表示不限制
+		}
+		if len(conns) > 1 {
+			DB.SetMaxIdleConns(conns[1]) //用于设置闲置的连接数
+		} else {
+			DB.SetMaxIdleConns(50)
+		}
+
+		log.Println("pgsql database connected")
+		DB.SetConnMaxLifetime(time.Minute * 2)
+		return nil
+	}
+
+	return fmt.Errorf("after %d attempts: %w", maxRetries, dbConnErr)
+}
+
+// 达梦8连接
+func DmConnect(DBHOST, DBUSER, DBPWD, DBNAME, DBPORT string, conns ...int) error {
+	log.Println("DM database connectting...")
+
+	var dbConnErr error
+	const maxRetries = 10
+	DB_PROVIDER = "DmSql"
+
+	if DBHOST == "" || DBUSER == "" || DBPWD == "" || DBPORT == "" {
+		return errors.New("dm DBconnection params errors")
+	}
+	//达梦8如果密码存在特殊字符，需使用 url.PathEscape 进行转义后再放入连接串
+	DBPWD = url.PathEscape(DBPWD)
+	dsn := "dm://" + DBUSER + ":" + DBPWD + "@" + DBHOST + ":" + DBPORT + "?charSet=utf8&compatibleMode=mysql"
+	log.Println("database dsn", dsn)
+
+	for i := 0; i < maxRetries; i++ {
+		//Open并不真正建立连接，它只是创建一个连接对象，实际的连接是延迟建立的。通过ping来检测（账号密码和网络问题）
+		// 每次尝试创建新连接对象
+		DB, dbConnErr = sql.Open("dm", dsn)
+		if dbConnErr != nil {
+			log.Println("sql open failed:", i+1, dbConnErr)
+			time.Sleep(time.Second * 5)
+			continue
+		}
+
+		// 验证连接有效性
+		if pingErr := DB.Ping(); pingErr != nil {
+			DB.Close()
+			// 记录真实错误信息
+			dbConnErr = pingErr
+			log.Println("ping failed:", i+1, pingErr)
+			time.Sleep(time.Second * 5)
+			continue
+		}
+
+		if len(conns) > 0 {
+			DB.SetMaxOpenConns(conns[0]) //用于设置最大打开的连接数，默认值为0表示不限制
+		} else {
+			DB.SetMaxOpenConns(200) //默认值为0表示不限制
+		}
+		if len(conns) > 1 {
+			DB.SetMaxIdleConns(conns[1]) //用于设置闲置的连接数
+		} else {
+			DB.SetMaxIdleConns(50)
+		}
+
+		log.Println("dm database connected")
+		DB.SetConnMaxLifetime(time.Minute * 2)
+		return nil
+	}
+
+	return fmt.Errorf("after %d attempts: %w", maxRetries, dbConnErr)
+}

db.go

@@ -2,7 +2,9 @@ package dbquery
 
 import (
 	"database/sql"
+	"github.com/jmoiron/sqlx"
 	"log"
+	"strconv"
 
 	"errors"
 	"strings"
@@ -22,7 +24,11 @@ func Insert(dbName, table string, data map[string]string) (int64, error) {
 	if dbName == "" && table == "" {
 		return insertId, errors.New("没有数据表")
 	}
-	dbName = getTableName(dbName, table)
+	if strings.Contains(table, "select ") {
+		dbName = table
+	} else {
+		dbName = getTableName(dbName, table)
+	}
 
 	if len(data) < 1 {
 		return insertId, errors.New("没有要写入的数据")
@@ -39,16 +45,33 @@ func Insert(dbName, table string, data map[string]string) (int64, error) {
 		valueList[i] = value
 		i++
 	}
-
-	result, err := DB.Exec("insert into "+dbName+" ("+strings.Join(keyList, ",")+") value("+strings.Join(keyStr, ",")+")", valueList...)
-
-	if err != nil {
-		log.Println("ERROR|插入", dbName, "数据失败,", err)
-		return insertId, err
+	var Sql string
+	Sql = "insert into " + dbName + " (" + strings.Join(keyList, ",") + ") values (" + strings.Join(keyStr, ",") + ")"
+	if DB_PROVIDER == "PgsqlDb" {
+		Sql = sqlx.Rebind(sqlx.DOLLAR, Sql)
+		Sql = ReplaeByOtherSql(Sql, "PgsqlDb", "add")
+		stmt, err = DB.Prepare(Sql)
+		if err != nil {
+			return 0, errors.New("创建失败：" + err.Error())
+		}
+		row := stmt.QueryRow(valueList...)
+		var id int64
+		err = row.Scan(&id) // 扫描 RETURNING 返回的 ID
+		if err != nil {
+			return 0, errors.New("创建失败：" + err.Error())
+		}
+		return id, nil
 	} else {
-		insertId, _ = result.LastInsertId()
-		time.Sleep(time.Second * 2)
-		return insertId, nil
+		result, err := DB.Exec(Sql, valueList...)
+
+		if err != nil {
+			log.Println("ERROR|插入", dbName, "数据失败,", err)
+			return insertId, err
+		} else {
+			insertId, _ = result.LastInsertId()
+			time.Sleep(time.Second * 2)
+			return insertId, nil
+		}
 	}
 
 }
@@ -62,8 +85,11 @@ func Update(dbName, table string, data map[string]string, where map[string]strin
 	if dbName == "" && table == "" {
 		return rowsAffected, errors.New("没有数据表")
 	}
-
-	dbName = getTableName(dbName, table)
+	if strings.Contains(table, "select ") {
+		dbName = table
+	} else {
+		dbName = getTableName(dbName, table)
+	}
 	if len(data) < 1 {
 		return rowsAffected, errors.New("同有更新的数据")
 	}
@@ -100,7 +126,15 @@ func Update(dbName, table string, data map[string]string, where map[string]strin
 		log.Println("ERROR|修改数据表", dbName, "时条件中有空数据,条件：", where, "数据：", data)
 		return rowsAffected, errors.New("条件中有空数据")
 	}
-	result, err := DB.Exec("update "+dbName+" set "+strings.Join(keyList, " , ")+" where "+strings.Join(whereStr, " and "), valueList...)
+	var Sql string
+	Sql = "update " + dbName + " set " + strings.Join(keyList, " , ") + " where " + strings.Join(whereStr, " and ")
+	if DB_PROVIDER == "PgsqlDb" {
+		Sql = sqlx.Rebind(sqlx.DOLLAR, Sql)
+		Sql = ReplaeByOtherSql(Sql, "PgsqlDb", "")
+	} else if DB_PROVIDER == "DmSql" {
+		Sql = ReplaeByOtherSql(Sql, "DmSql", "")
+	}
+	result, err := DB.Exec(Sql, valueList...)
 
 	if err != nil {
 		log.Println("ERROR|修改", dbName, "数据失败,", err)
@@ -122,9 +156,11 @@ func Delete(dbName, table string, data map[string]string, del_count ...string) (
 	if dbName == "" && table == "" {
 		return count, errors.New("没有数据表")
 	}
-
-	dbName = getTableName(dbName, table)
-
+	if strings.Contains(table, "select ") {
+		dbName = table
+	} else {
+		dbName = getTableName(dbName, table)
+	}
 	if len(data) < 1 {
 		return count, errors.New("没有要删除的数据")
 	}
@@ -155,7 +191,15 @@ func Delete(dbName, table string, data map[string]string, del_count ...string) (
 		limitStr = " limit " + del_count[0]
 
 	}
-	result, err := DB.Exec("delete from "+dbName+" where "+strings.Join(keyList, " and ")+limitStr, valueList...)
+	var Sql string
+	Sql = "delete from " + dbName + " where " + strings.Join(keyList, " and ") + limitStr
+	if DB_PROVIDER == "PgsqlDb" {
+		Sql = sqlx.Rebind(sqlx.DOLLAR, Sql)
+		Sql = ReplaeByOtherSql(Sql, "PgsqlDb", "")
+	} else if DB_PROVIDER == "DmSql" {
+		Sql = ReplaeByOtherSql(Sql, "DmSql", "")
+	}
+	result, err := DB.Exec(Sql, valueList...)
 
 	if err != nil {
 		log.Println("ERROR|删除", dbName, "数据失败,", err)
@@ -179,7 +223,6 @@ func GetData(dbName, table string, title string, where map[string]string, limit
 	if dbName == "" && table == "" {
 		return count, info, errors.New("没有数据表")
 	}
-
 	dbName = getTableName(dbName, table)
 
 	if len(title) < 1 {
@@ -198,7 +241,11 @@ func GetData(dbName, table string, title string, where map[string]string, limit
 		if _, ok := limit["from"]; ok {
 			from = limit["from"]
 		}
-		limitStr += " limit " + from + ",1"
+		if DB_PROVIDER == "PgsqlDb" {
+			limitStr += " limit 1 OFFSET " + from
+		} else {
+			limitStr += " limit " + from + ",1"
+		}
 
 	} else {
 		limitStr = " limit 1"
@@ -229,8 +276,15 @@ func GetData(dbName, table string, title string, where map[string]string, limit
 	var err error
 	var queryNum int = 0
 	for queryNum < 3 { //如发生错误，继续查询3次，防止数据库连接断开问题
-
-		rows, err = DB.Query("SELECT "+title+" FROM "+dbName+" where "+strings.Join(keyList, " and ")+" "+limitStr, valueList...)
+		var Sql string
+		Sql = "SELECT " + title + " FROM " + dbName + " where " + strings.Join(keyList, " and ") + " " + limitStr
+		if DB_PROVIDER == "PgsqlDb" {
+			Sql = sqlx.Rebind(sqlx.DOLLAR, Sql)
+			Sql = ReplaeByOtherSql(Sql, "PgsqlDb", "")
+		} else if DB_PROVIDER == "DmSql" {
+			Sql = ReplaeByOtherSql(Sql, "DmSql", "")
+		}
+		rows, err = DB.Query(Sql, valueList...)
 
 		if err == nil {
 			break
@@ -262,8 +316,15 @@ func GetData(dbName, table string, title string, where map[string]string, limit
 		if rowerr == nil {
 			for i, col := range values {
 				if col != nil {
-					index = helper.StrFirstToUpper(columns[i])
-					info[index] = helper.ToString(col)
+					if DB_PROVIDER == "DmSql" {
+						//达梦返回全大写字段，需先转小写
+						index = helper.StrFirstToUpper(strings.ToLower(columns[i]))
+						//达梦返回的字段类型比较细，比如：int16、int32
+						info[index] = ToString(col)
+					} else {
+						index = helper.StrFirstToUpper(columns[i])
+						info[index] = helper.ToString(col)
+					}
 				}
 			}
 			count++
@@ -277,6 +338,431 @@ func GetData(dbName, table string, title string, where map[string]string, limit
 	return count, info, nil
 
 }
+
+/**
+ * 查找一条记录
+ * @param dbName 数据表名
+ * @param title  查询字段名
+ */
+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)
+
+	if dbName == "" && table_name == "" {
+		return count, info, errors.New("没有数据表")
+	}
+	table := ""
+	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)
+	}
+	var sql_str, title string
+
+	if titles != "" {
+		title = titles
+	} else {
+		title = "*"
+	}
+
+	if DB_PROVIDER == "TencentDB" {
+		sql_str = helper.StringJoin("/*slave*/ ", withSql, " select ", title)
+	} else {
+		sql_str = helper.StringJoin(withSql, "select ", title)
+	}
+	if alias != "" {
+		table = helper.StringJoin(table, " as ", alias)
+	}
+
+	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
+			}
+			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 {
+		sql_str = helper.StringJoin(sql_str, " where ")
+	}
+	if len(where) > 0 {
+		sql_str = helper.StringJoin(sql_str, " (", strings.Join(where, " and "), " ) ")
+	}
+	if len(where_or) > 0 {
+		if len(where) > 0 {
+			sql_str = helper.StringJoin(sql_str, " or ", strings.Join(where_or, " or "))
+		} else {
+			sql_str = helper.StringJoin(sql_str, strings.Join(where_or, " or "))
+		}
+	}
+	if groupby != "" {
+		sql_str = helper.StringJoin(sql_str, " group by ", groupby)
+	}
+	if having != "" {
+		sql_str = helper.StringJoin(sql_str, " having ", having)
+	}
+	if orderby != "" {
+		sql_str = helper.StringJoin(sql_str, " order by ", orderby)
+	}
+	if debug {
+		log.Println("query sql:", sql_str, valueList)
+	}
+
+	condition_len := 0 //所有条件数
+	for _, ch2 := range sql_str {
+		if string(ch2) == "?" {
+			condition_len++
+		}
+	}
+	if condition_len != len(valueList) {
+		return 0, nil, errors.New("参数错误，条件值错误")
+	}
+
+	var rows *sql.Rows
+	var err error
+	var queryNum int = 0
+
+	sql_str = helper.StringJoin(sql_str, " limit 1")
+
+	var db *sql.DB
+
+	if SLAVER_DB != nil {
+		db = SLAVER_DB
+	} else {
+		db = DB
+	}
+
+	for queryNum < 2 { //如发生错误，继续查询2次，防止数据库连接断开问题
+		if DB_PROVIDER == "PgsqlDb" {
+			sql_str = sqlx.Rebind(sqlx.DOLLAR, sql_str)
+			sql_str = ReplaeByOtherSql(sql_str, "PgsqlDb", "")
+		} else if DB_PROVIDER == "DmSql" {
+			sql_str = ReplaeByOtherSql(sql_str, "DmSql", "")
+		}
+
+		rows, err = db.Query(sql_str, valueList...)
+
+		if err == nil {
+			break
+		} else {
+			log.Println(err)
+
+			time.Sleep(time.Millisecond * 500)
+		}
+		queryNum++
+	}
+
+	if err != nil {
+		log.Println("DB error:", err)
+		rows.Close()
+		return count, info, err
+	}
+
+	columns, _ := rows.Columns()
+	scanArgs := make([]interface{}, len(columns))
+	values := make([]interface{}, len(columns))
+
+	for i := range values {
+		scanArgs[i] = &values[i]
+	}
+
+	var index string
+	var rowerr error
+	for rows.Next() {
+		rowerr = rows.Scan(scanArgs...)
+		if rowerr == nil {
+			for i, col := range values {
+				if col != nil {
+					if DB_PROVIDER == "DmSql" {
+						//达梦返回全大写字段，需先转小写
+						index = helper.StrFirstToUpper(strings.ToLower(columns[i]))
+						//达梦返回的字段类型比较细，比如：int16、int32
+						info[index] = ToString(col)
+					} else {
+						index = helper.StrFirstToUpper(columns[i])
+						info[index] = helper.ToString(col)
+					}
+				}
+			}
+			count++
+		} else {
+			log.Println("ERROR", rowerr)
+		}
+	}
+	rows.Close()
+	if rowerr != nil {
+		log.Println("DB row error:", rowerr)
+		return count, info, rowerr
+	}
+	return count, info, nil
+
+}
+
+/**
+ * 查找多条记录
+ * @param dbName 数据表名
+ * @param title  查询字段名
+ */
+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)
+
+	if dbName == "" && table_name == "" {
+		return count, list, errors.New("没有数据表")
+	}
+	table := ""
+	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)
+	}
+
+	var sql_str, title string
+
+	if titles != "" {
+		title = titles
+	} else {
+		title = "*"
+	}
+
+	if DB_PROVIDER == "TencentDB" {
+		sql_str = helper.StringJoin("/*slave*/ ", withSql, " select ", title)
+	} else {
+		sql_str = helper.StringJoin(withSql, "select ", title)
+	}
+	if alias != "" {
+		table = helper.StringJoin(table, " as ", alias)
+	}
+
+	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
+			}
+			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 {
+		sql_str = helper.StringJoin(sql_str, " where ")
+	}
+	if len(where) > 0 {
+		sql_str = helper.StringJoin(sql_str, " (", strings.Join(where, " and "), " ) ")
+	}
+	if len(where_or) > 0 {
+		if len(where) > 0 {
+			sql_str = helper.StringJoin(sql_str, " or ", strings.Join(where_or, " or "))
+		} else {
+			sql_str = helper.StringJoin(sql_str, strings.Join(where_or, " or "))
+		}
+	}
+	if groupby != "" {
+		sql_str = helper.StringJoin(sql_str, " group by ", groupby)
+	}
+	if having != "" {
+		sql_str = helper.StringJoin(sql_str, " HAVING ", having)
+	}
+	if orderby != "" {
+		sql_str = helper.StringJoin(sql_str, " order by ", orderby)
+	}
+
+	if page > 0 || page_size > 0 {
+
+		if page < 1 {
+			page = 1
+		}
+		if page_size < 1 {
+			page_size = 10
+		}
+		from := strconv.Itoa((page - 1) * page_size)
+		offset := strconv.Itoa(page_size)
+		if from != "" && offset != "" {
+			if DB_PROVIDER == "PgsqlDb" {
+				sql_str = helper.StringJoin(sql_str, " limit ", offset, " OFFSET ", from)
+			} else {
+				sql_str = helper.StringJoin(sql_str, " limit ", from, " , ", offset)
+			}
+		}
+	}
+	if debug {
+		log.Println("query sql:", sql_str, valueList)
+	}
+	condition_len := 0 //所有条件数
+	for _, ch2 := range sql_str {
+		if string(ch2) == "?" {
+			condition_len++
+		}
+	}
+	if condition_len != len(valueList) {
+		return 0, list, errors.New("参数错误，条件值错误")
+	}
+
+	var db *sql.DB
+	if SLAVER_DB != nil {
+		db = SLAVER_DB
+	} else {
+		db = DB
+	}
+	var rows *sql.Rows
+	var err error
+	var queryNum int = 0
+	for queryNum < 2 { //如发生错误，继续查询2次，防止数据库连接断开问题
+		if DB_PROVIDER == "PgsqlDb" {
+			sql_str = sqlx.Rebind(sqlx.DOLLAR, sql_str)
+			sql_str = ReplaeByOtherSql(sql_str, "PgsqlDb", "")
+		} else if DB_PROVIDER == "DmSql" {
+			sql_str = ReplaeByOtherSql(sql_str, "DmSql", "")
+		}
+		rows, err = db.Query(sql_str, valueList...)
+
+		if err == nil {
+			break
+		} else {
+			log.Println(err)
+
+			time.Sleep(time.Millisecond * 500)
+		}
+		queryNum++
+	}
+
+	if err != nil {
+		rows.Close()
+		return 0, list, err
+	}
+
+	columns, _ := rows.Columns()
+	scanArgs := make([]interface{}, len(columns))
+	values := make([]interface{}, len(columns))
+
+	for i := range values {
+		scanArgs[i] = &values[i]
+	}
+
+	var index string
+	var rowerr error
+	var info map[string]string
+
+	for rows.Next() {
+		rowerr = rows.Scan(scanArgs...)
+		info = make(map[string]string)
+		if rowerr == nil {
+			for i, col := range values {
+				if col != nil {
+					if DB_PROVIDER == "DmSql" {
+						//达梦返回全大写字段，需先转小写
+						index = helper.StrFirstToUpper(strings.ToLower(columns[i]))
+						//达梦返回的字段类型比较细，比如：int16、int32
+						info[index] = ToString(col)
+					} else {
+						index = helper.StrFirstToUpper(columns[i])
+						info[index] = helper.ToString(col)
+					}
+				}
+			}
+			count++
+		} else {
+			log.Println("ERROR", rowerr)
+		}
+		if len(info) > 0 {
+			list = append(list, info)
+		}
+	}
+
+	rows.Close()
+	return count, list, nil
+
+}
+
 func GetInfo(dbName, table string, title string, where map[string]string) (map[string]string, error) {
 
 	count, info, gzErr := GetData(dbName, table, title, where, nil)
@@ -301,9 +787,11 @@ func GetList(dbName, table string, title string, where map[string]string, limit
 	if dbName == "" && table == "" {
 		return list, errors.New("没有数据表")
 	}
-
-	dbName = getTableName(dbName, table)
-
+	if strings.Contains(table, "select ") {
+		dbName = table
+	} else {
+		dbName = getTableName(dbName, table)
+	}
 	var rows *sql.Rows
 	var err error
 	var queryNum int = 0
@@ -326,7 +814,12 @@ func GetList(dbName, table string, title string, where map[string]string, limit
 			from = limit["from"]
 		}
 		if offset != "0" && from != "" {
-			limitStr += " limit " + from + "," + offset
+
+			if DB_PROVIDER == "PgsqlDb" {
+				limitStr += " limit " + offset + " OFFSET " + from
+			} else {
+				limitStr += " limit " + from + "," + offset
+			}
 		}
 	}
 
@@ -360,8 +853,15 @@ func GetList(dbName, table string, title string, where map[string]string, limit
 		}
 
 		for queryNum < 5 { //如发生错误，继续查询5次，防止数据库连接断开问题
-
-			rows, err = DB.Query("select "+title+" from "+dbName+" where "+strings.Join(whereStr, " and ")+" "+limitStr, valueList...)
+			var Sql string
+			Sql = "select " + title + " from " + dbName + " where " + strings.Join(whereStr, " and ") + " " + limitStr
+			if DB_PROVIDER == "PgsqlDb" {
+				Sql = sqlx.Rebind(sqlx.DOLLAR, Sql)
+				Sql = ReplaeByOtherSql(Sql, "PgsqlDb", "")
+			} else if DB_PROVIDER == "DmSql" {
+				Sql = ReplaeByOtherSql(Sql, "DmSql", "")
+			}
+			rows, err = DB.Query(Sql, valueList...)
 
 			if err == nil {
 				break
@@ -406,8 +906,15 @@ func GetList(dbName, table string, title string, where map[string]string, limit
 
 		for i, col := range values {
 			if col != nil {
-				index = helper.StrFirstToUpper(columns[i])
-				record[index] = helper.ToString(col)
+				if DB_PROVIDER == "DmSql" {
+					//达梦返回全大写字段，需先转小写
+					index = helper.StrFirstToUpper(strings.ToLower(columns[i]))
+					//达梦返回的字段类型比较细，比如：int16、int32
+					record[index] = ToString(col)
+				} else {
+					index = helper.StrFirstToUpper(columns[i])
+					record[index] = helper.ToString(col)
+				}
 			}
 		}
 		list = append(list, record)
@@ -425,8 +932,11 @@ func GetTotal(dbName, table string, args ...string) (total int) {
 	if dbName == "" && table == "" {
 		return
 	}
-
-	dbName = getTableName(dbName, table)
+	if strings.Contains(table, "select ") {
+		dbName = table
+	} else {
+		dbName = getTableName(dbName, table)
+	}
 
 	var title string = "*"
 
@@ -439,7 +949,6 @@ func GetTotal(dbName, table string, args ...string) (total int) {
 	var queryNum int = 0
 
 	for queryNum < 5 { //如发生错误，继续查询5次，防止数据库连接断开问题
-
 		rows, err = DB.Query("select count(" + title + ") as count from " + dbName + " limit 1")
 
 		if err == nil {
@@ -480,7 +989,11 @@ func GetCount(dbName, table string, where map[string]string, args ...string) (to
 	if dbName == "" && table == "" {
 		return
 	}
-	dbName = getTableName(dbName, table)
+	if strings.Contains(table, "select ") {
+		dbName = table
+	} else {
+		dbName = getTableName(dbName, table)
+	}
 
 	var title string = "*"
 
@@ -519,7 +1032,15 @@ func GetCount(dbName, table string, where map[string]string, args ...string) (to
 
 		for queryNum < 5 { //如发生错误，继续查询5次，防止数据库连接断开问题
 
-			rows, err = DB.Query("select count("+title+") as count from "+dbName+" where "+strings.Join(whereStr, " and ")+" limit 1", valueList...)
+			var Sql string
+			Sql = "select count(" + title + ") as count from " + dbName + " where " + strings.Join(whereStr, " and ") + " limit 1"
+			if DB_PROVIDER == "PgsqlDb" {
+				Sql = sqlx.Rebind(sqlx.DOLLAR, Sql)
+				Sql = ReplaeByOtherSql(Sql, "PgsqlDb", "")
+			} else if DB_PROVIDER == "DmSql" {
+				Sql = ReplaeByOtherSql(Sql, "DmSql", "")
+			}
+			rows, err = DB.Query(Sql, valueList...)
 
 			if err == nil {
 				break
@@ -578,6 +1099,12 @@ func DoQuery(args ...interface{}) ([]map[string]string, error) {
 
 	for queryNum < 3 { //如发生错误，继续查询5次，防止数据库连接断开问题
 		if len(args) > 1 {
+			if DB_PROVIDER == "PgsqlDb" {
+				queryStr = sqlx.Rebind(sqlx.DOLLAR, queryStr)
+				queryStr = ReplaeByOtherSql(queryStr, "PgsqlDb", "")
+			} else if DB_PROVIDER == "DmSql" {
+				queryStr = ReplaeByOtherSql(queryStr, "DmSql", "")
+			}
 			rows, err = DB.Query(queryStr, args[1:]...) //strings.Join(args[1:], ",")
 			if err != nil {
 				log.Println("ERROR|DoQuery error:", err)
@@ -618,8 +1145,15 @@ func DoQuery(args ...interface{}) ([]map[string]string, error) {
 
 		for i, col := range values {
 			if col != nil {
-				index = helper.StrFirstToUpper(columns[i])
-				record[index] = helper.ToString(col)
+				if DB_PROVIDER == "DmSql" {
+					//达梦返回全大写字段，需先转小写
+					index = helper.StrFirstToUpper(strings.ToLower(columns[i]))
+					//达梦返回的字段类型比较细，比如：int16、int32
+					record[index] = ToString(col)
+				} else {
+					index = helper.StrFirstToUpper(columns[i])
+					record[index] = helper.ToString(col)
+				}
 			}
 		}
 		list = append(list, record)

db_test.go

@@ -1,11 +1,87 @@
 package dbquery
 
 import (
+	"log"
 	"testing"
 )
 
-func Test_GetTotal(t *testing.T) {
-	Connect()
-	total := GetTotal("dev_tetel_net", TABLE_CONFIG, "id")
-	t.Log(total)
+func Test_Connet(t *testing.T) {
+	for i := 0; i < 1; i++ {
+		dbhost := "localhost"
+		dbname := "shop"
+		dbusername := "tetele"
+		dbpassword := "fly123456"
+		dbport := "3306"
+		table := "ttl_order_product"
+		err := Connect(dbhost, dbusername, dbpassword, dbname, dbport)
+
+		if err != nil {
+			log.Println(err.Error())
+		}
+
+		//_,err = new(Query).Db(dbname).Table("ttl_user").Where("id > 0").Select()
+
+		// _, err = new(Query).Db(dbname).Table("ttl_news").
+		// 	Datas([]string{"title=?", "content=?"}).
+		// 	Values([]interface{}{"aaaaaaaaa", "bbbbbb"}).Create()
+
+		title := "op.id,op.sn,op.order_price"
+		alias := "op"
+		join := [][]string{}
+		join = append(join, []string{"ttl_product as p", "op.product_id=p.id"})
+		where := []string{}
+		where_or := []string{}
+		valueList := []interface{}{}
+		orderby := "id desc"
+		debug := true
+
+		//count, row, err := GetRow(dbname, table, alias, title, join, where, where_or, valueList, orderby, debug)
+		count, row, err := FetchRows(dbname, table, alias, title, join, join, where, where_or, valueList, orderby, "", "", 1, 10, debug)
+
+		log.Println(count)
+		log.Println(row)
+		log.Println(err)
+		if err != nil {
+			log.Println(err.Error())
+		}
+	}
+}
+
+func Test_Query(t *testing.T) {
+	token := "67c121aa-6e1c-011f-ebb6-976d855fd777"
+	dbhost := "192.168.233.134"
+	dbname := "canyin"
+	dbusername := "bin"
+	dbpassword := "Bin123456"
+	dbport := "5432"
+	table := "ttl_user_token"
+	err := PgConnect(dbhost, dbusername, dbpassword, dbname, dbport)
+
+	if err != nil {
+		log.Println(err.Error())
+	}
+
+	title := "user.*,ut.expiretime"
+	alias := "ut"
+	join := [][]string{}
+	join = append(join, []string{"ttl_user as user", "ut.user_id= user.id"})
+	where := []string{
+		"ut.token=?",
+	}
+	where_or := []string{}
+	valueList := []interface{}{
+		token,
+	}
+	orderby := ""
+	debug := true
+
+	count, row, err := GetRow(dbname, table, alias, title, [][]string{}, join, where, where_or, valueList, orderby, "", "", debug)
+	//count, row, err := FetchRows(dbname, table, alias, title, join, join, where, where_or, valueList, orderby, "", "", 1, 10, debug)
+
+	log.Println(count)
+	log.Println(row)
+	log.Println(err)
+	if err != nil {
+		log.Println(err.Error())
+	}
 }

go.mod

@@ -0,0 +1,23 @@
+module git.tetele.net/tgo/dbquery
+
+go 1.23.0
+
+toolchain go1.24.0
+
+require (
+	git.tetele.net/tgo/helper v0.1.0
+	gitee.com/opengauss/openGauss-connector-go-pq v1.0.7
+	github.com/denisenkom/go-mssqldb v0.11.0
+	github.com/go-sql-driver/mysql v1.8.1
+	github.com/jmoiron/sqlx v1.4.0
+)
+
+require (
+	filippo.io/edwards25519 v1.1.0 // indirect
+	github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect
+	github.com/golang/snappy v1.0.0 // indirect
+	github.com/tjfoc/gmsm v1.4.1 // indirect
+	golang.org/x/crypto v0.40.0 // indirect
+	golang.org/x/text v0.28.0 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+)

go.sum

@@ -0,0 +1,118 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
+filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
+git.tetele.net/tgo/helper v0.1.0 h1:ZdsBXUWX3+22ZzHTZRldBfBsQwu+CwUH8qScUvpgimE=
+git.tetele.net/tgo/helper v0.1.0/go.mod h1:shYQE/hvMy3fOE8JXKGxvywOXiz3M5Nw4e+u7HR8+NY=
+gitee.com/opengauss/openGauss-connector-go-pq v1.0.7 h1:plLidoldV5RfMU6i/I+tvRKtP3sfDyUzQ//HGXLLsZo=
+gitee.com/opengauss/openGauss-connector-go-pq v1.0.7/go.mod h1:2UEp+ug6ls6C0pLfZgBn7VBzBntFUzxJuy+6FlQ7qyI=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/denisenkom/go-mssqldb v0.11.0 h1:9rHa233rhdOyrz2GcP9NM+gi2psgJZ4GWDpL/7ND8HI=
+github.com/denisenkom/go-mssqldb v0.11.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
+github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
+github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
+github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs=
+github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
+github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
+github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
+github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/tjfoc/gmsm v1.4.1 h1:aMe1GlZb+0bLjn+cKTPEvvn9oUEBlJitaZiiBwsbgho=
+github.com/tjfoc/gmsm v1.4.1/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVcTE=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
+golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
+golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

prepare.go

@@ -3,6 +3,7 @@ package dbquery
 import (
 	"database/sql"
 	"errors"
+	"github.com/jmoiron/sqlx"
 	"log"
 	"strings"
 
@@ -41,8 +42,11 @@ func StmtForRead(dbName, table string, title string, where []string, limit map[s
 			offset = limit["offset"]
 		}
 		if from != "" && offset != "" {
-
-			limitStr += " limit " + from + "," + offset
+			if DB_PROVIDER == "PgsqlDb" {
+				limitStr += " limit " + offset + " OFFSET " + from
+			} else {
+				limitStr += " limit " + from + "," + offset
+			}
 		}
 
 	}
@@ -52,7 +56,15 @@ func StmtForRead(dbName, table string, title string, where []string, limit map[s
 
 	if len(where) > 0 {
 		// log.Println("SELECT " + title + " FROM " + dbName + " where " + strings.Join(where, " and ") + limitStr)
-		stmt, err = DB.Prepare("SELECT " + title + " FROM " + dbName + " where " + strings.Join(where, " and ") + limitStr)
+		var Sql string
+		Sql = "SELECT " + title + " FROM " + dbName + " where " + strings.Join(where, " and ") + limitStr
+		if DB_PROVIDER == "PgsqlDb" {
+			Sql = sqlx.Rebind(sqlx.DOLLAR, Sql)
+			Sql = ReplaeByOtherSql(Sql, "PgsqlDb", "")
+		} else if DB_PROVIDER == "DmSql" {
+			Sql = ReplaeByOtherSql(Sql, "DmSql", "")
+		}
+		stmt, err = DB.Prepare(Sql)
 	} else {
 		// log.Println("SELECT " + title + " FROM " + dbName + limitStr)
 		stmt, err = DB.Prepare("SELECT " + title + " FROM " + dbName + limitStr)
@@ -75,8 +87,6 @@ func StmtForQueryList(stmt *sql.Stmt, valuelist []interface{}) ([]map[string]str
 		return nil, errors.New("缺少必要参数")
 	}
 
-	// log.Println(valuelist...)
-
 	rows, err := stmt.Query(valuelist...)
 	defer stmt.Close()
 	if err != nil {
@@ -106,8 +116,15 @@ func StmtForQueryList(stmt *sql.Stmt, valuelist []interface{}) ([]map[string]str
 		if rowerr == nil {
 			for i, col := range values {
 				if col != nil {
-					index = helper.StrFirstToUpper(columns[i])
-					info[index] = helper.ToString(col)
+					if DB_PROVIDER == "DmSql" {
+						//达梦返回全大写字段，需先转小写
+						index = helper.StrFirstToUpper(strings.ToLower(columns[i]))
+						//达梦返回的字段类型比较细，比如：int16、int32
+						info[index] = ToString(col)
+					} else {
+						index = helper.StrFirstToUpper(columns[i])
+						info[index] = helper.ToString(col)
+					}
 				}
 			}
 		} else {
@@ -154,8 +171,15 @@ func StmtForQueryRow(stmt *sql.Stmt, valuelist []interface{}) (map[string]string
 		if rowerr == nil {
 			for i, col := range values {
 				if col != nil {
-					index = helper.StrFirstToUpper(columns[i])
-					info[index] = helper.ToString(col)
+					if DB_PROVIDER == "DmSql" {
+						//达梦返回全大写字段，需先转小写
+						index = helper.StrFirstToUpper(strings.ToLower(columns[i]))
+						//达梦返回的字段类型比较细，比如：int16、int32
+						info[index] = ToString(col)
+					} else {
+						index = helper.StrFirstToUpper(columns[i])
+						info[index] = helper.ToString(col)
+					}
 				}
 			}
 		} else {
@@ -186,8 +210,15 @@ func StmtForUpdate(dbName, table string, data []string, where []string) (*sql.St
 
 	var stmt *sql.Stmt
 	var err error
-
-	stmt, err = DB.Prepare("update " + dbName + " set " + strings.Join(data, " , ") + " where " + strings.Join(where, " and "))
+	var Sql string
+	Sql = "update " + dbName + " set " + strings.Join(data, " , ") + " where " + strings.Join(where, " and ")
+	if DB_PROVIDER == "PgsqlDb" {
+		Sql = sqlx.Rebind(sqlx.DOLLAR, Sql)
+		Sql = ReplaeByOtherSql(Sql, "PgsqlDb", "")
+	} else if DB_PROVIDER == "DmSql" {
+		Sql = ReplaeByOtherSql(Sql, "DmSql", "")
+	}
+	stmt, err = DB.Prepare(Sql)
 
 	return stmt, err
 }
@@ -224,7 +255,41 @@ func StmtForInsert(dbName, table string, data []string) (*sql.Stmt, error) {
 	var stmt *sql.Stmt
 	var err error
 
-	stmt, err = DB.Prepare("insert into " + dbName + " set " + strings.Join(data, " , "))
+	var sql string
+	if DB_PROVIDER == "PgsqlDb" || DB_PROVIDER == "DmSql" {
+		insert_data := []string{}
+		value_data := []string{}
+		for _, rv := range data {
+			dv := strings.Split(rv, "=")
+			if len(dv) < 2 {
+				return nil, errors.New("参数错误，条件值错误,=号不存在")
+			}
+			if strings.Contains(rv, "?") {
+				insert_data = append(insert_data, dv[0])
+				value_data = append(value_data, "?")
+			} else {
+				insert_data = append(insert_data, dv[0])
+				value_data = append(value_data, dv[1])
+			}
+
+		}
+		sql = helper.StringJoin("insert into ", dbName, " ("+strings.Join(insert_data, " , ")+")", " VALUES ", "("+strings.Join(value_data, " , ")+")")
+
+		if DB_PROVIDER == "PgsqlDb" {
+			sql = helper.StringJoin(sql, " RETURNING id")
+		}
+	} else {
+		sql = helper.StringJoin("insert into ", dbName, " set ", strings.Join(data, " , "))
+	}
+	if DB_PROVIDER == "PgsqlDb" {
+		sql = sqlx.Rebind(sqlx.DOLLAR, sql)
+		sql = ReplaeByOtherSql(sql, "PgsqlDb", "")
+	} else if DB_PROVIDER == "DmSql" {
+		sql = ReplaeByOtherSql(sql, "DmSql", "")
+	}
+
+	//stmt, err = DB.Prepare("insert into " + dbName + " set " + strings.Join(data, " , "))
+	stmt, err = DB.Prepare(sql)
 
 	return stmt, err
 }
@@ -234,11 +299,23 @@ func StmtForInsert(dbName, table string, data []string) (*sql.Stmt, error) {
  * @return lastId error
  */
 func StmtForInsertExec(stmt *sql.Stmt, valuelist []interface{}) (int64, error) {
-	res, err := stmt.Exec(valuelist...)
-	if err != nil {
-		return 0, errors.New("创建失败：" + err.Error())
+	if DB_PROVIDER == "PgsqlDb" {
+		row := stmt.QueryRow(valuelist...)
+		var id int64
+		err = row.Scan(&id) // 扫描 RETURNING 返回的 ID
+		if err != nil {
+			return 0, errors.New("创建失败：" + err.Error())
+		}
+		return id, nil
+
+	} else {
+		res, err := stmt.Exec(valuelist...)
+		if err != nil {
+			return 0, errors.New("创建失败：" + err.Error())
+		}
+		return res.LastInsertId()
 	}
-	return res.LastInsertId()
+
 }
 
 /**
@@ -350,7 +427,12 @@ func StmtForQuery(querysql string) (*sql.Stmt, error) {
 
 	var stmt *sql.Stmt
 	var err error
-
+	if DB_PROVIDER == "PgsqlDb" {
+		querysql = sqlx.Rebind(sqlx.DOLLAR, querysql)
+		querysql = ReplaeByOtherSql(querysql, "PgsqlDb", "")
+	} else if DB_PROVIDER == "DmSql" {
+		querysql = ReplaeByOtherSql(querysql, "DmSql", "")
+	}
 	stmt, err = DB.Prepare(querysql)
 
 	return stmt, err

sqlserver.go

@@ -0,0 +1,70 @@
+package dbquery
+
+import (
+	"database/sql"
+	"errors"
+	"fmt"
+	"strconv"
+
+	"log"
+
+	"time"
+
+	_ "github.com/denisenkom/go-mssqldb"
+)
+
+var MSDB_CONN *sql.DB
+
+func MSConnect(DBHOST, DBUSER, DBPWD, DBNAME, DBPORT, encrypt string, conns ...int) error {
+
+	log.Println("msdb connectting...")
+
+	var dbConnErr error
+
+	if DBHOST != "" && DBUSER != "" && DBPWD != "" && DBPORT != "" { //&& DBNAME != ""
+
+		for i := 0; i < 10; i++ {
+
+			//连接字符串
+
+			db_port, _ := strconv.Atoi(DBPORT)
+
+			params := "server=%s;port=%d;database=%s;user id=%s;password=%s"
+			if encrypt != "" {
+				params = params + ";encrypt=" + encrypt
+			}
+
+			connString := fmt.Sprintf(params, DBHOST, db_port, DBNAME, DBUSER, DBPWD)
+
+			log.Println(connString)
+
+			//建立连接
+
+			MSDB_CONN, dbConnErr = sql.Open("mssql", connString)
+
+			if dbConnErr != nil {
+				log.Println("ERROR", "can not connect to Database, ", dbConnErr)
+				time.Sleep(time.Second * 5)
+			} else {
+
+				err = MSDB_CONN.Ping()
+
+				log.Println("msdb connected", err)
+
+				break
+			}
+		}
+
+	} else {
+		return errors.New("msdb connection params errors")
+	}
+
+	return dbConnErr
+}
+
+func CloseMSConn() error {
+	if MSDB_CONN != nil {
+		return MSDB_CONN.Close()
+	}
+	return nil
+}

transaction.go

@@ -6,6 +6,8 @@ package dbquery
 import (
 	"database/sql"
 	"errors"
+	"git.tetele.net/tgo/helper"
+	"github.com/jmoiron/sqlx"
 	"log"
 	"strings"
 	"time"
@@ -21,7 +23,12 @@ func TxInsert(tx *sql.Tx, dbname, table string, data map[string]string) (int64,
 	if dbname == "" && table == "" {
 		return 0, errors.New("参数错误，没有数据表")
 	}
-	dbName := getTableName(dbname, table)
+	dbName := ""
+	if strings.Contains(table, "select ") {
+		dbName = table
+	} else {
+		dbName = getTableName(dbname, table)
+	}
 	if len(data) < 1 {
 		return 0, errors.New("参数错误，没有要写入的数据")
 	}
@@ -38,16 +45,33 @@ func TxInsert(tx *sql.Tx, dbname, table string, data map[string]string) (int64,
 		valueList[i] = value
 		i++
 	}
-
-	result, err := tx.Exec("insert into "+dbName+" ("+strings.Join(keyList, ",")+") value("+strings.Join(keyStr, ",")+")", valueList...)
-
-	if err != nil {
-		log.Println("ERROR", "insert into ", dbName, "error:", err)
-		return insertId, err
+	if DB_PROVIDER == "PgsqlDb" {
+		var Sql string
+		Sql = "insert into " + dbName + " (" + strings.Join(keyList, ",") + ") values (" + strings.Join(keyStr, ",") + ")"
+		Sql = sqlx.Rebind(sqlx.DOLLAR, Sql)
+		Sql = ReplaeByOtherSql(Sql, "PgsqlDb", "add")
+		stmt, err = tx.Prepare(Sql)
+		if err != nil {
+			return 0, errors.New("创建失败：" + err.Error())
+		}
+		row := stmt.QueryRow(valueList...)
+		var id int64
+		err = row.Scan(&id) // 扫描 RETURNING 返回的 ID
+		if err != nil {
+			return 0, errors.New("创建失败：" + err.Error())
+		}
+		return id, nil
 	} else {
-		insertId, _ = result.LastInsertId()
-		time.Sleep(time.Second * 2)
-		return insertId, nil
+		result, err := tx.Exec("insert into "+dbName+" ("+strings.Join(keyList, ",")+") value("+strings.Join(keyStr, ",")+")", valueList...)
+
+		if err != nil {
+			log.Println("ERROR", "insert into ", dbName, "error:", err)
+			return insertId, err
+		} else {
+			insertId, _ = result.LastInsertId()
+			time.Sleep(time.Second * 2)
+			return insertId, nil
+		}
 	}
 
 }
@@ -62,7 +86,12 @@ func TxPreInsert(tx *sql.Tx, dbname, table string, data map[string]interface{})
 		return 0, errors.New("params error,no db or table")
 	}
 
-	dbName := getTableName(dbname, table)
+	dbName := ""
+	if strings.Contains(table, "select ") {
+		dbName = table
+	} else {
+		dbName = getTableName(dbname, table)
+	}
 
 	if len(data) < 1 {
 		return 0, errors.New("params error,no data to insert")
@@ -74,28 +103,52 @@ func TxPreInsert(tx *sql.Tx, dbname, table string, data map[string]interface{})
 
 	var field []string = make([]string, len(data))
 	var valuelist []interface{} = make([]interface{}, len(data))
-
+	insert_data := []string{}
+	value_data := []string{}
 	var i int = 0
 	for key, item := range data {
 		field[i] = key + "=?"
 		valuelist[i] = item
 		i++
+		insert_data = append(insert_data, key)
+		value_data = append(value_data, "?")
 	}
+	if DB_PROVIDER == "PgsqlDb" {
+		Sql := helper.StringJoin("insert into ", dbName, " ("+strings.Join(insert_data, " , ")+")", " VALUES ", "("+strings.Join(value_data, " , ")+")")
+		Sql = sqlx.Rebind(sqlx.DOLLAR, Sql)
+		Sql = ReplaeByOtherSql(Sql, "PgsqlDb", "add")
+		stmt, err = tx.Prepare(Sql)
+		if err != nil {
+			return 0, errors.New("创建失败：" + err.Error())
+		}
+		row := stmt.QueryRow(valuelist...)
+		var id int64
+		err = row.Scan(&id) // 扫描 RETURNING 返回的 ID
+		if err != nil {
+			return 0, errors.New("创建失败：" + err.Error())
+		}
+		return id, nil
+	} else {
 
-	sql := "insert into " + dbName + " set " + strings.Join(field, " , ")
-	stmt, err = tx.Prepare(sql)
+		sql := "insert into " + dbName + " set " + strings.Join(field, " , ")
+		if DB_PROVIDER == "DmSql" {
+			sql = helper.StringJoin("insert into ", dbName, " ("+strings.Join(insert_data, " , ")+")", " VALUES ", "("+strings.Join(value_data, " , ")+")")
+			sql = ReplaeByOtherSql(sql, "DmSql", "")
+		}
+		stmt, err = tx.Prepare(sql)
 
-	if err != nil {
-		log.Println("insert prepare error:", sql, err)
-		return 0, errors.New("insert prepare error：" + err.Error())
-	}
-	result, err := stmt.Exec(valuelist...)
-	if err != nil {
-		log.Println("insert exec error：", sql, valuelist, err)
-		return 0, errors.New("insert exec error：" + err.Error())
+		if err != nil {
+			log.Println("insert prepare error:", sql, err)
+			return 0, errors.New("insert prepare error：" + err.Error())
+		}
+		result, err := stmt.Exec(valuelist...)
+		if err != nil {
+			log.Println("insert exec error：", sql, valuelist, err)
+			return 0, errors.New("insert exec error：" + err.Error())
+		}
+		insertId, _ := result.LastInsertId()
+		return insertId, nil
 	}
-	insertId, _ := result.LastInsertId()
-	return insertId, nil
 
 }
 
@@ -108,7 +161,12 @@ func TxUpdate(tx *sql.Tx, dbname, table string, data map[string]string, where ma
 	if dbname == "" && table == "" {
 		return rowsAffected, errors.New("参数错误，没有数据表")
 	}
-	dbName := getTableName(dbname, table)
+	dbName := ""
+	if strings.Contains(table, "select ") {
+		dbName = table
+	} else {
+		dbName = getTableName(dbname, table)
+	}
 	if len(data) < 1 {
 		return rowsAffected, errors.New("参数错误，没有要写入的数据")
 	}
@@ -145,7 +203,15 @@ func TxUpdate(tx *sql.Tx, dbname, table string, data map[string]string, where ma
 		log.Println("ERROR", "update", dbName, "error, params empty")
 		return rowsAffected, errors.New("params empty")
 	}
-	result, err := tx.Exec("update "+dbName+" set "+strings.Join(keyList, " , ")+" where "+strings.Join(whereStr, " and "), valueList...)
+	var Sql string
+	Sql = "update " + dbName + " set " + strings.Join(keyList, " , ") + " where " + strings.Join(whereStr, " and ")
+	if DB_PROVIDER == "PgsqlDb" {
+		Sql = sqlx.Rebind(sqlx.DOLLAR, Sql)
+		Sql = ReplaeByOtherSql(Sql, "PgsqlDb", "")
+	} else if DB_PROVIDER == "DmSql" {
+		Sql = ReplaeByOtherSql(Sql, "DmSql", "")
+	}
+	result, err := tx.Exec(Sql, valueList...)
 
 	if err != nil {
 		log.Println("ERROR", "update", dbName, "error:", err)
@@ -167,7 +233,12 @@ func TxPreUpdate(tx *sql.Tx, dbname, table string, data []string, where []string
 		return 0, errors.New("params error,no db or table")
 	}
 
-	dbName := getTableName(dbname, table)
+	dbName := ""
+	if strings.Contains(table, "select ") {
+		dbName = table
+	} else {
+		dbName = getTableName(dbname, table)
+	}
 
 	if len(where) < 1 {
 		return 0, errors.New("params error, no data for update")
@@ -178,7 +249,12 @@ func TxPreUpdate(tx *sql.Tx, dbname, table string, data []string, where []string
 	var stmt *sql.Stmt
 
 	sql := "update " + dbName + " set " + strings.Join(data, " , ") + " where " + strings.Join(where, " and ")
-
+	if DB_PROVIDER == "PgsqlDb" {
+		sql = sqlx.Rebind(sqlx.DOLLAR, sql)
+		sql = ReplaeByOtherSql(sql, "PgsqlDb", "")
+	} else if DB_PROVIDER == "DmSql" {
+		sql = ReplaeByOtherSql(sql, "DmSql", "")
+	}
 	stmt, err = tx.Prepare(sql)
 
 	if err != nil {
@@ -204,8 +280,12 @@ func TxDelete(tx *sql.Tx, dbname, table string, where map[string]string, del_cou
 	if dbname == "" && table == "" {
 		return count, errors.New("参数错误，没有数据表")
 	}
-	dbName := getTableName(dbname, table)
-
+	dbName := ""
+	if strings.Contains(table, "select ") {
+		dbName = table
+	} else {
+		dbName = getTableName(dbname, table)
+	}
 	if len(where) < 1 {
 		return count, errors.New("参数错误，没有删除条件")
 	}
@@ -236,7 +316,15 @@ func TxDelete(tx *sql.Tx, dbname, table string, where map[string]string, del_cou
 		limitStr = " limit " + del_count[0]
 
 	}
-	result, err := tx.Exec("delete from "+dbName+" where "+strings.Join(keyList, " and ")+limitStr, valueList...)
+	var Sql string
+	Sql = "delete from " + dbName + " where " + strings.Join(keyList, " and ") + limitStr
+	if DB_PROVIDER == "PgsqlDb" {
+		Sql = sqlx.Rebind(sqlx.DOLLAR, Sql)
+		Sql = ReplaeByOtherSql(Sql, "PgsqlDb", "")
+	} else if DB_PROVIDER == "DmSql" {
+		Sql = ReplaeByOtherSql(Sql, "DmSql", "")
+	}
+	result, err := tx.Exec(Sql, valueList...)
 
 	if err != nil {
 		log.Println("ERROR", "delete from", dbName, "error:", err)
@@ -257,8 +345,11 @@ func TxForRead(tx *sql.Tx, dbName, table string, title string, where []string) (
 	if dbName == "" && table == "" {
 		return nil, errors.New("参数错误，没有数据表")
 	}
-
-	dbName = getTableName(dbName, table)
+	if strings.Contains(table, "select ") {
+		dbName = table
+	} else {
+		dbName = getTableName(dbName, table)
+	}
 
 	if len(title) < 1 {
 		return nil, errors.New("没有要查询内容")
@@ -269,7 +360,15 @@ func TxForRead(tx *sql.Tx, dbName, table string, title string, where []string) (
 
 	if len(where) > 0 {
 		// log.Println("SELECT " + title + " FROM " + dbName + " where " + strings.Join(where, " and ") + " FOR UPDATE")
-		stmt, err = tx.Prepare("SELECT " + title + " FROM " + dbName + " where " + strings.Join(where, " and ") + " FOR UPDATE")
+		var Sql string
+		Sql = "SELECT " + title + " FROM " + dbName + " where " + strings.Join(where, " and ") + " FOR UPDATE"
+		if DB_PROVIDER == "PgsqlDb" {
+			Sql = sqlx.Rebind(sqlx.DOLLAR, Sql)
+			Sql = ReplaeByOtherSql(Sql, "PgsqlDb", "")
+		} else if DB_PROVIDER == "DmSql" {
+			Sql = ReplaeByOtherSql(Sql, "DmSql", "")
+		}
+		stmt, err = tx.Prepare(Sql)
 	} else {
 		// log.Println("SELECT " + title + " FROM " + dbName + " FOR UPDATE")
 		stmt, err = tx.Prepare("SELECT " + title + " FROM " + dbName + " FOR UPDATE")