mythix-orm-sql-base 1.9.0 → 1.9.2

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

@@ -459,20 +459,17 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
   }
 
   generateOrderClause(queryEngine, _options) {
-    if (!queryEngine)
-      return '';
-
-    if (typeof queryEngine.getOperationContext !== 'function')
-      return '';
+    if (!queryEngine || typeof queryEngine.getOperationContext !== 'function')
+      return (_options && _options.rawOrder) ? [] : '';
 
-    let order = this.getQueryEngineOrder(queryEngine, _options);
+    let options = _options || {};
+    let order   = this.getQueryEngineOrder(queryEngine, _options);
     if (!order || !order.size)
-      return '';
+      return (options.rawOrder) ? [] : '';
 
-    let options             = _options || {};
     let contextOrderSupport = this.connection.isOrderSupportedInContext(options);
     if (contextOrderSupport === false)
-      return '';
+      return (options.rawOrder) ? [] : '';
 
     let allModelsUsedInQuery  = queryEngine.getAllModelsUsedInQuery();
     let orderByParts          = [];
@@ -515,23 +512,20 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
     }
 
     if (Nife.isEmpty(orderByParts))
-      return '';
+      return (options.rawOrder) ? [] : '';
 
-    return `ORDER BY ${orderByParts.join(',')}`;
+    return (options.rawOrder) ? orderByParts : `ORDER BY ${orderByParts.join(',')}`;
   }
 
   generateGroupByClause(queryEngine, _options) {
-    if (!queryEngine)
-      return '';
-
-    if (typeof queryEngine.getOperationContext !== 'function')
-      return '';
+    if (!queryEngine || typeof queryEngine.getOperationContext !== 'function')
+      return (_options && _options.rawGroupBy) ? [] : '';
 
+    let options = _options || {};
     let groupBy = queryEngine.getOperationContext().groupBy;
     if (!groupBy || !groupBy.size)
-      return '';
+      return (options.rawGroupBy) ? [] : '';
 
-    let options = _options || {};
 
     let groupByParts  = [];
     for (let groupByScope of groupBy.values()) {
@@ -551,9 +545,9 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
     }
 
     if (Nife.isEmpty(groupByParts))
-      return '';
+      return (options.rawGroupBy) ? [] : '';
 
-    return `GROUP BY ${groupByParts.join(',')}`;
+    return (options.rawGroupBy) ? groupByParts : `GROUP BY ${groupByParts.join(',')}`;
   }
 
   generateHavingClause(queryEngine, options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm-sql-base",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "description": "SQL base support for Mythix ORM",
   "main": "lib/index",
   "type": "commonjs",
@@ -34,7 +34,7 @@
   },
   "homepage": "https://github.com/th317erd/mythix-orm-sql-base#readme",
   "peerDependencies": {
-    "mythix-orm": "^1.11.0"
+    "mythix-orm": "^1.11.3"
   },
   "dependencies": {
     "luxon": "^3.1.0",
@@ -43,8 +43,8 @@
   },
   "devDependencies": {
     "@spothero/eslint-plugin-spothero": "github:spothero/eslint-plugin-spothero",
-    "better-sqlite3": "^7.6.2",
-    "eslint": "^8.27.0",
+    "better-sqlite3": "^8.0.0",
+    "eslint": "^8.28.0",
     "jasmine": "^4.5.0",
     "nyc": "^15.1.0"
   },