drizzle-kit 0.30.1-e6823b4 → 0.30.1-f2d266c

package/api.js

@@ -24837,24 +24837,33 @@ var init_primary_keys = __esm({
 function getOrderByOperators() {
   return orderByOperators;
 }
-function mapRelationalRow(row, buildQueryResultSelection, mapColumnValue = (value) => value, parseJson = false) {
+function mapRelationalRow(row, buildQueryResultSelection, mapColumnValue = (value) => value, parseJson = false, path2) {
   for (const selectionItem of buildQueryResultSelection) {
     const field = selectionItem.field;
     if (is(field, Table2)) {
+      const currentPath = `${path2 ? `${path2}.` : ""}${selectionItem.key}`;
       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);
+          mapRelationalRow(
+            item,
+            selectionItem.selection,
+            mapColumnValue,
+            false,
+            currentPath
+          );
         }
         continue;
       }
       mapRelationalRow(
         row[selectionItem.key],
         selectionItem.selection,
-        mapColumnValue
+        mapColumnValue,
+        false,
+        currentPath
       );
       continue;
     }
@@ -24905,7 +24914,7 @@ function defineRelations(schema5, relations) {
   );
 }
 function relationsFieldFilterToSQL(column5, filter2) {
-  if (typeof filter2 !== "object" || is(filter2, Placeholder))
+  if (typeof filter2 !== "object")
     return eq(column5, filter2);
   const entries = Object.entries(filter2);
   if (!entries.length)
@@ -24932,6 +24941,21 @@ function relationsFieldFilterToSQL(column5, filter2) {
         );
         continue;
       }
+      case "isNotNull":
+      case "isNull": {
+        if (!value)
+          continue;
+        parts.push(operators[target](column5));
+        continue;
+      }
+      case "in": {
+        parts.push(operators.inArray(column5, value));
+        continue;
+      }
+      case "notIn": {
+        parts.push(operators.notInArray(column5, value));
+        continue;
+      }
       default: {
         parts.push(
           operators[target](
@@ -25029,18 +25053,49 @@ function relationExtrasToSQL(table5, extras) {
     selection
   };
 }
-function relationToSQL(relation, sourceTable, targetTable) {
+function getTableSql(table5) {
+  return sql`${sql`${sql`${sql.identifier(table5[Schema] ?? "")}.`.if(!table5[IsAlias] && table5[Schema])}`}${table5}`;
+}
+function relationToSQL(relation, sourceTable, targetTable, throughTable) {
+  if (relation.through) {
+    const outerColumnWhere = relation.sourceColumns.map((s, i) => {
+      const t = relation.through.source[i];
+      return eq(
+        sql`${getTableSql(sourceTable)}.${sql.identifier(s.name)}`,
+        sql`${getTableSql(throughTable)}.${sql.identifier(t.name)}`
+      );
+    });
+    const innerColumnWhere = relation.targetColumns.map((s, i) => {
+      const t = relation.through.target[i];
+      return eq(
+        sql`${getTableSql(throughTable)}.${sql.identifier(t.name)}`,
+        sql`${getTableSql(targetTable)}.${sql.identifier(s.name)}`
+      );
+    });
+    return {
+      filter: and(
+        relation.where ? relation.isReversed ? relationsFilterToSQL(targetTable, relation.where) : relationsFilterToSQL(sourceTable, relation.where) : void 0
+      ),
+      joinCondition: and(
+        ...outerColumnWhere,
+        ...innerColumnWhere
+      )
+    };
+  }
   const columnWhere = relation.sourceColumns.map((s, i) => {
     const t = relation.targetColumns[i];
     return eq(
-      sql`${sql`${sql`${sql.identifier(sourceTable[Schema] ?? "")}.`.if(sourceTable[Schema] && !sourceTable[IsAlias])}`}${sourceTable}.${sql.identifier(s.name)}`,
-      sql`${sql`${sql`${sql.identifier(targetTable[Schema] ?? "")}.`.if(targetTable[Schema] && !targetTable[IsAlias])}`}${targetTable}.${sql.identifier(t.name)}`
+      sql`${getTableSql(sourceTable)}.${sql.identifier(s.name)}`,
+      sql`${getTableSql(targetTable)}.${sql.identifier(t.name)}`
     );
   });
-  const targetWhere = relation.where ? and(...columnWhere, relationsFilterToSQL(sourceTable, relation.where)) : and(...columnWhere);
-  return targetWhere;
+  const fullWhere = and(
+    ...columnWhere,
+    relation.where ? relation.isReversed ? relationsFilterToSQL(targetTable, relation.where) : relationsFilterToSQL(sourceTable, relation.where) : void 0
+  );
+  return { filter: fullWhere };
 }
-var _a118, Relations, _a119, Relation, _a120, _b95, One, _a121, _b96, Many, _a122, AggregatedField, _a123, _b97, Count, operators, orderByOperators, _a124, RelationsBuilderTable, _a125, RelationsBuilderColumn, _a126, RelationsHelperStatic;
+var _a118, Relations, _a119, Relation, _a120, _b95, One, _a121, _b96, Many, _a122, AggregatedField, _a123, _b97, Count, operators, orderByOperators, _a124, RelationsBuilderTable, _a125, _RelationsBuilderColumn, RelationsBuilderColumn, _a126, RelationsHelperStatic;
 var init_relations = __esm({
   "../drizzle-orm/dist/relations.js"() {
     "use strict";
@@ -25115,9 +25170,30 @@ var init_relations = __esm({
             if (relation.sourceColumns && relation.targetColumns) {
               if (relation.sourceColumns.length !== relation.targetColumns.length) {
                 throw new Error(
-                  `${relationPrintName}: "from" and "to" arrays must have the same length`
+                  `${relationPrintName}: "from" and "to" fields must have the same length`
                 );
               }
+              if (relation.through) {
+                if (relation.through.source.length !== relation.through.target.length || relation.through.source.length !== relation.sourceColumns.length || relation.through.target.length !== relation.targetColumns.length) {
+                  throw new Error(
+                    `${relationPrintName}: ".through(column)" must be used either on all columns in "from" and "to" or not defined on any of them`
+                  );
+                }
+                for (const column5 of relation.through.source) {
+                  if (column5.table !== relation.throughTable) {
+                    throw new Error(
+                      `${relationPrintName}: ".through(column)" must be used on the same table by all columns of the relation`
+                    );
+                  }
+                }
+                for (const column5 of relation.through.target) {
+                  if (column5.table !== relation.throughTable) {
+                    throw new Error(
+                      `${relationPrintName}: ".through(column)" must be used on the same table by all columns of the relation`
+                    );
+                  }
+                }
+              }
               continue;
             }
             if (relation.sourceColumns || relation.targetColumns) {
@@ -25177,7 +25253,13 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
             }
             relation.sourceColumns = reverseRelation.targetColumns;
             relation.targetColumns = reverseRelation.sourceColumns;
-            relation.where = reverseRelation.where;
+            relation.through = reverseRelation.through ? {
+              source: reverseRelation.through.target,
+              target: reverseRelation.through.source
+            } : void 0;
+            relation.throughTable = reverseRelation.throughTable;
+            relation.isReversed = !relation.where;
+            relation.where = relation.where ?? reverseRelation.where;
           }
         }
       }
@@ -25192,6 +25274,9 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
         __publicField(this, "alias");
         __publicField(this, "where");
         __publicField(this, "sourceTable");
+        __publicField(this, "through");
+        __publicField(this, "throughTable");
+        __publicField(this, "isReversed");
         this.targetTable = targetTable;
       }
     };
@@ -25203,12 +25288,30 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
         this.alias = config?.alias;
         this.where = config?.where;
         if (config?.from) {
-          this.sourceColumns = Array.isArray(config.from) ? config.from.map((it) => it._.column) : [config.from._.column];
+          this.sourceColumns = (Array.isArray(config.from) ? config.from : [config.from]).map((it) => {
+            this.throughTable ??= it._.through?._.column.table;
+            return it._.column;
+          });
         }
         if (config?.to) {
-          this.targetColumns = Array.isArray(config.to) ? config.to.map((it) => it._.column) : [config.to._.column];
+          this.targetColumns = (Array.isArray(config.to) ? config.to : [config.to]).map((it) => {
+            this.throughTable ??= it._.through?._.column.table;
+            return it._.column;
+          });
         }
-        this.optional = config?.optional ?? false;
+        if (this.throughTable) {
+          this.through = Array.isArray(config?.from) ? {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain -- in case it's undefined, error will be thrown in Relations constructor
+            source: config.from.map((e) => e._.through?._.column),
+            target: (config.to ?? []).map((e) => e._.column)
+          } : {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain -- in case it's undefined, error will be thrown in Relations constructor
+            source: [config?.from?._.through?._.column],
+            // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
+            target: [config?.to?._.through?._.column]
+          };
+        }
+        this.optional = config?.optional ?? true;
       }
     };
     __publicField(One, _a120, "OneV2");
@@ -25219,10 +25322,28 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
         this.alias = config?.alias;
         this.where = config?.where;
         if (config?.from) {
-          this.sourceColumns = Array.isArray(config.from) ? config.from.map((it) => it._.column) : [config.from._.column];
+          this.sourceColumns = (Array.isArray(config.from) ? config.from : [config.from]).map((it) => {
+            this.throughTable ??= it._.through?._.column.table;
+            return it._.column;
+          });
         }
         if (config?.to) {
-          this.targetColumns = Array.isArray(config.to) ? config.to.map((it) => it._.column) : [config.to._.column];
+          this.targetColumns = (Array.isArray(config.to) ? config.to : [config.to]).map((it) => {
+            this.throughTable ??= it._.through?._.column.table;
+            return it._.column;
+          });
+        }
+        if (this.throughTable) {
+          this.through = Array.isArray(config?.from) ? {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain -- in case it's undefined, error will be thrown in Relations constructor
+            source: config.from.map((e) => e._.through?._.column),
+            target: (config.to ?? []).map((e) => e._.column)
+          } : {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain -- in case it's undefined, error will be thrown in Relations constructor
+            source: [config?.from?._.through?._.column],
+            // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
+            target: [config?.to?._.through?._.column]
+          };
         }
       }
     };
