velocious 1.0.49 → 1.0.51

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.49",
+  "version": "1.0.51",
   "main": "index.js",
   "scripts": {
     "test": "VELOCIOUS_TEST_DIR=../ cd spec/dummy && npx velocious test",
@@ -21,19 +21,8 @@
   },
   "homepage": "https://github.com/kaspernj/velocious#readme",
   "description": "",
-  "devDependencies": {
-    "awaitery": "^1.0.1",
-    "mssql": "^11.0.1",
-    "mysql": "^2.18.1",
-    "node-fetch": "^3.3.1",
-    "pg": "^8.16.3",
-    "require-context": "^1.1.0",
-    "sqlite": "^5.1.1",
-    "sqlite3": "^5.1.7",
-    "tedious": "^18.6.1",
-    "uniqunize": "^1.0.1"
-  },
   "dependencies": {
+    "awaitery": "^1.0.1",
     "bcryptjs": "^3.0.2",
     "better-localstorage": "^1.0.7",
     "debounce": "^2.2.0",
@@ -48,5 +37,16 @@
     "sql-escape-string": "^1.1.0",
     "sql.js": "^1.12.0",
     "strftime": "^0.10.2"
+  },
+  "devDependencies": {
+    "mssql": "^11.0.1",
+    "mysql": "^2.18.1",
+    "node-fetch": "^3.3.1",
+    "pg": "^8.16.3",
+    "require-context": "^1.1.0",
+    "sqlite": "^5.1.1",
+    "sqlite3": "^5.1.7",
+    "tedious": "^18.6.1",
+    "uniqunize": "^1.0.1"
   }
 }

package/src/database/drivers/base.js

