fix ignore/docs tables

go/libraries/doltcore/merge/schema_merge_test.go

@@ -1626,7 +1626,7 @@ func makeRootWithTable(t *testing.T, ddb *doltdb.DoltDB, eo editor.Options, tbl
 	require.NoError(t, err)
 	noop := func(ctx *sql.Context, dbName string, root doltdb.RootValue) (err error) { return }
 	sess := writer.NewWriteSession(ddb.Format(), ws, gst, eo)
-	wr, err := sess.GetTableWriter(sql.NewContext(ctx), doltdb.TableName{Name: tbl.ns.name}, "test", noop)
+	wr, err := sess.GetTableWriter(sql.NewContext(ctx), dt, doltdb.TableName{Name: tbl.ns.name}, "test", noop)
 	require.NoError(t, err)
 
 	sctx := sql.NewEmptyContext()

go/libraries/doltcore/sqle/dsess/table_writer.go

@@ -28,6 +28,9 @@ type WriteSession interface {
 	// GetTableWriter creates a TableWriter and adds it to the WriteSession.
 	GetTableWriter(ctx *sql.Context, t *doltdb.Table, table doltdb.TableName, db string, setter SessionRootSetter) (TableWriter, error)
 
+	// GetWorkingSet returns the session's current working set.
+	GetWorkingSet() *doltdb.WorkingSet
+
 	// SetWorkingSet modifies the state of the WriteSession. The WorkingSetRef of |ws| must match the existing Ref.
 	SetWorkingSet(ctx *sql.Context, ws *doltdb.WorkingSet) error
 

go/libraries/doltcore/sqle/dtables/docs_table.go

@@ -257,7 +257,7 @@ func (iw *docsWriter) StatementBegin(ctx *sql.Context) {
 	}
 
 	if ws := dbState.WriteSession(); ws != nil {
-		table, _, err := roots.Working.GetTable(ctx, doltdb.TableName{Name: doltdb.DocTableName})
+		table, _, err := ws.GetWorkingSet().WorkingRoot().GetTable(ctx, doltdb.TableName{Name: doltdb.IgnoreTableName})
 		if err != nil {
 			iw.errDuringStatementBegin = err
 			return

go/libraries/doltcore/sqle/dtables/ignore_table.go

@@ -273,7 +273,7 @@ func (iw *ignoreWriter) StatementBegin(ctx *sql.Context) {
 	}
 
 	if ws := dbState.WriteSession(); ws != nil {
-		table, _, err := roots.Working.GetTable(ctx, doltdb.TableName{Name: doltdb.IgnoreTableName})
+		table, _, err := ws.GetWorkingSet().WorkingRoot().GetTable(ctx, doltdb.TableName{Name: doltdb.IgnoreTableName})
 		if err != nil {
 			iw.errDuringStatementBegin = err
 			return
@@ -300,7 +300,10 @@ func (iw *ignoreWriter) DiscardChanges(ctx *sql.Context, errorEncountered error)
 // StatementComplete is called after the last operation of the statement, indicating that it has successfully completed.
 // The mark set in StatementBegin may be removed, and a new one should be created on the next StatementBegin.
 func (iw *ignoreWriter) StatementComplete(ctx *sql.Context) error {
-	return iw.tableWriter.StatementComplete(ctx)
+	if iw.tableWriter != nil {
+		return iw.tableWriter.StatementComplete(ctx)
+	}
+	return nil
 }
 
 // Close finalizes the delete operation, persisting the result.

go/libraries/doltcore/sqle/writer/noms_write_session.go

@@ -66,6 +66,10 @@ func NewWriteSession(nbf *types.NomsBinFormat, ws *doltdb.WorkingSet, aiTracker
 	}
 }
 
+func (s *nomsWriteSession) GetWorkingSet() *doltdb.WorkingSet {
+	return s.workingSet
+}
+
 func (s *nomsWriteSession) GetTableWriter(ctx *sql.Context, _ *doltdb.Table, table doltdb.TableName, db string, setter dsess.SessionRootSetter) (dsess.TableWriter, error) {
 	s.mut.Lock()
 	defer s.mut.Unlock()

go/libraries/doltcore/sqle/writer/prolly_write_session.go

@@ -38,6 +38,10 @@ type prollyWriteSession struct {
 
 var _ dsess.WriteSession = &prollyWriteSession{}
 
+func (s *prollyWriteSession) GetWorkingSet() *doltdb.WorkingSet {
+	return s.workingSet
+}
+
 // GetTableWriter implemented WriteSession.
 func (s *prollyWriteSession) GetTableWriter(ctx *sql.Context, t *doltdb.Table, tableName doltdb.TableName, db string, setter dsess.SessionRootSetter) (dsess.TableWriter, error) {
 	s.mut.Lock()