From 33854d63ec0118f24272c64a341b039473cc234c Mon Sep 17 00:00:00 2001 From: Neil Macneale IV Date: Thu, 4 Jun 2026 20:21:15 +0000 Subject: [PATCH] Account for dolt dsess refactor --- core/context.go | 4 ++-- core/relations.go | 2 +- server/connection_handler.go | 2 +- server/functions/iterate.go | 6 +++--- server/functions/pg_get_serial_sequence.go | 2 +- server/node/alter_sequence.go | 2 +- server/node/no_op.go | 2 +- server/pg_provider.go | 3 +-- server/plpgsql/interpreter_logic.go | 2 +- server/server.go | 2 +- server/tables/pgcatalog/pg_database.go | 4 ++-- testing/go/enginetest/doltgres_engine_test.go | 2 +- testing/go/enginetest/doltgres_harness_test.go | 2 +- 13 files changed, 17 insertions(+), 18 deletions(-) diff --git a/core/context.go b/core/context.go index 95edd71c46..fea8755a18 100644 --- a/core/context.go +++ b/core/context.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/errors" "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" - "github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess" + "github.com/dolthub/dolt/go/libraries/doltcore/dsess" "github.com/dolthub/dolt/go/libraries/doltcore/sqle/resolve" "github.com/dolthub/go-mysql-server/sql" @@ -166,7 +166,7 @@ func GetSqlDatabaseFromContext(ctx *sql.Context, database string) (sql.Database, if len(database) == 0 { database = ctx.GetCurrentDatabase() } - db, err := session.Provider().Database(ctx, database) + db, err := session.GenericProvider().Database(ctx, database) if err != nil { if sql.ErrDatabaseNotFound.Is(err) { return nil, nil diff --git a/core/relations.go b/core/relations.go index 79693f4ead..e08f3706df 100644 --- a/core/relations.go +++ b/core/relations.go @@ -17,7 +17,7 @@ package core import ( "github.com/cockroachdb/errors" "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" - "github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess" + "github.com/dolthub/dolt/go/libraries/doltcore/dsess" "github.com/dolthub/go-mysql-server/sql" "github.com/dolthub/doltgresql/core/id" diff --git a/server/connection_handler.go b/server/connection_handler.go index b571e07287..f1a0928458 100644 --- a/server/connection_handler.go +++ b/server/connection_handler.go @@ -30,7 +30,7 @@ import ( "sync/atomic" "github.com/cockroachdb/errors" - "github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess" + "github.com/dolthub/dolt/go/libraries/doltcore/dsess" "github.com/dolthub/dolt/go/libraries/doltcore/sqlserver" "github.com/dolthub/go-mysql-server/server" "github.com/dolthub/go-mysql-server/sql" diff --git a/server/functions/iterate.go b/server/functions/iterate.go index 78b8d006c4..817879f3b7 100644 --- a/server/functions/iterate.go +++ b/server/functions/iterate.go @@ -19,7 +19,7 @@ import ( "github.com/cockroachdb/errors" "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" - "github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess" + "github.com/dolthub/dolt/go/libraries/doltcore/dsess" "github.com/dolthub/go-mysql-server/sql" "github.com/dolthub/doltgresql/core" @@ -126,7 +126,7 @@ type ItemView struct { // items. This function should be expanded as we add more items to iterate over. func IterateDatabase(ctx *sql.Context, database string, callbacks Callbacks) error { sess := ctx.Session.(*dsess.DoltSession) - currentDatabase, err := sess.Provider().Database(ctx, database) + currentDatabase, err := sess.GenericProvider().Database(ctx, database) if err != nil { return err } @@ -481,7 +481,7 @@ func RunCallback(ctx *sql.Context, internalID id.Id, callbacks Callbacks) error } // We know we have the relevant callback for the given section, so we'll grab the schema doltSession := dsess.DSessFromSess(ctx.Session) - currentDatabase, err := doltSession.Provider().Database(ctx, ctx.GetCurrentDatabase()) + currentDatabase, err := doltSession.GenericProvider().Database(ctx, ctx.GetCurrentDatabase()) if err != nil { return err } diff --git a/server/functions/pg_get_serial_sequence.go b/server/functions/pg_get_serial_sequence.go index 7256135499..c04a45e172 100644 --- a/server/functions/pg_get_serial_sequence.go +++ b/server/functions/pg_get_serial_sequence.go @@ -19,7 +19,7 @@ import ( "github.com/cockroachdb/errors" "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" - "github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess" + "github.com/dolthub/dolt/go/libraries/doltcore/dsess" "github.com/dolthub/dolt/go/libraries/doltcore/sqle/resolve" "github.com/dolthub/go-mysql-server/sql" diff --git a/server/node/alter_sequence.go b/server/node/alter_sequence.go index b28a68dc14..f23a6f761e 100644 --- a/server/node/alter_sequence.go +++ b/server/node/alter_sequence.go @@ -19,7 +19,7 @@ import ( "github.com/cockroachdb/errors" "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" - "github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess" + "github.com/dolthub/dolt/go/libraries/doltcore/dsess" "github.com/dolthub/go-mysql-server/sql" "github.com/dolthub/go-mysql-server/sql/plan" vitess "github.com/dolthub/vitess/go/vt/sqlparser" diff --git a/server/node/no_op.go b/server/node/no_op.go index 2ef1d43c46..a2945dc8f2 100755 --- a/server/node/no_op.go +++ b/server/node/no_op.go @@ -19,7 +19,7 @@ import ( "fmt" "io" - "github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess" + "github.com/dolthub/dolt/go/libraries/doltcore/dsess" "github.com/dolthub/go-mysql-server/sql" vitess "github.com/dolthub/vitess/go/vt/sqlparser" "github.com/jackc/pgx/v5/pgproto3" diff --git a/server/pg_provider.go b/server/pg_provider.go index 5ee68c91f5..85870712b1 100644 --- a/server/pg_provider.go +++ b/server/pg_provider.go @@ -16,7 +16,6 @@ package server import ( "github.com/dolthub/dolt/go/libraries/doltcore/sqle" - "github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess" "github.com/dolthub/dolt/go/libraries/utils/filesys" "github.com/dolthub/go-mysql-server/sql" @@ -70,7 +69,7 @@ var _ sqle.ProviderFactory = DoltgresProviderFactory{} // NewProvider overrides DoltProviderFactory.NewProvider to wrap the created provider in // DoltgresDatabaseProvider before returning it. -func (f DoltgresProviderFactory) NewProvider(defaultBranch string, fs filesys.Filesys, databases []dsess.SqlDatabase, locations []filesys.Filesys, overrides sql.EngineOverrides) (sql.DatabaseProvider, error) { +func (f DoltgresProviderFactory) NewProvider(defaultBranch string, fs filesys.Filesys, databases []sqle.SqlDatabase, locations []filesys.Filesys, overrides sql.EngineOverrides) (sql.DatabaseProvider, error) { inner, err := f.DoltProviderFactory.NewProvider(defaultBranch, fs, databases, locations, overrides) if err != nil { return nil, err diff --git a/server/plpgsql/interpreter_logic.go b/server/plpgsql/interpreter_logic.go index 87cd96dfbe..07127866ad 100644 --- a/server/plpgsql/interpreter_logic.go +++ b/server/plpgsql/interpreter_logic.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/cockroachdb/errors" - "github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess" + "github.com/dolthub/dolt/go/libraries/doltcore/dsess" "github.com/dolthub/go-mysql-server/sql" "github.com/jackc/pgx/v5/pgproto3" diff --git a/server/server.go b/server/server.go index 30d8270ac9..dd5de28a4c 100644 --- a/server/server.go +++ b/server/server.go @@ -28,7 +28,7 @@ import ( "github.com/dolthub/dolt/go/libraries/doltcore/env" doltservercfg "github.com/dolthub/dolt/go/libraries/doltcore/servercfg" "github.com/dolthub/dolt/go/libraries/doltcore/sqle/dfunctions" - "github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess" + "github.com/dolthub/dolt/go/libraries/doltcore/dsess" "github.com/dolthub/dolt/go/libraries/doltcore/sqle/resolve" "github.com/dolthub/dolt/go/libraries/utils/argparser" "github.com/dolthub/dolt/go/libraries/utils/config" diff --git a/server/tables/pgcatalog/pg_database.go b/server/tables/pgcatalog/pg_database.go index c3e166c9f0..d568007517 100644 --- a/server/tables/pgcatalog/pg_database.go +++ b/server/tables/pgcatalog/pg_database.go @@ -18,7 +18,7 @@ import ( "io" "sort" - "github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess" + "github.com/dolthub/dolt/go/libraries/doltcore/dsess" sqle "github.com/dolthub/go-mysql-server" "github.com/dolthub/go-mysql-server/sql" @@ -49,7 +49,7 @@ func (p PgDatabaseHandler) Name() string { func (p PgDatabaseHandler) RowIter(ctx *sql.Context, partition sql.Partition) (sql.RowIter, error) { // TODO: Should the catalog be passed to RowIter like it is for the information_schema tables RowIter? doltSession := dsess.DSessFromSess(ctx.Session) - c := sqle.NewDefault(doltSession.Provider()).Analyzer.Catalog + c := sqle.NewDefault(doltSession.GenericProvider()).Analyzer.Catalog databases := c.AllDatabases(ctx) dbs := make([]sql.Database, 0, len(databases)) diff --git a/testing/go/enginetest/doltgres_engine_test.go b/testing/go/enginetest/doltgres_engine_test.go index dba83ede89..6caa886343 100755 --- a/testing/go/enginetest/doltgres_engine_test.go +++ b/testing/go/enginetest/doltgres_engine_test.go @@ -32,7 +32,7 @@ import ( "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" "github.com/dolthub/dolt/go/libraries/doltcore/env" "github.com/dolthub/dolt/go/libraries/doltcore/sqle" - "github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess" + "github.com/dolthub/dolt/go/libraries/doltcore/dsess" "github.com/dolthub/dolt/go/libraries/utils/config" ) diff --git a/testing/go/enginetest/doltgres_harness_test.go b/testing/go/enginetest/doltgres_harness_test.go index 6e45c1b514..9aaf020bcf 100644 --- a/testing/go/enginetest/doltgres_harness_test.go +++ b/testing/go/enginetest/doltgres_harness_test.go @@ -26,7 +26,7 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess" + "github.com/dolthub/dolt/go/libraries/doltcore/dsess" denginetest "github.com/dolthub/dolt/go/libraries/doltcore/sqle/enginetest" "github.com/dolthub/dolt/go/libraries/utils/svcs" gms "github.com/dolthub/go-mysql-server"