Query service implementations for database/sql interfaces

.github/workflows/tests.yml

@@ -133,6 +133,7 @@ jobs:
       YDB_CONNECTION_STRING_SECURE: grpcs://localhost:2135/local
       YDB_SSL_ROOT_CERTIFICATES_FILE: /tmp/ydb_certs/ca.pem
       YDB_SESSIONS_SHUTDOWN_URLS: http://localhost:8765/actors/kqp_proxy?force_shutdown=all
+      YDB_DATABASE_SQL_OVER_QUERY_SERVICE: 1
       HIDE_APPLICATION_OUTPUT: 1
     steps:
       - name: Checkout code

driver.go

@@ -14,7 +14,6 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/discovery"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/connector"
 	internalCoordination "github.com/ydb-platform/ydb-go-sdk/v3/internal/coordination"
 	coordinationConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/coordination/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/credentials"
@@ -37,6 +36,7 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicclientinternal"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsync"
 	"github.com/ydb-platform/ydb-go-sdk/v3/log"
 	"github.com/ydb-platform/ydb-go-sdk/v3/operation"
@@ -93,7 +93,7 @@ type (
 		topic        *xsync.Once[*topicclientinternal.Client]
 		topicOptions []topicoptions.TopicOption
 
-		databaseSQLOptions []connector.Option
+		databaseSQLOptions []xsql.Option
 
 		pool *conn.Pool
 

dsn.go

@@ -9,10 +9,10 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/balancers"
 	"github.com/ydb-platform/ydb-go-sdk/v3/credentials"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/bind"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/connector"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/dsn"
-	tableSql "github.com/ydb-platform/ydb-go-sdk/v3/internal/table/conn"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql"
+	tableSql "github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/table/conn"
 )
 
 const tablePathPrefixTransformer = "table_path_prefix"
