From 0b3b1aecb4a2a26f8797ea62af2b5a0381962ad5 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 08 十月 2019 20:50:01 +0800
Subject: [PATCH] query response by sendToTcp
---
dbself.go | 76 +++++++++++++++++++++++++++----------
1 files changed, 55 insertions(+), 21 deletions(-)
diff --git a/dbself.go b/dbself.go
index d793d14..884b867 100644
--- a/dbself.go
+++ b/dbself.go
@@ -9,10 +9,13 @@
"strings"
"sync"
"github.com/jinzhu/gorm"
+ "basic.com/valib/logger.git"
)
const (
PersonSqliteDBPath = "~/workspace/gitblit/dbserver/config/testdb.db"
+ DbT_TableName = "dbtables"
+ DBP_TableName = "dbtablepersons"
)
var syncMut sync.Mutex
@@ -25,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
}
@@ -46,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()
@@ -78,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
@@ -95,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
@@ -103,6 +106,8 @@
func ExecuteSqlByGorm(sqls []string) (bool,error) {
if localDb != nil {
+ localDb.LogMode(false)
+ defer localDb.LogMode(true)
var err error
tx := localDb.Begin()
defer func() {
@@ -112,11 +117,12 @@
}()
for _,sql :=range sqls {
result := tx.Exec(sql)
- if result.Error !=nil {
+ err = result.Error
+ if err !=nil {
return false,result.Error
}
if result.RowsAffected == 0{
- fmt.Println("ExecuteSqlByGorm fail")
+ logger.Error("ExecuteSqlByGorm fail")
return false,errors.New("ExecuteSqlByGorm fail")
}
}
@@ -135,17 +141,25 @@
Pk int `json:"pk"`
}
+type DumpSql struct {
+ Sql string `json:"sql"`
+}
+
func ExecuteQueryByGorm(tableNames []string) ([]string, error) {
+ localDb.LogMode(false)
+ defer localDb.LogMode(true)
if tableNames !=nil {
var arr []string
+ var dumpSql []DumpSql
for _,table :=range tableNames {
+ dumpSql = make([]DumpSql, 0)
var tDescArr []TableDesc
tSql := fmt.Sprintf(`PRAGMA table_info("%s")`, table)
err := localDb.Raw(tSql).Scan(&tDescArr).Error
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")
}
@@ -153,16 +167,36 @@
for _,col :=range tDescArr {
columnNames = append(columnNames, fmt.Sprintf(`'||quote("%s")||'`, col.Name))
}
- tSql = fmt.Sprintf(`SELECT 'INSERT INTO "%s" VALUES(%s)' FROM "%s";`,
- table,
- strings.Join(columnNames, ","),
- table)
- var dumpSqls []string
- err = localDb.Raw(tSql).Scan(&dumpSqls).Error
+ if table == DbT_TableName {
+ tSql = fmt.Sprintf(`SELECT 'INSERT INTO "%s" VALUES(%s)' as sql FROM "%s" where (analyServerId='' or analyServerId is NULL);`,
+ table,
+ strings.Join(columnNames, ","),
+ table)
+ } else if table == DBP_TableName {
+ tSql = fmt.Sprintf(`SELECT 'INSERT INTO "%s" VALUES(%s)' as sql FROM "%s" where tableId in (select id from dbTables where (analyServerId='' or analyServerId is NULL));`,
+ table,
+ strings.Join(columnNames, ","),
+ table)
+ } else {
+ tSql = fmt.Sprintf(`SELECT 'INSERT INTO "%s" VALUES(%s)' as sql FROM "%s";`,
+ table,
+ strings.Join(columnNames, ","),
+ table)
+ }
+
+ logger.Info("tSql:",tSql)
+
+ err = localDb.Raw(tSql).Scan(&dumpSql).Error
if err !=nil {
return nil,errors.New("dump err")
+ continue
}
- arr = append(arr, dumpSqls...)
+ if len(dumpSql)>0 {
+ for _,d :=range dumpSql {
+ arr = append(arr, d.Sql)
+ }
+ }
+
}
return arr,nil
}
@@ -173,9 +207,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