orange-dragonfly-model 0.11.3 → 0.11.5

package/components/model.js

@@ -1,11 +1,8 @@
-const ORM = require('orange-dragonfly-orm')
+const { ActiveRecord } = require('orange-dragonfly-orm')
 const validate = require('orange-dragonfly-validator')
+const ValidationException = require('./validation-exception')
 
-class ValidationException extends Error {
-  info = {}
-}
-
-class Model extends ORM.ActiveRecord {
+class Model extends ActiveRecord {
   static get IGNORE_EXTRA_FIELDS () {
     return false
   }
@@ -18,6 +15,14 @@ class Model extends ORM.ActiveRecord {
     return []
   }
 
+  /**
+   * Returns list of fulltext keys
+   * @returns Array[] List of unique keys
+   */
+  static get FULLTEXT_INDEXES () {
+    return []
+  }
+
   /**
    * Returns schema for the model (Orange Dragonfly Validator format)
    * @return object
@@ -80,11 +85,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/components/validation-exception.js

@@ -0,0 +1,11 @@
+class ValidationException extends Error {
+  get info () {
+    return this.__info || {}
+  }
+
+  set info (v) {
+    this.__info = v
+  }
+}
+
+module.exports = ValidationException

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orange-dragonfly-model",
-  "version": "0.11.3",
+  "version": "0.11.5",
   "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 }