From 341999a6d3713dbc33038feeec6718296aac8b3c Mon Sep 17 00:00:00 2001
From: qydysky <qydysky@foxmail.com>
Date: Tue, 14 Jan 2025 02:10:52 +0800
Subject: [PATCH] 1 (#7)

---
 log/Log.go      | 42 ++++++++++++++++++++++++++++++++----------
 log/Log_test.go |  2 +-
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/log/Log.go b/log/Log.go
index dcc3e9f..9a2f16c 100644
--- a/log/Log.go
+++ b/log/Log.go
@@ -27,10 +27,11 @@ type Log_interface struct {
 }
 
 type Config struct {
-	To       time.Duration
-	File     string
-	DBConn   *sql.DB
-	DBConnTo time.Duration
+	To           time.Duration
+	File         string
+	DBDriverName string
+	DBConn       *sql.DB
+	DBConnTo     time.Duration
 
 	// $1:Prefix $2:Base $2:Msgs
 	DBInsert string
@@ -61,6 +62,21 @@ func New(c Config) (o *Log_interface) {
 		o.MQ = m.NewType[Msg_item]()
 	}
 
+	type LogI struct {
+		Date   string
+		Unix   int64
+		Prefix string
+		Base   string
+		Msgs   string
+	}
+
+	var replaceF []func(index int, holder string) (replaceTo string)
+	if c.DBDriverName == "postgres" {
+		replaceF = append(replaceF, func(index int, holder string) (replaceTo string) {
+			return fmt.Sprintf("$%d", index+1)
+		})
+	}
+
 	o.MQ.Pull_tag_only(`L`, func(msg Msg_item) bool {
 		var showObj = []io.Writer{}
 		if msg.Stdout {
@@ -82,11 +98,15 @@ func New(c Config) (o *Log_interface) {
 			} else {
 				sqlTx = psql.BeginTx[any](msg.DBConn, pctx.GenTOCtx(o.DBConnTo))
 			}
-			sqlTx.SimpleDo(
-				msg.DBInsert,
-				strings.TrimSpace(msg.Prefix),
-				strings.TrimSpace(fmt.Sprintln(msg.Base_string...)),
-				strings.TrimSpace(fmt.Sprintln(msg.Msgs...)))
+
+			sqlTx.DoPlaceHolder(psql.SqlFunc[any]{Sql: msg.DBInsert}, &LogI{
+				Date:   time.Now().Format(time.DateTime),
+				Unix:   time.Now().Unix(),
+				Prefix: strings.TrimSpace(msg.Prefix),
+				Base:   strings.TrimSpace(fmt.Sprintln(msg.Base_string...)),
+				Msgs:   strings.TrimSpace(fmt.Sprintln(msg.Msgs...)),
+			}, replaceF...)
+
 			if _, err := sqlTx.Fin(); err != nil {
 				log.Println(err)
 			}
@@ -144,15 +164,17 @@ func (I *Log_interface) Log_to_file(fileP string) (O *Log_interface) {
 }
 
 // Open 日志输出至DB
-func (I *Log_interface) LDB(db *sql.DB, insert string, to ...time.Duration) (O *Log_interface) {
+func (I *Log_interface) LDB(driverName string, db *sql.DB, insert string, to ...time.Duration) (O *Log_interface) {
 	O = I
 	if db != nil && insert != `` {
+		O.DBDriverName = driverName
 		O.DBConn = db
 		O.DBInsert = insert
 		if len(to) > 0 {
 			O.DBConnTo = to[0]
 		}
 	} else {
+		O.DBDriverName = ``
 		O.DBConn = nil
 		O.DBInsert = ``
 		O.DBConnTo = 0
diff --git a/log/Log_test.go b/log/Log_test.go
index e2232f0..956cae8 100644
--- a/log/Log_test.go
+++ b/log/Log_test.go
@@ -66,7 +66,7 @@ func Test_2(t *testing.T) {
 	})
 
 	ndb := n.Base_add(`>1`)
-	ndb = ndb.LDB(db, `insert into log (p,base,msg) values (?,?,?)`)
+	ndb = ndb.LDB("sqlite", db, `insert into log (p,base,msg) values ({Prefix},{Base},{Msgs})`)
 	ndb.L(`T:`, `s`)
 	n.L(`T:`, `p`)
 
-- 
2.39.2