mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-12 10:32:27 -06:00
Code Issues Packages Projects Releases 129 Wiki Activity

fix rebase problems

Browse Source
This commit is contained in:
Andy Arthur
2021-07-14 11:25:58 -07:00
parent dc81473219
commit c54ce0be5a
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
go/libraries/doltcore/sqle/dsess/session.go
View File

@@ -565,20 +565,22 @@ func (sess *Session) GetDoltDB(ctx *sql.Context, dbName string) (*doltdb.DoltDB,
return dbState.dbData.Ddb, true
}
func (sess *Session) GetDoltDbAutoIncrementTracker(dbName string) (globalstate.AutoIncrementTracker, bool) {
d, ok := sess.DbStates[dbName]
func (sess *Session) GetDoltDbAutoIncrementTracker(ctx *sql.Context, dbName string) (globalstate.AutoIncrementTracker, bool) {
dbState, ok, err := sess.LookupDbState(ctx, dbName)
if err != nil {
return nil, false
}
if !ok {
return nil, false
}
wsref := d.WorkingSet.Ref()
wsref := dbState.WorkingSet.Ref()
if d.GlobalState == nil {
if dbState.GlobalState == nil {
return nil, false
}
tracker := d.GlobalState.GetAutoIncrementTracker(wsref)
tracker := dbState.GlobalState.GetAutoIncrementTracker(wsref)
return tracker, true
}

2
go/libraries/doltcore/sqle/table_editor.go
View File

@@ -68,7 +68,7 @@ func newSqlTableEditor(ctx *sql.Context, t *WritableDoltTable) (*sqlTableEditor,
}
doltSession := dsess.DSessFromSess(ctx.Session)
ait, _ := doltSession.GetDoltDbAutoIncrementTracker(t.db.Name())
ait, _ := doltSession.GetDoltDbAutoIncrementTracker(ctx, t.db.Name())
conv := NewKVToSqlRowConverterForCols(t.nbf, t.sch.GetAllCols().GetColumns())
return &sqlTableEditor{