orange-dragonfly-model 0.11.2 → 0.11.4

package/components/model.js

@@ -2,9 +2,7 @@ const ORM = require('orange-dragonfly-orm')
 const validate = require('orange-dragonfly-validator')
 
 class ValidationException extends Error {
-  get info () {
-    return {}
-  }
+  info = {}
 }
 
 class Model extends ORM.ActiveRecord {
@@ -82,11 +80,12 @@ class Model extends ORM.ActiveRecord {
   /**
    * Lookup method
    * @param data
+   * @param {?FilteredQuery} basicQuery Query to be used for adding conditions automatically. By default new SelectQuery object will be created.
    * @return {SelectQuery}
    */
-  static lookupQuery (data) {
+  static lookupQuery (data, basicQuery = null) {
     const rules = this.validation_rules
-    const q = this.selectQuery()
+    const q = basicQuery || this.selectQuery()
     const filtered_rules = {}
     for (const field of Object.keys(data)) {
       if (!rules.hasOwnProperty(field)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orange-dragonfly-model",
-  "version": "0.11.2",
+  "version": "0.11.4",
   "description": "Orange Dragonfly Model",
   "main": "index.js",
   "repository": {

package/tests/lookup-query.test.js

@@ -10,6 +10,14 @@ test('select-id', () => {
   expect(q.params).toEqual(data)
 })
 
+test('delete-id', () => {
+  const data = [1]
+  const lookup_data = { id: data[0] }
+  const q = TestModel.lookupQuery(lookup_data, TestModel.deleteQuery()).buildRawSQL()
+  expect(q.sql).toBe('DELETE FROM test_model WHERE test_model.id = ?')
+  expect(q.params).toEqual(data)
+})
+
 test('select-id-multiple', () => {
   const data = [1, 2, 3]
   const lookup_data = { id: data }