Merge pull request #69 from unistack-org/fixes

remove ErrUnsupported and fixes

.github/workflows/dependabot-automerge.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - name: metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.3.5
+        uses: dependabot/fetch-metadata@v1.3.6
         with:
           github-token: "${{ secrets.TOKEN }}"
       - name: merge

README.md

@@ -50,6 +50,7 @@ func Connect(cfg *PostgresConfig) (*sqlx.DB, error) {
 		t.Fatal(err)
 	}
 
+  // for postgres user stdlib.GetDefaultDriver() or it fails
 	sql.Register("micro-wrapper-sql", wrapper.NewWrapper(&sqlite.Driver{},
 		wrapper.DatabaseHost("localhost"),
 		wrapper.DatabaseName("mydb"),

common.go

@@ -6,9 +6,6 @@ import (
 	"fmt"
 )
 
-// ErrUnsupported is an error returned when the underlying driver doesn't provide a given function.
-var ErrUnsupported = errors.New("operation unsupported by the underlying driver")
-
 // namedValueToValue converts driver arguments of NamedValue format to Value format. Implemented in the same way as in
 // database/sql ctxutil.go.
 func namedValueToValue(named []driver.NamedValue) ([]driver.Value, error) {

conn.go

@@ -13,9 +13,11 @@ var _ driver.Conn = &wrapperConn{}
 
 // wrapperConn defines a wrapper for driver.Conn
 type wrapperConn struct {
-	conn driver.Conn
+	d     *wrapperDriver
-	opts Options
+	dname string
-	ctx  context.Context
+	conn  driver.Conn
+	opts  Options
+	ctx   context.Context
 }
 
 // Prepare implements driver.Conn Prepare
@@ -243,10 +245,7 @@ func (w *wrapperConn) Exec(query string, args []driver.Value) (driver.Result, er
 	// nolint:staticcheck
 	execer, ok := w.conn.(driver.Execer)
 	if !ok {
-		if w.opts.LoggerEnabled {
+		return nil, driver.ErrSkip
-			w.opts.Logger.Fields(w.opts.LoggerObserver(ctx, "Exec", labelUnknown, 0, ErrUnsupported)...).Log(ctx, w.opts.LoggerLevel)
-		}
-		return nil, ErrUnsupported
 	}
 
 	labels := []string{labelMethod, "Exec", labelQuery, labelUnknown}
@@ -341,10 +340,11 @@ func (w *wrapperConn) ExecContext(ctx context.Context, query string, args []driv
 func (w *wrapperConn) Ping(ctx context.Context) error {
 	conn, ok := w.conn.(driver.Pinger)
 	if !ok {
-		if w.opts.LoggerEnabled {
+		wc, err := w.d.Open(w.dname)
-			w.opts.Logger.Fields(w.opts.LoggerObserver(ctx, "Ping", labelUnknown, 0, ErrUnsupported)...).Log(ctx, w.opts.LoggerLevel)
+		if err != nil {
+			return err
 		}
-		return ErrUnsupported
+		return wc.Close()
 	}
 
 	var nctx context.Context
@@ -389,10 +389,7 @@ func (w *wrapperConn) Query(query string, args []driver.Value) (driver.Rows, err
 	//nolint:staticcheck
 	conn, ok := w.conn.(driver.Queryer)
 	if !ok {
-		if w.opts.LoggerEnabled {
+		return nil, driver.ErrSkip
-			w.opts.Logger.Fields(w.opts.LoggerObserver(ctx, "Query", labelUnknown, 0, ErrUnsupported)...).Log(ctx, w.opts.LoggerLevel)
-		}
-		return nil, ErrUnsupported
 	}
 
 	labels := []string{labelMethod, "Query", labelQuery, labelUnknown}

driver.go

@@ -32,5 +32,5 @@ func (w *wrapperDriver) Open(name string) (driver.Conn, error) {
 		return nil, err
 	}
 
-	return &wrapperConn{conn: c, opts: w.opts, ctx: w.ctx}, nil
+	return &wrapperConn{d: w, dname: name, conn: c, opts: w.opts, ctx: w.ctx}, nil
 }

go.mod

@@ -2,4 +2,4 @@ module go.unistack.org/micro-wrapper-sql/v3
 
 go 1.16
 
-require go.unistack.org/micro/v3 v3.10.4
+require go.unistack.org/micro/v3 v3.10.11

go.sum

@@ -74,8 +74,8 @@ github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQ
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.unistack.org/micro-proto/v3 v3.3.1 h1:nQ0MtWvP2G3QrpOgawVOPhpZZYkq6umTGDqs8FxJYIo=
 go.unistack.org/micro-proto/v3 v3.3.1/go.mod h1:cwRyv8uInM2I7EbU7O8Fx2Ls3N90Uw9UCCcq4olOdfE=
-go.unistack.org/micro/v3 v3.10.4 h1:8HneC2t7oteTwwkFLmSg5bs62h/OqEzevx/IbXG1vRo=
+go.unistack.org/micro/v3 v3.10.11 h1:IPUEVQ5oGZ6Ft2/2zQAOIkp+Ztt6GIHxwMoG4l+eJGQ=
-go.unistack.org/micro/v3 v3.10.4/go.mod h1:gI4RkJKHLPW7KV6h4+ZBOZD997MRvFRXMPQIHpozikI=
+go.unistack.org/micro/v3 v3.10.11/go.mod h1:gI4RkJKHLPW7KV6h4+ZBOZD997MRvFRXMPQIHpozikI=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=

options.go

@@ -78,7 +78,7 @@ func NewOptions(opts ...Option) Options {
 		Tracer:             tracer.DefaultTracer,
 		MeterStatsInterval: DefaultMeterStatsInterval,
 		MeterMetricPrefix:  DefaultMeterMetricPrefix,
-		LoggerLevel:        logger.ErrorLevel,
+		LoggerLevel:        logger.DebugLevel,
 		LoggerObserver:     DefaultLoggerObserver,
 	}
 	for _, o := range opts {