drizzle-kit 0.31.6-5a7c534 → 0.31.7-82993ae

package/api.js

@@ -828,7 +828,7 @@ var version;
 var init_version = __esm({
   "../drizzle-orm/dist/version.js"() {
     "use strict";
-    version = "0.44.7";
+    version = "0.45.0";
   }
 });
 
@@ -1628,6 +1628,8 @@ function mapResultRow(columns, row, joinsNotNullableMap) {
         decoder2 = field;
       } else if (is(field, SQL)) {
         decoder2 = field.decoder;
+      } else if (is(field, Subquery)) {
+        decoder2 = field._.sql.decoder;
       } else {
         decoder2 = field.sql.decoder;
       }
@@ -1670,7 +1672,7 @@ function orderSelectedFields(fields, pathPrefix) {
       return result;
     }
     const newPath = pathPrefix ? [...pathPrefix, name3] : [name3];
-    if (is(field, Column) || is(field, SQL) || is(field, SQL.Aliased)) {
+    if (is(field, Column) || is(field, SQL) || is(field, SQL.Aliased) || is(field, Subquery)) {
       result.push({ path: newPath, field });
     } else if (is(field, Table)) {
       result.push(...orderSelectedFields(field[Table.Symbol.Columns], newPath));
@@ -6041,8 +6043,8 @@ var init_indexes = __esm({
         this.config.using = using;
         return this;
       }
-      algorythm(algorythm) {
-        this.config.algorythm = algorythm;
+      algorithm(algorithm) {
+        this.config.algorithm = algorithm;
         return this;
       }
       lock(lock) {
@@ -6648,6 +6650,16 @@ var init_dialect = __esm({
             } else {
               chunk.push(field);
             }
+          } else if (is(field, Subquery)) {
+            const entries = Object.entries(field._.selectedFields);
+            if (entries.length === 1) {
+              const entry = entries[0][1];
+              const fieldDecoder = is(entry, SQL) ? entry.decoder : is(entry, Column) ? { mapFromDriverValue: (v11) => entry.mapFromDriverValue(v11) } : entry.sql.decoder;
+              if (fieldDecoder) {
+                field._.sql.decoder = fieldDecoder;
+              }
+            }
+            chunk.push(field);
           }
           if (i8 < columnsLen - 1) {
             chunk.push(sql`, `);
@@ -9718,6 +9730,16 @@ var init_dialect2 = __esm({
             } else {
               chunk.push(field);
             }
+          } else if (is(field, Subquery)) {
+            const entries = Object.entries(field._.selectedFields);
+            if (entries.length === 1) {
+              const entry = entries[0][1];
+              const fieldDecoder = is(entry, SQL) ? entry.decoder : is(entry, Column) ? { mapFromDriverValue: (v11) => entry.mapFromDriverValue(v11) } : entry.sql.decoder;
+              if (fieldDecoder) {
+                field._.sql.decoder = fieldDecoder;
+              }
+            }
+            chunk.push(field);
           }
           if (i8 < columnsLen - 1) {
             chunk.push(sql`, `);
@@ -15262,8 +15284,8 @@ var init_indexes3 = __esm({
         this.config.using = using;
         return this;
       }
-      algorythm(algorythm) {
-        this.config.algorythm = algorythm;
+      algorithm(algorithm) {
+        this.config.algorithm = algorithm;
         return this;
       }
       lock(lock) {
@@ -15882,6 +15904,16 @@ var init_dialect3 = __esm({
             } else {
               chunk.push(field);
             }
+          } else if (is(field, Subquery)) {
+            const entries = Object.entries(field._.selectedFields);
+            if (entries.length === 1) {
+              const entry = entries[0][1];
+              const fieldDecoder = is(entry, SQL) ? entry.decoder : is(entry, Column) ? { mapFromDriverValue: (v11) => entry.mapFromDriverValue(v11) } : entry.sql.decoder;
+              if (fieldDecoder) {
+                field._.sql.decoder = fieldDecoder;
+              }
+            }
+            chunk.push(field);
           }
           if (i8 < columnsLen - 1) {
             chunk.push(sql`, `);
@@ -18915,6 +18947,9 @@ var init_dialect4 = __esm({
                 new SQL(
                   query.queryChunks.map((c6) => {
                     if (is(c6, Column)) {
+                      if (c6.columnType === "SQLiteNumericBigInt") {
+                        return chunk.push(sql`cast(${sql.identifier(this.casing.getColumnCasing(c6))} as text)`);
+                      }
                       return sql.identifier(this.casing.getColumnCasing(c6));
                     }
                     return c6;
@@ -18944,6 +18979,14 @@ var init_dialect4 = __esm({
                 chunk.push(sql`${sql.identifier(tableName)}.${sql.identifier(this.casing.getColumnCasing(field))}`);
               }
             }
+          } else if (is(field, Subquery)) {
+            const entries = Object.entries(field._.selectedFields);
+            if (entries.length === 1) {
+              const entry = entries[0][1];
+              const fieldDecoder = is(entry, SQL) ? entry.decoder : is(entry, Column) ? { mapFromDriverValue: (v11) => entry.mapFromDriverValue(v11) } : entry.sql.decoder;
+              if (fieldDecoder) field._.sql.decoder = fieldDecoder;
+            }
+            chunk.push(field);
           }
           if (i8 < columnsLen - 1) {
             chunk.push(sql`, `);
@@ -46309,7 +46352,7 @@ We have encountered a collision between the index name on columns ${source_defau
             columns: indexColumns,
             isUnique: value.config.unique ?? false,
             using: value.config.using,
-            algorithm: value.config.algorythm,
+            algorithm: value.config.algorithm,
             lock: value.config.lock
           };
         });
@@ -47440,7 +47483,7 @@ The unique index ${source_default.underline.blue(
             columns: indexColumns,
             isUnique: value.config.unique ?? false,
             using: value.config.using,
-            algorithm: value.config.algorythm,
+            algorithm: value.config.algorithm,
             lock: value.config.lock
           };
         });
@@ -97808,7 +97851,7 @@ var init_core = __esm({
 });
 
 // ../drizzle-orm/dist/node-postgres/session.js
-var Pool2, types4, _a461, _b335, NodePgPreparedQuery, _a462, _b336, _NodePgSession, NodePgSession, _a463, _b337, _NodePgTransaction, NodePgTransaction;
+var Pool2, types4, NativePool, _a461, _b335, NodePgPreparedQuery, _a462, _b336, _NodePgSession, NodePgSession, _a463, _b337, _NodePgTransaction, NodePgTransaction;
 var init_session7 = __esm({
   "../drizzle-orm/dist/node-postgres/session.js"() {
     "use strict";
@@ -97822,6 +97865,7 @@ var init_session7 = __esm({
     init_tracing();
     init_utils();
     ({ Pool: Pool2, types: types4 } = esm_default);
+    NativePool = esm_default.native ? esm_default.native.Pool : void 0;
     NodePgPreparedQuery = class extends (_b335 = PgPreparedQuery, _a461 = entityKind, _b335) {
       constructor(client, queryString, params, logger2, cache5, queryMetadata, cacheConfig, fields, name3, _isResponseInArrayMode, customResultMapper) {
         super({ sql: queryString, params }, cache5, queryMetadata, cacheConfig);
@@ -97991,7 +98035,7 @@ var init_session7 = __esm({
         );
       }
       async transaction(transaction, config) {
-        const session = this.client instanceof Pool2 ? new _NodePgSession(await this.client.connect(), this.dialect, this.schema, this.options) : this;
+        const session = this.client instanceof Pool2 || NativePool && this.client instanceof NativePool ? new _NodePgSession(await this.client.connect(), this.dialect, this.schema, this.options) : this;
         const tx = new NodePgTransaction(this.dialect, session, this.schema);
         await tx.execute(sql`begin${config ? sql` ${tx.getTransactionConfigSQL(config)}` : void 0}`);
         try {
@@ -98002,7 +98046,7 @@ var init_session7 = __esm({
           await tx.execute(sql`rollback`);
           throw error2;
         } finally {
-          if (this.client instanceof Pool2) {
+          if (this.client instanceof Pool2 || NativePool && this.client instanceof NativePool) {
             session.client.release();
           }
         }

package/api.mjs

@@ -834,7 +834,7 @@ var version;
 var init_version = __esm({
   "../drizzle-orm/dist/version.js"() {
     "use strict";
-    version = "0.44.7";
+    version = "0.45.0";
   }
 });
 
@@ -1634,6 +1634,8 @@ function mapResultRow(columns, row, joinsNotNullableMap) {
         decoder2 = field;
       } else if (is(field, SQL)) {
         decoder2 = field.decoder;
+      } else if (is(field, Subquery)) {
+        decoder2 = field._.sql.decoder;
       } else {
         decoder2 = field.sql.decoder;
       }
@@ -1676,7 +1678,7 @@ function orderSelectedFields(fields, pathPrefix) {
       return result;
     }
     const newPath = pathPrefix ? [...pathPrefix, name3] : [name3];
-    if (is(field, Column) || is(field, SQL) || is(field, SQL.Aliased)) {
+    if (is(field, Column) || is(field, SQL) || is(field, SQL.Aliased) || is(field, Subquery)) {
       result.push({ path: newPath, field });
     } else if (is(field, Table)) {
       result.push(...orderSelectedFields(field[Table.Symbol.Columns], newPath));
@@ -6047,8 +6049,8 @@ var init_indexes = __esm({
         this.config.using = using;
         return this;
       }
-      algorythm(algorythm) {
-        this.config.algorythm = algorythm;
+      algorithm(algorithm) {
+        this.config.algorithm = algorithm;
         return this;
       }
       lock(lock) {
@@ -6654,6 +6656,16 @@ var init_dialect = __esm({
             } else {
               chunk.push(field);
             }
+          } else if (is(field, Subquery)) {
+            const entries = Object.entries(field._.selectedFields);
+            if (entries.length === 1) {
+              const entry = entries[0][1];
+              const fieldDecoder = is(entry, SQL) ? entry.decoder : is(entry, Column) ? { mapFromDriverValue: (v11) => entry.mapFromDriverValue(v11) } : entry.sql.decoder;
+              if (fieldDecoder) {
+                field._.sql.decoder = fieldDecoder;
+              }
+            }
+            chunk.push(field);
           }
           if (i8 < columnsLen - 1) {
             chunk.push(sql`, `);
@@ -9724,6 +9736,16 @@ var init_dialect2 = __esm({
             } else {
               chunk.push(field);
             }
+          } else if (is(field, Subquery)) {
+            const entries = Object.entries(field._.selectedFields);
+            if (entries.length === 1) {
+              const entry = entries[0][1];
+              const fieldDecoder = is(entry, SQL) ? entry.decoder : is(entry, Column) ? { mapFromDriverValue: (v11) => entry.mapFromDriverValue(v11) } : entry.sql.decoder;
+              if (fieldDecoder) {
+                field._.sql.decoder = fieldDecoder;
+              }
+            }
+            chunk.push(field);
           }
           if (i8 < columnsLen - 1) {
             chunk.push(sql`, `);
@@ -15268,8 +15290,8 @@ var init_indexes3 = __esm({
         this.config.using = using;
         return this;
       }
-      algorythm(algorythm) {
-        this.config.algorythm = algorythm;
+      algorithm(algorithm) {
+        this.config.algorithm = algorithm;
         return this;
       }
       lock(lock) {
@@ -15888,6 +15910,16 @@ var init_dialect3 = __esm({
             } else {
               chunk.push(field);
             }
+          } else if (is(field, Subquery)) {
+            const entries = Object.entries(field._.selectedFields);
+            if (entries.length === 1) {
+              const entry = entries[0][1];
+              const fieldDecoder = is(entry, SQL) ? entry.decoder : is(entry, Column) ? { mapFromDriverValue: (v11) => entry.mapFromDriverValue(v11) } : entry.sql.decoder;
+              if (fieldDecoder) {
+                field._.sql.decoder = fieldDecoder;
+              }
+            }
+            chunk.push(field);
           }
           if (i8 < columnsLen - 1) {
             chunk.push(sql`, `);
@@ -18921,6 +18953,9 @@ var init_dialect4 = __esm({
                 new SQL(
                   query.queryChunks.map((c6) => {
                     if (is(c6, Column)) {
+                      if (c6.columnType === "SQLiteNumericBigInt") {
+                        return chunk.push(sql`cast(${sql.identifier(this.casing.getColumnCasing(c6))} as text)`);
+                      }
                       return sql.identifier(this.casing.getColumnCasing(c6));
                     }
                     return c6;
@@ -18950,6 +18985,14 @@ var init_dialect4 = __esm({
                 chunk.push(sql`${sql.identifier(tableName)}.${sql.identifier(this.casing.getColumnCasing(field))}`);
               }
             }
+          } else if (is(field, Subquery)) {
+            const entries = Object.entries(field._.selectedFields);
+            if (entries.length === 1) {
+              const entry = entries[0][1];
+              const fieldDecoder = is(entry, SQL) ? entry.decoder : is(entry, Column) ? { mapFromDriverValue: (v11) => entry.mapFromDriverValue(v11) } : entry.sql.decoder;
+              if (fieldDecoder) field._.sql.decoder = fieldDecoder;
+            }
+            chunk.push(field);
           }
           if (i8 < columnsLen - 1) {
             chunk.push(sql`, `);
@@ -46315,7 +46358,7 @@ We have encountered a collision between the index name on columns ${source_defau
             columns: indexColumns,
             isUnique: value.config.unique ?? false,
             using: value.config.using,
-            algorithm: value.config.algorythm,
+            algorithm: value.config.algorithm,
             lock: value.config.lock
           };
         });
@@ -47446,7 +47489,7 @@ The unique index ${source_default.underline.blue(
             columns: indexColumns,
             isUnique: value.config.unique ?? false,
             using: value.config.using,
-            algorithm: value.config.algorythm,
+            algorithm: value.config.algorithm,
             lock: value.config.lock
           };
         });
@@ -97809,7 +97852,7 @@ var init_core = __esm({
 });
 
 // ../drizzle-orm/dist/node-postgres/session.js
-var Pool2, types4, _a461, _b335, NodePgPreparedQuery, _a462, _b336, _NodePgSession, NodePgSession, _a463, _b337, _NodePgTransaction, NodePgTransaction;
+var Pool2, types4, NativePool, _a461, _b335, NodePgPreparedQuery, _a462, _b336, _NodePgSession, NodePgSession, _a463, _b337, _NodePgTransaction, NodePgTransaction;
 var init_session7 = __esm({
   "../drizzle-orm/dist/node-postgres/session.js"() {
     "use strict";
@@ -97823,6 +97866,7 @@ var init_session7 = __esm({
     init_tracing();
     init_utils();
     ({ Pool: Pool2, types: types4 } = esm_default);
+    NativePool = esm_default.native ? esm_default.native.Pool : void 0;
     NodePgPreparedQuery = class extends (_b335 = PgPreparedQuery, _a461 = entityKind, _b335) {
       constructor(client, queryString, params, logger2, cache5, queryMetadata, cacheConfig, fields, name3, _isResponseInArrayMode, customResultMapper) {
         super({ sql: queryString, params }, cache5, queryMetadata, cacheConfig);
@@ -97992,7 +98036,7 @@ var init_session7 = __esm({
         );
       }
       async transaction(transaction, config) {
-        const session = this.client instanceof Pool2 ? new _NodePgSession(await this.client.connect(), this.dialect, this.schema, this.options) : this;
+        const session = this.client instanceof Pool2 || NativePool && this.client instanceof NativePool ? new _NodePgSession(await this.client.connect(), this.dialect, this.schema, this.options) : this;
         const tx = new NodePgTransaction(this.dialect, session, this.schema);
         await tx.execute(sql`begin${config ? sql` ${tx.getTransactionConfigSQL(config)}` : void 0}`);
         try {
@@ -98003,7 +98047,7 @@ var init_session7 = __esm({
           await tx.execute(sql`rollback`);
           throw error2;
         } finally {
-          if (this.client instanceof Pool2) {
+          if (this.client instanceof Pool2 || NativePool && this.client instanceof NativePool) {
             session.client.release();
           }
         }

package/bin.cjs

@@ -17955,7 +17955,7 @@ We have encountered a collision between the index name on columns ${source_defau
             columns: indexColumns,
             isUnique: value.config.unique ?? false,
             using: value.config.using,
-            algorithm: value.config.algorythm,
+            algorithm: value.config.algorithm,
             lock: value.config.lock
           };
         });
@@ -21150,7 +21150,7 @@ The unique index ${source_default.underline.blue(
             columns: indexColumns,
             isUnique: value.config.unique ?? false,
             using: value.config.using,
-            algorithm: value.config.algorythm,
+            algorithm: value.config.algorithm,
             lock: value.config.lock
           };
         });
@@ -94332,7 +94332,7 @@ init_utils5();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "0.31.6-5a7c534";
+  const envVersion = "0.31.7-82993ae";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-kit",
-	"version": "0.31.6-5a7c534",
+	"version": "0.31.7-82993ae",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",