drizzle-kit 0.28.1-d21dbf5 → 0.28.1-dbf7383

package/api.js

@@ -23965,12 +23965,14 @@ var init_primary_keys = __esm({
 function getOrderByOperators() {
   return orderByOperators;
 }
-function mapRelationalRow(row, buildQueryResultSelection, mapColumnValue = (value) => value) {
+function mapRelationalRow(row, buildQueryResultSelection, mapColumnValue = (value) => value, parseJson = false) {
   for (const selectionItem of buildQueryResultSelection) {
     const field = selectionItem.field;
     if (is(field, Table2)) {
       if (row[selectionItem.key] === null)
         continue;
+      if (parseJson)
+        row[selectionItem.key] = JSON.parse(row[selectionItem.key]);
       if (selectionItem.isArray) {
         for (const item of row[selectionItem.key]) {
           mapRelationalRow(item, selectionItem.selection, mapColumnValue);
@@ -24365,12 +24367,12 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
         if (!this.query) {
           if (!this.table)
             throw new Error("Table must be set before building aggregate field");
-          this.query = sql`select count(*) as ${sql.identifier("count")} from ${this.table}`.mapWith(Number);
+          this.query = sql`select count(*) as ${sql.identifier("r")} from ${this.table}`.mapWith(Number);
         }
         return this.query;
       }
     };
-    __publicField(Count, _a123, "Count");
+    __publicField(Count, _a123, "AggregatedFieldCount");
     operators = {
       and,
       between,
@@ -25850,7 +25852,7 @@ var init_dialect = __esm({
         const extras = params?.extras ? relationExtrasToSQL(table4, params.extras) : void 0;
         if (extras)
           selection.push(...extras.selection);
-        const selectionArr = [columns, extras?.sql];
+        const selectionArr = [columns];
         const joins = params ? (() => {
           const { with: joins2 } = params;
           if (!joins2)
@@ -25860,17 +25862,18 @@ var init_dialect = __esm({
             return;
           return sql.join(
             withEntries.map(([k, join]) => {
-              const relation = tableConfig.relations[k];
-              if (relation.$brand === "AggregatedField") {
-                relation.onTable(table4);
-                const query2 = relation.getSQL();
+              if (is(tableConfig.relations[k], AggregatedField)) {
+                const relation2 = tableConfig.relations[k];
+                relation2.onTable(table4);
+                const query2 = relation2.getSQL();
                 selection.push({
                   key: k,
-                  field: relation
+                  field: relation2
                 });
                 selectionArr.push(sql`${sql.identifier(k)}.${sql.identifier("r")} as ${sql.identifier(k)}`);
                 return sql`left join lateral(${query2}) as ${sql.identifier(k)} on true`;
               }
+              const relation = tableConfig.relations[k];
               const isSingle2 = is(relation, One);
               const targetTable = relation.targetTable;
               const relationFilter = relationToSQL(relation);
@@ -25898,6 +25901,8 @@ var init_dialect = __esm({
             sql` `
           );
         })() : void 0;
+        if (extras?.sql)
+          selectionArr.push(extras.sql);
         const selectionSet = sql.join(selectionArr.filter((e) => e !== void 0), sql`, `);
         const query = sql`select ${selectionSet} from ${table4}${sql` ${joins}`.if(joins)}${sql` where ${where}`.if(where)}${sql` order by ${order}`.if(order)}${sql` limit ${limit}`.if(limit !== void 0)}${sql` offset ${offset}`.if(offset !== void 0)}`;
         return {
@@ -31350,72 +31355,20 @@ var init_dialect2 = __esm({
           }
           return selectedColumns;
         });
-        __publicField(this, "buildWithColumns", (tableConfig, withContainer, jsonColumns) => {
-          for (const [k, v] of Object.entries(
-            withContainer
-          )) {
-            if (!v)
-              continue;
-            const relation = tableConfig.relations[k];
-            if (relation.$brand === "AggregatedField")
-              continue;
-            const table4 = relation.targetTable;
-            const columns = this.getSelectedTableColumns(table4, typeof v === "boolean" ? void 0 : v.columns).map(
-              (c) => sql`${sql.raw(this.escapeString(c.tsName))}, ${sql.identifier(c.tsName)}`
-            );
-            if (typeof v !== "boolean") {
-              if (v.extras) {
-                if (typeof v.extras === "function") {
-                  v.extras = v.extras(table4[Columns], { sql });
-                }
-                for (const [ek, ev] of Object.entries(v.extras)) {
-                  if (!ev)
-                    continue;
-                  columns.push(
-                    sql`${sql.raw(this.escapeString(ek))}, ${sql.identifier(ek)}`
-                  );
-                }
-              }
-              if (v.with) {
-                const withEntries = Object.entries(v.with);
-                for (const [k2, w] of withEntries) {
-                  if (!w)
-                    continue;
-                  columns.push(sql`${sql.raw(this.escapeString(k2))}, jsonb(${sql.identifier(k2)})`);
-                }
-              }
-            }
-            jsonColumns[k] = jsonColumns[k] ? sql`${jsonColumns[k]}, ${sql.join(columns, sql`, `)}` : sql.join(columns, sql`, `);
-          }
-        });
-        __publicField(this, "buildColumns", (table4, tableConfig, selection, params) => params?.columns ? (() => {
-          const jsonColumns = {};
+        __publicField(this, "buildColumns", (table4, selection, params) => params?.columns ? (() => {
           const columnIdentifiers = [];
           const selectedColumns = this.getSelectedTableColumns(table4, params?.columns);
           for (const column4 of selectedColumns) {
-            columnIdentifiers.push(sql`${column4} as ${sql.identifier(column4.tsName)}`);
+            columnIdentifiers.push(sql`${column4.column} as ${sql.identifier(column4.tsName)}`);
             selection.push({
               key: column4.tsName,
               field: column4.column
             });
           }
-          if (params?.with) {
-            this.buildWithColumns(tableConfig, params.with, jsonColumns);
-          }
-          return {
-            columns: columnIdentifiers.length ? sql.join(columnIdentifiers, sql`, `) : this.unwrapAllColumns(table4, selection),
-            jsonColumns
-          };
+          return columnIdentifiers.length ? sql.join(columnIdentifiers, sql`, `) : this.unwrapAllColumns(table4, selection);
         })() : (() => {
           const columnIdentifiers = [this.unwrapAllColumns(table4, selection)];
-          const jsonColumns = {};
-          if (params?.with) {
-            this.buildWithColumns(tableConfig, params.with, jsonColumns);
-          }
-          return {
-            columns: sql.join(columnIdentifiers, sql`, `),
-            jsonColumns
-          };
+          return sql.join(columnIdentifiers, sql`, `);
         })());
         this.casing = new CasingCache(config?.casing);
       }
@@ -31970,7 +31923,7 @@ var init_dialect2 = __esm({
         const params = config === true ? void 0 : config;
         const limit = isSingle ? 1 : params?.limit;
         const offset = params?.offset;
-        const { columns, jsonColumns } = this.buildColumns(table4, tableConfig, selection, params);
+        const columns = this.buildColumns(table4, selection, params);
         const where = params?.where && relationWhere ? and(relationFilterToSQL(table4, params.where), relationWhere) : params?.where ? relationFilterToSQL(table4, params.where) : relationWhere;
         const order = params?.orderBy ? relationsOrderToSQL(table4, params.orderBy) : void 0;
         const extras = params?.extras ? relationExtrasToSQL(table4, params.extras) : void 0;
@@ -31985,16 +31938,17 @@ var init_dialect2 = __esm({
             return;
           return sql.join(
             withEntries.map(([k, join]) => {
-              const relation = tableConfig.relations[k];
-              if (relation.$brand === "AggregatedField") {
-                relation.onTable(table4);
-                const query2 = relation.getSQL();
+              if (is(tableConfig.relations[k], AggregatedField)) {
+                const relation2 = tableConfig.relations[k];
+                relation2.onTable(table4);
+                const query2 = relation2.getSQL();
                 selection.push({
                   key: k,
-                  field: relation
+                  field: relation2
                 });
                 return sql`(${query2}) as ${sql.identifier(k)}`;
               }
+              const relation = tableConfig.relations[k];
               const isSingle2 = is(relation, One);
               const targetTable = relation.targetTable;
               const relationFilter = relationToSQL(relation);
@@ -32015,7 +31969,13 @@ var init_dialect2 = __esm({
                 selection: innerQuery.selection,
                 isArray: !isSingle2
               });
-              return isNested ? isSingle2 ? sql`(select ${sql`jsonb_object(${jsonColumns[k]}) as ${sql.identifier("r")}`} from (${innerQuery}) as ${sql.identifier("t")}) as ${sql.identifier(k)}` : sql`coalesce((select ${sql`jsonb_group_array(json_object(${jsonColumns[k]})) as ${sql.identifier("r")}`} from (${innerQuery}) as ${sql.identifier("t")}), jsonb_array()) as ${sql.identifier(k)}` : isSingle2 ? sql`(select ${sql`json_object(${jsonColumns[k]}) as ${sql.identifier("r")}`} from (${innerQuery}) as ${sql.identifier("t")}) as ${sql.identifier(k)}` : sql`coalesce((select ${sql`json_group_array(json_object(${jsonColumns[k]})) as ${sql.identifier("r")}`} from (${innerQuery}) as ${sql.identifier("t")}), jsonb_array()) as ${sql.identifier(k)}`;
+              const jsonColumns = sql.join(
+                innerQuery.selection.map((s) => {
+                  return sql`${sql.raw(this.escapeString(s.key))}, ${s.selection ? sql`jsonb(${sql.identifier(s.key)})` : sql.identifier(s.key)}`;
+                }),
+                sql`, `
+              );
+              return isNested ? isSingle2 ? sql`(select jsonb_object(${jsonColumns}) as ${sql.identifier("r")} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)}` : sql`coalesce((select jsonb_group_array(json_object(${jsonColumns})) as ${sql.identifier("r")} from (${innerQuery.sql}) as ${sql.identifier("t")}), jsonb_array()) as ${sql.identifier(k)}` : isSingle2 ? sql`(select json_object(${jsonColumns}) as ${sql.identifier("r")} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)}` : sql`coalesce((select json_group_array(json_object(${jsonColumns})) as ${sql.identifier("r")} from (${innerQuery.sql}) as ${sql.identifier("t")}), jsonb_array()) as ${sql.identifier(k)}`;
             }),
             sql`, `
           );
@@ -33473,7 +33433,7 @@ var init_query4 = __esm({
           void 0,
           this.mode === "first" ? "get" : "all",
           (rawRows, mapColumnValue) => {
-            const rows = rawRows.map((row) => mapRelationalRow(row, query.selection, mapColumnValue));
+            const rows = rawRows.map((row) => mapRelationalRow(row, query.selection, mapColumnValue, true));
             if (this.mode === "first") {
               return rows[0];
             }
@@ -36850,42 +36810,7 @@ var init_dialect3 = __esm({
           }
           return selectedColumns;
         });
-        __publicField(this, "buildWithColumns", (tableConfig, withContainer, jsonColumns, columnIdentifiers) => {
-          for (const [k, v] of Object.entries(
-            withContainer
-          )) {
-            if (!v)
-              continue;
-            const relation = tableConfig.relations[k];
-            if (relation.$brand === "AggregatedField")
-              continue;
-            const table4 = relation.targetTable;
-            const columns = this.getSelectedTableColumns(table4, typeof v === "boolean" ? void 0 : v.columns).map(
-              (c) => sql`${sql.raw(this.escapeString(c.tsName))}, ${sql.identifier(c.tsName)}`
-            );
-            if (typeof v === "object" && v.extras) {
-              if (typeof v.extras === "function") {
-                v.extras = v.extras(table4[Columns], { sql });
-              }
-              for (const [ek, ev] of Object.entries(v.extras)) {
-                if (!ev)
-                  continue;
-                columns.push(
-                  sql`${sql.raw(this.escapeString(ek))}, ${sql.identifier(ek)}`
-                );
-              }
-            }
-            columnIdentifiers.push(
-              sql`${table4}.${sql.identifier("r")} as ${sql.identifier(k)}`
-            );
-            jsonColumns[k] = sql.join(
-              columns,
-              sql`, `
-            );
-          }
-        });
-        __publicField(this, "buildColumns", (table4, tableConfig, selection, params) => params?.columns ? (() => {
-          const jsonColumns = {};
+        __publicField(this, "buildColumns", (table4, selection, params) => params?.columns ? (() => {
           const columnIdentifiers = [];
           const selectedColumns = this.getSelectedTableColumns(table4, params?.columns);
           for (const column4 of selectedColumns) {
@@ -36893,23 +36818,10 @@ var init_dialect3 = __esm({
               sql`${table4[column4.tsName]} as ${sql.identifier(column4.tsName)}`
             );
           }
-          if (params?.with) {
-            this.buildWithColumns(tableConfig, params.with, jsonColumns, columnIdentifiers);
-          }
-          return {
-            columns: columnIdentifiers.length ? sql.join(columnIdentifiers, sql`, `) : this.unwrapAllColumns(table4, selection),
-            jsonColumns
-          };
+          return columnIdentifiers.length ? sql.join(columnIdentifiers, sql`, `) : this.unwrapAllColumns(table4, selection);
         })() : (() => {
           const columnIdentifiers = [this.unwrapAllColumns(table4, selection)];
-          const jsonColumns = {};
-          if (params?.with) {
-            this.buildWithColumns(tableConfig, params.with, jsonColumns, columnIdentifiers);
-          }
-          return {
-            columns: sql.join(columnIdentifiers, sql`, `),
-            jsonColumns
-          };
+          return sql.join(columnIdentifiers, sql`, `);
         })());
         this.casing = new CasingCache(config?.casing);
       }
@@ -37719,13 +37631,13 @@ var init_dialect3 = __esm({
         const params = config === true ? void 0 : config;
         const limit = isSingle ? 1 : params?.limit;
         const offset = params?.offset;
-        const { columns, jsonColumns } = this.buildColumns(table4, tableConfig, selection, params);
+        const columns = this.buildColumns(table4, selection, params);
         const where = params?.where && relationWhere ? and(relationFilterToSQL(table4, params.where), relationWhere) : params?.where ? relationFilterToSQL(table4, params.where) : relationWhere;
         const order = params?.orderBy ? relationsOrderToSQL(table4, params.orderBy) : void 0;
         const extras = params?.extras ? relationExtrasToSQL(table4, params.extras) : void 0;
         if (extras)
           selection.push(...extras.selection);
-        const selectionSet = sql.join([columns, extras].filter((e) => !!e), sql`, `);
+        const selectionArr = [columns];
         const joins = params ? (() => {
           const { with: joins2 } = params;
           if (!joins2)
@@ -37735,16 +37647,18 @@ var init_dialect3 = __esm({
             return;
           return sql.join(
             withEntries.map(([k, join]) => {
-              const relation = tableConfig.relations[k];
-              if (relation.$brand === "AggregatedField") {
-                relation.onTable(table4);
-                const query2 = relation.getSQL();
+              selectionArr.push(sql`${sql.identifier(k)}.${sql.identifier("r")} as ${sql.identifier(k)}`);
+              if (is(tableConfig.relations[k], AggregatedField)) {
+                const relation2 = tableConfig.relations[k];
+                relation2.onTable(table4);
+                const query2 = relation2.getSQL();
                 selection.push({
                   key: k,
-                  field: relation
+                  field: relation2
                 });
                 return sql`, lateral(${query2}) as ${sql.identifier(k)}`;
               }
+              const relation = tableConfig.relations[k];
               const isSingle2 = is(relation, One);
               const targetTable = relation.targetTable;
               const relationFilter = relationToSQL(relation);
@@ -37764,10 +37678,17 @@ var init_dialect3 = __esm({
                 selection: innerQuery.selection,
                 isArray: !isSingle2
               });
-              return sql`, lateral(select ${isSingle2 ? sql`json_object(${jsonColumns[k]}) as ${sql.identifier("r")}` : sql`coalesce(json_arrayagg(json_object(${jsonColumns[k]})), json_array()) as ${sql.identifier("r")}`} from (${innerQuery}) as ${sql.identifier("t")}) as ${schema4[k]}`;
+              const jsonColumns = sql.join(
+                innerQuery.selection.map((s) => sql`${sql.raw(this.escapeString(s.key))}, ${sql.identifier(s.key)}`),
+                sql`, `
+              );
+              return sql`, lateral(select ${isSingle2 ? sql`json_object(${jsonColumns}) as ${sql.identifier("r")}` : sql`coalesce(json_arrayagg(json_object(${jsonColumns})), json_array()) as ${sql.identifier("r")}`} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)}`;
             })
           );
         })() : void 0;
+        if (extras?.sql)
+          selectionArr.push(extras.sql);
+        const selectionSet = sql.join(selectionArr, sql`, `);
         const query = sql`select ${selectionSet} from ${table4}${sql`${joins}`.if(joins)}${sql` where ${where}`.if(where)}${sql` order by ${order}`.if(order)}${sql` limit ${limit}`.if(limit !== void 0)}${sql` offset ${offset}`.if(offset !== void 0)}`;
         return {
           sql: query,

package/api.mjs

@@ -23970,12 +23970,14 @@ var init_primary_keys = __esm({
 function getOrderByOperators() {
   return orderByOperators;
 }
-function mapRelationalRow(row, buildQueryResultSelection, mapColumnValue = (value) => value) {
+function mapRelationalRow(row, buildQueryResultSelection, mapColumnValue = (value) => value, parseJson = false) {
   for (const selectionItem of buildQueryResultSelection) {
     const field = selectionItem.field;
     if (is(field, Table2)) {
       if (row[selectionItem.key] === null)
         continue;
+      if (parseJson)
+        row[selectionItem.key] = JSON.parse(row[selectionItem.key]);
       if (selectionItem.isArray) {
         for (const item of row[selectionItem.key]) {
           mapRelationalRow(item, selectionItem.selection, mapColumnValue);
@@ -24370,12 +24372,12 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
         if (!this.query) {
           if (!this.table)
             throw new Error("Table must be set before building aggregate field");
-          this.query = sql`select count(*) as ${sql.identifier("count")} from ${this.table}`.mapWith(Number);
+          this.query = sql`select count(*) as ${sql.identifier("r")} from ${this.table}`.mapWith(Number);
         }
         return this.query;
       }
     };
-    __publicField(Count, _a123, "Count");
+    __publicField(Count, _a123, "AggregatedFieldCount");
     operators = {
       and,
       between,
@@ -25855,7 +25857,7 @@ var init_dialect = __esm({
         const extras = params?.extras ? relationExtrasToSQL(table4, params.extras) : void 0;
         if (extras)
           selection.push(...extras.selection);
-        const selectionArr = [columns, extras?.sql];
+        const selectionArr = [columns];
         const joins = params ? (() => {
           const { with: joins2 } = params;
           if (!joins2)
@@ -25865,17 +25867,18 @@ var init_dialect = __esm({
             return;
           return sql.join(
             withEntries.map(([k, join]) => {
-              const relation = tableConfig.relations[k];
-              if (relation.$brand === "AggregatedField") {
-                relation.onTable(table4);
-                const query2 = relation.getSQL();
+              if (is(tableConfig.relations[k], AggregatedField)) {
+                const relation2 = tableConfig.relations[k];
+                relation2.onTable(table4);
+                const query2 = relation2.getSQL();
                 selection.push({
                   key: k,
-                  field: relation
+                  field: relation2
                 });
                 selectionArr.push(sql`${sql.identifier(k)}.${sql.identifier("r")} as ${sql.identifier(k)}`);
                 return sql`left join lateral(${query2}) as ${sql.identifier(k)} on true`;
               }
+              const relation = tableConfig.relations[k];
               const isSingle2 = is(relation, One);
               const targetTable = relation.targetTable;
               const relationFilter = relationToSQL(relation);
@@ -25903,6 +25906,8 @@ var init_dialect = __esm({
             sql` `
           );
         })() : void 0;
+        if (extras?.sql)
+          selectionArr.push(extras.sql);
         const selectionSet = sql.join(selectionArr.filter((e) => e !== void 0), sql`, `);
         const query = sql`select ${selectionSet} from ${table4}${sql` ${joins}`.if(joins)}${sql` where ${where}`.if(where)}${sql` order by ${order}`.if(order)}${sql` limit ${limit}`.if(limit !== void 0)}${sql` offset ${offset}`.if(offset !== void 0)}`;
         return {
@@ -31355,72 +31360,20 @@ var init_dialect2 = __esm({
           }
           return selectedColumns;
         });
-        __publicField(this, "buildWithColumns", (tableConfig, withContainer, jsonColumns) => {
-          for (const [k, v] of Object.entries(
-            withContainer
-          )) {
-            if (!v)
-              continue;
-            const relation = tableConfig.relations[k];
-            if (relation.$brand === "AggregatedField")
-              continue;
-            const table4 = relation.targetTable;
-            const columns = this.getSelectedTableColumns(table4, typeof v === "boolean" ? void 0 : v.columns).map(
-              (c) => sql`${sql.raw(this.escapeString(c.tsName))}, ${sql.identifier(c.tsName)}`
-            );
-            if (typeof v !== "boolean") {
-              if (v.extras) {
-                if (typeof v.extras === "function") {
-                  v.extras = v.extras(table4[Columns], { sql });
-                }
-                for (const [ek, ev] of Object.entries(v.extras)) {
-                  if (!ev)
-                    continue;
-                  columns.push(
-                    sql`${sql.raw(this.escapeString(ek))}, ${sql.identifier(ek)}`
-                  );
-                }
-              }
-              if (v.with) {
-                const withEntries = Object.entries(v.with);
-                for (const [k2, w] of withEntries) {
-                  if (!w)
-                    continue;
-                  columns.push(sql`${sql.raw(this.escapeString(k2))}, jsonb(${sql.identifier(k2)})`);
-                }
-              }
-            }
-            jsonColumns[k] = jsonColumns[k] ? sql`${jsonColumns[k]}, ${sql.join(columns, sql`, `)}` : sql.join(columns, sql`, `);
-          }
-        });
-        __publicField(this, "buildColumns", (table4, tableConfig, selection, params) => params?.columns ? (() => {
-          const jsonColumns = {};
+        __publicField(this, "buildColumns", (table4, selection, params) => params?.columns ? (() => {
           const columnIdentifiers = [];
           const selectedColumns = this.getSelectedTableColumns(table4, params?.columns);
           for (const column4 of selectedColumns) {
-            columnIdentifiers.push(sql`${column4} as ${sql.identifier(column4.tsName)}`);
+            columnIdentifiers.push(sql`${column4.column} as ${sql.identifier(column4.tsName)}`);
             selection.push({
               key: column4.tsName,
               field: column4.column
             });
           }
-          if (params?.with) {
-            this.buildWithColumns(tableConfig, params.with, jsonColumns);
-          }
-          return {
-            columns: columnIdentifiers.length ? sql.join(columnIdentifiers, sql`, `) : this.unwrapAllColumns(table4, selection),
-            jsonColumns
-          };
+          return columnIdentifiers.length ? sql.join(columnIdentifiers, sql`, `) : this.unwrapAllColumns(table4, selection);
         })() : (() => {
           const columnIdentifiers = [this.unwrapAllColumns(table4, selection)];
-          const jsonColumns = {};
-          if (params?.with) {
-            this.buildWithColumns(tableConfig, params.with, jsonColumns);
-          }
-          return {
-            columns: sql.join(columnIdentifiers, sql`, `),
-            jsonColumns
-          };
+          return sql.join(columnIdentifiers, sql`, `);
         })());
         this.casing = new CasingCache(config?.casing);
       }
@@ -31975,7 +31928,7 @@ var init_dialect2 = __esm({
         const params = config === true ? void 0 : config;
         const limit = isSingle ? 1 : params?.limit;
         const offset = params?.offset;
-        const { columns, jsonColumns } = this.buildColumns(table4, tableConfig, selection, params);
+        const columns = this.buildColumns(table4, selection, params);
         const where = params?.where && relationWhere ? and(relationFilterToSQL(table4, params.where), relationWhere) : params?.where ? relationFilterToSQL(table4, params.where) : relationWhere;
         const order = params?.orderBy ? relationsOrderToSQL(table4, params.orderBy) : void 0;
         const extras = params?.extras ? relationExtrasToSQL(table4, params.extras) : void 0;
@@ -31990,16 +31943,17 @@ var init_dialect2 = __esm({
             return;
           return sql.join(
             withEntries.map(([k, join]) => {
-              const relation = tableConfig.relations[k];
-              if (relation.$brand === "AggregatedField") {
-                relation.onTable(table4);
-                const query2 = relation.getSQL();
+              if (is(tableConfig.relations[k], AggregatedField)) {
+                const relation2 = tableConfig.relations[k];
+                relation2.onTable(table4);
+                const query2 = relation2.getSQL();
                 selection.push({
                   key: k,
-                  field: relation
+                  field: relation2
                 });
                 return sql`(${query2}) as ${sql.identifier(k)}`;
               }
+              const relation = tableConfig.relations[k];
               const isSingle2 = is(relation, One);
               const targetTable = relation.targetTable;
               const relationFilter = relationToSQL(relation);
@@ -32020,7 +31974,13 @@ var init_dialect2 = __esm({
                 selection: innerQuery.selection,
                 isArray: !isSingle2
               });
-              return isNested ? isSingle2 ? sql`(select ${sql`jsonb_object(${jsonColumns[k]}) as ${sql.identifier("r")}`} from (${innerQuery}) as ${sql.identifier("t")}) as ${sql.identifier(k)}` : sql`coalesce((select ${sql`jsonb_group_array(json_object(${jsonColumns[k]})) as ${sql.identifier("r")}`} from (${innerQuery}) as ${sql.identifier("t")}), jsonb_array()) as ${sql.identifier(k)}` : isSingle2 ? sql`(select ${sql`json_object(${jsonColumns[k]}) as ${sql.identifier("r")}`} from (${innerQuery}) as ${sql.identifier("t")}) as ${sql.identifier(k)}` : sql`coalesce((select ${sql`json_group_array(json_object(${jsonColumns[k]})) as ${sql.identifier("r")}`} from (${innerQuery}) as ${sql.identifier("t")}), jsonb_array()) as ${sql.identifier(k)}`;
+              const jsonColumns = sql.join(
+                innerQuery.selection.map((s) => {
+                  return sql`${sql.raw(this.escapeString(s.key))}, ${s.selection ? sql`jsonb(${sql.identifier(s.key)})` : sql.identifier(s.key)}`;
+                }),
+                sql`, `
+              );
+              return isNested ? isSingle2 ? sql`(select jsonb_object(${jsonColumns}) as ${sql.identifier("r")} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)}` : sql`coalesce((select jsonb_group_array(json_object(${jsonColumns})) as ${sql.identifier("r")} from (${innerQuery.sql}) as ${sql.identifier("t")}), jsonb_array()) as ${sql.identifier(k)}` : isSingle2 ? sql`(select json_object(${jsonColumns}) as ${sql.identifier("r")} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)}` : sql`coalesce((select json_group_array(json_object(${jsonColumns})) as ${sql.identifier("r")} from (${innerQuery.sql}) as ${sql.identifier("t")}), jsonb_array()) as ${sql.identifier(k)}`;
             }),
             sql`, `
           );
@@ -33478,7 +33438,7 @@ var init_query4 = __esm({
           void 0,
           this.mode === "first" ? "get" : "all",
           (rawRows, mapColumnValue) => {
-            const rows = rawRows.map((row) => mapRelationalRow(row, query.selection, mapColumnValue));
+            const rows = rawRows.map((row) => mapRelationalRow(row, query.selection, mapColumnValue, true));
             if (this.mode === "first") {
               return rows[0];
             }
@@ -36855,42 +36815,7 @@ var init_dialect3 = __esm({
           }
           return selectedColumns;
         });
-        __publicField(this, "buildWithColumns", (tableConfig, withContainer, jsonColumns, columnIdentifiers) => {
-          for (const [k, v] of Object.entries(
-            withContainer
-          )) {
-            if (!v)
-              continue;
-            const relation = tableConfig.relations[k];
-            if (relation.$brand === "AggregatedField")
-              continue;
-            const table4 = relation.targetTable;
-            const columns = this.getSelectedTableColumns(table4, typeof v === "boolean" ? void 0 : v.columns).map(
-              (c) => sql`${sql.raw(this.escapeString(c.tsName))}, ${sql.identifier(c.tsName)}`
-            );
-            if (typeof v === "object" && v.extras) {
-              if (typeof v.extras === "function") {
-                v.extras = v.extras(table4[Columns], { sql });
-              }
-              for (const [ek, ev] of Object.entries(v.extras)) {
-                if (!ev)
-                  continue;
-                columns.push(
-                  sql`${sql.raw(this.escapeString(ek))}, ${sql.identifier(ek)}`
-                );
-              }
-            }
-            columnIdentifiers.push(
-              sql`${table4}.${sql.identifier("r")} as ${sql.identifier(k)}`
-            );
-            jsonColumns[k] = sql.join(
-              columns,
-              sql`, `
-            );
-          }
-        });
-        __publicField(this, "buildColumns", (table4, tableConfig, selection, params) => params?.columns ? (() => {
-          const jsonColumns = {};
+        __publicField(this, "buildColumns", (table4, selection, params) => params?.columns ? (() => {
           const columnIdentifiers = [];
           const selectedColumns = this.getSelectedTableColumns(table4, params?.columns);
           for (const column4 of selectedColumns) {
@@ -36898,23 +36823,10 @@ var init_dialect3 = __esm({
               sql`${table4[column4.tsName]} as ${sql.identifier(column4.tsName)}`
             );
           }
-          if (params?.with) {
-            this.buildWithColumns(tableConfig, params.with, jsonColumns, columnIdentifiers);
-          }
-          return {
-            columns: columnIdentifiers.length ? sql.join(columnIdentifiers, sql`, `) : this.unwrapAllColumns(table4, selection),
-            jsonColumns
-          };
+          return columnIdentifiers.length ? sql.join(columnIdentifiers, sql`, `) : this.unwrapAllColumns(table4, selection);
         })() : (() => {
           const columnIdentifiers = [this.unwrapAllColumns(table4, selection)];
-          const jsonColumns = {};
-          if (params?.with) {
-            this.buildWithColumns(tableConfig, params.with, jsonColumns, columnIdentifiers);
-          }
-          return {
-            columns: sql.join(columnIdentifiers, sql`, `),
-            jsonColumns
-          };
+          return sql.join(columnIdentifiers, sql`, `);
         })());
         this.casing = new CasingCache(config?.casing);
       }
@@ -37724,13 +37636,13 @@ var init_dialect3 = __esm({
         const params = config === true ? void 0 : config;
         const limit = isSingle ? 1 : params?.limit;
         const offset = params?.offset;
-        const { columns, jsonColumns } = this.buildColumns(table4, tableConfig, selection, params);
+        const columns = this.buildColumns(table4, selection, params);
         const where = params?.where && relationWhere ? and(relationFilterToSQL(table4, params.where), relationWhere) : params?.where ? relationFilterToSQL(table4, params.where) : relationWhere;
         const order = params?.orderBy ? relationsOrderToSQL(table4, params.orderBy) : void 0;
         const extras = params?.extras ? relationExtrasToSQL(table4, params.extras) : void 0;
         if (extras)
           selection.push(...extras.selection);
-        const selectionSet = sql.join([columns, extras].filter((e) => !!e), sql`, `);
+        const selectionArr = [columns];
         const joins = params ? (() => {
           const { with: joins2 } = params;
           if (!joins2)
@@ -37740,16 +37652,18 @@ var init_dialect3 = __esm({
             return;
           return sql.join(
             withEntries.map(([k, join]) => {
-              const relation = tableConfig.relations[k];
-              if (relation.$brand === "AggregatedField") {
-                relation.onTable(table4);
-                const query2 = relation.getSQL();
+              selectionArr.push(sql`${sql.identifier(k)}.${sql.identifier("r")} as ${sql.identifier(k)}`);
+              if (is(tableConfig.relations[k], AggregatedField)) {
+                const relation2 = tableConfig.relations[k];
+                relation2.onTable(table4);
+                const query2 = relation2.getSQL();
                 selection.push({
                   key: k,
-                  field: relation
+                  field: relation2
                 });
                 return sql`, lateral(${query2}) as ${sql.identifier(k)}`;
               }
+              const relation = tableConfig.relations[k];
               const isSingle2 = is(relation, One);
               const targetTable = relation.targetTable;
               const relationFilter = relationToSQL(relation);
@@ -37769,10 +37683,17 @@ var init_dialect3 = __esm({
                 selection: innerQuery.selection,
                 isArray: !isSingle2
               });
-              return sql`, lateral(select ${isSingle2 ? sql`json_object(${jsonColumns[k]}) as ${sql.identifier("r")}` : sql`coalesce(json_arrayagg(json_object(${jsonColumns[k]})), json_array()) as ${sql.identifier("r")}`} from (${innerQuery}) as ${sql.identifier("t")}) as ${schema4[k]}`;
+              const jsonColumns = sql.join(
+                innerQuery.selection.map((s) => sql`${sql.raw(this.escapeString(s.key))}, ${sql.identifier(s.key)}`),
+                sql`, `
+              );
+              return sql`, lateral(select ${isSingle2 ? sql`json_object(${jsonColumns}) as ${sql.identifier("r")}` : sql`coalesce(json_arrayagg(json_object(${jsonColumns})), json_array()) as ${sql.identifier("r")}`} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)}`;
             })
           );
         })() : void 0;
+        if (extras?.sql)
+          selectionArr.push(extras.sql);
+        const selectionSet = sql.join(selectionArr, sql`, `);
         const query = sql`select ${selectionSet} from ${table4}${sql`${joins}`.if(joins)}${sql` where ${where}`.if(where)}${sql` order by ${order}`.if(order)}${sql` limit ${limit}`.if(limit !== void 0)}${sql` offset ${offset}`.if(offset !== void 0)}`;
         return {
           sql: query,

package/bin.cjs

@@ -71324,9 +71324,9 @@ var require_dist_cjs46 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/auth/httpAuthSchemeProvider.js
+// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/auth/httpAuthSchemeProvider.js
 var require_httpAuthSchemeProvider3 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/auth/httpAuthSchemeProvider.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/auth/httpAuthSchemeProvider.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.resolveHttpAuthSchemeConfig = exports2.defaultSSOOIDCHttpAuthSchemeProvider = exports2.defaultSSOOIDCHttpAuthSchemeParametersProvider = void 0;
@@ -71393,9 +71393,9 @@ var require_httpAuthSchemeProvider3 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/package.json
+// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/package.json
 var require_package4 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/package.json"(exports2, module2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/package.json"(exports2, module2) {
     module2.exports = {
       name: "@aws-sdk/client-sso-oidc",
       description: "AWS SDK for JavaScript Sso Oidc Client for Node.js, Browser and React Native",
@@ -71499,9 +71499,9 @@ var require_package4 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/endpoint/ruleset.js
+// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/endpoint/ruleset.js
 var require_ruleset2 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/endpoint/ruleset.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/endpoint/ruleset.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.ruleSet = void 0;
@@ -71534,9 +71534,9 @@ var require_ruleset2 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/endpoint/endpointResolver.js
+// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/endpoint/endpointResolver.js
 var require_endpointResolver2 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/endpoint/endpointResolver.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/endpoint/endpointResolver.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.defaultEndpointResolver = void 0;
@@ -71554,9 +71554,9 @@ var require_endpointResolver2 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/runtimeConfig.shared.js
+// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/runtimeConfig.shared.js
 var require_runtimeConfig_shared2 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/runtimeConfig.shared.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/runtimeConfig.shared.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.getRuntimeConfig = void 0;
@@ -71600,9 +71600,9 @@ var require_runtimeConfig_shared2 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/runtimeConfig.js
+// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/runtimeConfig.js
 var require_runtimeConfig2 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/runtimeConfig.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/runtimeConfig.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.getRuntimeConfig = void 0;
@@ -71653,9 +71653,9 @@ var require_runtimeConfig2 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/index.js
+// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/index.js
 var require_dist_cjs47 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/index.js"(exports2, module2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/index.js"(exports2, module2) {
     "use strict";
     var __defProp3 = Object.defineProperty;
     var __getOwnPropDesc3 = Object.getOwnPropertyDescriptor;
@@ -73001,9 +73001,9 @@ Reference: https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-sso.ht
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/auth/httpAuthSchemeProvider.js
+// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/auth/httpAuthSchemeProvider.js
 var require_httpAuthSchemeProvider4 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/auth/httpAuthSchemeProvider.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/auth/httpAuthSchemeProvider.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.resolveHttpAuthSchemeConfig = exports2.resolveStsAuthConfig = exports2.defaultSTSHttpAuthSchemeProvider = exports2.defaultSTSHttpAuthSchemeParametersProvider = void 0;
@@ -73073,9 +73073,9 @@ var require_httpAuthSchemeProvider4 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/endpoint/EndpointParameters.js
+// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/endpoint/EndpointParameters.js
 var require_EndpointParameters = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/endpoint/EndpointParameters.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/endpoint/EndpointParameters.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.commonParams = exports2.resolveClientEndpointParameters = void 0;
@@ -73099,9 +73099,9 @@ var require_EndpointParameters = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/package.json
+// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/package.json
 var require_package5 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/package.json"(exports2, module2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/package.json"(exports2, module2) {
     module2.exports = {
       name: "@aws-sdk/client-sts",
       description: "AWS SDK for JavaScript Sts Client for Node.js, Browser and React Native",
@@ -73207,9 +73207,9 @@ var require_package5 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/endpoint/ruleset.js
+// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/endpoint/ruleset.js
 var require_ruleset3 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/endpoint/ruleset.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/endpoint/ruleset.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.ruleSet = void 0;
@@ -73254,9 +73254,9 @@ var require_ruleset3 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/endpoint/endpointResolver.js
+// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/endpoint/endpointResolver.js
 var require_endpointResolver3 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/endpoint/endpointResolver.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/endpoint/endpointResolver.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.defaultEndpointResolver = void 0;
@@ -73274,9 +73274,9 @@ var require_endpointResolver3 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/runtimeConfig.shared.js
+// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/runtimeConfig.shared.js
 var require_runtimeConfig_shared3 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/runtimeConfig.shared.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/runtimeConfig.shared.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.getRuntimeConfig = void 0;
@@ -73320,9 +73320,9 @@ var require_runtimeConfig_shared3 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/runtimeConfig.js
+// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/runtimeConfig.js
 var require_runtimeConfig3 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/runtimeConfig.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/runtimeConfig.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.getRuntimeConfig = void 0;
@@ -73386,9 +73386,9 @@ var require_runtimeConfig3 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/auth/httpAuthExtensionConfiguration.js
+// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/auth/httpAuthExtensionConfiguration.js
 var require_httpAuthExtensionConfiguration = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/auth/httpAuthExtensionConfiguration.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/auth/httpAuthExtensionConfiguration.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.resolveHttpAuthRuntimeConfig = exports2.getHttpAuthExtensionConfiguration = void 0;
@@ -73434,9 +73434,9 @@ var require_httpAuthExtensionConfiguration = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/runtimeExtensions.js
+// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/runtimeExtensions.js
 var require_runtimeExtensions = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/runtimeExtensions.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/runtimeExtensions.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.resolveRuntimeExtensions = void 0;
@@ -73465,9 +73465,9 @@ var require_runtimeExtensions = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/STSClient.js
+// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/STSClient.js
 var require_STSClient = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/STSClient.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/STSClient.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.STSClient = exports2.__Client = void 0;
@@ -73529,9 +73529,9 @@ var require_STSClient = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/index.js
+// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/index.js
 var require_dist_cjs50 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/index.js"(exports2, module2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/index.js"(exports2, module2) {
     "use strict";
     var __defProp3 = Object.defineProperty;
     var __getOwnPropDesc3 = Object.getOwnPropertyDescriptor;
@@ -89646,7 +89646,7 @@ init_utils2();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "0.28.1-d21dbf5";
+  const envVersion = "0.28.1-dbf7383";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-kit",
-	"version": "0.28.1-d21dbf5",
+	"version": "0.28.1-dbf7383",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",