velocious 1.0.38 → 1.0.40

package/package.json

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

package/peak_flow.yml

@@ -1,7 +1,7 @@
 before_install:
   - sudo mkdir -p /etc/apt/keyrings
   - curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --no-tty --batch --yes --dearmor -o /etc/apt/keyrings/nodesource.gpg
-  - echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list
+  - echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_24.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list
   - sudo apt-get update
   - sudo apt-get install -y nodejs
 before_script:
@@ -45,8 +45,9 @@ builds:
     name: MariaDB
     script:
       - cp spec/dummy/src/config/configuration.peakflow.mariadb.js spec/dummy/src/config/configuration.js
-      - wait-for-it mariadb:3306
       - wait-for-it mssql:1433
+      - wait-for-it mariadb:3306
+      - sleep 5
       - cd spec/dummy && npx velocious db:create
       - npm test
   build_2:
@@ -54,6 +55,7 @@ builds:
     script:
       - cp spec/dummy/src/config/configuration.peakflow.mssql.js spec/dummy/src/config/configuration.js
       - wait-for-it mssql:1433
+      - sleep 5
       - cd spec/dummy && npx velocious db:create
       - npm test
   build_3:
@@ -62,6 +64,7 @@ builds:
       - cp spec/dummy/src/config/configuration.peakflow.pgsql.js spec/dummy/src/config/configuration.js
       - wait-for-it mssql:1433
       - wait-for-it postgres:5432
+      - sleep 5
       - cd spec/dummy && npx velocious db:create
       - npm test
   build_4:
@@ -69,5 +72,6 @@ builds:
     script:
       - cp spec/dummy/src/config/configuration.peakflow.sqlite.js spec/dummy/src/config/configuration.js
       - wait-for-it mssql:1433
+      - sleep 5
       - cd spec/dummy && npx velocious db:create
       - npm test

package/spec/database/record/create-spec.js

@@ -22,6 +22,9 @@ describe("Record - create", () => {
       expect(project.nameEn()).toEqual("Test project")
       expect(project.createdAt()).toBeInstanceOf(Date)
       expect(project.updatedAt()).toBeInstanceOf(Date)
+
+      // 'name' is not a column but rather a column on the translation data model.
+      expect(() => project.readColumn("name")).toThrowError("No such attribute or not selected Project#name")
     })
   })
 

package/spec/database/record/find-spec.js

@@ -11,6 +11,7 @@ describe("Record - find", () => {
       const foundTask = await Task.find(task.id())
 
       expect(foundTask.readAttribute("name")).toEqual("Test task")
+      expect(foundTask.readColumn("name")).toEqual("Test task")
     })
   })
 

package/spec/database/record/validations-spec.js

@@ -11,6 +11,14 @@ describe("Record - validations", () => {
     })
   })
 
+  it("raises validations if trying to create an invalid record with a blank value because of a presence validation", async () => {
+    await Dummy.run(async () => {
+      const task = new Task({name: null})
+
+      await expectAsync(task.save()).toBeRejectedWith(new ValidationError("Name can't be blank"))
+    })
+  })
+
   it("raises validations if trying to create an invalid record because of a uniqueness validation", async () => {
     await Dummy.run(async () => {
       await Task.create({name: "Task 1"})

package/spec/dummy/src/config/configuration.peakflow.mssql.js

@@ -21,11 +21,6 @@ export default new Configuration({
           password: "Super-Secret-Password",
           database: "velocious_test",
           server: "mssql",
-          pool: {
-            max: 10,
-            min: 0,
-            idleTimeoutMillis: 30000
-          },
           options: {
             encrypt: true, // for azure
             trustServerCertificate: true // change to true for local dev / self-signed certs
@@ -43,11 +38,6 @@ export default new Configuration({
           password: "Super-Secret-Password",
           database: "velocious_test",
           server: "mssql",
-          pool: {
-            max: 10,
-            min: 0,
-            idleTimeoutMillis: 30000
-          },
           options: {
             encrypt: true, // for azure
             trustServerCertificate: true // change to true for local dev / self-signed certs

package/src/cli/commands/test.js

@@ -12,10 +12,10 @@ export default class VelociousCliCommandsInit extends BaseCommand {
 
     if (testRunner.isFailed()) {
       console.error(`Test run failed with ${testRunner.failedTests} failed tests and ${testRunner.successfulTests} successfull`)
-      process.exit(-1)
+      process.exit(1)
     } else {
       console.log(`Test run succeeded with ${testRunner.successfulTests} successful tests`)
-      process.exit(1)
+      process.exit(0)
     }
   }
 }

package/src/database/record/index.js

@@ -330,7 +330,13 @@ class VelociousDatabaseRecord {
     return record
   }
 
+  static setPrimaryKey(primaryKey) {
+    this._primaryKey = primaryKey
+  }
+
   static primaryKey() {
+    if (this._primaryKey) return this._primaryKey
+
     return "id"
   }
 
@@ -762,13 +768,18 @@ class VelociousDatabaseRecord {
 
   readAttribute(attributeName) {
     const attributeNameUnderscore = inflection.underscore(attributeName)
-    const column = this.constructor.getColumns().find((column) => column.getName() == attributeNameUnderscore)
+
+    return this.readColumn(attributeNameUnderscore)
+  }
+
+  readColumn(attributeName) {
+    const column = this.constructor.getColumns().find((column) => column.getName() == attributeName)
     let result
 
-    if (attributeNameUnderscore in this._changes) {
-      result = this._changes[attributeNameUnderscore]
-    } else if (attributeNameUnderscore in this._attributes) {
-      result = this._attributes[attributeNameUnderscore]
+    if (attributeName in this._changes) {
+      result = this._changes[attributeName]
+    } else if (attributeName in this._attributes) {
+      result = this._attributes[attributeName]
     } else if (this.isPersisted()) {
       throw new Error(`No such attribute or not selected ${this.constructor.name}#${attributeName}`)
     }

package/src/database/record/validators/presence.js

@@ -2,7 +2,7 @@ import Base from "./base.js"
 
 export default class VelociousDatabaseRecordValidatorsPresence extends Base {
   validate({model, attributeName}) {
-    const attributeValue = model.readAttribute(attributeName).trim()
+    const attributeValue = model.readAttribute(attributeName)?.trim()
 
     if (!attributeValue) {
       if (!(attributeName in model._validationErrors)) model._validationErrors[attributeName] = []