@@ -16,8 +16,6 @@ export default class VelociousDatabaseDriversBase {
   }
 
   async addForeignKey(tableName, columnName, referencedTableName, referencedColumnName, args) {
-    console.log("ADD FOREIGN KEY")
-
     const tableForeignKeyArgs = Object.assign(
       {
         columnName,

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

@@ -12,6 +12,7 @@ import Options from "./options.js"
 import QueryParser from "./query-parser.js"
 import Table from "./table.js"
 import Update from "./sql/update.js"
+import wait from "awaitery/src/wait.js"
 
 export default class VelociousDatabaseDriversSqliteBase extends Base {
   async alterTableSql(tableData) {
@@ -54,9 +55,9 @@ export default class VelociousDatabaseDriversSqliteBase extends Base {
     return dropTable.toSql()
   }
 
-  deleteSql = (args) => new Delete(Object.assign({driver: this}, args)).toSql()
-  getType = () => "sqlite"
-  insertSql = (args) => new Insert(Object.assign({driver: this}, args)).toSql()
+  deleteSql(args) { return new Delete(Object.assign({driver: this}, args)).toSql() }
+  getType() { return "sqlite" }
+  insertSql(args) { return new Insert(Object.assign({driver: this}, args)).toSql() }
 
   async getTableByName(tableName, args) {
     const result = await this.query(`SELECT name FROM sqlite_master WHERE type = 'table' AND name = ${this.quote(tableName)} LIMIT 1`)
@@ -148,8 +149,8 @@ export default class VelociousDatabaseDriversSqliteBase extends Base {
     return this._options
   }
 
-  primaryKeyType = () => "integer" // Because bigint on SQLite doesn't support auto increment
-  queryToSql = (query) => new QueryParser({query}).toSql()
+  primaryKeyType() { return "integer" } // Because bigint on SQLite doesn't support auto increment
+  queryToSql(query) { return new QueryParser({query}).toSql() }
 
   async registerVersion() {
     if (this.versionMajor || this.versionMinor) {
@@ -167,7 +168,7 @@ export default class VelociousDatabaseDriversSqliteBase extends Base {
     this.versionPatch = versionParts[2]
   }
 
-  shouldSetAutoIncrementWhenPrimaryKey = () => false
+  shouldSetAutoIncrementWhenPrimaryKey() { return false }
 
   escape(value) {
     value = this._convertValue(value)
@@ -182,6 +183,26 @@ export default class VelociousDatabaseDriversSqliteBase extends Base {
     return result
   }
 
+  async query(sql) {
+    let tries = 0
+
+    while(tries < 5) {
+      tries++
+
+      try {
+        return await this._queryActual(sql)
+      } catch (error) {
+        if (tries < 5 && error.message.includes("attempt to write a readonly database")) {
+          await wait(100)
+          this.logger.warn(`Retrying query because failed with: ${error.stack}`)
+          // Retry
+        } else {
+          throw error
+        }
+      }
+    }
+  }
+
   quote(value) {
     value = this._convertValue(value)
 
@@ -193,5 +214,5 @@ export default class VelociousDatabaseDriversSqliteBase extends Base {
     return escapeString(value)
   }
 
-  updateSql = ({conditions, data, tableName}) => new Update({conditions, data, driver: this, tableName}).toSql()
+  updateSql({conditions, data, tableName}) { return new Update({conditions, data, driver: this, tableName}).toSql() }
 }

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

@@ -34,9 +34,7 @@ export default class VelociousDatabaseDriversSqliteNode extends Base {
     this.connection = undefined
   }
 
-  async query(sql) {
-    console.error("SQL: ", sql)
-
+  async _queryActual(sql) {
     return await query(this.connection, sql)
   }
 }

package/src/database/drivers/sqlite/index.native.js

@@ -56,9 +56,7 @@ export default class VelociousDatabaseDriversSqliteNative extends Base {
     this.connection = undefined
   }
 
-  async query(sql) {
-    console.error("Native SQL: ", sql)
-
+  async _queryActual(sql) {
     if (!this.connection) throw new Error("Not connected yet")
 
     return await query(this.connection, sql)

package/src/database/drivers/sqlite/index.web.js

@@ -45,7 +45,7 @@ export default class VelociousDatabaseDriversSqliteWeb extends Base {
     return `VelociousDatabaseDriversSqliteWeb---${this.args.name}`
   }
 
-  query = async (sql) => {
+  async _queryActual(sql) {
     return await this.getConnection().query(sql)
   }
 }

package/src/database/drivers/sqlite/query.native.js

@@ -13,7 +13,8 @@ export default async function query(connection, sql) {
 
     error.message += `\n\n${sqlInErrorMessage}`
 
-    throw error
+    // Re-throw to recover stack trace
+    throw new Error(error.message)
   }
 
   for await (const entry of result) {

package/src/database/drivers/sqlite/sql/alter-table.js

@@ -89,8 +89,6 @@ export default class VelociousDatabaseConnectionDriversSqliteSqlAlterTable exten
     }
 
     for (const foreignKey of tableData.getForeignKeys()) {
-      console.log(`Foreign key`, {foreignKey})
-
       if (foundForeignKeys.includes(foreignKey.getName())) continue
 
       // Register foreign key on the table

package/src/database/query/index.js

@@ -222,7 +222,7 @@ export default class VelociousDatabaseQuery {
     const sql = this.toSql()
     const results = await this.driver.query(sql)
 
-    this.logger.debug("SQL: ", sql)
+    this.logger.debug("SQL:", sql)
 
     return results
   }

package/src/logger.js

@@ -12,6 +12,12 @@ function consoleError(message) {
   })
 }
 
+function consoleWarn(message) {
+  return new Promise((resolve) => {
+    process.stderr.write(`${message}\n`, "utf8", resolve)
+  })
+}
+
 function functionOrMessages(messages) {
   if (messages.length === 1 && typeof messages[0] == "function") {
     messages = messages[0]()
@@ -75,6 +81,10 @@ class Logger {
   async error(...messages) {
     await consoleError(messagesToMessage(this._subject, ...functionOrMessages(messages)))
   }
+
+  async warn(...messages) {
+    await consoleWarn(messagesToMessage(this._subject, ...functionOrMessages(messages)))
+  }
 }
 
 export {Logger}