drizzle-kit 0.25.0-1800fdd → 0.25.0-1fba875

package/api.js

@@ -26841,46 +26841,6 @@ var init_dialect = __esm({
         });
         return sql.join(chunks);
       }
-      buildOptimizedSelection(fields, { isSingleTable = false } = {}) {
-        const columnsLen = fields.length;
-        const chunks = fields.flatMap(({ field }, i5) => {
-          const chunk = [];
-          if (is(field, SQL.Aliased) && field.isSelectionField) {
-            chunk.push(sql.identifier(field.fieldAlias));
-          } else if (is(field, SQL.Aliased) || is(field, SQL)) {
-            const query = is(field, SQL.Aliased) ? field.sql : field;
-            if (isSingleTable) {
-              const parts = [];
-              for (const c5 of query.queryChunks) {
-                if (is(c5, PgColumn)) {
-                  parts.push(sql.raw(c5.name), sql`, `, sql.identifier(c5.name));
-                  continue;
-                }
-                parts.push(c5);
-              }
-              chunk.push(new SQL(parts));
-            } else {
-              chunk.push(query);
-            }
-            if (is(field, SQL.Aliased)) {
-              chunk.push(sql` as ${sql.identifier(field.fieldAlias)}`);
-            }
-          } else if (is(field, Column2)) {
-            if (isSingleTable) {
-              chunk.push(sql`'${sql.raw(field.name)}', ${sql.identifier(field.name)}`);
-            } else {
-              chunk.push(field);
-            }
-          }
-          if (i5 < columnsLen - 1) {
-            chunk.push(sql`, `);
-          }
-          return chunk;
-        });
-        chunks.unshift(sql`json_build_object(`);
-        chunks.push(sql`)`);
-        return sql.join(chunks);
-      }
       buildSelectQuery({
         withList,
         fields,
@@ -26895,8 +26855,7 @@ var init_dialect = __esm({
         offset,
         lockingClause,
         distinct,
-        setOperators,
-        optimize
+        setOperators
       }) {
         const fieldsList = fieldsFlat ?? orderSelectedFields(fields);
         for (const f5 of fieldsList) {
@@ -26915,9 +26874,7 @@ var init_dialect = __esm({
         if (distinct) {
           distinctSql = distinct === true ? sql` distinct` : sql` distinct on (${sql.join(distinct.on, sql`, `)})`;
         }
-        const selection = optimize ? this.buildOptimizedSelection(fieldsList, {
-          isSingleTable
-        }) : this.buildSelection(fieldsList, { isSingleTable });
+        const selection = this.buildSelection(fieldsList, { isSingleTable });
         const tableSql = (() => {
           if (is(table4, Table2) && table4[Table2.Symbol.OriginalName] !== table4[Table2.Symbol.Name]) {
             let fullName = sql`${sql.identifier(table4[Table2.Symbol.OriginalName])}`;
@@ -28598,10 +28555,6 @@ var init_select2 = __esm({
       $dynamic() {
         return this;
       }
-      $optimize() {
-        this.config.optimize = true;
-        return this;
-      }
     };
     __publicField(PgSelectQueryBuilderBase, _a130, "PgSelectQueryBuilder");
     PgSelectBase = class extends (_b101 = PgSelectQueryBuilderBase, _a131 = entityKind, _b101) {
@@ -28621,7 +28574,7 @@ var init_select2 = __esm({
         }
         return tracer.startActiveSpan("drizzle.prepareQuery", () => {
           const fieldsList = orderSelectedFields(config.fields);
-          const query = session.prepareQuery(dialect7.sqlToQuery(this.getSQL()), fieldsList, name2, true, void 0, config.optimize);
+          const query = session.prepareQuery(dialect7.sqlToQuery(this.getSQL()), fieldsList, name2, true);
           query.joinsNotNullableMap = joinsNotNullableMap;
           return query;
         });
@@ -28934,7 +28887,7 @@ var _a136, _b104, _c3, _PgCountBuilder, PgCountBuilder;
 var init_count = __esm({
   "../drizzle-orm/dist/pg-core/query-builders/count.js"() {
     "use strict";
-    init_dist3();
+    init_entity();
     init_sql();
     _PgCountBuilder = class _PgCountBuilder extends (_c3 = SQL, _b104 = entityKind, _a136 = Symbol.toStringTag, _c3) {
       constructor(params) {
@@ -30097,7 +30050,7 @@ var init_session2 = __esm({
     init_utils2();
     ({ Pool } = import_pg.default);
     NodePgPreparedQuery = class extends (_b114 = PgPreparedQuery, _a159 = entityKind, _b114) {
-      constructor(client, queryString, params, logger2, fields, name2, _isResponseInArrayMode, customResultMapper, isOptimized) {
+      constructor(client, queryString, params, logger2, fields, name2, _isResponseInArrayMode, customResultMapper) {
         super({ sql: queryString, params });
         __publicField(this, "rawQueryConfig");
         __publicField(this, "queryConfig");
@@ -30107,7 +30060,6 @@ var init_session2 = __esm({
         this.fields = fields;
         this._isResponseInArrayMode = _isResponseInArrayMode;
         this.customResultMapper = customResultMapper;
-        this.isOptimized = isOptimized;
         this.rawQueryConfig = {
           name: name2,
           text: queryString
@@ -30122,15 +30074,7 @@ var init_session2 = __esm({
         return tracer.startActiveSpan("drizzle.execute", async () => {
           const params = fillPlaceholders(this.params, placeholderValues);
           this.logger.logQuery(this.rawQueryConfig.text, params);
-          const {
-            fields,
-            rawQueryConfig: rawQuery,
-            client,
-            queryConfig: query,
-            joinsNotNullableMap,
-            customResultMapper,
-            isOptimized
-          } = this;
+          const { fields, rawQueryConfig: rawQuery, client, queryConfig: query, joinsNotNullableMap, customResultMapper } = this;
           if (!fields && !customResultMapper) {
             return tracer.startActiveSpan("drizzle.driver.execute", async (span) => {
               span?.setAttributes({
@@ -30150,7 +30094,7 @@ var init_session2 = __esm({
             return client.query(query, params);
           });
           return tracer.startActiveSpan("drizzle.mapResponse", () => {
-            return isOptimized ? result.rows.flat(1) : customResultMapper ? customResultMapper(result.rows) : result.rows.map((row) => mapResultRow(fields, row, joinsNotNullableMap));
+            return customResultMapper ? customResultMapper(result.rows) : result.rows.map((row) => mapResultRow(fields, row, joinsNotNullableMap));
           });
         });
       }
@@ -30183,7 +30127,7 @@ var init_session2 = __esm({
         this.options = options;
         this.logger = options.logger ?? new NoopLogger();
       }
-      prepareQuery(query, fields, name2, isResponseInArrayMode, customResultMapper, isOptimized) {
+      prepareQuery(query, fields, name2, isResponseInArrayMode, customResultMapper) {
         return new NodePgPreparedQuery(
           this.client,
           query.sql,
@@ -30192,8 +30136,7 @@ var init_session2 = __esm({
           fields,
           name2,
           isResponseInArrayMode,
-          customResultMapper,
-          isOptimized
+          customResultMapper
         );
       }
       async transaction(transaction, config) {
@@ -48672,7 +48615,6 @@ var init_session3 = __esm({
           database: options.database
         };
       }
-      // @ts-ignore
       prepareQuery(query, fields, name2, isResponseInArrayMode, customResultMapper, transactionId) {
         return new AwsDataApiPreparedQuery(
           this.client,
@@ -48693,8 +48635,6 @@ var init_session3 = __esm({
           void 0,
           false,
           void 0,
-          void 0,
-          // @ts-ignore
           this.transactionId
         ).execute();
       }
@@ -51929,7 +51869,7 @@ var _a215, _b158, _c7, _SQLiteCountBuilder, SQLiteCountBuilder;
 var init_count2 = __esm({
   "../drizzle-orm/dist/sqlite-core/query-builders/count.js"() {
     "use strict";
-    init_dist3();
+    init_entity();
     init_sql();
     _SQLiteCountBuilder = class _SQLiteCountBuilder extends (_c7 = SQL, _b158 = entityKind, _a215 = Symbol.toStringTag, _c7) {
       constructor(params) {
@@ -83019,7 +82959,7 @@ var _a252, _b183, _c9, _MySqlCountBuilder, MySqlCountBuilder;
 var init_count3 = __esm({
   "../drizzle-orm/dist/mysql-core/query-builders/count.js"() {
     "use strict";
-    init_dist3();
+    init_entity();
     init_sql();
     _MySqlCountBuilder = class _MySqlCountBuilder extends (_c9 = SQL, _b183 = entityKind, _a252 = Symbol.toStringTag, _c9) {
       constructor(params) {
@@ -94580,7 +94520,7 @@ var init_session14 = __esm({
     init_tracing();
     init_utils2();
     PostgresJsPreparedQuery = class extends (_b213 = PgPreparedQuery, _a299 = entityKind, _b213) {
-      constructor(client, queryString, params, logger2, fields, _isResponseInArrayMode, customResultMapper, isOptimized) {
+      constructor(client, queryString, params, logger2, fields, _isResponseInArrayMode, customResultMapper) {
         super({ sql: queryString, params });
         this.client = client;
         this.queryString = queryString;
@@ -94589,7 +94529,6 @@ var init_session14 = __esm({
         this.fields = fields;
         this._isResponseInArrayMode = _isResponseInArrayMode;
         this.customResultMapper = customResultMapper;
-        this.isOptimized = isOptimized;
       }
       async execute(placeholderValues = {}) {
         return tracer.startActiveSpan("drizzle.execute", async (span) => {
@@ -94599,7 +94538,7 @@ var init_session14 = __esm({
             "drizzle.query.params": JSON.stringify(params)
           });
           this.logger.logQuery(this.queryString, params);
-          const { fields, queryString: query, client, joinsNotNullableMap, customResultMapper, isOptimized } = this;
+          const { fields, queryString: query, client, joinsNotNullableMap, customResultMapper } = this;
           if (!fields && !customResultMapper) {
             return tracer.startActiveSpan("drizzle.driver.execute", () => {
               return client.unsafe(query, params);
@@ -94613,7 +94552,7 @@ var init_session14 = __esm({
             return client.unsafe(query, params).values();
           });
           return tracer.startActiveSpan("drizzle.mapResponse", () => {
-            return isOptimized ? rows.flat(1) : customResultMapper ? customResultMapper(rows) : rows.map((row) => mapResultRow(fields, row, joinsNotNullableMap));
+            return customResultMapper ? customResultMapper(rows) : rows.map((row) => mapResultRow(fields, row, joinsNotNullableMap));
           });
         });
       }
@@ -94649,7 +94588,7 @@ var init_session14 = __esm({
         this.options = options;
         this.logger = options.logger ?? new NoopLogger();
       }
-      prepareQuery(query, fields, name2, isResponseInArrayMode, customResultMapper, isOptimized) {
+      prepareQuery(query, fields, name2, isResponseInArrayMode, customResultMapper) {
         return new PostgresJsPreparedQuery(
           this.client,
           query.sql,
@@ -94657,8 +94596,7 @@ var init_session14 = __esm({
           this.logger,
           fields,
           isResponseInArrayMode,
-          customResultMapper,
-          isOptimized
+          customResultMapper
         );
       }
       query(query, params) {

package/api.mjs

@@ -26846,46 +26846,6 @@ var init_dialect = __esm({
         });
         return sql.join(chunks);
       }
-      buildOptimizedSelection(fields, { isSingleTable = false } = {}) {
-        const columnsLen = fields.length;
-        const chunks = fields.flatMap(({ field }, i5) => {
-          const chunk = [];
-          if (is(field, SQL.Aliased) && field.isSelectionField) {
-            chunk.push(sql.identifier(field.fieldAlias));
-          } else if (is(field, SQL.Aliased) || is(field, SQL)) {
-            const query = is(field, SQL.Aliased) ? field.sql : field;
-            if (isSingleTable) {
-              const parts = [];
-              for (const c5 of query.queryChunks) {
-                if (is(c5, PgColumn)) {
-                  parts.push(sql.raw(c5.name), sql`, `, sql.identifier(c5.name));
-                  continue;
-                }
-                parts.push(c5);
-              }
-              chunk.push(new SQL(parts));
-            } else {
-              chunk.push(query);
-            }
-            if (is(field, SQL.Aliased)) {
-              chunk.push(sql` as ${sql.identifier(field.fieldAlias)}`);
-            }
-          } else if (is(field, Column2)) {
-            if (isSingleTable) {
-              chunk.push(sql`'${sql.raw(field.name)}', ${sql.identifier(field.name)}`);
-            } else {
-              chunk.push(field);
-            }
-          }
-          if (i5 < columnsLen - 1) {
-            chunk.push(sql`, `);
-          }
-          return chunk;
-        });
-        chunks.unshift(sql`json_build_object(`);
-        chunks.push(sql`)`);
-        return sql.join(chunks);
-      }
       buildSelectQuery({
         withList,
         fields,
@@ -26900,8 +26860,7 @@ var init_dialect = __esm({
         offset,
         lockingClause,
         distinct,
-        setOperators,
-        optimize
+        setOperators
       }) {
         const fieldsList = fieldsFlat ?? orderSelectedFields(fields);
         for (const f5 of fieldsList) {
@@ -26920,9 +26879,7 @@ var init_dialect = __esm({
         if (distinct) {
           distinctSql = distinct === true ? sql` distinct` : sql` distinct on (${sql.join(distinct.on, sql`, `)})`;
         }
-        const selection = optimize ? this.buildOptimizedSelection(fieldsList, {
-          isSingleTable
-        }) : this.buildSelection(fieldsList, { isSingleTable });
+        const selection = this.buildSelection(fieldsList, { isSingleTable });
         const tableSql = (() => {
           if (is(table4, Table2) && table4[Table2.Symbol.OriginalName] !== table4[Table2.Symbol.Name]) {
             let fullName = sql`${sql.identifier(table4[Table2.Symbol.OriginalName])}`;
@@ -28603,10 +28560,6 @@ var init_select2 = __esm({
       $dynamic() {
         return this;
       }
-      $optimize() {
-        this.config.optimize = true;
-        return this;
-      }
     };
     __publicField(PgSelectQueryBuilderBase, _a130, "PgSelectQueryBuilder");
     PgSelectBase = class extends (_b101 = PgSelectQueryBuilderBase, _a131 = entityKind, _b101) {
@@ -28626,7 +28579,7 @@ var init_select2 = __esm({
         }
         return tracer.startActiveSpan("drizzle.prepareQuery", () => {
           const fieldsList = orderSelectedFields(config.fields);
-          const query = session.prepareQuery(dialect7.sqlToQuery(this.getSQL()), fieldsList, name2, true, void 0, config.optimize);
+          const query = session.prepareQuery(dialect7.sqlToQuery(this.getSQL()), fieldsList, name2, true);
           query.joinsNotNullableMap = joinsNotNullableMap;
           return query;
         });
@@ -28939,7 +28892,7 @@ var _a136, _b104, _c3, _PgCountBuilder, PgCountBuilder;
 var init_count = __esm({
   "../drizzle-orm/dist/pg-core/query-builders/count.js"() {
     "use strict";
-    init_dist3();
+    init_entity();
     init_sql();
     _PgCountBuilder = class _PgCountBuilder extends (_c3 = SQL, _b104 = entityKind, _a136 = Symbol.toStringTag, _c3) {
       constructor(params) {
@@ -30102,7 +30055,7 @@ var init_session2 = __esm({
     init_utils2();
     ({ Pool } = import_pg.default);
     NodePgPreparedQuery = class extends (_b114 = PgPreparedQuery, _a159 = entityKind, _b114) {
-      constructor(client, queryString, params, logger2, fields, name2, _isResponseInArrayMode, customResultMapper, isOptimized) {
+      constructor(client, queryString, params, logger2, fields, name2, _isResponseInArrayMode, customResultMapper) {
         super({ sql: queryString, params });
         __publicField(this, "rawQueryConfig");
         __publicField(this, "queryConfig");
@@ -30112,7 +30065,6 @@ var init_session2 = __esm({
         this.fields = fields;
         this._isResponseInArrayMode = _isResponseInArrayMode;
         this.customResultMapper = customResultMapper;
-        this.isOptimized = isOptimized;
         this.rawQueryConfig = {
           name: name2,
           text: queryString
@@ -30127,15 +30079,7 @@ var init_session2 = __esm({
         return tracer.startActiveSpan("drizzle.execute", async () => {
           const params = fillPlaceholders(this.params, placeholderValues);
           this.logger.logQuery(this.rawQueryConfig.text, params);
-          const {
-            fields,
-            rawQueryConfig: rawQuery,
-            client,
-            queryConfig: query,
-            joinsNotNullableMap,
-            customResultMapper,
-            isOptimized
-          } = this;
+          const { fields, rawQueryConfig: rawQuery, client, queryConfig: query, joinsNotNullableMap, customResultMapper } = this;
           if (!fields && !customResultMapper) {
             return tracer.startActiveSpan("drizzle.driver.execute", async (span) => {
               span?.setAttributes({
@@ -30155,7 +30099,7 @@ var init_session2 = __esm({
             return client.query(query, params);
           });
           return tracer.startActiveSpan("drizzle.mapResponse", () => {
-            return isOptimized ? result.rows.flat(1) : customResultMapper ? customResultMapper(result.rows) : result.rows.map((row) => mapResultRow(fields, row, joinsNotNullableMap));
+            return customResultMapper ? customResultMapper(result.rows) : result.rows.map((row) => mapResultRow(fields, row, joinsNotNullableMap));
           });
         });
       }
@@ -30188,7 +30132,7 @@ var init_session2 = __esm({
         this.options = options;
         this.logger = options.logger ?? new NoopLogger();
       }
-      prepareQuery(query, fields, name2, isResponseInArrayMode, customResultMapper, isOptimized) {
+      prepareQuery(query, fields, name2, isResponseInArrayMode, customResultMapper) {
         return new NodePgPreparedQuery(
           this.client,
           query.sql,
@@ -30197,8 +30141,7 @@ var init_session2 = __esm({
           fields,
           name2,
           isResponseInArrayMode,
-          customResultMapper,
-          isOptimized
+          customResultMapper
         );
       }
       async transaction(transaction, config) {
@@ -48676,7 +48619,6 @@ var init_session3 = __esm({
           database: options.database
         };
       }
-      // @ts-ignore
       prepareQuery(query, fields, name2, isResponseInArrayMode, customResultMapper, transactionId) {
         return new AwsDataApiPreparedQuery(
           this.client,
@@ -48697,8 +48639,6 @@ var init_session3 = __esm({
           void 0,
           false,
           void 0,
-          void 0,
-          // @ts-ignore
           this.transactionId
         ).execute();
       }
@@ -51933,7 +51873,7 @@ var _a215, _b158, _c7, _SQLiteCountBuilder, SQLiteCountBuilder;
 var init_count2 = __esm({
   "../drizzle-orm/dist/sqlite-core/query-builders/count.js"() {
     "use strict";
-    init_dist3();
+    init_entity();
     init_sql();
     _SQLiteCountBuilder = class _SQLiteCountBuilder extends (_c7 = SQL, _b158 = entityKind, _a215 = Symbol.toStringTag, _c7) {
       constructor(params) {
@@ -83023,7 +82963,7 @@ var _a252, _b183, _c9, _MySqlCountBuilder, MySqlCountBuilder;
 var init_count3 = __esm({
   "../drizzle-orm/dist/mysql-core/query-builders/count.js"() {
     "use strict";
-    init_dist3();
+    init_entity();
     init_sql();
     _MySqlCountBuilder = class _MySqlCountBuilder extends (_c9 = SQL, _b183 = entityKind, _a252 = Symbol.toStringTag, _c9) {
       constructor(params) {
@@ -94583,7 +94523,7 @@ var init_session14 = __esm({
     init_tracing();
     init_utils2();
     PostgresJsPreparedQuery = class extends (_b213 = PgPreparedQuery, _a299 = entityKind, _b213) {
-      constructor(client, queryString, params, logger2, fields, _isResponseInArrayMode, customResultMapper, isOptimized) {
+      constructor(client, queryString, params, logger2, fields, _isResponseInArrayMode, customResultMapper) {
         super({ sql: queryString, params });
         this.client = client;
         this.queryString = queryString;
@@ -94592,7 +94532,6 @@ var init_session14 = __esm({
         this.fields = fields;
         this._isResponseInArrayMode = _isResponseInArrayMode;
         this.customResultMapper = customResultMapper;
-        this.isOptimized = isOptimized;
       }
       async execute(placeholderValues = {}) {
         return tracer.startActiveSpan("drizzle.execute", async (span) => {
@@ -94602,7 +94541,7 @@ var init_session14 = __esm({
             "drizzle.query.params": JSON.stringify(params)
           });
           this.logger.logQuery(this.queryString, params);
-          const { fields, queryString: query, client, joinsNotNullableMap, customResultMapper, isOptimized } = this;
+          const { fields, queryString: query, client, joinsNotNullableMap, customResultMapper } = this;
           if (!fields && !customResultMapper) {
             return tracer.startActiveSpan("drizzle.driver.execute", () => {
               return client.unsafe(query, params);
@@ -94616,7 +94555,7 @@ var init_session14 = __esm({
             return client.unsafe(query, params).values();
           });
           return tracer.startActiveSpan("drizzle.mapResponse", () => {
-            return isOptimized ? rows.flat(1) : customResultMapper ? customResultMapper(rows) : rows.map((row) => mapResultRow(fields, row, joinsNotNullableMap));
+            return customResultMapper ? customResultMapper(rows) : rows.map((row) => mapResultRow(fields, row, joinsNotNullableMap));
           });
         });
       }
@@ -94652,7 +94591,7 @@ var init_session14 = __esm({
         this.options = options;
         this.logger = options.logger ?? new NoopLogger();
       }
-      prepareQuery(query, fields, name2, isResponseInArrayMode, customResultMapper, isOptimized) {
+      prepareQuery(query, fields, name2, isResponseInArrayMode, customResultMapper) {
         return new PostgresJsPreparedQuery(
           this.client,
           query.sql,
@@ -94660,8 +94599,7 @@ var init_session14 = __esm({
           this.logger,
           fields,
           isResponseInArrayMode,
-          customResultMapper,
-          isOptimized
+          customResultMapper
         );
       }
       query(query, params) {

package/bin.cjs

@@ -85222,7 +85222,7 @@ init_utils2();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "0.25.0-1800fdd";
+  const envVersion = "0.25.0-1fba875";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-kit",
-	"version": "0.25.0-1800fdd",
+	"version": "0.25.0-1fba875",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",