@@ -64,41 +64,41 @@ func parseConnectionString(dataSourceName string) (opts []Option, _ error) {
 		if mode == tableSql.UnknownQueryMode {
 			return nil, xerrors.WithStackTrace(fmt.Errorf("unknown query mode: %s", queryMode))
 		}
-		opts = append(opts, withConnectorOptions(connector.WithDefaultQueryMode(mode)))
+		opts = append(opts, withConnectorOptions(xsql.WithDefaultQueryMode(mode)))
 	} else if queryMode := info.Params.Get("query_mode"); queryMode != "" {
 		mode := tableSql.QueryModeFromString(queryMode)
 		if mode == tableSql.UnknownQueryMode {
 			return nil, xerrors.WithStackTrace(fmt.Errorf("unknown query mode: %s", queryMode))
 		}
-		opts = append(opts, withConnectorOptions(connector.WithDefaultQueryMode(mode)))
+		opts = append(opts, withConnectorOptions(xsql.WithDefaultQueryMode(mode)))
 	}
 	if fakeTx := info.Params.Get("go_fake_tx"); fakeTx != "" {
 		for _, queryMode := range strings.Split(fakeTx, ",") {
 			mode := tableSql.QueryModeFromString(queryMode)
 			if mode == tableSql.UnknownQueryMode {
 				return nil, xerrors.WithStackTrace(fmt.Errorf("unknown query mode: %s", queryMode))
 			}
-			opts = append(opts, withConnectorOptions(connector.WithFakeTx(mode)))
+			opts = append(opts, withConnectorOptions(xsql.WithFakeTx(mode)))
 		}
 	}
 	if info.Params.Has("go_query_bind") {
-		var binders []connector.Option
+		var binders []xsql.Option
 		queryTransformers := strings.Split(info.Params.Get("go_query_bind"), ",")
 		for _, transformer := range queryTransformers {
 			switch transformer {
 			case "declare":
-				binders = append(binders, connector.WithQueryBind(bind.AutoDeclare{}))
+				binders = append(binders, xsql.WithQueryBind(bind.AutoDeclare{}))
 			case "positional":
-				binders = append(binders, connector.WithQueryBind(bind.PositionalArgs{}))
+				binders = append(binders, xsql.WithQueryBind(bind.PositionalArgs{}))
 			case "numeric":
-				binders = append(binders, connector.WithQueryBind(bind.NumericArgs{}))
+				binders = append(binders, xsql.WithQueryBind(bind.NumericArgs{}))
 			default:
 				if strings.HasPrefix(transformer, tablePathPrefixTransformer) {
 					prefix, err := extractTablePathPrefixFromBinderName(transformer)
 					if err != nil {
 						return nil, xerrors.WithStackTrace(err)
 					}
-					binders = append(binders, connector.WithQueryBind(bind.TablePathPrefix(prefix)))
+					binders = append(binders, xsql.WithQueryBind(bind.TablePathPrefix(prefix)))
 				} else {
 					return nil, xerrors.WithStackTrace(
 						fmt.Errorf("unknown query rewriter: %s", transformer),

dsn_test.go

@@ -8,14 +8,14 @@ import (
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/bind"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/connector"
-	querySql "github.com/ydb-platform/ydb-go-sdk/v3/internal/query/conn"
-	tableSql "github.com/ydb-platform/ydb-go-sdk/v3/internal/table/conn"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql"
+	conn2 "github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/query/conn"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/table/conn"
 )
 
 func TestParse(t *testing.T) {
-	newConnector := func(opts ...connector.Option) *connector.Connector {
-		c := &connector.Connector{}
+	newConnector := func(opts ...xsql.Option) *xsql.Connector {
+		c := &xsql.Connector{}
 		for _, opt := range opts {
 			if opt != nil {
 				if err := opt.Apply(c); err != nil {
@@ -26,11 +26,11 @@ func TestParse(t *testing.T) {
 
 		return c
 	}
-	newTableConn := func(opts ...tableSql.Option) *tableSql.Conn {
-		return tableSql.New(context.Background(), nil, nil, opts...)
+	newTableConn := func(opts ...conn.Option) *conn.Conn {
+		return conn.New(context.Background(), nil, nil, opts...)
 	}
-	newQueryConn := func(opts ...querySql.Option) *querySql.Conn {
-		return querySql.New(context.Background(), nil, nil, opts...)
+	newQueryConn := func(opts ...conn2.Option) *conn2.Conn {
+		return conn2.New(context.Background(), nil, nil, opts...)
 	}
 	compareConfigs := func(t *testing.T, lhs, rhs *config.Config) {
 		require.Equal(t, lhs.Secure(), rhs.Secure())
@@ -40,7 +40,7 @@ func TestParse(t *testing.T) {
 	for _, tt := range []struct {
 		dsn           string
 		opts          []config.Option
-		connectorOpts []connector.Option
+		connectorOpts []xsql.Option
 		err           error
 	}{
 		{
@@ -70,8 +70,8 @@ func TestParse(t *testing.T) {
 				config.WithEndpoint("localhost:2135"),
 				config.WithDatabase("/local"),
 			},
-			connectorOpts: []connector.Option{
-				connector.WithDefaultQueryMode(tableSql.ScriptingQueryMode),
+			connectorOpts: []xsql.Option{
+				xsql.WithDefaultQueryMode(conn.ScriptingQueryMode),
 			},
 			err: nil,
 		},
@@ -82,9 +82,9 @@ func TestParse(t *testing.T) {
 				config.WithEndpoint("localhost:2135"),
 				config.WithDatabase("/local"),
 			},
-			connectorOpts: []connector.Option{
-				connector.WithDefaultQueryMode(tableSql.ScriptingQueryMode),
-				connector.WithQueryBind(bind.TablePathPrefix("path/to/tables")),
+			connectorOpts: []xsql.Option{
+				xsql.WithDefaultQueryMode(conn.ScriptingQueryMode),
+				xsql.WithQueryBind(bind.TablePathPrefix("path/to/tables")),
 			},
 			err: nil,
 		},
@@ -95,10 +95,10 @@ func TestParse(t *testing.T) {
 				config.WithEndpoint("localhost:2135"),
 				config.WithDatabase("/local"),
 			},
-			connectorOpts: []connector.Option{
-				connector.WithDefaultQueryMode(tableSql.ScriptingQueryMode),
-				connector.WithQueryBind(bind.TablePathPrefix("path/to/tables")),
-				connector.WithQueryBind(bind.NumericArgs{}),
+			connectorOpts: []xsql.Option{
+				xsql.WithDefaultQueryMode(conn.ScriptingQueryMode),
+				xsql.WithQueryBind(bind.TablePathPrefix("path/to/tables")),
+				xsql.WithQueryBind(bind.NumericArgs{}),
 			},
 			err: nil,
 		},
@@ -109,10 +109,10 @@ func TestParse(t *testing.T) {
 				config.WithEndpoint("localhost:2135"),
 				config.WithDatabase("/local"),
 			},
-			connectorOpts: []connector.Option{
-				connector.WithDefaultQueryMode(tableSql.ScriptingQueryMode),
-				connector.WithQueryBind(bind.TablePathPrefix("path/to/tables")),
-				connector.WithQueryBind(bind.PositionalArgs{}),
+			connectorOpts: []xsql.Option{
+				xsql.WithDefaultQueryMode(conn.ScriptingQueryMode),
+				xsql.WithQueryBind(bind.TablePathPrefix("path/to/tables")),
+				xsql.WithQueryBind(bind.PositionalArgs{}),
 			},
 			err: nil,
 		},
@@ -123,10 +123,10 @@ func TestParse(t *testing.T) {
 				config.WithEndpoint("localhost:2135"),
 				config.WithDatabase("/local"),
 			},
-			connectorOpts: []connector.Option{
-				connector.WithDefaultQueryMode(tableSql.ScriptingQueryMode),
-				connector.WithQueryBind(bind.TablePathPrefix("path/to/tables")),
-				connector.WithQueryBind(bind.AutoDeclare{}),
+			connectorOpts: []xsql.Option{
+				xsql.WithDefaultQueryMode(conn.ScriptingQueryMode),
+				xsql.WithQueryBind(bind.TablePathPrefix("path/to/tables")),
+				xsql.WithQueryBind(bind.AutoDeclare{}),
 			},
 			err: nil,
 		},
@@ -137,9 +137,9 @@ func TestParse(t *testing.T) {
 				config.WithEndpoint("localhost:2135"),
 				config.WithDatabase("/local"),
 			},
-			connectorOpts: []connector.Option{
-				connector.WithDefaultQueryMode(tableSql.ScriptingQueryMode),
-				connector.WithQueryBind(bind.TablePathPrefix("path/to/tables")),
+			connectorOpts: []xsql.Option{
+				xsql.WithDefaultQueryMode(conn.ScriptingQueryMode),
+				xsql.WithQueryBind(bind.TablePathPrefix("path/to/tables")),
 			},
 			err: nil,
 		},
@@ -150,11 +150,11 @@ func TestParse(t *testing.T) {
 				config.WithEndpoint("localhost:2135"),
 				config.WithDatabase("/local"),
 			},
-			connectorOpts: []connector.Option{
-				connector.WithDefaultQueryMode(tableSql.ScriptingQueryMode),
-				connector.WithQueryBind(bind.TablePathPrefix("path/to/tables")),
-				connector.WithQueryBind(bind.PositionalArgs{}),
-				connector.WithQueryBind(bind.AutoDeclare{}),
+			connectorOpts: []xsql.Option{
+				xsql.WithDefaultQueryMode(conn.ScriptingQueryMode),
+				xsql.WithQueryBind(bind.TablePathPrefix("path/to/tables")),
+				xsql.WithQueryBind(bind.PositionalArgs{}),
+				xsql.WithQueryBind(bind.AutoDeclare{}),
 			},
 			err: nil,
 		},
@@ -165,9 +165,9 @@ func TestParse(t *testing.T) {
 				config.WithEndpoint("localhost:2135"),
 				config.WithDatabase("/local"),
 			},
-			connectorOpts: []connector.Option{
-				connector.WithFakeTx(tableSql.ScriptingQueryMode),
-				connector.WithFakeTx(tableSql.SchemeQueryMode),
+			connectorOpts: []xsql.Option{
+				xsql.WithFakeTx(conn.ScriptingQueryMode),
+				xsql.WithFakeTx(conn.SchemeQueryMode),
 			},
 			err: nil,
 		},