Merge pull request 'use generated interface' (#76) from generator into master

Reviewed-on: #76

conn.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"time"
 
-	"go.unistack.org/micro/v3/tracer"
+	"go.unistack.org/micro/v4/tracer"
 )
 
 var (

go.mod

@@ -1,5 +1,5 @@
-module go.unistack.org/micro-wrapper-sql/v3
+module go.unistack.org/micro-wrapper-sql/v4
 
 go 1.19
 
-require go.unistack.org/micro/v3 v3.10.25
+require go.unistack.org/micro/v4 v4.0.3

go.sum

@@ -1,2 +1,2 @@
-go.unistack.org/micro/v3 v3.10.25 h1:A0epdZHOqjnXx103wwFhPKgmvVVbScvfbmn3HmHz1wE=
-go.unistack.org/micro/v3 v3.10.25/go.mod h1:ALkeXpqChYDjx8KPi7tz9mmIyOnob6nlNswsg8BnZjQ=
+go.unistack.org/micro/v4 v4.0.3 h1:AFr21ua3IrkuxH26kNYVrs7Kpsrm+4aylE/PfjLdCWM=
+go.unistack.org/micro/v4 v4.0.3/go.mod h1:+wBa98rSf+mRXb/MuSVFPXtDrqN0k8rzPQiC8wRCwCo=

options.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"time"
 
-	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v3/meter"
-	"go.unistack.org/micro/v3/tracer"
+	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v4/meter"
+	"go.unistack.org/micro/v4/tracer"
 )
 
 var (

stats.go

@@ -1,4 +1,4 @@
-package wrapper // import "go.unistack.org/micro-wrapper-sql/v3"
+package wrapper // import "go.unistack.org/micro-wrapper-sql-1/v3"
 
 import (
 	"context"

stmt.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"time"
 
-	"go.unistack.org/micro/v3/tracer"
+	"go.unistack.org/micro/v4/tracer"
 )
 
 var (
@@ -75,7 +75,8 @@ func (w *wrapperStmt) Exec(args []driver.Value) (driver.Result, error) {
 	}
 	labels := []string{labelMethod, "Exec"}
 	ts := time.Now()
-	res, err := w.stmt.Exec(args) // nolint:staticcheck
+	// nolint:staticcheck
+	res, err := w.stmt.Exec(args)
 	td := time.Since(ts)
 	te := td.Seconds()
 	if err != nil {

tx.go

@@ -5,7 +5,7 @@ import (
 	"database/sql/driver"
 	"time"
 
-	"go.unistack.org/micro/v3/tracer"
+	"go.unistack.org/micro/v4/tracer"
 )
 
 var _ driver.Tx = (*wrapperTx)(nil)

wrap.go

@@ -11,6 +11,118 @@ func wrapDriver(d driver.Driver, opts Options) driver.Driver {
 	return struct{ driver.Driver }{&wrapperDriver{driver: d, opts: opts}}
 }
 
+/*
+func wrapStmt(stmt driver.Stmt, query string, opts Options) driver.Stmt {
+	var (
+		_, hasExeCtx     = stmt.(driver.StmtExecContext)
+		_, hasQryCtx     = stmt.(driver.StmtQueryContext)
+		wc, hasColConv   = stmt.(driver.ColumnConverter) //nolint:staticcheck
+		wn, hasNamValChk = stmt.(driver.NamedValueChecker)
+	)
+
+	ws := &wrapperStmt{stmt: stmt, query: query, opts: opts}
+	switch {
+	case !hasExeCtx && !hasQryCtx && !hasColConv && !hasNamValChk:
+		return struct {
+			driver.Stmt
+		}{ws}
+	case !hasExeCtx && hasQryCtx && !hasColConv && !hasNamValChk:
+		return struct {
+			driver.Stmt
+			driver.StmtQueryContext
+		}{ws, ws}
+	case hasExeCtx && !hasQryCtx && !hasColConv && !hasNamValChk:
+		return struct {
+			driver.Stmt
+			driver.StmtExecContext
+		}{ws, ws}
+	case hasExeCtx && hasQryCtx && !hasColConv && !hasNamValChk:
+		return struct {
+			driver.Stmt
+			driver.StmtExecContext
+			driver.StmtQueryContext
+		}{ws, ws, ws}
+	case !hasExeCtx && !hasQryCtx && hasColConv && !hasNamValChk:
+		return struct {
+			driver.Stmt
+			driver.ColumnConverter
+		}{ws, wc}
+	case !hasExeCtx && hasQryCtx && hasColConv && !hasNamValChk:
+		return struct {
+			driver.Stmt
+			driver.StmtQueryContext
+			driver.ColumnConverter
+		}{ws, ws, wc}
+	case hasExeCtx && !hasQryCtx && hasColConv && !hasNamValChk:
+		return struct {
+			driver.Stmt
+			driver.StmtExecContext
+			driver.ColumnConverter
+		}{ws, ws, wc}
+	case hasExeCtx && hasQryCtx && hasColConv && !hasNamValChk:
+		return struct {
+			driver.Stmt
+			driver.StmtExecContext
+			driver.StmtQueryContext
+			driver.ColumnConverter
+		}{ws, ws, ws, wc}
+	case !hasExeCtx && !hasQryCtx && !hasColConv && hasNamValChk:
+		return struct {
+			driver.Stmt
+			driver.NamedValueChecker
+		}{ws, wn}
+	case !hasExeCtx && hasQryCtx && !hasColConv && hasNamValChk:
+		return struct {
+			driver.Stmt
+			driver.StmtQueryContext
+			driver.NamedValueChecker
+		}{ws, ws, wn}
+	case hasExeCtx && !hasQryCtx && !hasColConv && hasNamValChk:
+		return struct {
+			driver.Stmt
+			driver.StmtExecContext
+			driver.NamedValueChecker
+		}{ws, ws, wn}
+	case hasExeCtx && hasQryCtx && !hasColConv && hasNamValChk:
+		return struct {
+			driver.Stmt
+			driver.StmtExecContext
+			driver.StmtQueryContext
+			driver.NamedValueChecker
+		}{ws, ws, ws, wn}
+	case !hasExeCtx && !hasQryCtx && hasColConv && hasNamValChk:
+		return struct {
+			driver.Stmt
+			driver.ColumnConverter
+			driver.NamedValueChecker
+		}{ws, wc, wn}
+	case !hasExeCtx && hasQryCtx && hasColConv && hasNamValChk:
+		return struct {
+			driver.Stmt
+			driver.StmtQueryContext
+			driver.ColumnConverter
+			driver.NamedValueChecker
+		}{ws, ws, wc, wn}
+	case hasExeCtx && !hasQryCtx && hasColConv && hasNamValChk:
+		return struct {
+			driver.Stmt
+			driver.StmtExecContext
+			driver.ColumnConverter
+			driver.NamedValueChecker
+		}{ws, ws, wc, wn}
+	case hasExeCtx && hasQryCtx && hasColConv && hasNamValChk:
+		return struct {
+			driver.Stmt
+			driver.StmtExecContext
+			driver.StmtQueryContext
+			driver.ColumnConverter
+			driver.NamedValueChecker
+		}{ws, ws, ws, wc, wn}
+	}
+	panic("unreachable")
+}
+*/
+
 // WrapConn allows an existing driver.Conn to be wrapped.
 func WrapConn(c driver.Conn, opts ...Option) driver.Conn {
 	return wrapConn(c, NewOptions(opts...))