More tablename plumbing

go/libraries/doltcore/sqle/dtables/conflicts_tables_prolly.go

@@ -15,7 +15,6 @@
 package dtables
 
 import (
- "context"
  "encoding/base64"
  "fmt"
 
@@ -64,7 +63,7 @@ func newProllyConflictsTable(
  }
 
  return ProllyConflictsTable{
- tblName: tblName.Name,
+ tblName: tblName,
  sqlSch: sqlSch,
  baseSch: baseSch,
  ourSch: ourSch,
@@ -81,7 +80,7 @@ func newProllyConflictsTable(
 // ProllyConflictsTable is a sql.Table implementation that uses the merge
 // artifacts table to persist and read conflicts.
 type ProllyConflictsTable struct {
- tblName string
+ tblName doltdb.TableName
  sqlSch sql.PrimaryKeySchema
  baseSch, ourSch, theirSch schema.Schema
  root doltdb.RootValue
@@ -96,11 +95,11 @@ var _ sql.UpdatableTable = ProllyConflictsTable{}
 var _ sql.DeletableTable = ProllyConflictsTable{}
 
 func (ct ProllyConflictsTable) Name() string {
- return doltdb.DoltConfTablePrefix + ct.tblName
+ return doltdb.DoltConfTablePrefix + ct.tblName.Name
 }
 
 func (ct ProllyConflictsTable) String() string {
- return doltdb.DoltConfTablePrefix + ct.tblName
+ return doltdb.DoltConfTablePrefix + ct.tblName.Name
 }
 
 func (ct ProllyConflictsTable) Schema() sql.Schema {
@@ -130,7 +129,7 @@ func (ct ProllyConflictsTable) Deleter(ctx *sql.Context) sql.RowDeleter {
 
 type prollyConflictRowIter struct {
  itr prolly.ConflictArtifactIter
- tblName string
+ tblName doltdb.TableName
  vrw types.ValueReadWriter
  ns tree.NodeStore
  ourRows prolly.Map
@@ -404,13 +403,13 @@ func (itr *prollyConflictRowIter) nextConflictVals(ctx *sql.Context) (c conf, er
 
 // loadTableMaps loads the maps specified in the metadata if they are different from
 // the currently loaded maps. |baseHash| and |theirHash| are table hashes.
-func (itr *prollyConflictRowIter) loadTableMaps(ctx context.Context, baseHash, theirHash hash.Hash) error {
+func (itr *prollyConflictRowIter) loadTableMaps(ctx *sql.Context, baseHash, theirHash hash.Hash) error {
  if itr.baseHash.Compare(baseHash) != 0 {
  rv, err := doltdb.LoadRootValueFromRootIshAddr(ctx, itr.vrw, itr.ns, baseHash)
  if err != nil {
  return err
  }
- baseTbl, ok, err := rv.GetTable(ctx, doltdb.TableName{Name: itr.tblName})
+ baseTbl, ok, err := rv.GetTable(ctx, itr.tblName)
  if err != nil {
  return err
  }
@@ -435,7 +434,8 @@ func (itr *prollyConflictRowIter) loadTableMaps(ctx context.Context, baseHash, t
  if err != nil {
  return err
  }
- theirTbl, ok, err := rv.GetTable(ctx, doltdb.TableName{Name: itr.tblName})
+
+ theirTbl, ok, err := rv.GetTable(ctx, itr.tblName)
  if err != nil {
  return err
  }
@@ -660,7 +660,7 @@ func (cd *prollyConflictDeleter) Close(ctx *sql.Context) error {
  return err
  }
 
- updatedRoot, err := cd.ct.root.PutTable(ctx, doltdb.TableName{Name: cd.ct.tblName}, updatedTbl)
+ updatedRoot, err := cd.ct.root.PutTable(ctx, cd.ct.tblName, updatedTbl)
  if err != nil {
  return err
  }