velocious 1.0.43 → 1.0.45

package/package.json

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

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

@@ -20,7 +20,8 @@ export default class VelociousDatabaseDriversMssql extends Base{
     const sqlConfig = digg(args, "sqlConfig")
 
     try {
-      this.connection = await mssql.connect(sqlConfig)
+      this.connection = new mssql.ConnectionPool(sqlConfig)
+      await this.connection.connect()
     } catch (error) {
       throw new Error(`Couldn't connect to database: ${error.message}`) // Re-throw to fix unuseable stack trace.
     }
@@ -52,6 +53,12 @@ export default class VelociousDatabaseDriversMssql extends Base{
     return createTable.toSql()
   }
 
+  async currentDatabase() {
+    const rows = await this.query("SELECT DB_NAME() AS db_name")
+
+    return digg(rows, 0, "db_name")
+  }
+
   async disableForeignKeys() {
     await this.query("EXEC sp_MSforeachtable \"ALTER TABLE ? NOCHECK CONSTRAINT all\"")
   }
@@ -76,7 +83,7 @@ export default class VelociousDatabaseDriversMssql extends Base{
     if (this._currentTransaction) {
       request = new mssql.Request(this._currentTransaction)
     } else {
-      request = mssql
+      request = new mssql.Request(this.connection)
     }
 
     while (true) {

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

@@ -62,6 +62,12 @@ export default class VelociousDatabaseDriversMysql extends Base{
     return createTable.toSql()
   }
 
+  async currentDatabase() {
+    const rows = await this.query("SELECT DATABASE() AS db_name")
+
+    return digg(rows, 0, "db_name")
+  }
+
   async disableForeignKeys() {
     await this.query("SET FOREIGN_KEY_CHECKS = 0")
   }

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

@@ -70,6 +70,12 @@ export default class VelociousDatabaseDriversPgsql extends Base{
     return createTable.toSql()
   }
 
+  async currentDatabase() {
+    const rows = await this.query("SELECT CURRENT_DATABASE() AS db_name")
+
+    return digg(rows, 0, "db_name")
+  }
+
   async disableForeignKeys() {
     await this.query("SET session_replication_role = 'replica'")
   }

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

@@ -35,6 +35,10 @@ export default class VelociousDatabaseDriversSqliteBase extends Base {
     return createTable.toSql()
   }
 
+  currentDatabase() {
+    return null
+  }
+
   async disableForeignKeys() {
     await this.query("PRAGMA foreign_keys = 0")
   }

package/src/database/migration/index.js

@@ -26,6 +26,8 @@ export default class VelociousDatabaseMigration {
     return this._databaseIdentifier
   }
 
+  getDriver() { return this._db }
+
   async addColumn(tableName, columnName, columnType, args) {
     const tableColumnArgs = Object.assign({type: columnType}, args)
 
@@ -101,7 +103,9 @@ export default class VelociousDatabaseMigration {
 
     if (!(idType in tableData)) throw new Error(`Unsupported primary key type: ${idType}`)
 
-    tableData[idType]("id", {autoIncrement: true, default: idDefault, null: false, primaryKey: true})
+    if (id !== false) {
+      tableData[idType]("id", {autoIncrement: true, default: idDefault, null: false, primaryKey: true})
+    }
 
     if (callback) {
       callback(tableData)

package/src/database/table-data/index.js

@@ -76,6 +76,7 @@ export default class TableData {
   boolean = (name, args) => this._defineColumn(name, Object.assign({type: "boolean"}, args))
   datetime = (name, args) => this._defineColumn(name, Object.assign({type: "datetime"}, args))
   integer = (name, args = {}) => this._defineColumn(name, Object.assign({type: "integer"}, args))
+  tinyint = (name, args = {}) => this._defineColumn(name, Object.assign({type: "tinyint"}, args))
 
   references(name, args = {}) {
     const columnName = `${name}_id`

package/src/http-server/client/request-runner.js

@@ -1,3 +1,4 @@
+import BacktraceCleaner from "../../utils/backtrace-cleaner.js"
 import EventEmitter from "events"
 import {Logger} from "../../logger.js"
 import Response from "./response.js"
@@ -40,7 +41,7 @@ export default class VelociousHttpServerClientRequestRunner {
         await routesResolver.resolve()
       }
     } catch (error) {
-      await this.logger.error(() => [`Error while running request: ${error.message}\n\n${error.stack}`])
+      await this.logger.error(() => [`Error while running request: ${BacktraceCleaner.getCleanedStack(error)}`])
 
       response.setStatus(500)
       response.setErrorBody(error)

package/src/testing/test-runner.js

@@ -1,5 +1,6 @@
 import {addTrackedStackToError} from "../utils/with-tracked-stack.js"
 import Application from "../../src/application.js"
+import BacktraceCleaner from "../utils/backtrace-cleaner.js"
 import RequestClient from "./request-client.js"
 import {tests} from "./test.js"
 
@@ -147,7 +148,9 @@ export default class TestRunner {
         // console.error(`${leftPadding}  Test failed: ${error.message}`)
         addTrackedStackToError(error)
 
-        const stackLines = error.stack.split("\n")
+        const backtraceCleaner = new BacktraceCleaner(error)
+        const cleanedStack = backtraceCleaner.getCleanedStack()
+        const stackLines = cleanedStack.split("\n")
 
         for (const stackLine of stackLines) {
           console.error(`${leftPadding}  ${stackLine}`)

package/src/utils/backtrace-cleaner.js

@@ -0,0 +1,15 @@
+export default class BacktraceCleaner {
+  static getCleanedStack(error) {
+    return new BacktraceCleaner(error).getCleanedStack()
+  }
+
+  constructor(error) {
+    this.error = error
+  }
+
+  getCleanedStack() {
+    const backtrace = this.error.stack.split("\n")
+
+    return backtrace.filter((line) => !line.includes("node_modules") && !line.includes("(node:internal/process/")).join("\n")
+  }
+}