velocious 1.0.72 → 1.0.73

package/package.json

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

package/src/database/query/index.js

@@ -118,6 +118,24 @@ export default class VelociousDatabaseQuery {
     return record
   }
 
+  async findByOrFail(conditions) {
+    const newConditions = {}
+
+    for (const key in conditions) {
+      const keyUnderscore = inflection.underscore(key)
+
+      newConditions[keyUnderscore] = conditions[key]
+    }
+
+    const model = await this.clone().where(newConditions).first()
+
+    if (!model) {
+      throw new Error("Record not found")
+    }
+
+    return model
+  }
+
   async findOrInitializeBy(conditions, callback) {
     const record = await this.findBy(conditions)
 
@@ -166,8 +184,10 @@ export default class VelociousDatabaseQuery {
     return this
   }
 
-  last = async () => {
-    const results = await this.clone().reorder("id DESC").limit(1).toArray()
+  async last() {
+    const primaryKey = this.modelClass.primaryKey()
+    const tableName = this.modelClass.tableName()
+    const results = await this.clone().reorder(`${this.driver.quoteTable(tableName)}.${this.driver.quoteColumn(primaryKey)} DESC`).limit(1).toArray()
 
     return results[0]
   }
@@ -271,6 +291,7 @@ export default class VelociousDatabaseQuery {
     }
 
     this._wheres.push(where)
+
     return this
   }
 }

package/src/database/record/index.js

@@ -415,6 +415,19 @@ class VelociousDatabaseRecord {
     return record
   }
 
+  static async nextPrimaryKey() {
+    const primaryKey = this.primaryKey()
+    const tableName = this.tableName()
+    const connection = this.connection()
+    const newestRecord = await this.order(`${connection.quoteTable(tableName)}.${connection.quoteColumn(primaryKey)}`).last()
+
+    if (newestRecord) {
+      return newestRecord.id() + 1
+    } else {
+      return 1
+    }
+  }
+
   static setPrimaryKey(primaryKey) {
     this._primaryKey = primaryKey
   }
@@ -717,6 +730,10 @@ class VelociousDatabaseRecord {
     return this._newQuery().findBy(...args)
   }
 
+  static async findByOrFail(...args) {
+    return this._newQuery().findByOrFail(...args)
+  }
+
   static async findOrCreateBy(...args) {
     return this._newQuery().findOrCreateBy(...args)
   }
@@ -1010,7 +1027,7 @@ class VelociousDatabaseRecord {
     const query = this.constructor.where(whereObject)
     const reloadedModel = await query.first()
 
-    if (!reloadedModel) throw new Error(`${this.constructor.name}#${this.id()} couldn't be reloaded - record didn't exist`)
+    if (!reloadedModel) throw new Error(`${this.constructor.name}#${id} couldn't be reloaded - record didn't exist`)
 
     this._attributes = reloadedModel.attributes()
     this._changes = {}

package/src/http-server/client/request-buffer/index.js

@@ -1,7 +1,7 @@
 import {EventEmitter} from "events"
 import FormDataPart from "./form-data-part.js"
 import Header from "./header.js"
-import Incorporator from "incorporator"
+import {incorporate} from "incorporator"
 import {Logger} from "../../../logger.js"
 import ParamsToObject from "../params-to-object.js"
 import querystring from "querystring"
@@ -228,7 +228,6 @@ export default class RequestBuffer {
     delete this.postBodyChars
     delete this.postBodyBuffer
 
-    this.parseQueryStringPostParams()
     this.completeRequest()
   }
 
@@ -244,6 +243,8 @@ export default class RequestBuffer {
       this.parseApplicationJsonParams()
     } else if (this.multiPartyFormData) {
       // Done after each new form data part
+    } else {
+      this.parseQueryStringPostParams()
     }
 
     this.events.emit("completed")
@@ -251,17 +252,15 @@ export default class RequestBuffer {
 
   parseApplicationJsonParams() {
     const newParams = JSON.parse(this.postBody)
-    const incorporator = new Incorporator({objects: [this.params, newParams]})
 
-    incorporator.merge()
+    incorporate(this.params, newParams)
   }
 
   parseQueryStringPostParams() {
     const unparsedParams = querystring.parse(this.postBody)
     const paramsToObject = new ParamsToObject(unparsedParams)
     const newParams = paramsToObject.toObject()
-    const incorporator = new Incorporator({objects: [this.params, newParams]})
 
-    incorporator.merge()
+    incorporate(this.params, newParams)
   }
 }