From 7dd12adf9b1bc7e51c0dcad508a442a649e61194 Mon Sep 17 00:00:00 2001 From: Neil Macneale IV Date: Tue, 25 Mar 2025 14:25:04 -0700 Subject: [PATCH 1/2] Be more flexible for missing working sets when loading db --- go/libraries/doltcore/sqle/database_provider.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/go/libraries/doltcore/sqle/database_provider.go b/go/libraries/doltcore/sqle/database_provider.go index 1fa0163302..1e1ada242a 100644 --- a/go/libraries/doltcore/sqle/database_provider.go +++ b/go/libraries/doltcore/sqle/database_provider.go @@ -1562,7 +1562,9 @@ func initialStateForBranchDb(ctx *sql.Context, srcDb dsess.SqlDatabase) (dsess.I ws, err := srcDb.DbData().Ddb.ResolveWorkingSetAtRoot(ctx, wsRef, rootHash) if err != nil { - return dsess.InitialDbState{}, err + if err != doltdb.ErrWorkingSetNotFound { + return dsess.InitialDbState{}, err + } } static := staticRepoState{ From 133dc63de8c598b005095256dc4221f3c6ef4373 Mon Sep 17 00:00:00 2001 From: Neil Macneale IV Date: Tue, 25 Mar 2025 15:21:05 -0700 Subject: [PATCH 2/2] PR Feedback --- go/libraries/doltcore/sqle/database_provider.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/go/libraries/doltcore/sqle/database_provider.go b/go/libraries/doltcore/sqle/database_provider.go index 1e1ada242a..d6525549d3 100644 --- a/go/libraries/doltcore/sqle/database_provider.go +++ b/go/libraries/doltcore/sqle/database_provider.go @@ -1560,11 +1560,11 @@ func initialStateForBranchDb(ctx *sql.Context, srcDb dsess.SqlDatabase) (dsess.I return dsess.InitialDbState{}, err } + // Working set may not exist. Upstream code which calls here must + // handle the WorkingSet field being nil.q ws, err := srcDb.DbData().Ddb.ResolveWorkingSetAtRoot(ctx, wsRef, rootHash) - if err != nil { - if err != doltdb.ErrWorkingSetNotFound { - return dsess.InitialDbState{}, err - } + if err != nil && err != doltdb.ErrWorkingSetNotFound { + return dsess.InitialDbState{}, err } static := staticRepoState{