From 1b6a76f8658c11132fb364cf8121397dd4666fdb Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期六, 19 九月 2020 11:45:07 +0800
Subject: [PATCH] sync his use ExecuteSqlByGorm
---
dbself.go | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/dbself.go b/dbself.go
index f05cc24..47fe633 100644
--- a/dbself.go
+++ b/dbself.go
@@ -9,6 +9,7 @@
"strings"
"sync"
"github.com/jinzhu/gorm"
+ "basic.com/valib/logger.git"
)
const (
@@ -27,15 +28,15 @@
dbPath = PersonSqliteDBPath
}
- fmt.Println("self: ========>", dbPath)
+ logger.Info("self: ========>", dbPath)
db, err := New(dbPath, "", false)
if err != nil {
- fmt.Println("new db database: ", err)
+ logger.Error("new db database: ", err)
return err
}
dbConn, err := db.Connect()
if err != nil {
- fmt.Println("new db conn error; ", err)
+ logger.Error("new db conn error; ", err)
return err
}
@@ -48,21 +49,21 @@
path, err := getCurrentPath()
if err != nil {
- fmt.Println("getCurrentPath error; ", err)
+ logger.Error("getCurrentPath error; ", err)
return "", err
}
filepath := path + "tmp.db"
- fmt.Println("filepath:", filepath)
+ logger.Info("filepath:", filepath)
db, err := New(filepath, "", false)
if err != nil {
- fmt.Println("new db database: ", err)
+ logger.Error("new db database: ", err)
return "", err
}
tmpconn, err := db.Connect()
if err != nil {
- fmt.Println("new db conn error; ", err)
+ logger.Error("new db conn error; ", err)
return "", err
}
defer tmpconn.Close()
@@ -80,7 +81,7 @@
defer syncMut.Unlock()
allResults, err := SerfDbConn.Execute(sqlString, false, false)
if err != nil {
- fmt.Println("execute error!", err)
+ logger.Error("execute error!", err)
return nil, err
}
return allResults, nil
@@ -97,7 +98,7 @@
defer syncMut.Unlock()
rows, err := SerfDbConn.Query(sqlString, false, false)
if err != nil {
- fmt.Println("execute error!", err)
+ logger.Error("execute error!", err)
return nil, err
}
return rows, nil
@@ -118,11 +119,13 @@
result := tx.Exec(sql)
err = result.Error
if err !=nil {
- return false,result.Error
+ logger.Error("ExecuteSqlByGorm err:",err,",sql:",sql)
+ return false,err
}
- if result.RowsAffected == 0{
- fmt.Println("ExecuteSqlByGorm fail")
- return false,errors.New("ExecuteSqlByGorm fail")
+ if result.RowsAffected == 0 {
+ logger.Debug("ExecuteSqlByGorm RowsAffected == 0",",sql:",sql)
+ err = errors.New("ExecuteSqlByGorm RowsAffected == 0")
+ return false,err
}
}
tx.Commit()
@@ -151,14 +154,16 @@
var arr []string
var dumpSql []DumpSql
for _,table :=range tableNames {
+ logger.Info("dump current tableName:", table)
dumpSql = make([]DumpSql, 0)
var tDescArr []TableDesc
tSql := fmt.Sprintf(`PRAGMA table_info("%s")`, table)
err := localDb.Raw(tSql).Scan(&tDescArr).Error
+ logger.Debug("tDescArr err:", err, "len(tDescArr)=", len(tDescArr))
if err !=nil {
return nil,errors.New("tableDesc err")
}
- fmt.Println(table,"'Columns is:",tDescArr)
+ logger.Info(table,"'Columns is:",tDescArr)
if tDescArr == nil || len(tDescArr) == 0 {
return nil,errors.New(table+" has no column")
}
@@ -183,12 +188,12 @@
table)
}
- fmt.Println("tSql:",tSql)
+ logger.Info("tSql:",tSql)
err = localDb.Raw(tSql).Scan(&dumpSql).Error
+ logger.Debug("dump err:", err)
if err !=nil {
return nil,errors.New("dump err")
- continue
}
if len(dumpSql)>0 {
for _,d :=range dumpSql {
@@ -206,9 +211,9 @@
var b strings.Builder
if err := SerfDbConn.Dump(&b); err != nil {
- fmt.Println("dump file ", err.Error())
+ logger.Error("dump file ", err.Error())
}
- fmt.Printf("%T\n", b)
+ logger.Info("%T\n", b)
}
// get current path
--
Gitblit v1.8.0