drizzle-orm 0.10.12 → 0.10.13

package/builders/aggregators/selectAggregator.js

@@ -45,7 +45,8 @@ class SelectAggregator extends abstractAggregator_1.default {
         this.orderBy = (column, order) => {
             if (column !== null && column !== undefined) {
                 this._orderBy.push('ORDER BY ');
-                this._orderBy.push(`${column.getColumnName()} `);
+                const columnParent = this._joinCache[column.getParent().tableName()] ? this._joinCache[column.getParent().tableName()] : column.getParent();
+                this._orderBy.push(`${columnParent}.${ecranate_1.ecranate(column.getColumnName())} `);
                 this._orderBy.push(order_1.default[order]);
             }
             return this;

package/builders/requestBuilders/where/constArray.js

@@ -15,7 +15,7 @@ class ConstArray extends where_1.default {
                     finalArray.push(`$${nextPosition}`);
                     finalValues.push(`${value.toISOString()}`);
                 }
-                if (ecranate_1.shouldEcranate(value)) {
+                else if (ecranate_1.shouldEcranate(value)) {
                     finalArray.push(`$${nextPosition}`);
                     finalValues.push(`${value.toString()}`);
                 }
@@ -28,7 +28,7 @@ class ConstArray extends where_1.default {
                 }
                 nextPosition += 1;
             }
-            return { query: finalArray.join(','), values: finalValues };
+            return { query: finalArray.join(''), values: finalValues };
         };
         this.values = values;
     }

package/columns/types/pgInteger.js

@@ -9,6 +9,9 @@ class PgInteger extends columnType_1.default {
         this.dbName = 'INT';
     }
     selectStrategy(value) {
+        if (typeof value === 'string') {
+            return value ? parseInt(value, 10) : undefined;
+        }
         return value;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-orm",
-  "version": "0.10.12",
+  "version": "0.10.13",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",