fix generated system table name set to use adapter names conditionally

Author: elianddb

go/libraries/doltcore/doltdb/system_table.go

@@ -160,6 +160,8 @@ func GeneratedSystemTableNames() []string {
 		GetBackupsTableName(),
 		GetStashesTableName(),
 		GetBranchActivityTableName(),
+		// [dtables.StatusTable] now uses [adapters.TableAdapter] to overwrite this name.
+		StatusTableName,
 	}
 }
 

go/libraries/doltcore/sqle/adapters/table_adapter.go

@@ -23,8 +23,10 @@ type TableAdapter interface {
 
 var DoltTableAdapterRegistry = newDoltTableAdapterRegistry()
 
-// doltTableAdapterRegistry is a TableAdapter registry for Dolt tables, keyed by the table's original name. It is
-// populated during package initialization by integrators and intended to be read-only thereafter.
+// doltTableAdapterRegistry is a Dolt table name to TableAdapter map. Integrators populate this registry during package
+// initialization, and it's intended to be read-only thereafter. The registry links with existing Dolt system tables to
+// allow them to be resolved and evaluated to integrator's version and internal aliases (integrators' Dolt table name
+// keys).
 type doltTableAdapterRegistry struct {
 	Adapters        map[string]TableAdapter
 	internalAliases map[string]string
@@ -38,13 +40,12 @@ func newDoltTableAdapterRegistry() *doltTableAdapterRegistry {
 	}
 }
 
-// AddAdapter adds a TableAdapter to the Dolt table adapter registry with optional |internalAliases| (integrators'
-// alternative Dolt table name keys).
-func (as *doltTableAdapterRegistry) AddAdapter(doltTable string, adapter TableAdapter, internalAliases ...string) {
+// AddAdapter maps |doltTableName| to an |adapter| in the Dolt table adapter registry, with optional |internalAliases|.
+func (as *doltTableAdapterRegistry) AddAdapter(doltTableName string, adapter TableAdapter, internalAliases ...string) {
 	for _, alias := range internalAliases {
-		as.internalAliases[alias] = doltTable
+		as.internalAliases[alias] = doltTableName
 	}
-	as.Adapters[doltTable] = adapter
+	as.Adapters[doltTableName] = adapter
 }
 
 // GetAdapter gets a Dolt TableAdapter mapped to |name|, which can be the dolt table name or internal alias.
@@ -58,8 +59,8 @@ func (as *doltTableAdapterRegistry) GetAdapter(name string) (TableAdapter, bool)
 	return adapter, ok
 }
 
-// NormalizeName normalizes |name| if it's an internal alias to the correct Dolt table name, if no match is found the
-// |name| is returned as is.
+// NormalizeName normalizes |name| if it's an internal alias of the underlying Dolt table name. If no match is found,
+// |name| is returned as-is.
 func (as *doltTableAdapterRegistry) NormalizeName(name string) string {
 	doltTableName, ok := as.internalAliases[name]
 	if !ok {

go/libraries/doltcore/sqle/database.go

@@ -805,7 +805,7 @@ func (db Database) getTableInsensitiveWithRoot(ctx *sql.Context, head *doltdb.Co
 				}
 			}
 
-			dt, found = dtables.NewStatusTableWithAdapter(ctx, lwrName, db.ddb, ws, rootsProvider), true
+			dt, found = dtables.NewStatusTable(ctx, lwrName, db.ddb, ws, rootsProvider), true
 		}
 	case doltdb.MergeStatusTableName, doltdb.GetMergeStatusTableName():
 		isDoltgresSystemTable, err := resolve.IsDoltgresSystemTable(ctx, tname, root)

go/libraries/doltcore/sqle/dtables/status_table.go

@@ -82,19 +82,19 @@ func (st StatusTable) PartitionRows(context *sql.Context, _ sql.Partition) (sql.
 	return newStatusItr(context, &st)
 }
 
-// NewStatusTableWithAdapter creates a new StatusTable using either an integrators' [adapters.TableAdapter] or the
-// default [NewStatusTable] constructor.
-func NewStatusTableWithAdapter(ctx *sql.Context, tableName string, ddb *doltdb.DoltDB, ws *doltdb.WorkingSet, rp env.RootsProvider[*sql.Context]) sql.Table {
+// NewStatusTable creates a new StatusTable using either an integrators' [adapters.TableAdapter] or the default
+// [NewStatusTableWithNoAdapter] constructor (Dolt table default implementation).
+func NewStatusTable(ctx *sql.Context, tableName string, ddb *doltdb.DoltDB, ws *doltdb.WorkingSet, rp env.RootsProvider[*sql.Context]) sql.Table {
 	adapter, ok := adapters.DoltTableAdapterRegistry.GetAdapter(tableName)
 	if ok {
 		return adapter.NewTable(ctx, tableName, ddb, ws, rp)
 	}
 
-	return NewStatusTable(ctx, tableName, ddb, ws, rp)
+	return NewStatusTableWithNoAdapter(ctx, tableName, ddb, ws, rp)
 }
 
-// NewStatusTable returns a new StatusTable.
-func NewStatusTable(_ *sql.Context, tableName string, ddb *doltdb.DoltDB, ws *doltdb.WorkingSet, rp env.RootsProvider[*sql.Context]) sql.Table {
+// NewStatusTableWithNoAdapter returns a new StatusTable.
+func NewStatusTableWithNoAdapter(_ *sql.Context, tableName string, ddb *doltdb.DoltDB, ws *doltdb.WorkingSet, rp env.RootsProvider[*sql.Context]) sql.Table {
 	return &StatusTable{
 		tableName:     tableName,
 		ddb:           ddb,

go/libraries/doltcore/sqle/resolve/system_tables.go

@@ -27,19 +27,19 @@ func GetGeneratedSystemTables(ctx context.Context, root doltdb.RootValue) ([]dol
 	s := doltdb.NewTableNameSet(nil)
 
 	// Depending on whether the search path is used, the generated system tables will either be in the dolt namespace
-	// or the empty (default) namespace
-	if !UseSearchPath {
-		for _, t := range doltdb.GeneratedSystemTableNames() {
-			s.Add(doltdb.TableName{Name: t})
+	// or the empty (default) namespace.
+	for _, tableName := range doltdb.GeneratedSystemTableNames() {
+		adapter, ok := adapters.DoltTableAdapterRegistry.Adapters[tableName]
+		if ok {
+			tableName = adapter.TableName()
 		}
-	} else {
-		for _, t := range doltdb.GeneratedSystemTableNames() {
-			s.Add(doltdb.TableName{Name: t, Schema: doltdb.DoltNamespace})
+
+		tableUnique := doltdb.TableName{Name: tableName}
+		if UseSearchPath {
+			tableUnique.Schema = doltdb.DoltNamespace
 		}
-	}
 
-	for _, adapter := range adapters.DoltTableAdapterRegistry.Adapters {
-		s.Add(doltdb.TableName{Name: adapter.TableName(), Schema: doltdb.DoltNamespace})
+		s.Add(tableUnique)
 	}
 
 	schemas, err := root.GetDatabaseSchemas(ctx)