drizzle-kit 0.30.4-c417a27 → 0.30.4-d004082

package/api.js

@@ -23202,6 +23202,16 @@ function relationsFieldFilterToSQL(column5, filter2) {
         );
         continue;
       }
+      case "AND": {
+        if (!value.length)
+          continue;
+        parts.push(
+          and(
+            ...value.map((subFilter) => relationsFieldFilterToSQL(column5, subFilter))
+          )
+        );
+        continue;
+      }
       case "isNotNull":
       case "isNull": {
         if (!value)
@@ -23232,7 +23242,7 @@ function relationsFieldFilterToSQL(column5, filter2) {
     return void 0;
   return and(...parts);
 }
-function relationsFilterToSQL(table5, filter2) {
+function relationsFilterToSQL(table5, filter2, tableRelations = {}, tablesRelations = {}, tableNamesMap = {}, casing2, depth = 0) {
   const entries = Object.entries(filter2);
   if (!entries.length)
     return void 0;
@@ -23242,11 +23252,8 @@ function relationsFilterToSQL(table5, filter2) {
       continue;
     switch (target) {
       case "RAW": {
-        if (value) {
-          parts.push(
-            value(table5, operators)
-          );
-        }
+        const processed = typeof value === "function" ? value(table5, operators) : value.getSQL();
+        parts.push(processed);
         continue;
       }
       case "OR": {
@@ -23254,7 +23261,21 @@ function relationsFilterToSQL(table5, filter2) {
           continue;
         parts.push(
           or(
-            ...value.map((subFilter) => relationsFilterToSQL(table5, subFilter))
+            ...value.map(
+              (subFilter) => relationsFilterToSQL(table5, subFilter, tableRelations, tablesRelations, tableNamesMap, casing2, depth)
+            )
+          )
+        );
+        continue;
+      }
+      case "AND": {
+        if (!value?.length)
+          continue;
+        parts.push(
+          and(
+            ...value.map(
+              (subFilter) => relationsFilterToSQL(table5, subFilter, tableRelations, tablesRelations, tableNamesMap, casing2, depth)
+            )
           )
         );
         continue;
@@ -23262,21 +23283,60 @@ function relationsFilterToSQL(table5, filter2) {
       case "NOT": {
         if (value === void 0)
           continue;
-        const built = relationsFilterToSQL(table5, value);
+        const built = relationsFilterToSQL(
+          table5,
+          value,
+          tableRelations,
+          tablesRelations,
+          tableNamesMap,
+          casing2,
+          depth
+        );
         if (!built)
           continue;
         parts.push(not(built));
         continue;
       }
       default: {
-        const column5 = fieldSelectionToSQL(table5, target);
-        const colFilter = relationsFieldFilterToSQL(
-          column5,
-          value
+        if (table5[Columns][target]) {
+          const column5 = fieldSelectionToSQL(table5, target);
+          const colFilter = relationsFieldFilterToSQL(
+            column5,
+            value
+          );
+          if (colFilter)
+            parts.push(colFilter);
+          continue;
+        }
+        const relation = tableRelations[target];
+        if (!relation) {
+          throw new DrizzleError({
+            message: `Unknown relational filter field: "${target}"`
+          });
+        }
+        const targetTable = aliasedTable(relation.targetTable, `f${depth}`);
+        const throughTable = relation.throughTable ? aliasedTable(relation.throughTable, `ft${depth}`) : void 0;
+        const targetConfig = tablesRelations[tableNamesMap[getTableUniqueName(relation.targetTable)]];
+        const {
+          filter: relationFilter,
+          joinCondition
+        } = relationToSQL(casing2, relation, table5, targetTable, throughTable);
+        const subfilter = typeof value === "boolean" ? void 0 : relationsFilterToSQL(
+          targetTable,
+          value,
+          targetConfig.relations,
+          tablesRelations,
+          tableNamesMap,
+          casing2,
+          depth + 1
         );
-        if (colFilter)
-          parts.push(colFilter);
-        continue;
+        const filter22 = and(
+          relationFilter,
+          subfilter
+        );
+        const subquery = throughTable ? sql`(select * from ${getTableAsAliasSQL(targetTable)} inner join ${getTableAsAliasSQL(throughTable)} on ${joinCondition}${sql` where ${filter22}`.if(filter22)} limit 1)` : sql`(select * from ${getTableAsAliasSQL(targetTable)}${sql` where ${filter22}`.if(filter22)} limit 1)`;
+        if (filter22)
+          parts.push((value ? exists : notExists)(subquery));
       }
     }
   }
@@ -23316,37 +23376,35 @@ function relationExtrasToSQL(table5, extras) {
     selection
   };
 }
-function relationToSQL(relation, sourceTable, targetTable, throughTable) {
+function relationToSQL(casing2, relation, sourceTable, targetTable, throughTable) {
   if (relation.through) {
     const outerColumnWhere = relation.sourceColumns.map((s, i) => {
       const t = relation.through.source[i];
       return eq(
-        sql`${sourceTable}.${sql.identifier(s.name)}`,
-        sql`${throughTable}.${sql.identifier(is(t._.column, Column2) ? t._.column.name : t._.key)}`
+        sql`${sourceTable}.${sql.identifier(casing2.getColumnCasing(s))}`,
+        sql`${throughTable}.${sql.identifier(is(t._.column, Column2) ? casing2.getColumnCasing(t._.column) : t._.key)}`
       );
     });
     const innerColumnWhere = relation.targetColumns.map((s, i) => {
       const t = relation.through.target[i];
       return eq(
-        sql`${throughTable}.${sql.identifier(is(t._.column, Column2) ? t._.column.name : t._.key)}`,
-        sql`${targetTable}.${sql.identifier(s.name)}`
+        sql`${throughTable}.${sql.identifier(is(t._.column, Column2) ? casing2.getColumnCasing(t._.column) : t._.key)}`,
+        sql`${targetTable}.${sql.identifier(casing2.getColumnCasing(s))}`
       );
     });
     return {
       filter: and(
-        relation.where ? relationsFilterToSQL(relation.isReversed ? targetTable : sourceTable, relation.where) : void 0
+        relation.where ? relationsFilterToSQL(relation.isReversed ? targetTable : sourceTable, relation.where) : void 0,
+        ...outerColumnWhere
       ),
-      joinCondition: and(
-        ...outerColumnWhere,
-        ...innerColumnWhere
-      )
+      joinCondition: and(...innerColumnWhere)
     };
   }
   const columnWhere = relation.sourceColumns.map((s, i) => {
     const t = relation.targetColumns[i];
     return eq(
-      sql`${sourceTable}.${sql.identifier(s.name)}`,
-      sql`${targetTable}.${sql.identifier(t.name)}`
+      sql`${sourceTable}.${sql.identifier(casing2.getColumnCasing(s))}`,
+      sql`${targetTable}.${sql.identifier(casing2.getColumnCasing(t))}`
     );
   });
   const fullWhere = and(
@@ -23364,8 +23422,10 @@ var init_relations = __esm({
     "use strict";
     init_table();
     init_table();
+    init_alias();
     init_column();
     init_entity();
+    init_errors();
     init_expressions();
     init_sql();
     _a35 = entityKind;
@@ -27094,7 +27154,7 @@ var init_dialect = __esm({
         });
       }
       buildRqbColumn(column5, key) {
-        return sql`${is(column5, Column2) ? sql.identifier(column5.name) : is(column5, SQL.Aliased) ? sql.identifier(column5.fieldAlias) : isSQLWrapper(column5) ? sql.identifier(key) : this.nestedSelectionerror()} as ${sql.identifier(key)}`;
+        return sql`${is(column5, Column2) ? sql.identifier(this.casing.getColumnCasing(column5)) : is(column5, SQL.Aliased) ? sql.identifier(column5.fieldAlias) : isSQLWrapper(column5) ? sql.identifier(key) : this.nestedSelectionerror()} as ${sql.identifier(key)}`;
       }
       buildRelationalQuery({
         tables,
@@ -27118,7 +27178,10 @@ var init_dialect = __esm({
           table5 = aliasedTable(table5, `d${currentDepth}`);
         const limit = isSingle ? 1 : params?.limit;
         const offset = params?.offset;
-        const where = params?.where && relationWhere ? and(relationsFilterToSQL(table5, params.where), relationWhere) : params?.where ? relationsFilterToSQL(table5, params.where) : relationWhere;
+        const where = params?.where && relationWhere ? and(
+          relationsFilterToSQL(table5, params.where, tableConfig.relations, schema5, tableNamesMap, this.casing),
+          relationWhere
+        ) : params?.where ? relationsFilterToSQL(table5, params.where, tableConfig.relations, schema5, tableNamesMap, this.casing) : relationWhere;
         const order = params?.orderBy ? relationsOrderToSQL(table5, params.orderBy) : void 0;
         const columns = this.buildColumns(table5, selection, params);
         const extras = params?.extras ? relationExtrasToSQL(table5, params.extras) : void 0;
@@ -27134,22 +27197,12 @@ var init_dialect = __esm({
             return;
           return sql.join(
             withEntries.map(([k, join]) => {
-              if (is(tableConfig.relations[k], AggregatedField)) {
-                const relation2 = tableConfig.relations[k];
-                relation2.onTable(table5);
-                const query2 = relation2.getSQL();
-                selection.push({
-                  key: k,
-                  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 = aliasedTable(relation.targetTable, `d${currentDepth + 1}`);
               const throughTable = relation.throughTable ? aliasedTable(relation.throughTable, `tr${currentDepth}`) : void 0;
               const { filter: filter2, joinCondition } = relationToSQL(
+                this.casing,
                 relation,
                 table5,
                 targetTable,
@@ -33137,7 +33190,7 @@ var init_dialect2 = __esm({
         });
       }
       buildRqbColumn(column5, key) {
-        return sql`${is(column5, Column2) ? sql.identifier(column5.name) : is(column5, SQL.Aliased) ? sql.identifier(column5.fieldAlias) : isSQLWrapper(column5) ? sql.identifier(key) : this.nestedSelectionerror()} as ${sql.identifier(key)}`;
+        return sql`${is(column5, Column2) ? sql.identifier(this.casing.getColumnCasing(column5)) : is(column5, SQL.Aliased) ? sql.identifier(column5.fieldAlias) : isSQLWrapper(column5) ? sql.identifier(key) : this.nestedSelectionerror()} as ${sql.identifier(key)}`;
       }
       buildRelationalQuery({
         tables,
@@ -33163,7 +33216,10 @@ var init_dialect2 = __esm({
         const limit = isSingle ? 1 : params?.limit;
         const offset = params?.offset;
         const columns = this.buildColumns(table5, selection, params);
-        const where = params?.where && relationWhere ? and(relationsFilterToSQL(table5, params.where), relationWhere) : params?.where ? relationsFilterToSQL(table5, params.where) : relationWhere;
+        const where = params?.where && relationWhere ? and(
+          relationsFilterToSQL(table5, params.where, tableConfig.relations, schema5, tableNamesMap, this.casing),
+          relationWhere
+        ) : params?.where ? relationsFilterToSQL(table5, params.where, tableConfig.relations, schema5, tableNamesMap, this.casing) : relationWhere;
         const order = params?.orderBy ? relationsOrderToSQL(table5, params.orderBy) : void 0;
         const extras = params?.extras ? relationExtrasToSQL(table5, params.extras) : void 0;
         if (extras)
@@ -33177,21 +33233,12 @@ var init_dialect2 = __esm({
             return;
           return sql.join(
             withEntries.map(([k, join]) => {
-              if (is(tableConfig.relations[k], AggregatedField)) {
-                const relation2 = tableConfig.relations[k];
-                relation2.onTable(table5);
-                const query2 = relation2.getSQL();
-                selection.push({
-                  key: k,
-                  field: relation2
-                });
-                return sql`(${query2}) as ${sql.identifier(k)}`;
-              }
               const relation = tableConfig.relations[k];
               const isSingle2 = is(relation, One);
               const targetTable = aliasedTable(relation.targetTable, `d${currentDepth + 1}`);
               const throughTable = relation.throughTable ? aliasedTable(relation.throughTable, `tr${currentDepth}`) : void 0;
               const { filter: filter2, joinCondition } = relationToSQL(
+                this.casing,
                 relation,
                 table5,
                 targetTable,
@@ -38957,7 +39004,7 @@ var init_dialect3 = __esm({
         });
       }
       buildRqbColumn(column5, key) {
-        return sql`${is(column5, Column2) ? sql.identifier(column5.name) : is(column5, SQL.Aliased) ? sql.identifier(column5.fieldAlias) : isSQLWrapper(column5) ? sql.identifier(key) : this.nestedSelectionerror()} as ${sql.identifier(key)}`;
+        return sql`${is(column5, Column2) ? sql.identifier(this.casing.getColumnCasing(column5)) : is(column5, SQL.Aliased) ? sql.identifier(column5.fieldAlias) : isSQLWrapper(column5) ? sql.identifier(key) : this.nestedSelectionerror()} as ${sql.identifier(key)}`;
       }
       buildRelationalQuery({
         tables,
@@ -38983,7 +39030,10 @@ var init_dialect3 = __esm({
         const limit = isSingle ? 1 : params?.limit;
         const offset = params?.offset;
         const columns = this.buildColumns(table5, selection, params);
-        const where = params?.where && relationWhere ? and(relationsFilterToSQL(table5, params.where), relationWhere) : params?.where ? relationsFilterToSQL(table5, params.where) : relationWhere;
+        const where = params?.where && relationWhere ? and(
+          relationsFilterToSQL(table5, params.where, tableConfig.relations, schema5, tableNamesMap, this.casing),
+          relationWhere
+        ) : params?.where ? relationsFilterToSQL(table5, params.where, tableConfig.relations, schema5, tableNamesMap, this.casing) : relationWhere;
         const order = params?.orderBy ? relationsOrderToSQL(table5, params.orderBy) : void 0;
         const extras = params?.extras ? relationExtrasToSQL(table5, params.extras) : void 0;
         if (extras)
@@ -38999,21 +39049,12 @@ var init_dialect3 = __esm({
           return sql.join(
             withEntries.map(([k, join]) => {
               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(table5);
-                const query2 = relation2.getSQL();
-                selection.push({
-                  key: k,
-                  field: relation2
-                });
-                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 throughTable = relation.throughTable ? aliasedTable(relation.throughTable, `tr${currentDepth}`) : void 0;
               const { filter: filter2, joinCondition } = relationToSQL(
+                this.casing,
                 relation,
                 table5,
                 targetTable,

package/api.mjs

@@ -23207,6 +23207,16 @@ function relationsFieldFilterToSQL(column5, filter2) {
         );
         continue;
       }
+      case "AND": {
+        if (!value.length)
+          continue;
+        parts.push(
+          and(
+            ...value.map((subFilter) => relationsFieldFilterToSQL(column5, subFilter))
+          )
+        );
+        continue;
+      }
       case "isNotNull":
       case "isNull": {
         if (!value)
@@ -23237,7 +23247,7 @@ function relationsFieldFilterToSQL(column5, filter2) {
     return void 0;
   return and(...parts);
 }
-function relationsFilterToSQL(table5, filter2) {
+function relationsFilterToSQL(table5, filter2, tableRelations = {}, tablesRelations = {}, tableNamesMap = {}, casing2, depth = 0) {
   const entries = Object.entries(filter2);
   if (!entries.length)
     return void 0;
@@ -23247,11 +23257,8 @@ function relationsFilterToSQL(table5, filter2) {
       continue;
     switch (target) {
       case "RAW": {
-        if (value) {
-          parts.push(
-            value(table5, operators)
-          );
-        }
+        const processed = typeof value === "function" ? value(table5, operators) : value.getSQL();
+        parts.push(processed);
         continue;
       }
       case "OR": {
@@ -23259,7 +23266,21 @@ function relationsFilterToSQL(table5, filter2) {
           continue;
         parts.push(
           or(
-            ...value.map((subFilter) => relationsFilterToSQL(table5, subFilter))
+            ...value.map(
+              (subFilter) => relationsFilterToSQL(table5, subFilter, tableRelations, tablesRelations, tableNamesMap, casing2, depth)
+            )
+          )
+        );
+        continue;
+      }
+      case "AND": {
+        if (!value?.length)
+          continue;
+        parts.push(
+          and(
+            ...value.map(
+              (subFilter) => relationsFilterToSQL(table5, subFilter, tableRelations, tablesRelations, tableNamesMap, casing2, depth)
+            )
           )
         );
         continue;
@@ -23267,21 +23288,60 @@ function relationsFilterToSQL(table5, filter2) {
       case "NOT": {
         if (value === void 0)
           continue;
-        const built = relationsFilterToSQL(table5, value);
+        const built = relationsFilterToSQL(
+          table5,
+          value,
+          tableRelations,
+          tablesRelations,
+          tableNamesMap,
+          casing2,
+          depth
+        );
         if (!built)
           continue;
         parts.push(not(built));
         continue;
       }
       default: {
-        const column5 = fieldSelectionToSQL(table5, target);
-        const colFilter = relationsFieldFilterToSQL(
-          column5,
-          value
+        if (table5[Columns][target]) {
+          const column5 = fieldSelectionToSQL(table5, target);
+          const colFilter = relationsFieldFilterToSQL(
+            column5,
+            value
+          );
+          if (colFilter)
+            parts.push(colFilter);
+          continue;
+        }
+        const relation = tableRelations[target];
+        if (!relation) {
+          throw new DrizzleError({
+            message: `Unknown relational filter field: "${target}"`
+          });
+        }
+        const targetTable = aliasedTable(relation.targetTable, `f${depth}`);
+        const throughTable = relation.throughTable ? aliasedTable(relation.throughTable, `ft${depth}`) : void 0;
+        const targetConfig = tablesRelations[tableNamesMap[getTableUniqueName(relation.targetTable)]];
+        const {
+          filter: relationFilter,
+          joinCondition
+        } = relationToSQL(casing2, relation, table5, targetTable, throughTable);
+        const subfilter = typeof value === "boolean" ? void 0 : relationsFilterToSQL(
+          targetTable,
+          value,
+          targetConfig.relations,
+          tablesRelations,
+          tableNamesMap,
+          casing2,
+          depth + 1
         );
-        if (colFilter)
-          parts.push(colFilter);
-        continue;
+        const filter22 = and(
+          relationFilter,
+          subfilter
+        );
+        const subquery = throughTable ? sql`(select * from ${getTableAsAliasSQL(targetTable)} inner join ${getTableAsAliasSQL(throughTable)} on ${joinCondition}${sql` where ${filter22}`.if(filter22)} limit 1)` : sql`(select * from ${getTableAsAliasSQL(targetTable)}${sql` where ${filter22}`.if(filter22)} limit 1)`;
+        if (filter22)
+          parts.push((value ? exists : notExists)(subquery));
       }
     }
   }
@@ -23321,37 +23381,35 @@ function relationExtrasToSQL(table5, extras) {
     selection
   };
 }
-function relationToSQL(relation, sourceTable, targetTable, throughTable) {
+function relationToSQL(casing2, relation, sourceTable, targetTable, throughTable) {
   if (relation.through) {
     const outerColumnWhere = relation.sourceColumns.map((s, i) => {
       const t = relation.through.source[i];
       return eq(
-        sql`${sourceTable}.${sql.identifier(s.name)}`,
-        sql`${throughTable}.${sql.identifier(is(t._.column, Column2) ? t._.column.name : t._.key)}`
+        sql`${sourceTable}.${sql.identifier(casing2.getColumnCasing(s))}`,
+        sql`${throughTable}.${sql.identifier(is(t._.column, Column2) ? casing2.getColumnCasing(t._.column) : t._.key)}`
       );
     });
     const innerColumnWhere = relation.targetColumns.map((s, i) => {
       const t = relation.through.target[i];
       return eq(
-        sql`${throughTable}.${sql.identifier(is(t._.column, Column2) ? t._.column.name : t._.key)}`,
-        sql`${targetTable}.${sql.identifier(s.name)}`
+        sql`${throughTable}.${sql.identifier(is(t._.column, Column2) ? casing2.getColumnCasing(t._.column) : t._.key)}`,
+        sql`${targetTable}.${sql.identifier(casing2.getColumnCasing(s))}`
       );
     });
     return {
       filter: and(
-        relation.where ? relationsFilterToSQL(relation.isReversed ? targetTable : sourceTable, relation.where) : void 0
+        relation.where ? relationsFilterToSQL(relation.isReversed ? targetTable : sourceTable, relation.where) : void 0,
+        ...outerColumnWhere
       ),
-      joinCondition: and(
-        ...outerColumnWhere,
-        ...innerColumnWhere
-      )
+      joinCondition: and(...innerColumnWhere)
     };
   }
   const columnWhere = relation.sourceColumns.map((s, i) => {
     const t = relation.targetColumns[i];
     return eq(
-      sql`${sourceTable}.${sql.identifier(s.name)}`,
-      sql`${targetTable}.${sql.identifier(t.name)}`
+      sql`${sourceTable}.${sql.identifier(casing2.getColumnCasing(s))}`,
+      sql`${targetTable}.${sql.identifier(casing2.getColumnCasing(t))}`
     );
   });
   const fullWhere = and(
@@ -23369,8 +23427,10 @@ var init_relations = __esm({
     "use strict";
     init_table();
     init_table();
+    init_alias();
     init_column();
     init_entity();
+    init_errors();
     init_expressions();
     init_sql();
     _a35 = entityKind;
@@ -27099,7 +27159,7 @@ var init_dialect = __esm({
         });
       }
       buildRqbColumn(column5, key) {
-        return sql`${is(column5, Column2) ? sql.identifier(column5.name) : is(column5, SQL.Aliased) ? sql.identifier(column5.fieldAlias) : isSQLWrapper(column5) ? sql.identifier(key) : this.nestedSelectionerror()} as ${sql.identifier(key)}`;
+        return sql`${is(column5, Column2) ? sql.identifier(this.casing.getColumnCasing(column5)) : is(column5, SQL.Aliased) ? sql.identifier(column5.fieldAlias) : isSQLWrapper(column5) ? sql.identifier(key) : this.nestedSelectionerror()} as ${sql.identifier(key)}`;
       }
       buildRelationalQuery({
         tables,
@@ -27123,7 +27183,10 @@ var init_dialect = __esm({
           table5 = aliasedTable(table5, `d${currentDepth}`);
         const limit = isSingle ? 1 : params?.limit;
         const offset = params?.offset;
-        const where = params?.where && relationWhere ? and(relationsFilterToSQL(table5, params.where), relationWhere) : params?.where ? relationsFilterToSQL(table5, params.where) : relationWhere;
+        const where = params?.where && relationWhere ? and(
+          relationsFilterToSQL(table5, params.where, tableConfig.relations, schema5, tableNamesMap, this.casing),
+          relationWhere
+        ) : params?.where ? relationsFilterToSQL(table5, params.where, tableConfig.relations, schema5, tableNamesMap, this.casing) : relationWhere;
         const order = params?.orderBy ? relationsOrderToSQL(table5, params.orderBy) : void 0;
         const columns = this.buildColumns(table5, selection, params);
         const extras = params?.extras ? relationExtrasToSQL(table5, params.extras) : void 0;
@@ -27139,22 +27202,12 @@ var init_dialect = __esm({
             return;
           return sql.join(
             withEntries.map(([k, join]) => {
-              if (is(tableConfig.relations[k], AggregatedField)) {
-                const relation2 = tableConfig.relations[k];
-                relation2.onTable(table5);
-                const query2 = relation2.getSQL();
-                selection.push({
-                  key: k,
-                  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 = aliasedTable(relation.targetTable, `d${currentDepth + 1}`);
               const throughTable = relation.throughTable ? aliasedTable(relation.throughTable, `tr${currentDepth}`) : void 0;
               const { filter: filter2, joinCondition } = relationToSQL(
+                this.casing,
                 relation,
                 table5,
                 targetTable,
@@ -33142,7 +33195,7 @@ var init_dialect2 = __esm({
         });
       }
       buildRqbColumn(column5, key) {
-        return sql`${is(column5, Column2) ? sql.identifier(column5.name) : is(column5, SQL.Aliased) ? sql.identifier(column5.fieldAlias) : isSQLWrapper(column5) ? sql.identifier(key) : this.nestedSelectionerror()} as ${sql.identifier(key)}`;
+        return sql`${is(column5, Column2) ? sql.identifier(this.casing.getColumnCasing(column5)) : is(column5, SQL.Aliased) ? sql.identifier(column5.fieldAlias) : isSQLWrapper(column5) ? sql.identifier(key) : this.nestedSelectionerror()} as ${sql.identifier(key)}`;
       }
       buildRelationalQuery({
         tables,
@@ -33168,7 +33221,10 @@ var init_dialect2 = __esm({
         const limit = isSingle ? 1 : params?.limit;
         const offset = params?.offset;
         const columns = this.buildColumns(table5, selection, params);
-        const where = params?.where && relationWhere ? and(relationsFilterToSQL(table5, params.where), relationWhere) : params?.where ? relationsFilterToSQL(table5, params.where) : relationWhere;
+        const where = params?.where && relationWhere ? and(
+          relationsFilterToSQL(table5, params.where, tableConfig.relations, schema5, tableNamesMap, this.casing),
+          relationWhere
+        ) : params?.where ? relationsFilterToSQL(table5, params.where, tableConfig.relations, schema5, tableNamesMap, this.casing) : relationWhere;
         const order = params?.orderBy ? relationsOrderToSQL(table5, params.orderBy) : void 0;
         const extras = params?.extras ? relationExtrasToSQL(table5, params.extras) : void 0;
         if (extras)
@@ -33182,21 +33238,12 @@ var init_dialect2 = __esm({
             return;
           return sql.join(
             withEntries.map(([k, join]) => {
-              if (is(tableConfig.relations[k], AggregatedField)) {
-                const relation2 = tableConfig.relations[k];
-                relation2.onTable(table5);
-                const query2 = relation2.getSQL();
-                selection.push({
-                  key: k,
-                  field: relation2
-                });
-                return sql`(${query2}) as ${sql.identifier(k)}`;
-              }
               const relation = tableConfig.relations[k];
               const isSingle2 = is(relation, One);
               const targetTable = aliasedTable(relation.targetTable, `d${currentDepth + 1}`);
               const throughTable = relation.throughTable ? aliasedTable(relation.throughTable, `tr${currentDepth}`) : void 0;
               const { filter: filter2, joinCondition } = relationToSQL(
+                this.casing,
                 relation,
                 table5,
                 targetTable,
@@ -38962,7 +39009,7 @@ var init_dialect3 = __esm({
         });
       }
       buildRqbColumn(column5, key) {
-        return sql`${is(column5, Column2) ? sql.identifier(column5.name) : is(column5, SQL.Aliased) ? sql.identifier(column5.fieldAlias) : isSQLWrapper(column5) ? sql.identifier(key) : this.nestedSelectionerror()} as ${sql.identifier(key)}`;
+        return sql`${is(column5, Column2) ? sql.identifier(this.casing.getColumnCasing(column5)) : is(column5, SQL.Aliased) ? sql.identifier(column5.fieldAlias) : isSQLWrapper(column5) ? sql.identifier(key) : this.nestedSelectionerror()} as ${sql.identifier(key)}`;
       }
       buildRelationalQuery({
         tables,
@@ -38988,7 +39035,10 @@ var init_dialect3 = __esm({
         const limit = isSingle ? 1 : params?.limit;
         const offset = params?.offset;
         const columns = this.buildColumns(table5, selection, params);
-        const where = params?.where && relationWhere ? and(relationsFilterToSQL(table5, params.where), relationWhere) : params?.where ? relationsFilterToSQL(table5, params.where) : relationWhere;
+        const where = params?.where && relationWhere ? and(
+          relationsFilterToSQL(table5, params.where, tableConfig.relations, schema5, tableNamesMap, this.casing),
+          relationWhere
+        ) : params?.where ? relationsFilterToSQL(table5, params.where, tableConfig.relations, schema5, tableNamesMap, this.casing) : relationWhere;
         const order = params?.orderBy ? relationsOrderToSQL(table5, params.orderBy) : void 0;
         const extras = params?.extras ? relationExtrasToSQL(table5, params.extras) : void 0;
         if (extras)
@@ -39004,21 +39054,12 @@ var init_dialect3 = __esm({
           return sql.join(
             withEntries.map(([k, join]) => {
               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(table5);
-                const query2 = relation2.getSQL();
-                selection.push({
-                  key: k,
-                  field: relation2
-                });
-                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 throughTable = relation.throughTable ? aliasedTable(relation.throughTable, `tr${currentDepth}`) : void 0;
               const { filter: filter2, joinCondition } = relationToSQL(
+                this.casing,
                 relation,
                 table5,
                 targetTable,

package/bin.cjs

@@ -71197,94 +71197,144 @@ var init_introspect = __esm({
       const imports = [];
       const tableRelations = {};
       Object.values(schema6.tables).forEach((table5) => {
-        Object.values(table5.foreignKeys).forEach((fk4) => {
-          const tableNameFrom = paramNameFor(fk4.tableFrom, table5.schema);
-          const tableNameTo = paramNameFor(fk4.tableTo, fk4.schemaTo);
-          const tableFrom = withCasing3(tableNameFrom, casing2);
-          const tableTo = withCasing3(tableNameTo, casing2);
-          const columnFrom = withCasing3(fk4.columnsFrom[0], casing2);
-          const columnTo = withCasing3(fk4.columnsTo[0], casing2);
-          imports.push(tableTo, tableFrom);
-          const keyFrom = tableFrom;
-          if (!tableRelations[keyFrom]) {
-            tableRelations[keyFrom] = [];
-          }
-          tableRelations[keyFrom].push({
-            name: (0, import_pluralize.singular)(tableTo),
-            type: "one",
-            tableFrom,
-            columnFrom,
-            tableTo,
-            columnTo
-          });
-          const keyTo = tableTo;
-          if (!tableRelations[keyTo]) {
-            tableRelations[keyTo] = [];
-          }
-          tableRelations[keyTo].push({
-            name: (0, import_pluralize.plural)(tableFrom),
-            type: "many",
-            tableFrom: tableTo,
-            columnFrom: columnTo,
-            tableTo: tableFrom,
-            columnTo: columnFrom
+        const fks = Object.values(table5.foreignKeys);
+        if (fks.length === 2) {
+          const [fk1, fk22] = fks;
+          const toTable1 = withCasing3(paramNameFor(fk1.tableTo, fk1.schemaTo), casing2);
+          const columnsTo1 = fk1.columnsTo.map((it) => withCasing3(it, casing2));
+          const toTable2 = withCasing3(paramNameFor(fk22.tableTo, fk22.schemaTo), casing2);
+          const columnsTo2 = fk22.columnsTo.map((it) => withCasing3(it, casing2));
+          const tableThrough = withCasing3(paramNameFor(fk1.tableFrom, table5.schema), casing2);
+          const tableFrom2 = withCasing3(paramNameFor(fk22.tableFrom, table5.schema), casing2);
+          const columnsThroughFrom = fk1.columnsFrom.map((it) => withCasing3(it, casing2));
+          const columnsThroughTo = fk22.columnsFrom.map((it) => withCasing3(it, casing2));
+          if (toTable1 !== toTable2) {
+            if (!tableRelations[toTable1]) {
+              tableRelations[toTable1] = [];
+            }
+            tableRelations[toTable1].push({
+              name: (0, import_pluralize.plural)(toTable2),
+              type: "through",
+              tableFrom: toTable1,
+              columnsFrom: columnsTo1,
+              tableTo: toTable2,
+              columnsTo: columnsTo2,
+              tableThrough,
+              columnsThroughFrom,
+              columnsThroughTo
+            });
+            if (!tableRelations[toTable2]) {
+              tableRelations[toTable2] = [];
+            }
+            tableRelations[toTable2].push({
+              name: (0, import_pluralize.plural)(toTable1),
+              type: "many",
+              tableFrom: tableFrom2,
+              columnsFrom: fk22.columnsFrom,
+              tableTo: toTable2,
+              columnsTo: columnsTo2
+            });
+          }
+        } else {
+          fks.forEach((fk4) => {
+            const tableNameFrom = paramNameFor(fk4.tableFrom, table5.schema);
+            const tableNameTo = paramNameFor(fk4.tableTo, fk4.schemaTo);
+            const tableFrom = withCasing3(tableNameFrom, casing2);
+            const tableTo = withCasing3(tableNameTo, casing2);
+            const columnsFrom = fk4.columnsFrom.map((it) => withCasing3(it, casing2));
+            const columnsTo = fk4.columnsTo.map((it) => withCasing3(it, casing2));
+            imports.push(tableTo, tableFrom);
+            const keyFrom = tableFrom;
+            if (!tableRelations[keyFrom]) {
+              tableRelations[keyFrom] = [];
+            }
+            tableRelations[keyFrom].push({
+              name: (0, import_pluralize.singular)(tableTo),
+              type: "one",
+              tableFrom,
+              columnsFrom,
+              tableTo,
+              columnsTo
+            });
+            const keyTo = tableTo;
+            if (!tableRelations[keyTo]) {
+              tableRelations[keyTo] = [];
+            }
+            tableRelations[keyTo].push({
+              name: (0, import_pluralize.plural)(tableFrom),
+              type: "many",
+              tableFrom: tableTo,
+              columnsFrom: columnsTo,
+              tableTo: tableFrom,
+              columnsTo: columnsFrom
+            });
           });
-        });
+        }
       });
-      const uniqueImports = [...new Set(imports)];
-      const importsTs = `import { relations } from "drizzle-orm/_relations";
-import { ${uniqueImports.join(
-        ", "
-      )} } from "./schema";
+      const importsTs = `import { defineRelations } from "drizzle-orm";
+import * as schema from "./schema";
 
 `;
-      const relationStatements = Object.entries(tableRelations).map(
-        ([table5, relations4]) => {
-          const hasOne = relations4.some((it) => it.type === "one");
-          const hasMany = relations4.some((it) => it.type === "many");
-          const preparedRelations = relations4.map(
-            (relation, relationIndex, originArray) => {
-              let name = relation.name;
-              let relationName;
-              const hasMultipleRelations = originArray.some(
-                (it, originIndex) => relationIndex !== originIndex && it.tableTo === relation.tableTo
-              );
-              if (hasMultipleRelations) {
-                relationName = relation.type === "one" ? `${relation.tableFrom}_${relation.columnFrom}_${relation.tableTo}_${relation.columnTo}` : `${relation.tableTo}_${relation.columnTo}_${relation.tableFrom}_${relation.columnFrom}`;
-              }
-              const hasDuplicatedRelation = originArray.some(
-                (it, originIndex) => relationIndex !== originIndex && it.name === relation.name
-              );
-              if (hasDuplicatedRelation) {
-                name = `${relation.name}_${relation.type === "one" ? relation.columnFrom : relation.columnTo}`;
-              }
-              return {
-                ...relation,
-                name,
-                relationName
-              };
+      let relationString = `export const relations = defineRelations(schema, (r) => ({`;
+      Object.entries(tableRelations).forEach(([table5, relations4]) => {
+        const preparedRelations = relations4.map(
+          (relation, relationIndex, originArray) => {
+            let name = relation.name;
+            let relationName;
+            const hasMultipleRelations = originArray.some(
+              (it, originIndex) => relationIndex !== originIndex && it.tableTo === relation.tableTo
+            );
+            if (hasMultipleRelations) {
+              relationName = relation.type === "one" ? `${relation.tableFrom}_${relation.columnsFrom.join("_")}_${relation.tableTo}_${relation.columnsTo.join("_")}` : `${relation.tableTo}_${relation.columnsTo.join("_")}_${relation.tableFrom}_${relation.columnsFrom.join("_")}`;
             }
-          );
-          const fields = preparedRelations.map((relation) => {
-            if (relation.type === "one") {
-              return `	${relation.name}: one(${relation.tableTo}, {
-		fields: [${relation.tableFrom}.${relation.columnFrom}],
-		references: [${relation.tableTo}.${relation.columnTo}]${relation.relationName ? `,
-		relationName: "${relation.relationName}"` : ""}
-	}),`;
-            } else {
-              return `	${relation.name}: many(${relation.tableTo}${relation.relationName ? `, {
-		relationName: "${relation.relationName}"
-	}` : ""}),`;
+            const hasDuplicatedRelation = originArray.some(
+              (it, originIndex) => relationIndex !== originIndex && it.name === relation.name
+            );
+            if (hasDuplicatedRelation) {
+              name = `${relation.name}_${relation.type === "one" ? relation.columnsFrom.join("_") : relation.columnsTo.join("_")}`;
             }
-          });
-          return `export const ${table5}Relations = relations(${table5}, ({${hasOne ? "one" : ""}${hasOne && hasMany ? ", " : ""}${hasMany ? "many" : ""}}) => ({
-${fields.join("\n")}
-}));`;
-        }
-      );
+            return {
+              ...relation,
+              name,
+              relationName
+            };
+          }
+        );
+        relationString += `
+	${table5}: {`;
+        preparedRelations.forEach((relation) => {
+          if (relation.type === "one") {
+            const from = relation.columnsFrom.length === 1 ? `r.${relation.tableFrom}.${relation.columnsFrom[0]}` : `[${relation.columnsFrom.map((it) => `r.${relation.tableFrom}.${it}`).join(", ")}]`;
+            const to = relation.columnsTo.length === 1 ? `r.${relation.tableTo}.${relation.columnsTo[0]}` : `[${relation.columnsTo.map((it) => `r.${relation.tableTo}.${it}`).join(", ")}]`;
+            relationString += `
+		${relation.name}: r.one.${relation.tableTo}({
+			from: ${from},
+			to: ${to}` + (relation.relationName ? `,
+			alias: "${relation.relationName}"` : "") + `
+		}),`;
+          } else if (relation.type === "many") {
+            relationString += `
+		${relation.name}: r.many.${relation.tableTo}(` + (relation.relationName ? `{
+			alias: "${relation.relationName}"
+		}` : "") + `),`;
+          } else {
+            const from = relation.columnsThroughFrom.length === 1 ? `r.${relation.tableFrom}.${relation.columnsFrom[0]}.through(r.${relation.tableThrough}.${relation.columnsThroughFrom[0]})` : `[${relation.columnsThroughFrom.map((it) => `r.${relation.tableFrom}.${it}.through(${relation.tableThrough}.${it})`).join(", ")}]`;
+            const to = relation.columnsThroughTo.length === 1 ? `r.${relation.tableTo}.${relation.columnsThroughTo[0]}.through(r.${relation.tableThrough}.${relation.columnsThroughTo[0]})` : `[${relation.columnsThroughTo.map((it) => `r.${relation.tableTo}.${it}.through(${relation.tableThrough}.${it})`).join(", ")}]`;
+            relationString += `
+		${relation.name}: r.many.${relation.tableTo}({
+			from: ${from},
+			to: ${to}` + (relation.relationName ? `,
+			alias: "${relation.relationName}"` : "") + `
+		}),`;
+          }
+        });
+        relationString += `
+	},`;
+      });
+      relationString += `
+}))`;
       return {
-        file: importsTs + relationStatements.join("\n\n")
+        file: importsTs + relationString
       };
     };
   }
@@ -77582,7 +77632,7 @@ init_utils5();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "0.30.4-c417a27";
+  const envVersion = "0.30.4-d004082";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-kit",
-	"version": "0.30.4-c417a27",
+	"version": "0.30.4-d004082",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",