@snowtop/ent 0.1.23 → 0.1.25

package/core/base.d.ts

@@ -70,6 +70,7 @@ export interface SelectBaseDataOptions extends DataOptions {
     fields: string[];
     fieldsAlias?: string;
     disableFieldsAlias?: boolean;
+    disableDefaultOrderByAlias?: boolean;
 }
 export interface SelectDataOptions extends SelectBaseDataOptions {
     key: string;

package/core/clause.js

@@ -591,7 +591,7 @@ function ArrayNotEq(col, value) {
 exports.ArrayNotEq = ArrayNotEq;
 function Eq(col, value, overrideAlias) {
     return new simpleClause(col, value, "=", {
-        handleNull: new isNullClause(col),
+        handleNull: new isNullClause(col, overrideAlias),
         overrideAlias,
     });
 }
@@ -870,7 +870,7 @@ exports.JSONPathValuePredicate = JSONPathValuePredicate;
 function JSONKeyExists(dbCol, val, overrideAlias) {
     return new simpleClause(dbCol, val, "?", {
         // TODO ola: does isNullClause make sense here???
-        handleNull: new isNullClause(dbCol),
+        handleNull: new isNullClause(dbCol, overrideAlias),
         overrideAlias,
     });
 }
@@ -952,35 +952,35 @@ exports.PaginationMultipleColsQuery = PaginationMultipleColsQuery;
 // These 5 are used on the RHS of an expression
 function Add(col, value, overrideAlias) {
     return new simpleClause(col, value, "+", {
-        handleNull: new isNullClause(col),
+        handleNull: new isNullClause(col, overrideAlias),
         overrideAlias,
     });
 }
 exports.Add = Add;
 function Subtract(col, value, overrideAlias) {
     return new simpleClause(col, value, "-", {
-        handleNull: new isNullClause(col),
+        handleNull: new isNullClause(col, overrideAlias),
         overrideAlias,
     });
 }
 exports.Subtract = Subtract;
 function Multiply(col, value, overrideAlias) {
     return new simpleClause(col, value, "*", {
-        handleNull: new isNullClause(col),
+        handleNull: new isNullClause(col, overrideAlias),
         overrideAlias,
     });
 }
 exports.Multiply = Multiply;
 function Divide(col, value, overrideAlias) {
     return new simpleClause(col, value, "/", {
-        handleNull: new isNullClause(col),
+        handleNull: new isNullClause(col, overrideAlias),
         overrideAlias,
     });
 }
 exports.Divide = Divide;
 function Modulo(col, value, overrideAlias) {
     return new simpleClause(col, value, "%", {
-        handleNull: new isNullClause(col),
+        handleNull: new isNullClause(col, overrideAlias),
         overrideAlias,
     });
 }

package/core/query_impl.d.ts

@@ -2,6 +2,7 @@ import { QueryableDataOptions } from "./base";
 export interface OrderByOption {
     column: string;
     direction: "ASC" | "DESC";
+    alias?: string;
     nullsPlacement?: "first" | "last";
     dateColumn?: boolean;
 }

package/core/query_impl.js

@@ -13,7 +13,8 @@ function getOrderByPhrase(orderby, alias) {
                 nullsPlacement = " NULLS LAST";
                 break;
         }
-        const col = alias ? `${alias}.${v.column}` : v.column;
+        const orderByAlias = v.alias ?? alias;
+        const col = orderByAlias ? `${orderByAlias}.${v.column}` : v.column;
         return `${col} ${v.direction}${nullsPlacement}`;
     })
         .join(", ");
@@ -71,7 +72,7 @@ function buildQuery(options) {
         parts.push(`GROUP BY ${options.groupby}`);
     }
     if (options.orderby) {
-        parts.push(`ORDER BY ${getOrderByPhrase(options.orderby, fieldsAlias)}`);
+        parts.push(`ORDER BY ${getOrderByPhrase(options.orderby, options.disableDefaultOrderByAlias ? undefined : fieldsAlias)}`);
     }
     if (options.limit) {
         parts.push(`LIMIT ${options.limit}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",