From 82c17a51a2e0729a58113ac77749db2b11f87dde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=AE=97=E6=B4=8B?= <liuzongyang@cqliving.com>
Date: Tue, 28 Nov 2023 14:33:53 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9Alibpq=E9=A9=B1=E5=8A=A8=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81gaussdb=20sha256=E5=8A=A0=E5=AF=86=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/go.mod                           | 7 ++++---
 server/internal/db/dbm/db_type.go       | 2 +-
 server/internal/db/dbm/dialect_pgsql.go | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/server/go.mod b/server/go.mod
index 5ac531dc..5785dd89 100644
--- a/server/go.mod
+++ b/server/go.mod
@@ -3,6 +3,7 @@ module mayfly-go
 go 1.21
 
 require (
+	gitee.com/liuzongyang/libpq v1.0.9
 	github.com/buger/jsonparser v1.1.1
 	github.com/gin-gonic/gin v1.9.1
 	github.com/glebarez/sqlite v1.10.0
@@ -15,7 +16,6 @@ require (
 	github.com/golang-jwt/jwt/v5 v5.1.0
 	github.com/gorilla/websocket v1.5.1
 	github.com/kanzihuang/vitess/go/vt/sqlparser v0.0.0-20231018071450-ac8d9f0167e9
-	github.com/lib/pq v1.10.9
 	github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20230712084735-068dc2aee82d
 	github.com/mojocn/base64Captcha v1.3.5 // 验证码
 	github.com/pkg/errors v0.9.1
@@ -25,7 +25,7 @@ require (
 	github.com/robfig/cron/v3 v3.0.1 // 定时任务
 	github.com/stretchr/testify v1.8.4
 	go.mongodb.org/mongo-driver v1.12.1 // mongo
-	golang.org/x/crypto v0.15.0 // ssh
+	golang.org/x/crypto v0.16.0 // ssh
 	golang.org/x/oauth2 v0.14.0
 	gopkg.in/yaml.v3 v3.0.1
 	// gorm
@@ -68,6 +68,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/tjfoc/gmsm v1.4.1 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.11 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
@@ -79,7 +80,7 @@ require (
 	golang.org/x/image v0.0.0-20220302094943-723b81ca9867 // indirect
 	golang.org/x/net v0.18.0 // indirect
 	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230131230820-1c016267d619 // indirect
diff --git a/server/internal/db/dbm/db_type.go b/server/internal/db/dbm/db_type.go
index fb984b4d..f71c8e3e 100644
--- a/server/internal/db/dbm/db_type.go
+++ b/server/internal/db/dbm/db_type.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
+	pq "gitee.com/liuzongyang/libpq"
 	"github.com/kanzihuang/vitess/go/vt/sqlparser"
-	"github.com/lib/pq"
 )
 
 type DbType string
diff --git a/server/internal/db/dbm/dialect_pgsql.go b/server/internal/db/dbm/dialect_pgsql.go
index cb55b74e..1c028782 100644
--- a/server/internal/db/dbm/dialect_pgsql.go
+++ b/server/internal/db/dbm/dialect_pgsql.go
@@ -12,11 +12,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/lib/pq"
+	pq "gitee.com/liuzongyang/libpq"
 )
 
 func getPgsqlDB(d *DbInfo) (*sql.DB, error) {
-	driverName := string(d.Type)
+	driverName := "postgres"
 	// SSH Conect
 	if d.SshTunnelMachineId > 0 {
 		// 如果使用了隧道，则使用`postgres:ssh:隧道机器id`注册名