velocious 1.0.68 → 1.0.70

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.68",
+  "version": "1.0.70",
   "main": "index.js",
   "scripts": {
     "test": "VELOCIOUS_TEST_DIR=../ cd spec/dummy && npx velocious test",

package/src/database/drivers/mssql/index.js

@@ -115,10 +115,7 @@ export default class VelociousDatabaseDriversMssql extends Base{
     return result.recordsets[0]
   }
 
-  queryToSql(query) {
-    return new QueryParser({query}).toSql()
-  }
-
+  queryToSql(query) { return new QueryParser({query}).toSql() }
   shouldSetAutoIncrementWhenPrimaryKey() { return true }
 
   escape(value) {

package/src/database/drivers/mysql/index.js

@@ -103,10 +103,7 @@ export default class VelociousDatabaseDriversMysql extends Base{
     }
   }
 
-  queryToSql(query) {
-    return new QueryParser({query}).toSql()
-  }
-
+  queryToSql(query) { return new QueryParser({query}).toSql() }
   shouldSetAutoIncrementWhenPrimaryKey() { return true }
 
   escape(value) {

package/src/database/drivers/pgsql/index.js

@@ -114,10 +114,7 @@ export default class VelociousDatabaseDriversPgsql extends Base{
     return response.rows
   }
 
-  queryToSql(query) {
-    return new QueryParser({query}).toSql()
-  }
-
+  queryToSql(query) { return new QueryParser({query}).toSql() }
   shouldSetAutoIncrementWhenPrimaryKey() { return true }
 
   escape(value) {

package/src/database/drivers/sqlite/base.js

@@ -192,7 +192,7 @@ export default class VelociousDatabaseDriversSqliteBase extends Base {
       try {
         return await this._queryActual(sql)
       } catch (error) {
-        if (tries < 5 && error.message.includes("attempt to write a readonly database")) {
+        if (tries < 5 && this._retryableDatabaseError(error)) {
           await wait(100)
           this.logger.warn(`Retrying query because failed with: ${error.stack}`)
           // Retry
@@ -203,6 +203,13 @@ export default class VelociousDatabaseDriversSqliteBase extends Base {
     }
   }
 
+  _retryableDatabaseError(error) {
+    if (error.message?.includes("attempt to write a readonly database")) return true
+    if (this.getType() == "sqlite" && error.message?.startsWith("SQLITE_BUSY: database is locked")) return true
+
+    return false
+  }
+
   quote(value) {
     value = this._convertValue(value)
 

package/src/database/drivers/sqlite/connection-sql-js.js

@@ -13,7 +13,7 @@ export default class VelociousDatabaseDriversSqliteConnectionSqlJs {
     this.connection = undefined
   }
 
-  disconnect = async () => await this.saveDatabase()
+  async disconnect() { await this.saveDatabase() }
 
   async query(sql) {
     const result = await query(this.connection, sql)

package/src/database/record/index.js

@@ -569,7 +569,13 @@ class VelociousDatabaseRecord {
   }
 
   static async transaction(callback) {
-    return await this.connection().transaction(callback)
+    const useTransactions = this.connection().getConfiguration().record?.transactions
+
+    if (useTransactions !== false) {
+      await this.connection().transaction(callback)
+    } else {
+      return await callback()
+    }
   }
 
   static translates(...names) {