@@ -25247,7 +25368,8 @@ 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("r")} from ${this.table}`.mapWith(Number);
+          const table5 = this.table;
+          this.query = sql`select count(*) as ${sql.identifier("r")} from ${table5[IsAlias] ? sql`${sql`${sql.identifier(table5[Schema] ?? "")}.`.if(table5[Schema])}${sql.identifier(table5[OriginalName])} as ${table5}` : table5}`.mapWith(Number);
         }
         return this.query;
       }
@@ -25297,24 +25419,25 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
     };
     __publicField(RelationsBuilderTable, _a124, "RelationsBuilderTable");
     _a125 = entityKind;
-    RelationsBuilderColumn = class {
-      constructor(column5) {
+    _RelationsBuilderColumn = class _RelationsBuilderColumn {
+      constructor(column5, through) {
         __publicField(this, "_");
         this._ = {
           tableName: getTableName(column5.table),
           data: void 0,
-          column: column5
+          column: column5,
+          through
         };
       }
       through(column5) {
-        this._.through = column5;
-        return this;
+        return new _RelationsBuilderColumn(this._.column, column5);
       }
       getSQL() {
         return this._.column.getSQL();
       }
     };
-    __publicField(RelationsBuilderColumn, _a125, "RelationsBuilderColumn");
+    __publicField(_RelationsBuilderColumn, _a125, "RelationsBuilderColumn");
+    RelationsBuilderColumn = _RelationsBuilderColumn;
     _a126 = entityKind;
     RelationsHelperStatic = class {
       constructor(tables) {
@@ -26071,7 +26194,7 @@ var init_dialect = __esm({
             sql`, `
           );
         });
-        __publicField(this, "buildColumns", (table5, tableConfig, selection, config) => config?.columns ? (() => {
+        __publicField(this, "buildColumns", (table5, selection, config) => config?.columns ? (() => {
           const entries = Object.entries(config.columns);
           const columnIdentifiers = [];
           let colSelectionMode;
@@ -26718,7 +26841,8 @@ var init_dialect = __esm({
         relationWhere,
         mode,
         errorPath,
-        depth
+        depth,
+        throughJoin
       }) {
         const selection = [];
         const isSingle = mode === "first";
@@ -26729,7 +26853,7 @@ var init_dialect = __esm({
         const offset = params?.offset;
         const where = params?.where && relationWhere ? and(relationsFilterToSQL(table5, params.where), relationWhere) : params?.where ? relationsFilterToSQL(table5, params.where) : relationWhere;
         const order = params?.orderBy ? relationsOrderToSQL(table5, params.orderBy) : void 0;
-        const columns = this.buildColumns(table5, tableConfig, selection, params);
+        const columns = this.buildColumns(table5, selection, params);
         const extras = params?.extras ? relationExtrasToSQL(table5, params.extras) : void 0;
         if (extras)
           selection.push(...extras.selection);
@@ -26757,10 +26881,15 @@ var init_dialect = __esm({
               const relation = tableConfig.relations[k];
               const isSingle2 = is(relation, One);
               const targetTable = aliasedTable(relation.targetTable, `d${currentDepth + 1}`);
-              const relationFilter = relationToSQL(relation, table5, targetTable);
-              selectionArr.push(
-                isSingle2 ? sql`${sql.identifier(k)}.${sql.identifier("r")} as ${sql.identifier(k)}` : sql`coalesce(${sql.identifier(k)}.${sql.identifier("r")}, '[]') as ${sql.identifier(k)}`
+              const throughTable = relation.throughTable ? aliasedTable(relation.throughTable, `tr${currentDepth}`) : void 0;
+              const { filter: filter2, joinCondition } = relationToSQL(
+                relation,
+                table5,
+                targetTable,
+                throughTable
               );
+              selectionArr.push(sql`${sql.identifier(k)}.${sql.identifier("r")} as ${sql.identifier(k)}`);
+              const throughJoin2 = throughTable ? sql` inner join ${sql`${sql.identifier(throughTable[Schema] ?? "")}.`.if(throughTable[Schema])}${sql.identifier(throughTable[OriginalName])} as ${throughTable} on ${joinCondition}` : void 0;
               const innerQuery = this.buildRelationalQuery({
                 table: targetTable,
                 mode: isSingle2 ? "first" : "many",
@@ -26769,17 +26898,20 @@ var init_dialect = __esm({
                 tableConfig: schema5[tableNamesMap[getTableUniqueName(relation.targetTable)]],
                 tableNamesMap,
                 tables,
-                relationWhere: relationFilter,
+                relationWhere: filter2,
                 errorPath: `${currentPath.length ? `${currentPath}.` : ""}${k}`,
-                depth: currentDepth + 1
+                depth: currentDepth + 1,
+                throughJoin: throughJoin2
               });
               selection.push({
                 field: targetTable,
                 key: k,
                 selection: innerQuery.selection,
-                isArray: !isSingle2
+                isArray: !isSingle2,
+                isOptional: (relation.optional ?? false) || join !== true && !!join.where
               });
-              return sql`left join lateral(select ${isSingle2 ? sql`row_to_json(${sql.identifier("t")}.*) ${sql.identifier("r")}` : sql`json_agg(row_to_json(${sql.identifier("t")}.*)) ${sql.identifier("r")}`} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)} on true`;
+              const joinQuery = sql`left join lateral(select ${isSingle2 ? sql`row_to_json(${sql.identifier("t")}.*) ${sql.identifier("r")}` : sql`coalesce(json_agg(row_to_json(${sql.identifier("t")}.*)), '[]') as ${sql.identifier("r")}`} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)} on true`;
+              return joinQuery;
             }),
             sql` `
           );
@@ -26792,7 +26924,7 @@ var init_dialect = __esm({
           });
         }
         const selectionSet = sql.join(selectionArr.filter((e) => e !== void 0), sql`, `);
-        const query = sql`select ${selectionSet} from ${table5[IsAlias] ? sql`${sql`${sql.identifier(table5[Schema] ?? "")}.`.if(table5[Schema])}${sql.identifier(table5[OriginalName])} as ${table5}` : table5}${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)}`;
+        const query = sql`select ${selectionSet} from ${table5[IsAlias] ? sql`${sql`${sql.identifier(table5[Schema] ?? "")}.`.if(table5[Schema])}${sql.identifier(table5[OriginalName])} as ${table5}` : table5}${throughJoin}${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,
           selection
@@ -32797,7 +32929,8 @@ var init_dialect2 = __esm({
         mode,
         isNested,
         errorPath,
-        depth
+        depth,
+        throughJoin
       }) {
         const selection = [];
         const isSingle = mode === "first";
@@ -32834,7 +32967,14 @@ var init_dialect2 = __esm({
               const relation = tableConfig.relations[k];
               const isSingle2 = is(relation, One);
               const targetTable = aliasedTable(relation.targetTable, `d${currentDepth + 1}`);
-              const relationFilter = relationToSQL(relation, table5, targetTable);
+              const throughTable = relation.throughTable ? aliasedTable(relation.throughTable, `tr${currentDepth}`) : void 0;
+              const { filter: filter2, joinCondition } = relationToSQL(
+                relation,
+                table5,
+                targetTable,
+                throughTable
+              );
+              const throughJoin2 = throughTable ? sql` inner join ${sql`${sql.identifier(throughTable[Schema] ?? "")}.`.if(throughTable[Schema])}${sql.identifier(throughTable[OriginalName])} as ${throughTable} on ${joinCondition}` : void 0;
               const innerQuery = this.buildRelationalQuery({
                 table: targetTable,
                 mode: isSingle2 ? "first" : "many",
@@ -32843,16 +32983,18 @@ var init_dialect2 = __esm({
                 tableConfig: schema5[tableNamesMap[getTableUniqueName(relation.targetTable)]],
                 tableNamesMap,
                 tables,
-                relationWhere: relationFilter,
+                relationWhere: filter2,
                 isNested: true,
                 errorPath: `${currentPath.length ? `${currentPath}.` : ""}${k}`,
-                depth: currentDepth + 1
+                depth: currentDepth + 1,
+                throughJoin: throughJoin2
               });
               selection.push({
                 field: targetTable,
                 key: k,
                 selection: innerQuery.selection,
-                isArray: !isSingle2
+                isArray: !isSingle2,
+                isOptional: (relation.optional ?? false) || join !== true && !!join.where
               });
               const jsonColumns = sql.join(
                 innerQuery.selection.map((s) => {
@@ -32860,7 +33002,9 @@ var init_dialect2 = __esm({
                 }),
                 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)}`;
+              const json4 = isNested ? sql`jsonb` : sql`json`;
+              const joinQuery = isSingle2 ? sql`(select ${json4}_object(${jsonColumns}) as ${sql.identifier("r")} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)}` : sql`coalesce((select ${json4}_group_array(json_object(${jsonColumns})) as ${sql.identifier("r")} from (${innerQuery.sql}) as ${sql.identifier("t")}), jsonb_array()) as ${sql.identifier(k)}`;
+              return joinQuery;
             }),
             sql`, `
           );
@@ -32872,7 +33016,7 @@ var init_dialect2 = __esm({
           });
         }
         const selectionSet = sql.join(selectionArr, sql`, `);
-        const query = sql`select ${selectionSet} from ${table5[IsAlias] ? sql`${sql`${sql.identifier(table5[Schema] ?? "")}.`.if(table5[Schema])}${sql.identifier(table5[OriginalName])} as ${table5}` : table5}${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)}`;
+        const query = sql`select ${selectionSet} from ${table5[IsAlias] ? sql`${sql`${sql.identifier(table5[Schema] ?? "")}.`.if(table5[Schema])}${sql.identifier(table5[OriginalName])} as ${table5}` : table5}${throughJoin}${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,
           selection
@@ -37744,6 +37888,12 @@ var init_dialect3 = __esm({
             columnIdentifiers.push(
               sql`${table5[column5.tsName]} as ${sql.identifier(column5.tsName)}`
             );
+            selection.push(
+              {
+                key: column5.tsName,
+                field: column5.column
+              }
+            );
           }
           return columnIdentifiers.length ? sql.join(columnIdentifiers, sql`, `) : void 0;
         })() : this.unwrapAllColumns(table5, selection));
@@ -38565,7 +38715,9 @@ var init_dialect3 = __esm({
         relationWhere,
         mode,
         errorPath,
-        depth
+        depth,
+        isNested,
+        throughJoin
       }) {
         const selection = [];
         const isSingle = mode === "first";
@@ -38599,12 +38751,19 @@ var init_dialect3 = __esm({
                   key: k,
                   field: relation2
                 });
-                return sql`, lateral(${query2}) 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 = aliasedTable(relation.targetTable, `d${currentDepth + 1}`);
-              const relationFilter = relationToSQL(relation, table5, targetTable);
+              const throughTable = relation.throughTable ? aliasedTable(relation.throughTable, `tr${currentDepth}`) : void 0;
+              const { filter: filter2, joinCondition } = relationToSQL(
+                relation,
+                table5,
+                targetTable,
+                throughTable
+              );
+              const throughJoin2 = throughTable ? sql` inner join ${sql`${sql.identifier(throughTable[Schema] ?? "")}.`.if(throughTable[Schema])}${sql.identifier(throughTable[OriginalName])} as ${throughTable} on ${joinCondition}` : void 0;
               const innerQuery = this.buildRelationalQuery({
                 table: targetTable,
                 mode: isSingle2 ? "first" : "many",
@@ -38613,21 +38772,25 @@ var init_dialect3 = __esm({
                 tableConfig: schema5[tableNamesMap[getTableUniqueName(relation.targetTable)]],
                 tableNamesMap,
                 tables,
-                relationWhere: relationFilter,
+                relationWhere: filter2,
                 errorPath: `${currentPath.length ? `${currentPath}.` : ""}${k}`,
-                depth: currentDepth + 1
+                depth: currentDepth + 1,
+                isNested: true,
+                throughJoin: throughJoin2
               });
               selection.push({
                 field: targetTable,
                 key: k,
                 selection: innerQuery.selection,
-                isArray: !isSingle2
+                isArray: !isSingle2,
+                isOptional: (relation.optional ?? false) || join !== true && !!join.where
               });
               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)}`;
+              const joinQuery = sql` left join lateral(select ${sql`${isSingle2 ? sql`json_object(${jsonColumns})` : sql`coalesce(json_arrayagg(json_object(${jsonColumns})), json_array())`} as ${sql.identifier("r")}`} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)} on true`;
+              return joinQuery;
             })
           );
         })() : void 0;
