Insert scratch branch after adding the causal hash table

sellout · Jun 24, 2024 · 60f99c2 · 60f99c2
1 parent 1c186d4
commit 60f99c2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/codebase2/codebase-sqlite/U/Codebase/Sqlite/Queries.hs b/codebase2/codebase-sqlite/U/Codebase/Sqlite/Queries.hs
@@ -3755,7 +3755,7 @@ loadProjectAndBranchNames projectId branchId =
     |]
 
 -- | Insert a project branch.
-insertProjectBranch :: Text -> CausalHashId -> ProjectBranch -> Transaction ()
+insertProjectBranch :: HasCallStack => Text -> CausalHashId -> ProjectBranch -> Transaction ()
 insertProjectBranch description causalHashId (ProjectBranch projectId branchId branchName maybeParentBranchId) = do
   -- Ensure we never point at a causal we don't have the branch for.
   _ <- expectBranchObjectIdByCausalHashId causalHashId

diff --git a/parser-typechecker/src/Unison/Codebase/SqliteCodebase/Operations.hs b/parser-typechecker/src/Unison/Codebase/SqliteCodebase/Operations.hs
@@ -93,9 +93,10 @@ createSchema = do
   Q.addMostRecentNamespaceTable
   Sqlite.execute insertSchemaVersionSql
   Q.addSquashResultTable
-  (_, emptyCausalHashId) <- emptyCausalHash
-  void $ insertProjectAndBranch scratchProjectName scratchBranchName emptyCausalHashId
   Q.addProjectBranchCausalHashIdColumn
+  (_, emptyCausalHashId) <- emptyCausalHash
+  (_, ProjectBranch {projectId, branchId}) <- insertProjectAndBranch scratchProjectName scratchBranchName emptyCausalHashId
+  Q.setCurrentProjectPath projectId branchId []
   Q.addProjectBranchReflogTable
   Q.addProjectBranchCausalHashIdColumn
   where