mythix-orm-sql-base 1.11.1 → 1.12.0

package/lib/sql-connection-base.d.ts

@@ -6,6 +6,9 @@ export declare interface ModelDataFromQueryResults {
 }
 
 declare class SQLConnectionBase extends ConnectionBase {
+  public isLimitSupportedInContext(options?: GenericObject): boolean;
+  public isOrderSupportedInContext(options?: GenericObject): boolean | string;
+
   public prepareArrayValuesForSQL(array: Array<any>): Array<any>;
   public generateSavePointName(): string;
 

package/lib/sql-connection-base.js

@@ -82,6 +82,46 @@ class SQLConnectionBase extends ConnectionBase {
     return parts.map((part) => SqlString.escapeId(part).replace(/^`/, '"').replace(/`$/, '"')).join('.');
   }
 
+  /// This method is called (and often provided)
+  /// by the underlying database driver to see
+  /// if a `LIMIT` clause is allowed to appear in
+  /// a given context/operation.
+  ///
+  /// Arguments:
+  ///   options: object
+  ///     Driver specific options for the context.
+  ///
+  /// Return: boolean
+  isLimitSupportedInContext(options) {
+    return true;
+  }
+
+  /// This method is called (and often provided)
+  /// by the underlying database driver to see
+  /// if an `ORDER BY` clause is allowed to appear in
+  /// a given context/operation.
+  ///
+  /// Arguments:
+  ///   options: object
+  ///     Driver specific options for the context.
+  ///
+  /// Return: boolean
+  isOrderSupportedInContext(_options) {
+    let options = _options || {};
+    if (options.isSubQuery) {
+      let subQueryOperator = options.subQueryOperator;
+      if (subQueryOperator === 'EXISTS' || subQueryOperator === 'NOT EXISTS')
+        return false;
+
+      if (subQueryOperator === 'ANY' || subQueryOperator === 'ALL')
+        return true;
+
+      return 'PROJECTION_ONLY';
+    }
+
+    return true;
+  }
+
   /// Prepare an array of values for use in an `IN` statement.
   /// This method will flatten the provided array, and then
   /// will filter out all non-primitive values from the array.
@@ -680,7 +720,7 @@ class SQLConnectionBase extends ConnectionBase {
     if (!queryEngine)
       throw new Error(`${this.constructor.name}::updateAll: Model class or query is required to update.`);
 
-    let options = Object.assign({}, _options || {}, { isUpdateOperation: true });
+    let options = Object.assign({}, _options || {}, { isUpdateOperation: true, noPrimaryKey: true });
     queryEngine = await this.finalizeQuery('update', queryEngine, options);
 
     let rootModel = queryEngine.getOperationContext().rootModel;

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

@@ -2077,23 +2077,10 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
   /// Return: Array<string>
   ///   Return an array of `CREATE INDEX` statements. If the `index` property on the provided
   ///   `field` is falsy or empty, then an empty array will be returned instead.
-  generateColumnIndexes(Model, field, _options) {
-    let indexes = Nife.toArray(field.index).filter((index) => {
-      if (index === true)
-        return true;
-
-      return (Nife.instanceOf(index, 'string', 'array') && Nife.isNotEmpty(index));
-    });
-
-    if (indexes.length === 0)
-      return [];
-
-    let options = _options || {};
-    return indexes.map((indexNames) => {
-      let fieldIndexNames = [ field.fieldName ];
-      if (indexNames !== true)
-        fieldIndexNames = fieldIndexNames.concat(indexNames);
+  generateColumnIndexes(Model, field, options) {
+    let indexes = this.getIndexFieldsFromFieldIndex(field);
 
+    return indexes.map((fieldIndexNames) => {
       return this.generateCreateIndexStatement(Model, fieldIndexNames, options);
     });
   }
@@ -2710,7 +2697,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
     if (!ModelBase.isModel(model)) {
       let newModel = new Model();
       newModel.clearDirty();
-      newModel.setAttributes(model);
+      newModel.setAttributes(model, options.noPrimaryKey);
       model = newModel;
     }
 
@@ -2734,7 +2721,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
       let dirtyField        = dirtyFields[i];
       let fieldValue        = modelChanges[dirtyField.fieldName].current;
       let escapedColumnName = this.getEscapedColumnName(dirtyField.Model, dirtyField.columnName, { columnNameOnly: true });
-      let escapedValue      = (LiteralBase.isLiteral(fieldValue)) ? fieldValue.toString(this.connection) : this.escape(dirtyField, fieldValue);
+      let escapedValue      = (LiteralBase.isLiteral(fieldValue)) ? fieldValue.toString(this.connection, { as: false }) : this.escape(dirtyField, fieldValue);
       if (!escapedValue)
         continue;
 
@@ -3364,7 +3351,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
     let newDefaultValue      = this.getFieldDefaultValue(newField, newField.fieldName, { useDefaultKeyword: false, escape: true, remoteOnly: true });
 
     let currentFieldType  = field.type.toConnectionType(this.connection, { createTable: true, defaultValue: currentDefaultValue });
-    let newFieldType      = field.type.toConnectionType(this.connection, { createTable: true, defaultValue: newDefaultValue });
+    let newFieldType      = newField.type.toConnectionType(this.connection, { createTable: true, defaultValue: newDefaultValue });
     if (newFieldType !== currentFieldType)
       statements.push(this.generateAlterColumnChangeTypeStatement(field, newField, newFieldType, _options));
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm-sql-base",
-  "version": "1.11.1",
+  "version": "1.12.0",
   "description": "SQL base support for Mythix ORM",
   "main": "lib/index",
   "type": "commonjs",
@@ -34,18 +34,18 @@
   },
   "homepage": "https://github.com/th317erd/mythix-orm-sql-base#readme",
   "peerDependencies": {
-    "mythix-orm": "^1.13.2"
+    "mythix-orm": "^1.14.0"
   },
   "dependencies": {
-    "luxon": "^3.1.0",
+    "luxon": "^3.2.1",
     "nife": "^1.12.1",
     "sqlstring": "^2.3.3",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
     "@spothero/eslint-plugin-spothero": "github:spothero/eslint-plugin-spothero",
-    "better-sqlite3": "^8.0.0",
-    "eslint": "^8.28.0",
+    "better-sqlite3": "^8.0.1",
+    "eslint": "^8.31.0",
     "jasmine": "^4.5.0",
     "nyc": "^15.1.0"
   },