@@ -38638,8 +38801,11 @@ var init_dialect3 = __esm({
             message: `No fields selected for table "${tableConfig.tsName}"${currentPath ? ` ("${currentPath}")` : ""}`
           });
         }
+        if (isNested && order) {
+          selectionArr.push(sql`row_number() over (order by ${order})`);
+        }
         const selectionSet = sql.join(selectionArr, sql`, `);
-        const query = sql`select ${selectionSet} from ${table5[IsAlias] ? sql`${sql`${sql.identifier(table5[Schema] ?? "")}.`.if(table5[Schema])}${sql.identifier(table5[OriginalName])} as ${table5}` : table5}${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)}`;
+        const query = sql`select ${selectionSet} from ${table5[IsAlias] ? sql`${sql`${sql.identifier(table5[Schema] ?? "")}.`.if(table5[Schema])}${sql.identifier(table5[OriginalName])} as ${table5}` : table5}${throughJoin}${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,
           selection

package/api.mjs

@@ -24842,24 +24842,33 @@ var init_primary_keys = __esm({
 function getOrderByOperators() {
   return orderByOperators;
 }
-function mapRelationalRow(row, buildQueryResultSelection, mapColumnValue = (value) => value, parseJson = false) {
+function mapRelationalRow(row, buildQueryResultSelection, mapColumnValue = (value) => value, parseJson = false, path2) {
   for (const selectionItem of buildQueryResultSelection) {
     const field = selectionItem.field;
     if (is(field, Table2)) {
+      const currentPath = `${path2 ? `${path2}.` : ""}${selectionItem.key}`;
       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);
+          mapRelationalRow(
+            item,
+            selectionItem.selection,
+            mapColumnValue,
+            false,
+            currentPath
+          );
         }
         continue;
       }
       mapRelationalRow(
         row[selectionItem.key],
         selectionItem.selection,
-        mapColumnValue
+        mapColumnValue,
+        false,
+        currentPath
       );
       continue;
     }
@@ -24910,7 +24919,7 @@ function defineRelations(schema5, relations) {
   );
 }
 function relationsFieldFilterToSQL(column5, filter2) {
-  if (typeof filter2 !== "object" || is(filter2, Placeholder))
+  if (typeof filter2 !== "object")
     return eq(column5, filter2);
   const entries = Object.entries(filter2);
   if (!entries.length)
@@ -24937,6 +24946,21 @@ function relationsFieldFilterToSQL(column5, filter2) {
         );
         continue;
       }
+      case "isNotNull":
+      case "isNull": {
+        if (!value)
+          continue;
+        parts.push(operators[target](column5));
+        continue;
+      }
+      case "in": {
+        parts.push(operators.inArray(column5, value));
+        continue;
+      }
+      case "notIn": {
+        parts.push(operators.notInArray(column5, value));
+        continue;
+      }
       default: {
         parts.push(
           operators[target](
@@ -25034,18 +25058,49 @@ function relationExtrasToSQL(table5, extras) {
     selection
   };
 }
-function relationToSQL(relation, sourceTable, targetTable) {
+function getTableSql(table5) {
+  return sql`${sql`${sql`${sql.identifier(table5[Schema] ?? "")}.`.if(!table5[IsAlias] && table5[Schema])}`}${table5}`;
+}
+function relationToSQL(relation, sourceTable, targetTable, throughTable) {
+  if (relation.through) {
+    const outerColumnWhere = relation.sourceColumns.map((s, i) => {
+      const t = relation.through.source[i];
+      return eq(
+        sql`${getTableSql(sourceTable)}.${sql.identifier(s.name)}`,
+        sql`${getTableSql(throughTable)}.${sql.identifier(t.name)}`
+      );
+    });
+    const innerColumnWhere = relation.targetColumns.map((s, i) => {
+      const t = relation.through.target[i];
+      return eq(
+        sql`${getTableSql(throughTable)}.${sql.identifier(t.name)}`,
+        sql`${getTableSql(targetTable)}.${sql.identifier(s.name)}`
+      );
+    });
+    return {
+      filter: and(
+        relation.where ? relation.isReversed ? relationsFilterToSQL(targetTable, relation.where) : relationsFilterToSQL(sourceTable, relation.where) : void 0
+      ),
+      joinCondition: and(
+        ...outerColumnWhere,
+        ...innerColumnWhere
+      )
+    };
+  }
   const columnWhere = relation.sourceColumns.map((s, i) => {
     const t = relation.targetColumns[i];
     return eq(
-      sql`${sql`${sql`${sql.identifier(sourceTable[Schema] ?? "")}.`.if(sourceTable[Schema] && !sourceTable[IsAlias])}`}${sourceTable}.${sql.identifier(s.name)}`,
-      sql`${sql`${sql`${sql.identifier(targetTable[Schema] ?? "")}.`.if(targetTable[Schema] && !targetTable[IsAlias])}`}${targetTable}.${sql.identifier(t.name)}`
+      sql`${getTableSql(sourceTable)}.${sql.identifier(s.name)}`,
+      sql`${getTableSql(targetTable)}.${sql.identifier(t.name)}`
     );
   });
-  const targetWhere = relation.where ? and(...columnWhere, relationsFilterToSQL(sourceTable, relation.where)) : and(...columnWhere);
-  return targetWhere;
+  const fullWhere = and(
+    ...columnWhere,
+    relation.where ? relation.isReversed ? relationsFilterToSQL(targetTable, relation.where) : relationsFilterToSQL(sourceTable, relation.where) : void 0
+  );
+  return { filter: fullWhere };
 }
-var _a118, Relations, _a119, Relation, _a120, _b95, One, _a121, _b96, Many, _a122, AggregatedField, _a123, _b97, Count, operators, orderByOperators, _a124, RelationsBuilderTable, _a125, RelationsBuilderColumn, _a126, RelationsHelperStatic;
+var _a118, Relations, _a119, Relation, _a120, _b95, One, _a121, _b96, Many, _a122, AggregatedField, _a123, _b97, Count, operators, orderByOperators, _a124, RelationsBuilderTable, _a125, _RelationsBuilderColumn, RelationsBuilderColumn, _a126, RelationsHelperStatic;
 var init_relations = __esm({
   "../drizzle-orm/dist/relations.js"() {
     "use strict";
@@ -25120,9 +25175,30 @@ var init_relations = __esm({
             if (relation.sourceColumns && relation.targetColumns) {
               if (relation.sourceColumns.length !== relation.targetColumns.length) {
                 throw new Error(
-                  `${relationPrintName}: "from" and "to" arrays must have the same length`
+                  `${relationPrintName}: "from" and "to" fields must have the same length`
                 );
               }
+              if (relation.through) {
+                if (relation.through.source.length !== relation.through.target.length || relation.through.source.length !== relation.sourceColumns.length || relation.through.target.length !== relation.targetColumns.length) {
+                  throw new Error(
+                    `${relationPrintName}: ".through(column)" must be used either on all columns in "from" and "to" or not defined on any of them`
+                  );
+                }
+                for (const column5 of relation.through.source) {
+                  if (column5.table !== relation.throughTable) {
+                    throw new Error(
+                      `${relationPrintName}: ".through(column)" must be used on the same table by all columns of the relation`
+                    );
+                  }
+                }
+                for (const column5 of relation.through.target) {
+                  if (column5.table !== relation.throughTable) {
+                    throw new Error(
+                      `${relationPrintName}: ".through(column)" must be used on the same table by all columns of the relation`
+                    );
+                  }
+                }
+              }
               continue;
             }
             if (relation.sourceColumns || relation.targetColumns) {
@@ -25182,7 +25258,13 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
             }
             relation.sourceColumns = reverseRelation.targetColumns;
             relation.targetColumns = reverseRelation.sourceColumns;
-            relation.where = reverseRelation.where;
+            relation.through = reverseRelation.through ? {
+              source: reverseRelation.through.target,
+              target: reverseRelation.through.source
+            } : void 0;
+            relation.throughTable = reverseRelation.throughTable;
+            relation.isReversed = !relation.where;
+            relation.where = relation.where ?? reverseRelation.where;
           }
         }
       }
@@ -25197,6 +25279,9 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
         __publicField(this, "alias");
         __publicField(this, "where");
         __publicField(this, "sourceTable");
+        __publicField(this, "through");
+        __publicField(this, "throughTable");
+        __publicField(this, "isReversed");
         this.targetTable = targetTable;
       }
     };
@@ -25208,12 +25293,30 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
         this.alias = config?.alias;
         this.where = config?.where;
         if (config?.from) {
-          this.sourceColumns = Array.isArray(config.from) ? config.from.map((it) => it._.column) : [config.from._.column];
+          this.sourceColumns = (Array.isArray(config.from) ? config.from : [config.from]).map((it) => {
+            this.throughTable ??= it._.through?._.column.table;
+            return it._.column;
+          });
         }
         if (config?.to) {
-          this.targetColumns = Array.isArray(config.to) ? config.to.map((it) => it._.column) : [config.to._.column];
+          this.targetColumns = (Array.isArray(config.to) ? config.to : [config.to]).map((it) => {
+            this.throughTable ??= it._.through?._.column.table;
+            return it._.column;
+          });
         }
-        this.optional = config?.optional ?? false;
+        if (this.throughTable) {
+          this.through = Array.isArray(config?.from) ? {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain -- in case it's undefined, error will be thrown in Relations constructor
+            source: config.from.map((e) => e._.through?._.column),
+            target: (config.to ?? []).map((e) => e._.column)
+          } : {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain -- in case it's undefined, error will be thrown in Relations constructor
+            source: [config?.from?._.through?._.column],
+            // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
+            target: [config?.to?._.through?._.column]
+          };
+        }
+        this.optional = config?.optional ?? true;
       }
     };
     __publicField(One, _a120, "OneV2");
@@ -25224,10 +25327,28 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
         this.alias = config?.alias;
         this.where = config?.where;
         if (config?.from) {
-          this.sourceColumns = Array.isArray(config.from) ? config.from.map((it) => it._.column) : [config.from._.column];
+          this.sourceColumns = (Array.isArray(config.from) ? config.from : [config.from]).map((it) => {
+            this.throughTable ??= it._.through?._.column.table;
+            return it._.column;
+          });
         }
         if (config?.to) {
-          this.targetColumns = Array.isArray(config.to) ? config.to.map((it) => it._.column) : [config.to._.column];
+          this.targetColumns = (Array.isArray(config.to) ? config.to : [config.to]).map((it) => {
+            this.throughTable ??= it._.through?._.column.table;
+            return it._.column;
+          });
+        }
+        if (this.throughTable) {
+          this.through = Array.isArray(config?.from) ? {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain -- in case it's undefined, error will be thrown in Relations constructor
+            source: config.from.map((e) => e._.through?._.column),
+            target: (config.to ?? []).map((e) => e._.column)
+          } : {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain -- in case it's undefined, error will be thrown in Relations constructor
+            source: [config?.from?._.through?._.column],
+            // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
+            target: [config?.to?._.through?._.column]
+          };
         }
       }
     };
@@ -25252,7 +25373,8 @@ 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("r")} from ${this.table}`.mapWith(Number);
+          const table5 = this.table;
+          this.query = sql`select count(*) as ${sql.identifier("r")} from ${table5[IsAlias] ? sql`${sql`${sql.identifier(table5[Schema] ?? "")}.`.if(table5[Schema])}${sql.identifier(table5[OriginalName])} as ${table5}` : table5}`.mapWith(Number);
         }
         return this.query;
       }
