Merge pull request #159 from askuy/feature/dm

support dm

egorm/component.go

@@ -3,13 +3,13 @@ package egorm
 import (
 	"context"
 	"errors"
+	"fmt"
 
+	"github.com/gotomicro/ego-component/egorm/dsn"
 	"github.com/gotomicro/ego/core/elog"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
 	"gorm.io/gorm/schema"
-
-	"github.com/gotomicro/ego-component/egorm/dsn"
 )
 
 // PackageName ...
@@ -52,6 +52,7 @@ func WithContext(ctx context.Context, db *Component) *Component {
 // newComponent ...
 func newComponent(compName string, dsnParser dsn.DSNParser, config *config, elogger *elog.Component) (*Component, error) {
 	db, err := gorm.Open(dsnParser.GetDialector(config.DSN), &gorm.Config{})
+	fmt.Printf("err--------------->"+"%+v\n", err)
 	if err != nil {
 		return nil, err
 	}
@@ -88,6 +89,5 @@ func newComponent(compName string, dsnParser dsn.DSNParser, config *config, elog
 	replace(db.Callback().Query(), "gorm:query", config.interceptors...)
 	// replace(db.Callback().Row(), "gorm:row", config.interceptors...)
 	replace(db.Callback().Raw(), "gorm:raw", config.interceptors...)
-
 	return db, nil
 }

egorm/config.go

@@ -12,6 +12,7 @@ import (
 const (
 	dialectMysql    = "mysql"
 	dialectPostgres = "postgres"
+	dialectDm       = "dm"
 )
 
 var errSupportDialect = errors.New("invalid support Dialect")

egorm/container.go

@@ -46,6 +46,8 @@ func (c *Container) setDSNParserIfNotExists(dialect string) error {
 		c.dsnParser = dsn.DefaultMysqlDSNParser
 	case dialectPostgres:
 		c.dsnParser = dsn.DefaultPostgresDSNParser
+	case dialectDm:
+		c.dsnParser = dsn.DefaultDmDSNParser
 	default:
 		return errSupportDialect
 	}

egorm/dsn/dm.go

@@ -0,0 +1,69 @@
+package dsn
+
+import (
+	"github.com/gotomicro/gorm-driver-dm"
+	"gorm.io/gorm"
+)
+
+var (
+	DefaultDmDSNParser           = &DmDSNParser{}
+	_                  DSNParser = (*DmDSNParser)(nil)
+)
+
+type DmDSNParser struct {
+}
+
+func (m *DmDSNParser) GetDialector(dsn string) gorm.Dialector {
+	return dm.Open(dsn)
+}
+
+func (m *DmDSNParser) ParseDSN(dsn string) (cfg *DSN, err error) {
+	// New config with some default values
+	cfg = new(DSN)
+
+	// [user[:password]@][net[(addr)]]/dbname[?param1=value1&paramN=valueN]
+	// Find the last '/' (since the password or the net addr might contain a '/')
+	//foundSlash := false
+	for i := len(dsn) - 1; i >= 0; i-- {
+		if dsn[i] == '/' {
+			//foundSlash = true
+			var j int
+
+			// left part is empty if i <= 0
+			if i > 0 {
+				// [username[:password]@][protocol[(address)]]
+				// Find the last '@' in dsn[:i]
+				for j = i; j >= 0; j-- {
+					if dsn[j] == '@' {
+						parseUsernamePassword(cfg, dsn[:j])
+						break
+					}
+				}
+
+				// [protocol[(address)]]
+				// Find the first '(' in dsn[j+1:i]
+				if err = parseAddrNet(cfg, dsn[j:i]); err != nil {
+					return
+				}
+			}
+
+			// dbname[?param1=value1&...&paramN=valueN]
+			// Find the first '?' in dsn[i+1:]
+			for j = i + 1; j < len(dsn); j++ {
+				if dsn[j] == '?' {
+					if err = parseDSNParams(cfg, dsn[j+1:]); err != nil {
+						return
+					}
+					break
+				}
+			}
+			//cfg.DBName = dsn[i+1 : j]
+
+			break
+		}
+	}
+	//if !foundSlash && len(dsn) > 0 {
+	//	return nil, errInvalidDSNNoSlash
+	//}
+	return
+}

egorm/examples/commonmysql/config.toml

@@ -11,7 +11,8 @@
 #   enableDetailSQL = false
 #   enableAccessInterceptor = true
 #   enableAccessInterceptorReq = true
-#   enableAccessInterceptorReply = true
+#   enableAccessInterceptorRes = true
+
 
 [pg.test]
    dialect = "postgres"
@@ -27,7 +28,8 @@
 #   enableDetailSQL = false
 #   enableAccessInterceptor = true
 #   enableAccessInterceptorReq = true
-#   enableAccessInterceptorReply = true
+#   enableAccessInterceptorRes = true
+
 
 [other.test]
    dialect = "other"
@@ -43,4 +45,5 @@
 #   enableDetailSQL = false
 #   enableAccessInterceptor = true
 #   enableAccessInterceptorReq = true
-#   enableAccessInterceptorReply = true
+#   enableAccessInterceptorRes = true
+

egorm/examples/dm/config.toml

@@ -0,0 +1,15 @@
+[dm.test]
+dialect = "dm"
+debug = true # ego重写gorm debug，打开后可以看到，配置名、地址、耗时、请求数据、响应数据
+#   rawDebug = true 原生gorm debug
+dsn = "sysdba:shimo2021@192.168.242.136:5236/SYSDBA"
+onFail = "panic" # 失败后，直接fail fast，panic操作
+#   connMaxLifetime = "300s"
+#   maxIdleConns = 50
+#   maxOpenConns = 100
+#   disableTrace = false
+#   disableMetric = false
+#   enableDetailSQL = false
+#   enableAccessInterceptor = true
+#   enableAccessInterceptorReq = true
+#   enableAccessInterceptorRes = true

egorm/examples/dm/main.go

@@ -0,0 +1,34 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gotomicro/ego"
+	"github.com/gotomicro/ego-component/egorm"
+)
+
+func main() {
+	err := ego.New().Invoker(
+		openDB,
+	).Run()
+	fmt.Printf("err--------------->"+"%+v\n", err)
+}
+
+func openDB() error {
+	db := egorm.Load("dm.test").Build()
+	fmt.Printf("db--------------->"+"%+v\n", db)
+	//1.查询多少张表
+	tables := make([]UserTabComments, 0)
+	db.Find(&tables)
+	// select  TABLE_NAME,comments TABLE_COMMENT from user_tab_comments
+	fmt.Printf("tables--------------->"+"%+v\n", tables)
+	for _, value := range tables {
+		fmt.Printf("value--------------->"+"%+v\n", value)
+	}
+	return nil
+}
+
+type UserTabComments struct {
+	TableName    string `gorm:"column:TABLE_NAME"`    //表名
+	TableComment string `gorm:"column:TABLE_COMMENT"` //表注释
+}

egorm/examples/mysqltrace/config.toml

@@ -11,4 +11,4 @@
 #   enableDetailSQL = false
 #   enableAccessInterceptor = true
 #   enableAccessInterceptorReq = true
-#   enableAccessInterceptorReply = true
+#   enableAccessInterceptorRes = true

egorm/examples/origindm/origindm.go

@@ -0,0 +1,27 @@
+package main
+
+import (
+	"database/sql"
+	"fmt"
+
+	_ "github.com/gotomicro/dmgo"
+)
+
+func main() {
+	obj, err := sql.Open("dm", "dm://sysdba:shimo2021@192.168.242.136:5236")
+	if err != nil {
+		panic(err)
+		return
+	}
+	rows, err := obj.Query("select  TABLE_NAME,comments TABLE_COMMENT from user_tab_comments")
+	for rows.Next() {
+		a := TableStruct{}
+		rows.Scan(&a.TableName, &a.TableComment)
+		fmt.Printf("a--------------->"+"%+v\n", a)
+	}
+}
+
+type TableStruct struct {
+	TableName    string //表名
+	TableComment string //表注释
+}

egorm/go.mod

@@ -4,12 +4,17 @@ go 1.15
 
 require (
 	github.com/davecgh/go-spew v1.1.1
-	github.com/gotomicro/ego v0.6.14
-	github.com/json-iterator/go v1.1.11
+	github.com/emirpasic/gods v1.12.0 // indirect
+	github.com/gotomicro/dmgo v1.8.4 // indirect
+	github.com/gotomicro/ego v0.7.0
+	github.com/gotomicro/gorm-driver-dm v0.0.0-20211124105326-5891acf63020 // indirect
+	github.com/jinzhu/now v1.1.2 // indirect
+	github.com/json-iterator/go v1.1.12
 	github.com/opentracing/opentracing-go v1.1.0
 	github.com/spf13/cast v1.3.1
 	github.com/stretchr/testify v1.7.0
-	google.golang.org/grpc v1.39.0
+	github.com/thoas/go-funk v0.9.1 // indirect
+	google.golang.org/grpc v1.42.0
 	gorm.io/driver/mysql v1.0.5
 	gorm.io/driver/postgres v1.0.8
 	gorm.io/gorm v1.21.3