velocious 1.0.44 → 1.0.46

package/package.json

@@ -3,10 +3,10 @@
     "velocious": "bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.44",
+  "version": "1.0.46",
   "main": "index.js",
   "scripts": {
-    "test": "jasmine",
+    "test": "VELOCIOUS_TEST_DIR=../ cd spec/dummy && npx velocious test",
     "velocious": "asd"
   },
   "type": "module",
@@ -23,7 +23,6 @@
   "description": "",
   "devDependencies": {
     "awaitery": "^1.0.1",
-    "jasmine": "^5.0.2",
     "mssql": "^11.0.1",
     "mysql": "^2.18.1",
     "node-fetch": "^3.3.1",

package/src/cli/base-command.js

@@ -7,5 +7,6 @@ export default class VelociousCliBaseCommand {
     this.processArgs = args.processArgs
   }
 
-  directory = () => digg(this, "configuration").getDirectory()
+  directory() { return digg(this, "configuration").getDirectory() }
+  getConfiguration() { return this.configuration }
 }

package/src/cli/commands/test.js

@@ -4,6 +4,8 @@ import TestRunner from "../../testing/test-runner.js"
 
 export default class VelociousCliCommandsTest extends BaseCommand {
   async execute() {
+    this.getConfiguration().setEnvironment("test")
+
     const directory = process.env.VELOCIOUS_TEST_DIR || this.directory()
     const testFilesFinder = new TestFilesFinder({directory, processArgs: this.processArgs})
     const testFiles = await testFilesFinder.findTestFiles()

package/src/cli/index.js

@@ -60,5 +60,5 @@ export default class VelociousCli {
     this.args.configuration = this.configuration
   }
 
-  getConfiguration = () => this.args.configuration
+  getConfiguration() { return this.args.configuration }
 }

package/src/configuration.js

@@ -78,11 +78,10 @@ export default class VelociousConfiguration {
   }
 
   getEnvironment() { return digg(this, "_environment") }
+  setEnvironment(newEnvironment) { this._environment = newEnvironment }
 
   getLocaleFallbacks = () => this.localeFallbacks
-  setLocaleFallbacks(newLocaleFallbacks) {
-    this.localeFallbacks = newLocaleFallbacks
-  }
+  setLocaleFallbacks(newLocaleFallbacks) { this.localeFallbacks = newLocaleFallbacks }
 
   getLocale() {
     if (typeof this.locale == "function") {

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/record/index.js

@@ -204,6 +204,8 @@ class VelociousDatabaseRecord {
     this._table = await this.connection().getTableByName(this.tableName())
     this._columns = await this._getTable().getColumns()
     this._columnsAsHash = {}
+    this._columnNameToAttributeName = {}
+    this._attributeNameToColumnName = {}
 
     for (const column of this._columns) {
       this._columnsAsHash[column.getName()] = column
@@ -212,6 +214,9 @@ class VelociousDatabaseRecord {
       const camelizedColumnNameBigFirst = inflection.camelize(column.getName())
       const setterMethodName = `set${camelizedColumnNameBigFirst}`
 
+      this._attributeNameToColumnName[camelizedColumnName] = column.getName()
+      this._columnNameToAttributeName[column.getName()] = camelizedColumnName
+
       this.prototype[camelizedColumnName] = function () {
         return this.readAttribute(camelizedColumnName)
       }
@@ -300,7 +305,11 @@ class VelociousDatabaseRecord {
   }
 
   _setColumnAttribute(name, newValue) {
-    const columnName = inflection.underscore(name)
+    if (!this.constructor._attributeNameToColumnName) throw new Error("No attribute-to-column mapping. Has record been initialized?")
+
+    const columnName = this.constructor._attributeNameToColumnName[name]
+
+    if (!columnName) throw new Error(`Couldn't figure out column name for attribute: ${attributeName}`)
 
     if (this._attributes[columnName] != newValue) {
       this._changes[columnName] = newValue
@@ -767,9 +776,11 @@ class VelociousDatabaseRecord {
   }
 
   readAttribute(attributeName) {
-    const attributeNameUnderscore = inflection.underscore(attributeName)
+    const columnName = this.constructor._attributeNameToColumnName[attributeName]
+
+    if (!columnName) throw new Error(`Couldn't figure out column name for attribute: ${attributeName}`)
 
-    return this.readColumn(attributeNameUnderscore)
+    return this.readColumn(columnName)
   }
 
   readColumn(attributeName) {

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/worker-handler/index.js

@@ -24,6 +24,7 @@ export default class VelociousHttpServerWorker {
         workerData: {
           debug,
           directory,
+          environment: this.configuration.getEnvironment(),
           workerCount: this.workerCount
         }
       })

package/src/http-server/worker-handler/worker-thread.js

@@ -25,11 +25,12 @@ export default class VelociousHttpServerWorkerHandlerWorkerThread {
   }
 
   async initialize() {
-    const {debug, directory} = digs(this.workerData, "debug", "directory")
-    const configurationPath = `${this.workerData.directory}/src/config/configuration.js`
+    const {debug, directory, environment} = digs(this.workerData, "debug", "directory", "environment")
+    const configurationPath = `${directory}/src/config/configuration.js`
     const configurationImport = await import(configurationPath)
 
     this.configuration = configurationImport.default
+    this.configuration.setEnvironment(environment)
     this.configuration.setCurrent()
 
     this.application = new Application({configuration: this.configuration, debug, directory})

package/spec/support/jasmine.json

@@ -1,12 +0,0 @@
-{
-  "spec_dir": "spec",
-  "spec_files": [
-    "**/*-spec.js"
-  ],
-  "helpers": [
-    "helpers/**/*.js"
-  ],
-  "stopSpecOnExpectationFailure": false,
-  "random": false,
-  "jsLoader": "import"
-}