Initialize SQLite database at all entry points

Author: ad-si

src/Language/PureScript/Docs/Collect.hs

@@ -25,6 +25,7 @@ import Language.PureScript.Crash qualified as P
 import Language.PureScript.Errors qualified as P
 import Language.PureScript.Externs qualified as P
 import Language.PureScript.Make qualified as P
+import Language.PureScript.Make.IdeCache (sqliteInit)
 import Language.PureScript.Names qualified as P
 import Language.PureScript.Options qualified as P
 
@@ -89,6 +90,7 @@ compileForDocs ::
   m [P.ExternsFile]
 compileForDocs outputDir inputFiles = do
   result <- liftIO $ do
+    sqliteInit outputDir
     moduleFiles <- readUTF8FilesT inputFiles
     fmap fst $ P.runMake testOptions $ do
       ms <- P.parseModulesFromFiles identity moduleFiles

tests/Language/PureScript/Ide/Test.hs

@@ -10,6 +10,7 @@ import Language.PureScript.Ide (handleCommand)
 import Language.PureScript.Ide.Command (Command)
 import Language.PureScript.Ide.Error (IdeError)
 import Language.PureScript.Ide.Types
+import Language.PureScript.Make.IdeCache (sqliteInit)
 import Protolude
 import System.Directory (doesDirectoryExist, getCurrentDirectory, makeAbsolute, removeDirectoryRecursive, setCurrentDirectory)
 import System.FilePath ((</>))
@@ -30,13 +31,14 @@ defConfig =
 
 runIde' :: IdeConfiguration -> IdeState -> [Command] -> IO ([Either IdeError Success], IdeState)
 runIde' conf s cs = do
+  sqliteInit (confOutputPath conf)
   stateVar <- newTVarIO s
   ts <- newIORef Nothing
   let env' = IdeEnvironment
         { ideStateVar = stateVar
         , ideConfiguration = conf
         , ideCacheDbTimestamp = ts
-        , query = \q -> SQLite.withConnection defConfig.sqliteFilePath
+        , query = \q -> SQLite.withConnection conf.sqliteFilePath
              (\conn -> SQLite.query_ conn $ SQLite.Query q)
         }
   r <- runNoLoggingT (runReaderT (traverse (runExceptT . handleCommand) cs) env')

tests/TestMake.hs

@@ -7,6 +7,7 @@ import Prelude hiding (writeFile)
 
 import Language.PureScript qualified as P
 import Language.PureScript.CST qualified as CST
+import Language.PureScript.Make.IdeCache (sqliteInit)
 
 import Control.Concurrent (threadDelay)
 import Control.Monad (guard, void, forM_, when)
@@ -696,6 +697,7 @@ compileWithOptions ::
   [FilePath] ->
   IO (Either P.MultipleErrors [P.ExternsFile], Set P.ModuleName)
 compileWithOptions opts input = do
+  sqliteInit modulesDir
   recompiled <- newMVar Set.empty
   moduleFiles <- readUTF8FilesT input
   (makeResult, _) <- P.runMake opts $ do

tests/TestUtils.hs

@@ -7,6 +7,7 @@ import Language.PureScript.CST qualified as CST
 import Language.PureScript.AST qualified as AST
 import Language.PureScript.Names qualified as N
 import Language.PureScript.Interactive.IO (findNodeProcess)
+import Language.PureScript.Make.IdeCache (sqliteInit)
 
 import Control.Arrow ((***), (>>>))
 import Control.Monad (forM, guard, unless)
@@ -198,6 +199,7 @@ compile'
   -> [FilePath]
   -> IO ([(FilePath, T.Text)], (Either P.MultipleErrors FilePath, P.MultipleErrors))
 compile' options expectedModule SupportModules{..} inputFiles = do
+  sqliteInit modulesDir
   -- Sorting the input files makes some messages (e.g., duplicate module) deterministic
   fs <- readInput (sort inputFiles)
   fmap (fs, ) . P.runMake options $ do
@@ -259,7 +261,9 @@ makeActions modules foreigns = (P.buildMakeActions modulesDir (P.internalError "
 
 
 runTest :: P.Make a -> IO (Either P.MultipleErrors a, P.MultipleErrors)
-runTest = P.runMake P.defaultOptions
+runTest action = do
+  sqliteInit modulesDir
+  P.runMake P.defaultOptions action
 
 inferForeignModules
   :: MonadIO m