@simplysm/sd-orm-common - npm Package Compare versions

Comparing version 3.5.58 to 3.5.59

dist-browser/Queryable.js

@@ -310,23 +310,23 @@ "use strict";
         var subFrom = clone.getSelectDef();
-        var unknownOrderBys;
         if (subFrom.orderBy) {
-            unknownOrderBys = subFrom.orderBy.filter(function (item) { return !Object.values(subFrom.select).includes(item[0]); });
             var seq = 0;
-            for (var _b = 0, unknownOrderBys_1 = unknownOrderBys; _b < unknownOrderBys_1.length; _b++) {
-                var unknownOrderBy = unknownOrderBys_1[_b];
+            for (var _b = 0, _c = subFrom.orderBy; _b < _c.length; _b++) {
+                var subOrderBy = _c[_b];
                 seq++;
-                subFrom.select["__order_" + seq] = unknownOrderBy[0];
+                subFrom.select["__order_" + seq] = subOrderBy[0];
             }
-            delete subFrom.orderBy;
         }
         var currEntity = this._getParentEntity(clone._entity, this._as, undefined);
         var result = new Queryable(this.db, tableType, this._as, currEntity, { from: subFrom });
-        if (unknownOrderBys && unknownOrderBys.length > 0) {
+        if (subFrom.orderBy && subFrom.orderBy.length > 0) {
             result._def.orderBy = [];
             var seq = 0;
-            for (var _c = 0, unknownOrderBys_2 = unknownOrderBys; _c < unknownOrderBys_2.length; _c++) {
-                var unknownOrderBy = unknownOrderBys_2[_c];
+            for (var _d = 0, _e = subFrom.orderBy; _d < _e.length; _d++) {
+                var subOrderBy = _e[_d];
                 seq++;
-                result._def.orderBy.push(["__order_" + seq, unknownOrderBy[1]]);
+                result._def.orderBy.push(["__order_" + seq, subOrderBy[1]]);
             }
+            if (!subFrom.limit) {
+                delete subFrom.orderBy;
+            }
         }
@@ -333,0 +333,0 @@ return result;

dist/Queryable.js

@@ -293,21 +293,21 @@ "use strict";
         const subFrom = clone.getSelectDef();
-        let unknownOrderBys;
         if (subFrom.orderBy) {
-            unknownOrderBys = subFrom.orderBy.filter(item => !Object.values(subFrom.select).includes(item[0]));
             let seq = 0;
-            for (const unknownOrderBy of unknownOrderBys) {
+            for (const subOrderBy of subFrom.orderBy) {
                 seq++;
-                subFrom.select["__order_" + seq] = unknownOrderBy[0];
+                subFrom.select["__order_" + seq] = subOrderBy[0];
             }
-            delete subFrom.orderBy;
         }
         const currEntity = this._getParentEntity(clone._entity, this._as, undefined);
         const result = new Queryable(this.db, tableType, this._as, currEntity, { from: subFrom });
-        if (unknownOrderBys && unknownOrderBys.length > 0) {
+        if (subFrom.orderBy && subFrom.orderBy.length > 0) {
             result._def.orderBy = [];
             let seq = 0;
-            for (const unknownOrderBy of unknownOrderBys) {
+            for (const subOrderBy of subFrom.orderBy) {
                 seq++;
-                result._def.orderBy.push(["__order_" + seq, unknownOrderBy[1]]);
+                result._def.orderBy.push(["__order_" + seq, subOrderBy[1]]);
             }
+            if (!subFrom.limit) {
+                delete subFrom.orderBy;
+            }
         }
@@ -314,0 +314,0 @@ return result;

package.json

 {
   "name": "@simplysm/sd-orm-common",
-  "version": "3.5.58",
+  "version": "3.5.59",
   "description": "심플리즘 패키지 - ORM 모듈 (browser/node)",
@@ -13,4 +13,4 @@ "author": "김석래",
   "dependencies": {
-    "@simplysm/sd-core-common": "3.5.58"
+    "@simplysm/sd-core-common": "3.5.59"
   }
 }

src/Queryable.ts

@@ -500,11 +500,8 @@ import { DbContext } from "./DbContext";
     const subFrom = clone.getSelectDef();
-    let unknownOrderBys;
     if (subFrom.orderBy) {
-      unknownOrderBys = subFrom.orderBy.filter(item => !Object.values(subFrom.select).includes(item[0]));
       let seq = 0;
-      for (const unknownOrderBy of unknownOrderBys) {
+      for (const subOrderBy of subFrom.orderBy) {
         seq++;
-        subFrom.select["__order_" + seq] = unknownOrderBy[0];
+        subFrom.select["__order_" + seq] = subOrderBy[0];
       }
-      delete subFrom.orderBy;
     }
@@ -516,9 +513,13 @@
 
-    if (unknownOrderBys && unknownOrderBys.length > 0) {
+    if (subFrom.orderBy && subFrom.orderBy.length > 0) {
       result._def.orderBy = [];
       let seq = 0;
-      for (const unknownOrderBy of unknownOrderBys) {
+      for (const subOrderBy of subFrom.orderBy) {
         seq++;
-        result._def.orderBy.push(["__order_" + seq, unknownOrderBy[1]]);
+        result._def.orderBy.push(["__order_" + seq, subOrderBy[1]]);
       }
+
+      if (!subFrom.limit) {
+        delete subFrom.orderBy;
+      }
     }
@@ -525,0 +526,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

656345

decreased by-0.1%

Dependency changes

• + Added@simplysm/sd-core-common@3.5.59(transitive)

• - Removed@simplysm/sd-core-common@3.5.58(transitive)

• Updated@simplysm/sd-core-common@3.5.59