@@ -25302,24 +25424,25 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
     };
     __publicField(RelationsBuilderTable, _a124, "RelationsBuilderTable");
     _a125 = entityKind;
-    RelationsBuilderColumn = class {
-      constructor(column5) {
+    _RelationsBuilderColumn = class _RelationsBuilderColumn {
+      constructor(column5, through) {
         __publicField(this, "_");
         this._ = {
           tableName: getTableName(column5.table),
           data: void 0,
-          column: column5
+          column: column5,
+          through
         };
       }
       through(column5) {
-        this._.through = column5;
-        return this;
+        return new _RelationsBuilderColumn(this._.column, column5);
       }
       getSQL() {
         return this._.column.getSQL();
       }
     };
-    __publicField(RelationsBuilderColumn, _a125, "RelationsBuilderColumn");
+    __publicField(_RelationsBuilderColumn, _a125, "RelationsBuilderColumn");
+    RelationsBuilderColumn = _RelationsBuilderColumn;
     _a126 = entityKind;
     RelationsHelperStatic = class {
       constructor(tables) {
@@ -26076,7 +26199,7 @@ var init_dialect = __esm({
             sql`, `
           );
         });
-        __publicField(this, "buildColumns", (table5, tableConfig, selection, config) => config?.columns ? (() => {
+        __publicField(this, "buildColumns", (table5, selection, config) => config?.columns ? (() => {
           const entries = Object.entries(config.columns);
           const columnIdentifiers = [];
           let colSelectionMode;
@@ -26723,7 +26846,8 @@ var init_dialect = __esm({
         relationWhere,
         mode,
         errorPath,
-        depth
+        depth,
+        throughJoin
       }) {
         const selection = [];
         const isSingle = mode === "first";
@@ -26734,7 +26858,7 @@ var init_dialect = __esm({
         const offset = params?.offset;
         const where = params?.where && relationWhere ? and(relationsFilterToSQL(table5, params.where), relationWhere) : params?.where ? relationsFilterToSQL(table5, params.where) : relationWhere;
         const order = params?.orderBy ? relationsOrderToSQL(table5, params.orderBy) : void 0;
-        const columns = this.buildColumns(table5, tableConfig, selection, params);
+        const columns = this.buildColumns(table5, selection, params);
         const extras = params?.extras ? relationExtrasToSQL(table5, params.extras) : void 0;
         if (extras)
           selection.push(...extras.selection);
@@ -26762,10 +26886,15 @@ var init_dialect = __esm({
               const relation = tableConfig.relations[k];
               const isSingle2 = is(relation, One);
               const targetTable = aliasedTable(relation.targetTable, `d${currentDepth + 1}`);
-              const relationFilter = relationToSQL(relation, table5, targetTable);
-              selectionArr.push(
-                isSingle2 ? sql`${sql.identifier(k)}.${sql.identifier("r")} as ${sql.identifier(k)}` : sql`coalesce(${sql.identifier(k)}.${sql.identifier("r")}, '[]') as ${sql.identifier(k)}`
+              const throughTable = relation.throughTable ? aliasedTable(relation.throughTable, `tr${currentDepth}`) : void 0;
+              const { filter: filter2, joinCondition } = relationToSQL(
+                relation,
+                table5,
+                targetTable,
+                throughTable
               );
+              selectionArr.push(sql`${sql.identifier(k)}.${sql.identifier("r")} as ${sql.identifier(k)}`);
+              const throughJoin2 = throughTable ? sql` inner join ${sql`${sql.identifier(throughTable[Schema] ?? "")}.`.if(throughTable[Schema])}${sql.identifier(throughTable[OriginalName])} as ${throughTable} on ${joinCondition}` : void 0;
               const innerQuery = this.buildRelationalQuery({
                 table: targetTable,
                 mode: isSingle2 ? "first" : "many",
@@ -26774,17 +26903,20 @@ var init_dialect = __esm({
                 tableConfig: schema5[tableNamesMap[getTableUniqueName(relation.targetTable)]],
                 tableNamesMap,
                 tables,
-                relationWhere: relationFilter,
+                relationWhere: filter2,
                 errorPath: `${currentPath.length ? `${currentPath}.` : ""}${k}`,
-                depth: currentDepth + 1
+                depth: currentDepth + 1,
+                throughJoin: throughJoin2
               });
               selection.push({
                 field: targetTable,
                 key: k,
                 selection: innerQuery.selection,
-                isArray: !isSingle2
+                isArray: !isSingle2,
+                isOptional: (relation.optional ?? false) || join !== true && !!join.where
               });
-              return sql`left join lateral(select ${isSingle2 ? sql`row_to_json(${sql.identifier("t")}.*) ${sql.identifier("r")}` : sql`json_agg(row_to_json(${sql.identifier("t")}.*)) ${sql.identifier("r")}`} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)} on true`;
+              const joinQuery = sql`left join lateral(select ${isSingle2 ? sql`row_to_json(${sql.identifier("t")}.*) ${sql.identifier("r")}` : sql`coalesce(json_agg(row_to_json(${sql.identifier("t")}.*)), '[]') as ${sql.identifier("r")}`} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)} on true`;
+              return joinQuery;
             }),
             sql` `
           );
@@ -26797,7 +26929,7 @@ var init_dialect = __esm({
           });
         }
         const selectionSet = sql.join(selectionArr.filter((e) => e !== void 0), sql`, `);
-        const query = sql`select ${selectionSet} from ${table5[IsAlias] ? sql`${sql`${sql.identifier(table5[Schema] ?? "")}.`.if(table5[Schema])}${sql.identifier(table5[OriginalName])} as ${table5}` : table5}${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)}`;
+        const query = sql`select ${selectionSet} from ${table5[IsAlias] ? sql`${sql`${sql.identifier(table5[Schema] ?? "")}.`.if(table5[Schema])}${sql.identifier(table5[OriginalName])} as ${table5}` : table5}${throughJoin}${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,
           selection
@@ -32802,7 +32934,8 @@ var init_dialect2 = __esm({
         mode,
         isNested,
         errorPath,
-        depth
+        depth,
+        throughJoin
       }) {
         const selection = [];
         const isSingle = mode === "first";
@@ -32839,7 +32972,14 @@ var init_dialect2 = __esm({
               const relation = tableConfig.relations[k];
               const isSingle2 = is(relation, One);
               const targetTable = aliasedTable(relation.targetTable, `d${currentDepth + 1}`);
-              const relationFilter = relationToSQL(relation, table5, targetTable);
+              const throughTable = relation.throughTable ? aliasedTable(relation.throughTable, `tr${currentDepth}`) : void 0;
+              const { filter: filter2, joinCondition } = relationToSQL(
+                relation,
+                table5,
+                targetTable,
+                throughTable
+              );
+              const throughJoin2 = throughTable ? sql` inner join ${sql`${sql.identifier(throughTable[Schema] ?? "")}.`.if(throughTable[Schema])}${sql.identifier(throughTable[OriginalName])} as ${throughTable} on ${joinCondition}` : void 0;
               const innerQuery = this.buildRelationalQuery({
                 table: targetTable,
                 mode: isSingle2 ? "first" : "many",
@@ -32848,16 +32988,18 @@ var init_dialect2 = __esm({
                 tableConfig: schema5[tableNamesMap[getTableUniqueName(relation.targetTable)]],
                 tableNamesMap,
                 tables,
-                relationWhere: relationFilter,
+                relationWhere: filter2,
                 isNested: true,
                 errorPath: `${currentPath.length ? `${currentPath}.` : ""}${k}`,
-                depth: currentDepth + 1
+                depth: currentDepth + 1,
+                throughJoin: throughJoin2
               });
               selection.push({
                 field: targetTable,
                 key: k,
                 selection: innerQuery.selection,
-                isArray: !isSingle2
+                isArray: !isSingle2,
+                isOptional: (relation.optional ?? false) || join !== true && !!join.where
               });
               const jsonColumns = sql.join(
                 innerQuery.selection.map((s) => {
@@ -32865,7 +33007,9 @@ var init_dialect2 = __esm({
                 }),
                 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)}`;
+              const json4 = isNested ? sql`jsonb` : sql`json`;
+              const joinQuery = isSingle2 ? sql`(select ${json4}_object(${jsonColumns}) as ${sql.identifier("r")} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)}` : sql`coalesce((select ${json4}_group_array(json_object(${jsonColumns})) as ${sql.identifier("r")} from (${innerQuery.sql}) as ${sql.identifier("t")}), jsonb_array()) as ${sql.identifier(k)}`;
+              return joinQuery;
             }),
             sql`, `
           );
@@ -32877,7 +33021,7 @@ var init_dialect2 = __esm({
           });
         }
         const selectionSet = sql.join(selectionArr, sql`, `);
-        const query = sql`select ${selectionSet} from ${table5[IsAlias] ? sql`${sql`${sql.identifier(table5[Schema] ?? "")}.`.if(table5[Schema])}${sql.identifier(table5[OriginalName])} as ${table5}` : table5}${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)}`;
+        const query = sql`select ${selectionSet} from ${table5[IsAlias] ? sql`${sql`${sql.identifier(table5[Schema] ?? "")}.`.if(table5[Schema])}${sql.identifier(table5[OriginalName])} as ${table5}` : table5}${throughJoin}${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,
           selection
@@ -37749,6 +37893,12 @@ var init_dialect3 = __esm({
             columnIdentifiers.push(
               sql`${table5[column5.tsName]} as ${sql.identifier(column5.tsName)}`
             );
+            selection.push(
+              {
+                key: column5.tsName,
+                field: column5.column
+              }
+            );
           }
           return columnIdentifiers.length ? sql.join(columnIdentifiers, sql`, `) : void 0;
         })() : this.unwrapAllColumns(table5, selection));
@@ -38570,7 +38720,9 @@ var init_dialect3 = __esm({
         relationWhere,
         mode,
         errorPath,
-        depth
+        depth,
+        isNested,
+        throughJoin
       }) {
         const selection = [];
         const isSingle = mode === "first";
@@ -38604,12 +38756,19 @@ var init_dialect3 = __esm({
                   key: k,
                   field: relation2
                 });
-                return sql`, lateral(${query2}) 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 = aliasedTable(relation.targetTable, `d${currentDepth + 1}`);
-              const relationFilter = relationToSQL(relation, table5, targetTable);
+              const throughTable = relation.throughTable ? aliasedTable(relation.throughTable, `tr${currentDepth}`) : void 0;
+              const { filter: filter2, joinCondition } = relationToSQL(
+                relation,
+                table5,
+                targetTable,
+                throughTable
+              );
+              const throughJoin2 = throughTable ? sql` inner join ${sql`${sql.identifier(throughTable[Schema] ?? "")}.`.if(throughTable[Schema])}${sql.identifier(throughTable[OriginalName])} as ${throughTable} on ${joinCondition}` : void 0;
               const innerQuery = this.buildRelationalQuery({
                 table: targetTable,
                 mode: isSingle2 ? "first" : "many",
@@ -38618,21 +38777,25 @@ var init_dialect3 = __esm({
                 tableConfig: schema5[tableNamesMap[getTableUniqueName(relation.targetTable)]],
                 tableNamesMap,
                 tables,
-                relationWhere: relationFilter,
+                relationWhere: filter2,
                 errorPath: `${currentPath.length ? `${currentPath}.` : ""}${k}`,
-                depth: currentDepth + 1
+                depth: currentDepth + 1,
+                isNested: true,
+                throughJoin: throughJoin2
               });
               selection.push({
                 field: targetTable,
                 key: k,
                 selection: innerQuery.selection,
-                isArray: !isSingle2
+                isArray: !isSingle2,
+                isOptional: (relation.optional ?? false) || join !== true && !!join.where
               });
               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)}`;
+              const joinQuery = sql` left join lateral(select ${sql`${isSingle2 ? sql`json_object(${jsonColumns})` : sql`coalesce(json_arrayagg(json_object(${jsonColumns})), json_array())`} as ${sql.identifier("r")}`} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)} on true`;
+              return joinQuery;
             })
           );
         })() : void 0;
@@ -38643,8 +38806,11 @@ var init_dialect3 = __esm({
             message: `No fields selected for table "${tableConfig.tsName}"${currentPath ? ` ("${currentPath}")` : ""}`
           });
         }
+        if (isNested && order) {
+          selectionArr.push(sql`row_number() over (order by ${order})`);
+        }
         const selectionSet = sql.join(selectionArr, sql`, `);
-        const query = sql`select ${selectionSet} from ${table5[IsAlias] ? sql`${sql`${sql.identifier(table5[Schema] ?? "")}.`.if(table5[Schema])}${sql.identifier(table5[OriginalName])} as ${table5}` : table5}${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)}`;
+        const query = sql`select ${selectionSet} from ${table5[IsAlias] ? sql`${sql`${sql.identifier(table5[Schema] ?? "")}.`.if(table5[Schema])}${sql.identifier(table5[OriginalName])} as ${table5}` : table5}${throughJoin}${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,
           selection

package/bin.cjs

@@ -92611,7 +92611,7 @@ init_utils5();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "0.30.1-e6823b4";
+  const envVersion = "0.30.1-f2d266c";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-kit",
-	"version": "0.30.1-e6823b4",
+	"version": "0.30.1-f2d266c",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",