velocious 1.0.22 → 1.0.23

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.22",
+  "version": "1.0.23",
   "main": "index.js",
   "scripts": {
     "test": "jasmine",

package/src/database/use-database.js

@@ -5,29 +5,30 @@ import useEnvSense from "env-sense/src/use-env-sense.js"
 import Configuration from "../configuration.js"
 import restArgsError from "../utils/rest-args-error.js"
 
-const shared = {
-  loaded: false
-}
-
 const loadMigrations = function loadMigrations({migrationsRequireContext, ...restArgs}) {
+  const instance = React.useMemo(() => ({running: false}), [])
   const {isServer} = useEnvSense()
-  const [loaded, setLoaded] = React.useState(shared.loaded)
+  const [loaded, setLoaded] = React.useState(false)
 
   const loadDatabase = React.useCallback(async () => {
-    await Configuration.current().getDatabasePool().withConnection(async () => {
-      const databaseMigrateFromRequireContext = new DatabaseMigrateFromRequireContext()
+    instance.running = true
 
-      await databaseMigrateFromRequireContext.execute(migrationsRequireContext)
-    })
+    try {
+      await Configuration.current().getDatabasePool().withConnection(async () => {
+        const databaseMigrateFromRequireContext = new DatabaseMigrateFromRequireContext()
 
-    await Configuration.current().initialize()
+        await databaseMigrateFromRequireContext.execute(migrationsRequireContext)
+      })
 
-    shared.loaded = true
-    setLoaded(true)
+      await Configuration.current().initialize()
+      setLoaded(true)
+    } finally {
+      instance.running = false
+    }
   }, [])
 
   React.useMemo(() => {
-    if (!loaded && !isServer) {
+    if (!loaded && !isServer && !instance.running) {
       loadDatabase()
     }
   }, [loaded])