velocious 1.0.73 → 1.0.75

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.73",
+  "version": "1.0.75",
   "main": "index.js",
   "scripts": {
     "test": "VELOCIOUS_TEST_DIR=../ cd spec/dummy && npx velocious test",

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

@@ -106,6 +106,13 @@ export default class VelociousDatabaseDriversSqliteBase extends Base {
     return false
   }
 
+  supportsInsertIntoReturning() {
+    if (this.versionMajor >= 4) return true
+    if (this.versionMajor == 3 && this.versionMinor >= 35) return true
+
+    return false
+  }
+
   async insertMultipleWithSingleInsert(tableName, columns, rows) {
     const sql = new Insert({columns, driver: this, rows, tableName}).toSql()
 

package/src/database/query/index.js

@@ -49,7 +49,7 @@ export default class VelociousDatabaseQuery {
 
   async count() {
     // Generate count SQL
-    let sql = "COUNT(id)"
+    let sql = `COUNT(${this.driver.quoteTable(this.modelClass.tableName())}.${this.driver.quoteColumn(this.modelClass.primaryKey())})`
 
     if (this.driver.getType() == "pgsql") sql += "::int"
 
@@ -151,8 +151,8 @@ export default class VelociousDatabaseQuery {
   }
 
   async first() {
-    const newQuery = this.clone()
-    const results = await newQuery.limit(1).reorder(this.modelClass.orderableColumn()).toArray()
+    const newQuery = this.clone().limit(1).reorder(this.modelClass.orderableColumn())
+    const results = await newQuery.toArray()
 
     return results[0]
   }

package/src/database/query/insert-base.js

@@ -34,7 +34,7 @@ export default class VelociousDatabaseQueryInsertBase {
         if (Object.keys(this.data).length <= 0) {
           sql += lastInsertedSQL
         }
-      } else if (driver.getType() == "mysql" || driver.getType() == "pgsql") {
+      } else if (driver.getType() == "mysql" || driver.getType() == "pgsql" || (driver.getType() == "sqlite" && driver.supportsInsertIntoReturning())) {
         lastInsertedSQL = ` RETURNING ${driver.quoteColumn(this.returnLastInsertedColumnName)} AS lastInsertID`
       }
     }
@@ -89,7 +89,7 @@ export default class VelociousDatabaseQueryInsertBase {
     }
 
     if (this.returnLastInsertedColumnName) {
-      if (driver.getType() == "mysql") {
+      if (driver.getType() == "mysql" || (driver.getType() == "sqlite" && driver.supportsInsertIntoReturning())) {
         sql += lastInsertedSQL
       }
     }

package/src/testing/test.js

@@ -225,6 +225,9 @@ class Expect {
 
     for (const key in result) {
       const value = result[key]
+
+      if (!(key in this._object)) throw new Error(`${this._object.constructor.name} doesn't respond to ${key}`)
+
       const objectValue = this._object[key]()
 
       if (value != objectValue) {