* Supported the *sql.Conn as input type ydb.Unwrap helper for go's 1.18

Author: asmyasnikov

CHANGELOG.md

@@ -1,3 +1,5 @@
+* Supported the `*sql.Conn` as input type `ydb.Unwrap` helper for go's 1.18
+
 ## v3.36.2
 * Changed output of `sugar.GenerateDeclareSection` (added error as second result)
 * Specified `sugar.GenerateDeclareSection` for `go1.18` (supports input types `*table.QueryParameters` `[]table.ParameterOption` or `[]sql.NamedArg`)

internal/xsql/conn.go

@@ -325,21 +325,3 @@ func (c *conn) BeginTx(ctx context.Context, txOptions driver.TxOptions) (_ drive
 	}
 	return c.currentTx, nil
 }
-
-func Unwrap(db *sql.DB) (connector *Connector, err error) {
-	// hop with create session (connector.Connect()) helps to get ydb.Connection
-	c, err := db.Conn(context.Background())
-	if err != nil {
-		return nil, xerrors.WithStackTrace(err)
-	}
-	if err = c.Raw(func(driverConn interface{}) error {
-		if cc, ok := driverConn.(*conn); ok {
-			connector = cc.connector
-			return nil
-		}
-		return xerrors.WithStackTrace(badconn.Map(fmt.Errorf("%+v is not a *conn", driverConn)))
-	}); err != nil {
-		return nil, xerrors.WithStackTrace(err)
-	}
-	return connector, nil
-}

internal/xsql/connector.go

@@ -129,5 +129,13 @@ func (c *Connector) Connect(ctx context.Context) (_ driver.Conn, err error) {
 }
 
 func (c *Connector) Driver() driver.Driver {
-	return c.driver
+	return &driverWrapper{c: c}
+}
+
+type driverWrapper struct {
+	c *Connector
+}
+
+func (d *driverWrapper) Open(name string) (driver.Conn, error) {
+	return d.c.driver.Open(name)
 }

internal/xsql/unwrap.go

@@ -0,0 +1,31 @@
+//go:build !go1.18
+// +build !go1.18
+
+package xsql
+
+import (
+	"context"
+	"database/sql"
+	"fmt"
+
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/badconn"
+)
+
+func Unwrap(db *sql.DB) (connector *Connector, err error) {
+	// hop with create session (connector.Connect()) helps to get ydb.Connection
+	c, err := db.Conn(context.Background())
+	if err != nil {
+		return nil, xerrors.WithStackTrace(err)
+	}
+	if err = c.Raw(func(driverConn interface{}) error {
+		if cc, ok := driverConn.(*conn); ok {
+			connector = cc.connector
+			return nil
+		}
+		return xerrors.WithStackTrace(badconn.Map(fmt.Errorf("%+v is not a *conn", driverConn)))
+	}); err != nil {
+		return nil, xerrors.WithStackTrace(err)
+	}
+	return connector, nil
+}

internal/xsql/unwrap_go1.18.go

@@ -0,0 +1,35 @@
+//go:build go1.18
+// +build go1.18
+
+package xsql
+
+import (
+	"database/sql"
+	"fmt"
+
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
+)
+
+func Unwrap[T *sql.DB | *sql.Conn](v T) (connector *Connector, err error) {
+	switch vv := any(v).(type) {
+	case *sql.DB:
+		d := vv.Driver()
+		if dw, ok := d.(*driverWrapper); ok {
+			return dw.c, nil
+		}
+		return nil, xerrors.WithStackTrace(fmt.Errorf("%T is not a *driverWrapper", d))
+	case *sql.Conn:
+		if err = vv.Raw(func(driverConn interface{}) error {
+			if cc, ok := driverConn.(*conn); ok {
+				connector = cc.connector
+				return nil
+			}
+			return xerrors.WithStackTrace(fmt.Errorf("%T is not a *conn", driverConn))
+		}); err != nil {
+			return nil, xerrors.WithStackTrace(err)
+		}
+		return connector, nil
+	default:
+		return nil, xerrors.WithStackTrace(fmt.Errorf("unknown type %T for Unwrap", vv))
+	}
+}

sql.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"database/sql"
 	"database/sql/driver"
-	"fmt"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql"
@@ -128,14 +127,3 @@ func Connector(db Connection, opts ...ConnectorOption) (*xsql.Connector, error)
 	}
 	return c, nil
 }
-
-func Unwrap(db *sql.DB) (Connection, error) {
-	c, err := xsql.Unwrap(db)
-	if err != nil {
-		return nil, xerrors.WithStackTrace(err)
-	}
-	if cc, ok := c.Connection().(Connection); ok {
-		return cc, nil
-	}
-	return nil, xerrors.WithStackTrace(fmt.Errorf("%+v is not a ydb.Nonnection", c.Connection()))
-}

sql_unwrap.go

@@ -0,0 +1,23 @@
+//go:build !go1.18
+// +build !go1.18
+
+package ydb
+
+import (
+	"database/sql"
+	"fmt"
+
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql"
+)
+
+func Unwrap(db *sql.DB) (Connection, error) {
+	c, err := xsql.Unwrap(db)
+	if err != nil {
+		return nil, xerrors.WithStackTrace(err)
+	}
+	if cc, ok := c.Connection().(Connection); ok {
+		return cc, nil
+	}
+	return nil, xerrors.WithStackTrace(fmt.Errorf("%+v is not a ydb.Connection", c.Connection()))
+}

sql_unwrap_go1.18.go

@@ -0,0 +1,23 @@
+//go:build go1.18
+// +build go1.18
+
+package ydb
+
+import (
+	"database/sql"
+	"fmt"
+
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql"
+)
+
+func Unwrap[T *sql.DB | *sql.Conn](v T) (Connection, error) {
+	c, err := xsql.Unwrap(v)
+	if err != nil {
+		return nil, xerrors.WithStackTrace(err)
+	}
+	if cc, ok := c.Connection().(Connection); ok {
+		return cc, nil
+	}
+	return nil, xerrors.WithStackTrace(fmt.Errorf("%+v is not a ydb.Connection", c.Connection()))
+}