mythix-orm-sql-base 1.2.0 → 1.3.0

package/lib/sql-query-generator-base.js

@@ -117,7 +117,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
   }
 
   // eslint-disable-next-line no-unused-vars
-  generateSelectQueryOperatorFromQueryEngineOperator(operator, value, valueIsReference, options) {
+  generateSelectQueryOperatorFromQueryEngineOperator(queryPart, operator, value, valueIsReference, options) {
     if (LiteralBase.isLiteral(operator))
       return operator.toString(this.connection);
 
@@ -148,11 +148,36 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
         return '<';
       case 'LTE':
         return '<=';
+      case 'LIKE':
+        if (valueIsReference)
+          throw new TypeError(`${this.constructor.name}::generateSelectQueryOperatorFromQueryEngineOperator: The "LIKE" operator can not be used for table joins.`);
+
+        if (!Nife.instanceOf(value, 'string'))
+          throw new TypeError(`${this.constructor.name}::generateSelectQueryOperatorFromQueryEngineOperator: The "LIKE" operator requires a string for a value.`);
+
+        return 'LIKE';
+      case 'NOT_LIKE':
+        if (valueIsReference)
+          throw new TypeError(`${this.constructor.name}::generateSelectQueryOperatorFromQueryEngineOperator: The "NOT LIKE" operator can not be used for table joins.`);
+
+        if (!Nife.instanceOf(value, 'string'))
+          throw new TypeError(`${this.constructor.name}::generateSelectQueryOperatorFromQueryEngineOperator: The "NOT LIKE" operator requires a string for a value.`);
+
+        return 'NOT LIKE';
       default:
         throw new Error(`${this.constructor.name}::generateSelectQueryOperatorFromQueryEngineOperator: Unknown operator "${operator}".`);
     }
   }
 
+  formatLikeValue({ value }) {
+    return value;
+  }
+
+  // eslint-disable-next-line no-unused-vars
+  generateConditionPostfix(context) {
+    return '';
+  }
+
   generateSelectQueryCondition(queryPart, _value, options) {
     let value     = _value;
     let field     = queryPart.Field;
@@ -162,6 +187,9 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
     // If the value is an array, then handle the
     // special "IN" case for an array
     if (Array.isArray(value)) {
+      if (operator !== 'EQ' && operator !== 'NEQ')
+        throw new Error(`${this.constructor.name}::generateSelectQueryCondition: Invalid value provided to operator "${operator}": `, value);
+
       // Flatten array, filter down to
       // only unique items, and remove
       // anything that we can't match on
@@ -200,7 +228,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
 
     let escapedTableName  = this.escapeID(this.getTableNameFromQueryPart(queryPart));
     let escapedColumnName = this.escapeID(field.columnName);
-    let sqlOperator       = this.generateSelectQueryOperatorFromQueryEngineOperator(operator, value, false, options);
+    let sqlOperator       = this.generateSelectQueryOperatorFromQueryEngineOperator(queryPart, operator, value, false, options);
 
     if (QueryEngine.isQuery(value)) {
       if (!this.queryHasConditions(value._getRawQuery()))
@@ -214,7 +242,13 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
       return `${escapedTableName}.${escapedColumnName} ${sqlOperator} (${this.generateSelectStatement(value, this.stackAssign(options, { isSubQuery: true }))})`;
     }
 
-    return `${escapedTableName}.${escapedColumnName} ${sqlOperator} ${this.escape(field, value)}`;
+    let context = { queryPart, field, sqlOperator, operator, value };
+    if (sqlOperator === 'LIKE' || sqlOperator === 'NOT LIKE')
+      value = this.formatLikeValue(context);
+
+    let conditionPostfix = this.generateConditionPostfix(context);
+
+    return `${escapedTableName}.${escapedColumnName} ${sqlOperator} ${this.escape(field, value)}${(conditionPostfix) ? ` ${conditionPostfix}` : ''}`;
   }
 
   // eslint-disable-next-line no-unused-vars
@@ -231,7 +265,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
     let leftSideEscapedColumnName   = this.escapeID(leftField.columnName);
     let rightSideEscapedTableName   = this.escapeID(this.getTableNameFromQueryPart(rightQueryPart));
     let rightSideEscapedColumnName  = this.escapeID(rightField.columnName);
-    let sqlOperator                 = this.generateSelectQueryOperatorFromQueryEngineOperator(operator, undefined, true, options);
+    let sqlOperator                 = this.generateSelectQueryOperatorFromQueryEngineOperator(leftQueryPart, operator, undefined, true, options);
 
     return `${leftSideEscapedTableName}.${leftSideEscapedColumnName} ${sqlOperator} ${rightSideEscapedTableName}.${rightSideEscapedColumnName}`;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm-sql-base",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "SQL base support for Mythix ORM",
   "main": "lib/index.js",
   "type": "commonjs",
@@ -33,7 +33,7 @@
   },
   "homepage": "https://github.com/th317erd/mythix-orm-sql-base#readme",
   "peerDependencies": {
-    "mythix-orm": "^1.4.3"
+    "mythix-orm": "^1.4.4"
   },
   "dependencies": {
     "nife": "^1.11.3",