velocious 1.0.78 → 1.0.80

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.78",
+  "version": "1.0.80",
   "main": "index.js",
   "scripts": {
     "test": "VELOCIOUS_TEST_DIR=../ cd spec/dummy && npx velocious test",
@@ -40,7 +40,7 @@
     "strftime": "^0.10.2"
   },
   "devDependencies": {
-    "mssql": "^11.0.1",
+    "mssql": "^12.0.0",
     "mysql": "^2.18.1",
     "node-fetch": "^3.3.1",
     "pg": "^8.16.3",

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

@@ -0,0 +1,29 @@
+import Dummy from "../../dummy/index.js"
+import Project from "../../dummy/src/models/project.js"
+import Task from "../../dummy/src/models/task.js"
+
+describe("Record - last", () => {
+  it("finds the last record", async () => {
+    await Dummy.run(async () => {
+      const project1 = await Project.create()
+
+      await Task.create({name: "Test task 1", project: project1})
+      await Task.create({name: "Test task 2", project: project1})
+      await Task.create({name: "Test task 3", project: project1})
+
+      const project2 = await Project.create()
+
+      await Task.create({name: "Test task 4", project: project2})
+      await Task.create({name: "Test task 5", project: project2})
+      await Task.create({name: "Test task 6", project: project2})
+
+      const foundTask = await Task.last()
+
+      expect(foundTask.name()).toEqual("Test task 6")
+
+      const foundTaskWithFilter = await Task.where({project_id: project1.id()}).last()
+
+      expect(foundTaskWithFilter.name()).toEqual("Test task 3")
+    })
+  })
+})

package/src/database/query/index.js

@@ -174,7 +174,7 @@ export default class VelociousDatabaseQuery {
   }
 
   async first() {
-    const newQuery = this.clone().limit(1).reorder(this.modelClass.orderableColumn())
+    const newQuery = this.clone().limit(1).reorder(`${this.driver.quoteTable(this.modelClass.tableName())}.${this.driver.quoteColumn(this.modelClass.orderableColumn())}`)
     const results = await newQuery.toArray()
 
     return results[0]

package/src/database/query/where-hash.js

@@ -16,19 +16,18 @@ export default class VelociousDatabaseQueryWhereHash extends WhereBase {
     return sql
   }
 
-  _whereSQLFromHash(hash, tableName) {
+  _whereSQLFromHash(hash, tableName, index = 0) {
     const options = this.getOptions()
     let sql = ""
-    let index = 0
 
     for (const whereKey in hash) {
       const whereValue = hash[whereKey]
 
-      if (index > 0) sql += " AND "
-
-      if (!Array.isArray(whereValue) && typeof whereValue == "object") {
-        sql += this._whereSQLFromHash(whereValue, whereKey)
+      if (!Array.isArray(whereValue) && whereValue !== null && typeof whereValue == "object") {
+        sql += this._whereSQLFromHash(whereValue, whereKey, index)
       } else {
+        if (index > 0) sql += " AND "
+
         if (tableName) {
           sql += `${options.quoteTableName(tableName)}.`
         }
@@ -37,6 +36,8 @@ export default class VelociousDatabaseQueryWhereHash extends WhereBase {
 
         if (Array.isArray(whereValue)) {
           sql += ` IN (${whereValue.map((value) => options.quote(value)).join(", ")})`
+        } else if (whereValue === null) {
+          sql += " IS NULL"
         } else {
           sql += ` = ${options.quote(whereValue)}`
         }

package/src/database/record/index.js

@@ -290,15 +290,7 @@ class VelociousDatabaseRecord {
       this.prototype[`has${camelizedColumnNameBigFirst}`] = function() {
         let value = this[camelizedColumnName]()
 
-        if (typeof value == "string") {
-          value = value.trim()
-        }
-
-        if (value) {
-          return true
-        }
-
-        return false
+        return this._hasAttribute(value)
       }
     }
 
@@ -306,6 +298,18 @@ class VelociousDatabaseRecord {
     this._initialized = true
   }
 
+  _hasAttribute(value) {
+    if (typeof value == "string") {
+      value = value.trim()
+    }
+
+    if (value) {
+      return true
+    }
+
+    return false
+  }
+
   static isInitialized() {
     if (this._initialized) return true
 
@@ -324,13 +328,19 @@ class VelociousDatabaseRecord {
         const nameCamelized = inflection.camelize(name)
         const setterMethodName = `set${nameCamelized}`
 
-        this.prototype[name] = function() {
+        this.prototype[name] = function getTranslatedAttribute() {
           const locale = this._getConfiguration().getLocale()
 
           return this._getTranslatedAttributeWithFallback(name, locale)
         }
 
-        this.prototype[setterMethodName] = function(newValue) {
+        this.prototype[`has${nameCamelized}`] = function hasTranslatedAttribute() {
+          const value = this[name]()
+
+          return this._hasAttribute(value)
+        }
+
+        this.prototype[setterMethodName] = function setTranslatedAttribute(newValue) {
           const locale = this._getConfiguration().getLocale()
 
           return this._setTranslatedAttribute(name, locale, newValue)
@@ -341,11 +351,11 @@ class VelociousDatabaseRecord {
           const getterMethodNameLocalized = `${name}${localeCamelized}`
           const setterMethodNameLocalized = `${setterMethodName}${localeCamelized}`
 
-          this.prototype[getterMethodNameLocalized] = function() {
+          this.prototype[getterMethodNameLocalized] = function getTranslatedAttributeWithLocale() {
             return this._getTranslatedAttribute(name, locale)
           }
 
-          this.prototype[setterMethodNameLocalized] = function(newValue) {
+          this.prototype[setterMethodNameLocalized] = function setTranslatedAttributeWithLocale(newValue) {
             return this._setTranslatedAttribute(name, locale, newValue)
           }
         }
@@ -416,13 +426,6 @@ class VelociousDatabaseRecord {
     return await this.connection().insertMultiple(this.tableName(), columns, rows)
   }
 
-  static async last() {
-    const query = this._newQuery().order(this.primaryKey())
-    const record = await query.last()
-
-    return record
-  }
-
   static async nextPrimaryKey() {
     const primaryKey = this.primaryKey()
     const tableName = this.tableName()
@@ -758,6 +761,10 @@ class VelociousDatabaseRecord {
     return this._newQuery().joins(...args)
   }
 
+  static async last(...args) {
+    return await this._newQuery().last(...args)
+  }
+
   static limit(...args) {
     return this._newQuery().limit(...args)
   }
@@ -930,7 +937,7 @@ class VelociousDatabaseRecord {
     }
 
     if (column && this.constructor.getDatabaseType() == "sqlite") {
-      if (column.getType() == "date" || column.getType() == "datetime") {
+      if (result && (column.getType() == "date" || column.getType() == "datetime")) {
         result = new Date(Date.parse(result))
       }
     }
@@ -1021,7 +1028,17 @@ class VelociousDatabaseRecord {
     }
   }
 
-  id() { return this.readAttribute(this.constructor._columnNameToAttributeName[this.constructor.primaryKey()]) }
+  id() {
+    const primaryKey = this.constructor.primaryKey()
+    const attributeName = this.constructor._columnNameToAttributeName[primaryKey]
+
+    if (attributeName === undefined) {
+      throw new Error(`Primary key ${primaryKey} doesn't exist in columns: ${Object.keys(this.constructor._columnNameToAttributeName).join(", ")}`)
+    }
+
+    return this.readAttribute(attributeName)
+  }
+
   isPersisted() { return !this._isNewRecord }
   isNewRecord() { return this._isNewRecord }