search: generic error for search with multiple arguments

db-service/lib/cql-functions.js

@@ -21,7 +21,7 @@ const StandardFunctions = {
    * @returns {string}
    */
   search: function (ref, arg) {
-    if (!('val' in arg)) throw `SQLite only supports single value arguments for $search`
+    if (!('val' in arg)) throw `Only single value arguments are allowed for $search`
     const refs = ref.list || [ref],
       { toString } = ref
     return '(' + refs.map(ref2 => this.contains(this.tolower(toString(ref2)), this.tolower(arg))).join(' or ') + ')'
@@ -31,7 +31,7 @@ const StandardFunctions = {
    * @param  {...string} args
    * @returns {string}
    */
-  concat: (...args) => args.map(a => a.xpr ? `(${a})` : a).join(' || '),
+  concat: (...args) => args.map(a => (a.xpr ? `(${a})` : a)).join(' || '),
 
   /**
    * Generates SQL statement that produces a boolean value indicating whether the first string contains the second string
@@ -141,9 +141,9 @@ const StandardFunctions = {
 
   // Date and Time Functions
 
-  current_date: p => p ? `current_date(${p})`: 'current_date',
-  current_time: p => p ? `current_time(${p})`: 'current_time',
-  current_timestamp: p => p ? `current_timestamp(${p})`: 'current_timestamp',
+  current_date: p => (p ? `current_date(${p})` : 'current_date'),
+  current_time: p => (p ? `current_time(${p})` : 'current_time'),
+  current_timestamp: p => (p ? `current_timestamp(${p})` : 'current_timestamp'),
 
   /**
    * Generates SQL statement that produces the year of a given timestamp
@@ -341,7 +341,7 @@ const HANAFunctions = {
    */
   years_between(x, y) {
     return `floor(${this.months_between(x, y)} / 12)`
-  }
+  },
 }
 
 for (let each in HANAFunctions) HANAFunctions[each.toUpperCase()] = HANAFunctions[each]

postgres/lib/func.js

@@ -2,7 +2,7 @@ const session = require('./session.json')
 
 const StandardFunctions = {
   session_context: x => {
-    let sql = `current_setting('${ session[x.val] || x.val }')`
+    let sql = `current_setting('${session[x.val] || x.val}')`
     if (x.val === '$now') sql += '::timestamp'
     return sql
   },

sqlite/lib/SQLiteService.js

@@ -15,7 +15,9 @@ class SQLiteService extends SQLService {
         dbc.function('session_context', key => dbc[$session][key])
         dbc.function('regexp', { deterministic: true }, (re, x) => (RegExp(re).test(x) ? 1 : 0))
         dbc.function('ISO', { deterministic: true }, d => d && new Date(d).toISOString())
-        dbc.function('json_merge', { varargs: true, deterministic: true }, (...args) => args.join('').replace(/}{/g, ','))
+        dbc.function('json_merge', { varargs: true, deterministic: true }, (...args) =>
+          args.join('').replace(/}{/g, ','),
+        )
         if (!dbc.memory) dbc.pragma('journal_mode = WAL')
         return dbc
       },
@@ -136,7 +138,6 @@ class SQLiteService extends SQLService {
   }
 
   static CQN2SQL = class CQN2SQLite extends SQLService.CQN2SQL {
-
     column_alias4(x, q) {
       let alias = super.column_alias4(x, q)
       if (alias) return alias
@@ -201,13 +202,7 @@ class SQLiteService extends SQLService {
     }
 
     // Used for SQL function expressions
-    static Functions = { ...super.Functions,
-      // Ensure ISO strings are returned for date/time functions
-      current_timestamp: () => 'ISO(current_timestamp)',
-      // SQLite doesn't support arguments for current_date and current_time
-      current_date: () => 'current_date',
-      current_time: () => 'current_time',
-    }
+    static Functions = { ...super.Functions, ...require('./func') }
 
     // Used for CREATE TABLE statements
     static TypeMap = {
@@ -219,8 +214,12 @@ class SQLiteService extends SQLService {
       Timestamp: () => 'TIMESTAMP_TEXT',
     }
 
-    get is_distinct_from_() { return 'is not' }
-    get is_not_distinct_from_() { return 'is' }
+    get is_distinct_from_() {
+      return 'is not'
+    }
+    get is_not_distinct_from_() {
+      return 'is'
+    }
 
     static ReservedWords = { ...super.ReservedWords, ...require('./ReservedWords.json') }
   }

sqlite/lib/func.js

@@ -0,0 +1,17 @@
+'use strict'
+
+const StandardFunctions = {
+  // Ensure ISO strings are returned for date/time functions
+  current_timestamp: () => 'ISO(current_timestamp)',
+  // SQLite doesn't support arguments for current_date and current_time
+  current_date: () => 'current_date',
+  current_time: () => 'current_time',
+}
+
+const HANAFunctions = {
+  /** defined in db-service */
+}
+
+for (let each in HANAFunctions) HANAFunctions[each.toUpperCase()] = HANAFunctions[each]
+
+module.exports = { ...StandardFunctions, ...HANAFunctions }