drizzle-kit 0.28.1-5514d51 → 0.28.1-66f461a

package/api.mjs

@@ -23970,12 +23970,14 @@ var init_primary_keys = __esm({
 function getOrderByOperators() {
   return orderByOperators;
 }
-function mapRelationalRow(row, buildQueryResultSelection, mapColumnValue = (value) => value) {
+function mapRelationalRow(row, buildQueryResultSelection, mapColumnValue = (value) => value, parseJson = false) {
   for (const selectionItem of buildQueryResultSelection) {
     const field = selectionItem.field;
     if (is(field, Table2)) {
       if (row[selectionItem.key] === null)
         continue;
+      if (parseJson)
+        row[selectionItem.key] = JSON.parse(row[selectionItem.key]);
       if (selectionItem.isArray) {
         for (const item of row[selectionItem.key]) {
           mapRelationalRow(item, selectionItem.selection, mapColumnValue);
@@ -24036,7 +24038,7 @@ function defineRelations(schema4, relations) {
   );
 }
 function relationsFieldFilterToSQL(column4, filter2) {
-  if (typeof filter2 !== "object")
+  if (typeof filter2 !== "object" || is(filter2, Placeholder))
     return eq(column4, filter2);
   const entries = Object.entries(filter2);
   if (!entries.length)
@@ -24046,14 +24048,14 @@ function relationsFieldFilterToSQL(column4, filter2) {
     if (value === void 0)
       continue;
     switch (target) {
-      case "$not": {
+      case "NOT": {
         const res = relationsFieldFilterToSQL(column4, value);
         if (!res)
           continue;
         parts.push(not(res));
         continue;
       }
-      case "$or": {
+      case "OR": {
         if (!value.length)
           continue;
         parts.push(
@@ -24078,7 +24080,7 @@ function relationsFieldFilterToSQL(column4, filter2) {
     return void 0;
   return and(...parts);
 }
-function relationFilterToSQL(table4, filter2) {
+function relationsFilterToSQL(table4, filter2) {
   const entries = Object.entries(filter2);
   if (!entries.length)
     return void 0;
@@ -24087,35 +24089,33 @@ function relationFilterToSQL(table4, filter2) {
     if (value === void 0)
       continue;
     switch (target) {
-      case "$raw": {
-        if (value)
-          parts.push(value(operators));
+      case "RAW": {
+        if (value) {
+          parts.push(
+            value(table4[Columns], operators)
+          );
+        }
         continue;
       }
-      case "$or": {
+      case "OR": {
         if (!value?.length)
           continue;
         parts.push(
           or(
             ...value.map(
-              (subFilter) => relationFilterToSQL(table4, subFilter)
+              (subFilter) => relationsFilterToSQL(table4, subFilter)
             )
           )
         );
         continue;
       }
-      case "$not": {
-        if (!value?.length)
+      case "NOT": {
+        if (value === void 0)
           continue;
-        parts.push(
-          not(
-            and(
-              ...value.map(
-                (subFilter) => relationFilterToSQL(table4, subFilter)
-              )
-            )
-          )
-        );
+        const built = relationsFilterToSQL(table4, value);
+        if (!built)
+          continue;
+        parts.push(not(built));
         continue;
       }
       default: {
@@ -24156,13 +24156,15 @@ function relationExtrasToSQL(table4, extras) {
     selection
   };
 }
-function relationToSQL(relation) {
-  const table4 = relation.sourceTable;
+function relationToSQL(relation, sourceTable, targetTable) {
   const columnWhere = relation.sourceColumns.map((s, i) => {
     const t = relation.targetColumns[i];
-    return eq(s, t);
+    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)}`
+    );
   });
-  const targetWhere = relation.where ? and(...columnWhere, relationFilterToSQL(table4, relation.where)) : and(...columnWhere);
+  const targetWhere = relation.where ? and(...columnWhere, relationsFilterToSQL(sourceTable, relation.where)) : and(...columnWhere);
   return targetWhere;
 }
 var _a118, Relations, _a119, Relation, _a120, _b95, One, _a121, _b96, Many, _a122, AggregatedField, _a123, _b97, Count, operators, orderByOperators, _a124, RelationsBuilderTable, _a125, RelationsBuilderColumn, _a126, RelationsHelperStatic;
@@ -24187,6 +24189,8 @@ var init_relations = __esm({
         this.tables = tables;
         this.config = config;
         for (const [tsName, table4] of Object.entries(tables)) {
+          if (!is(table4, Table2))
+            continue;
           this.tableNamesMap[getTableUniqueName(table4)] = tsName;
           const tableConfig = this.tablesConfig[tsName] = {
             table: table4,
@@ -24370,12 +24374,12 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
         if (!this.query) {
           if (!this.table)
             throw new Error("Table must be set before building aggregate field");
-          this.query = sql`select count(*) as ${sql.identifier("count")} from ${this.table}`.mapWith(Number);
+          this.query = sql`select count(*) as ${sql.identifier("r")} from ${this.table}`.mapWith(Number);
         }
         return this.query;
       }
     };
-    __publicField(Count, _a123, "Count");
+    __publicField(Count, _a123, "AggregatedFieldCount");
     operators = {
       and,
       between,
@@ -24686,8 +24690,8 @@ __export(dist_exports, {
   param: () => param,
   placeholder: () => placeholder,
   relationExtrasToSQL: () => relationExtrasToSQL,
-  relationFilterToSQL: () => relationFilterToSQL,
   relationToSQL: () => relationToSQL,
+  relationsFilterToSQL: () => relationsFilterToSQL,
   relationsOrderToSQL: () => relationsOrderToSQL,
   sql: () => sql,
   sum: () => sum,
@@ -25223,11 +25227,8 @@ var init_dialect = __esm({
               });
             }
           }
-          return columnIdentifiers.length ? sql.join(columnIdentifiers, sql`, `) : this.unwrapAllColumns(table4, selection);
-        })() : (() => {
-          const columnIdentifiers = [this.unwrapAllColumns(table4, selection)];
-          return sql.join(columnIdentifiers, sql`, `);
-        })());
+          return columnIdentifiers.length ? sql.join(columnIdentifiers, sql`, `) : void 0;
+        })() : this.unwrapAllColumns(table4, selection));
         this.casing = new CasingCache(config?.casing);
       }
       async migrate(migrations, session, config) {
@@ -25842,20 +25843,24 @@ var init_dialect = __esm({
         tableConfig,
         queryConfig: config,
         relationWhere,
-        mode
+        mode,
+        errorPath,
+        depth
       }) {
         const selection = [];
         const isSingle = mode === "first";
         const params = config === true ? void 0 : config;
+        const currentPath = errorPath ?? "";
+        const currentDepth = depth ?? 0;
         const limit = isSingle ? 1 : params?.limit;
         const offset = params?.offset;
-        const where = params?.where && relationWhere ? and(relationFilterToSQL(table4, params.where), relationWhere) : params?.where ? relationFilterToSQL(table4, params.where) : relationWhere;
+        const where = params?.where && relationWhere ? and(relationsFilterToSQL(table4, params.where), relationWhere) : params?.where ? relationsFilterToSQL(table4, params.where) : relationWhere;
         const order = params?.orderBy ? relationsOrderToSQL(table4, params.orderBy) : void 0;
         const columns = this.buildColumns(table4, tableConfig, selection, params);
         const extras = params?.extras ? relationExtrasToSQL(table4, params.extras) : void 0;
         if (extras)
           selection.push(...extras.selection);
-        const selectionArr = [columns, extras?.sql];
+        const selectionArr = columns ? [columns] : [];
         const joins = params ? (() => {
           const { with: joins2 } = params;
           if (!joins2)
@@ -25865,20 +25870,21 @@ var init_dialect = __esm({
             return;
           return sql.join(
             withEntries.map(([k, join]) => {
-              const relation = tableConfig.relations[k];
-              if (relation.$brand === "AggregatedField") {
-                relation.onTable(table4);
-                const query2 = relation.getSQL();
+              if (is(tableConfig.relations[k], AggregatedField)) {
+                const relation2 = tableConfig.relations[k];
+                relation2.onTable(table4);
+                const query2 = relation2.getSQL();
                 selection.push({
                   key: k,
-                  field: relation
+                  field: relation2
                 });
                 selectionArr.push(sql`${sql.identifier(k)}.${sql.identifier("r")} as ${sql.identifier(k)}`);
                 return sql`left join lateral(${query2}) as ${sql.identifier(k)} on true`;
               }
+              const relation = tableConfig.relations[k];
               const isSingle2 = is(relation, One);
-              const targetTable = relation.targetTable;
-              const relationFilter = relationToSQL(relation);
+              const targetTable = aliasedTable(relation.targetTable, `d${currentDepth + 1}`);
+              const relationFilter = relationToSQL(relation, table4, 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)}`
               );
@@ -25887,10 +25893,12 @@ var init_dialect = __esm({
                 mode: isSingle2 ? "first" : "many",
                 schema: schema4,
                 queryConfig: join,
-                tableConfig: schema4[tableNamesMap[getTableUniqueName(targetTable)]],
+                tableConfig: schema4[tableNamesMap[getTableUniqueName(relation.targetTable)]],
                 tableNamesMap,
                 tables,
-                relationWhere: relationFilter
+                relationWhere: relationFilter,
+                errorPath: `${currentPath.length ? `${currentPath}.` : ""}${k}`,
+                depth: currentDepth + 1
               });
               selection.push({
                 field: targetTable,
@@ -25903,8 +25911,15 @@ var init_dialect = __esm({
             sql` `
           );
         })() : void 0;
+        if (extras?.sql)
+          selectionArr.push(extras.sql);
+        if (!selectionArr.length) {
+          throw new DrizzleError({
+            message: `No fields selected for table "${tableConfig.tsName}"${currentPath ? ` ("${currentPath}")` : ""}`
+          });
+        }
         const selectionSet = sql.join(selectionArr.filter((e) => e !== void 0), sql`, `);
-        const query = sql`select ${selectionSet} from ${table4}${sql` ${joins}`.if(joins)}${sql` where ${where}`.if(where)}${sql` order by ${order}`.if(order)}${sql` limit ${limit}`.if(limit !== void 0)}${sql` offset ${offset}`.if(offset !== void 0)}`;
+        const query = sql`select ${selectionSet} from ${table4[IsAlias] ? sql`${sql`${sql.identifier(table4[Schema] ?? "")}.`.if(table4[Schema])}${sql.identifier(table4[OriginalName])} as ${table4}` : table4}${sql` ${joins}`.if(joins)}${sql` where ${where}`.if(where)}${sql` order by ${order}`.if(order)}${sql` limit ${limit}`.if(limit !== void 0)}${sql` offset ${offset}`.if(offset !== void 0)}`;
         return {
           sql: query,
           selection
@@ -31355,73 +31370,18 @@ var init_dialect2 = __esm({
           }
           return selectedColumns;
         });
-        __publicField(this, "buildWithColumns", (tableConfig, withContainer, jsonColumns) => {
-          for (const [k, v] of Object.entries(
-            withContainer
-          )) {
-            if (!v)
-              continue;
-            const relation = tableConfig.relations[k];
-            if (relation.$brand === "AggregatedField")
-              continue;
-            const table4 = relation.targetTable;
-            const columns = this.getSelectedTableColumns(table4, typeof v === "boolean" ? void 0 : v.columns).map(
-              (c) => sql`${sql.raw(this.escapeString(c.tsName))}, ${sql.identifier(c.tsName)}`
-            );
-            if (typeof v !== "boolean") {
-              if (v.extras) {
-                if (typeof v.extras === "function") {
-                  v.extras = v.extras(table4[Columns], { sql });
-                }
-                for (const [ek, ev] of Object.entries(v.extras)) {
-                  if (!ev)
-                    continue;
-                  columns.push(
-                    sql`${sql.raw(this.escapeString(ek))}, ${sql.identifier(ek)}`
-                  );
-                }
-              }
-              if (v.with) {
-                const withEntries = Object.entries(v.with);
-                for (const [k2, w] of withEntries) {
-                  if (!w)
-                    continue;
-                  columns.push(sql`${sql.raw(this.escapeString(k2))}, jsonb(${sql.identifier(k2)})`);
-                }
-              }
-            }
-            jsonColumns[k] = jsonColumns[k] ? sql`${jsonColumns[k]}, ${sql.join(columns, sql`, `)}` : sql.join(columns, sql`, `);
-          }
-        });
-        __publicField(this, "buildColumns", (table4, tableConfig, selection, params) => params?.columns ? (() => {
-          const jsonColumns = {};
+        __publicField(this, "buildColumns", (table4, selection, params) => params?.columns ? (() => {
           const columnIdentifiers = [];
           const selectedColumns = this.getSelectedTableColumns(table4, params?.columns);
           for (const column4 of selectedColumns) {
-            columnIdentifiers.push(sql`${column4} as ${sql.identifier(column4.tsName)}`);
+            columnIdentifiers.push(sql`${column4.column} as ${sql.identifier(column4.tsName)}`);
             selection.push({
               key: column4.tsName,
               field: column4.column
             });
           }
-          if (params?.with) {
-            this.buildWithColumns(tableConfig, params.with, jsonColumns);
-          }
-          return {
-            columns: columnIdentifiers.length ? sql.join(columnIdentifiers, sql`, `) : this.unwrapAllColumns(table4, selection),
-            jsonColumns
-          };
-        })() : (() => {
-          const columnIdentifiers = [this.unwrapAllColumns(table4, selection)];
-          const jsonColumns = {};
-          if (params?.with) {
-            this.buildWithColumns(tableConfig, params.with, jsonColumns);
-          }
-          return {
-            columns: sql.join(columnIdentifiers, sql`, `),
-            jsonColumns
-          };
-        })());
+          return columnIdentifiers.length ? sql.join(columnIdentifiers, sql`, `) : void 0;
+        })() : this.unwrapAllColumns(table4, selection));
         this.casing = new CasingCache(config?.casing);
       }
       escapeName(name2) {
@@ -31968,15 +31928,19 @@ var init_dialect2 = __esm({
         queryConfig: config,
         relationWhere,
         mode,
-        isNested
+        isNested,
+        errorPath,
+        depth
       }) {
         const selection = [];
         const isSingle = mode === "first";
         const params = config === true ? void 0 : config;
+        const currentPath = errorPath ?? "";
+        const currentDepth = depth ?? 0;
         const limit = isSingle ? 1 : params?.limit;
         const offset = params?.offset;
-        const { columns, jsonColumns } = this.buildColumns(table4, tableConfig, selection, params);
-        const where = params?.where && relationWhere ? and(relationFilterToSQL(table4, params.where), relationWhere) : params?.where ? relationFilterToSQL(table4, params.where) : relationWhere;
+        const columns = this.buildColumns(table4, selection, params);
+        const where = params?.where && relationWhere ? and(relationsFilterToSQL(table4, params.where), relationWhere) : params?.where ? relationsFilterToSQL(table4, params.where) : relationWhere;
         const order = params?.orderBy ? relationsOrderToSQL(table4, params.orderBy) : void 0;
         const extras = params?.extras ? relationExtrasToSQL(table4, params.extras) : void 0;
         if (extras)
@@ -31990,29 +31954,32 @@ var init_dialect2 = __esm({
             return;
           return sql.join(
             withEntries.map(([k, join]) => {
-              const relation = tableConfig.relations[k];
-              if (relation.$brand === "AggregatedField") {
-                relation.onTable(table4);
-                const query2 = relation.getSQL();
+              if (is(tableConfig.relations[k], AggregatedField)) {
+                const relation2 = tableConfig.relations[k];
+                relation2.onTable(table4);
+                const query2 = relation2.getSQL();
                 selection.push({
                   key: k,
-                  field: relation
+                  field: relation2
                 });
                 return sql`(${query2}) as ${sql.identifier(k)}`;
               }
+              const relation = tableConfig.relations[k];
               const isSingle2 = is(relation, One);
               const targetTable = relation.targetTable;
-              const relationFilter = relationToSQL(relation);
+              const relationFilter = relationToSQL(relation, table4, targetTable);
               const innerQuery = this.buildRelationalQuery({
                 table: targetTable,
                 mode: isSingle2 ? "first" : "many",
                 schema: schema4,
                 queryConfig: join,
-                tableConfig: schema4[tableNamesMap[getTableUniqueName(targetTable)]],
+                tableConfig: schema4[tableNamesMap[getTableUniqueName(relation.targetTable)]],
                 tableNamesMap,
                 tables,
                 relationWhere: relationFilter,
-                isNested: true
+                isNested: true,
+                errorPath: `${currentPath.length ? `${currentPath}.` : ""}${k}`,
+                depth: currentDepth + 1
               });
               selection.push({
                 field: targetTable,
@@ -32020,13 +31987,25 @@ var init_dialect2 = __esm({
                 selection: innerQuery.selection,
                 isArray: !isSingle2
               });
-              return isNested ? isSingle2 ? sql`(select ${sql`jsonb_object(${jsonColumns[k]}) as ${sql.identifier("r")}`} from (${innerQuery}) as ${sql.identifier("t")}) as ${sql.identifier(k)}` : sql`coalesce((select ${sql`jsonb_group_array(json_object(${jsonColumns[k]})) as ${sql.identifier("r")}`} from (${innerQuery}) as ${sql.identifier("t")}), jsonb_array()) as ${sql.identifier(k)}` : isSingle2 ? sql`(select ${sql`json_object(${jsonColumns[k]}) as ${sql.identifier("r")}`} from (${innerQuery}) as ${sql.identifier("t")}) as ${sql.identifier(k)}` : sql`coalesce((select ${sql`json_group_array(json_object(${jsonColumns[k]})) as ${sql.identifier("r")}`} from (${innerQuery}) as ${sql.identifier("t")}), jsonb_array()) as ${sql.identifier(k)}`;
+              const jsonColumns = sql.join(
+                innerQuery.selection.map((s) => {
+                  return sql`${sql.raw(this.escapeString(s.key))}, ${s.selection ? sql`jsonb(${sql.identifier(s.key)})` : sql.identifier(s.key)}`;
+                }),
+                sql`, `
+              );
+              return isNested ? isSingle2 ? sql`(select jsonb_object(${jsonColumns}) as ${sql.identifier("r")} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)}` : sql`coalesce((select jsonb_group_array(json_object(${jsonColumns})) as ${sql.identifier("r")} from (${innerQuery.sql}) as ${sql.identifier("t")}), jsonb_array()) as ${sql.identifier(k)}` : isSingle2 ? sql`(select json_object(${jsonColumns}) as ${sql.identifier("r")} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)}` : sql`coalesce((select json_group_array(json_object(${jsonColumns})) as ${sql.identifier("r")} from (${innerQuery.sql}) as ${sql.identifier("t")}), jsonb_array()) as ${sql.identifier(k)}`;
             }),
             sql`, `
           );
         })() : void 0;
-        const selectionSet = sql.join([columns, extras?.sql, joins].filter((e) => e !== void 0), sql`, `);
-        const query = sql`select ${selectionSet} from ${table4}${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 selectionArr = [columns, extras?.sql, joins].filter((e) => e !== void 0);
+        if (!selectionArr.length) {
+          throw new DrizzleError({
+            message: `No fields selected for table "${tableConfig.tsName}"${currentPath ? ` ("${currentPath}")` : ""}`
+          });
+        }
+        const selectionSet = sql.join(selectionArr, sql`, `);
+        const query = sql`select ${selectionSet} from ${table4[IsAlias] ? sql`${sql`${sql.identifier(table4[Schema] ?? "")}.`.if(table4[Schema])}${sql.identifier(table4[OriginalName])} as ${table4}` : table4}${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
@@ -33403,7 +33382,8 @@ var init_query4 = __esm({
     init_relations();
     _a224 = entityKind;
     RelationalQueryBuilder2 = class {
-      constructor(tables, schema4, tableNamesMap, table4, tableConfig, dialect4, session) {
+      constructor(mode, tables, schema4, tableNamesMap, table4, tableConfig, dialect4, session) {
+        this.mode = mode;
         this.tables = tables;
         this.schema = schema4;
         this.tableNamesMap = tableNamesMap;
@@ -33413,7 +33393,17 @@ var init_query4 = __esm({
         this.session = session;
       }
       findMany(config) {
-        return new SQLiteRelationalQuery2(
+        return this.mode === "sync" ? new SQLiteSyncRelationalQuery2(
+          this.tables,
+          this.schema,
+          this.tableNamesMap,
+          this.table,
+          this.tableConfig,
+          this.dialect,
+          this.session,
+          config ?? true,
+          "many"
+        ) : new SQLiteRelationalQuery2(
           this.tables,
           this.schema,
           this.tableNamesMap,
@@ -33426,7 +33416,17 @@ var init_query4 = __esm({
         );
       }
       findFirst(config) {
-        return new SQLiteRelationalQuery2(
+        return this.mode === "sync" ? new SQLiteSyncRelationalQuery2(
+          this.tables,
+          this.schema,
+          this.tableNamesMap,
+          this.table,
+          this.tableConfig,
+          this.dialect,
+          this.session,
+          config ?? true,
+          "first"
+        ) : new SQLiteRelationalQuery2(
           this.tables,
           this.schema,
           this.tableNamesMap,
@@ -33478,7 +33478,7 @@ var init_query4 = __esm({
           void 0,
           this.mode === "first" ? "get" : "all",
           (rawRows, mapColumnValue) => {
-            const rows = rawRows.map((row) => mapRelationalRow(row, query.selection, mapColumnValue));
+            const rows = rawRows.map((row) => mapRelationalRow(row, query.selection, mapColumnValue, true));
             if (this.mode === "first") {
               return rows[0];
             }
@@ -33621,6 +33621,7 @@ var init_db2 = __esm({
         if (relations) {
           for (const [tableName, relation] of Object.entries(relations.tablesConfig)) {
             this.query[tableName] = new RelationalQueryBuilder2(
+              resultKind,
               relations.tables,
               relations.tablesConfig,
               relations.tableNamesMap,
@@ -36855,42 +36856,7 @@ var init_dialect3 = __esm({
           }
           return selectedColumns;
         });
-        __publicField(this, "buildWithColumns", (tableConfig, withContainer, jsonColumns, columnIdentifiers) => {
-          for (const [k, v] of Object.entries(
-            withContainer
-          )) {
-            if (!v)
-              continue;
-            const relation = tableConfig.relations[k];
-            if (relation.$brand === "AggregatedField")
-              continue;
-            const table4 = relation.targetTable;
-            const columns = this.getSelectedTableColumns(table4, typeof v === "boolean" ? void 0 : v.columns).map(
-              (c) => sql`${sql.raw(this.escapeString(c.tsName))}, ${sql.identifier(c.tsName)}`
-            );
-            if (typeof v === "object" && v.extras) {
-              if (typeof v.extras === "function") {
-                v.extras = v.extras(table4[Columns], { sql });
-              }
-              for (const [ek, ev] of Object.entries(v.extras)) {
-                if (!ev)
-                  continue;
-                columns.push(
-                  sql`${sql.raw(this.escapeString(ek))}, ${sql.identifier(ek)}`
-                );
-              }
-            }
-            columnIdentifiers.push(
-              sql`${table4}.${sql.identifier("r")} as ${sql.identifier(k)}`
-            );
-            jsonColumns[k] = sql.join(
-              columns,
-              sql`, `
-            );
-          }
-        });
-        __publicField(this, "buildColumns", (table4, tableConfig, selection, params) => params?.columns ? (() => {
-          const jsonColumns = {};
+        __publicField(this, "buildColumns", (table4, selection, params) => params?.columns ? (() => {
           const columnIdentifiers = [];
           const selectedColumns = this.getSelectedTableColumns(table4, params?.columns);
           for (const column4 of selectedColumns) {
@@ -36898,24 +36864,8 @@ var init_dialect3 = __esm({
               sql`${table4[column4.tsName]} as ${sql.identifier(column4.tsName)}`
             );
           }
-          if (params?.with) {
-            this.buildWithColumns(tableConfig, params.with, jsonColumns, columnIdentifiers);
-          }
-          return {
-            columns: columnIdentifiers.length ? sql.join(columnIdentifiers, sql`, `) : this.unwrapAllColumns(table4, selection),
-            jsonColumns
-          };
-        })() : (() => {
-          const columnIdentifiers = [this.unwrapAllColumns(table4, selection)];
-          const jsonColumns = {};
-          if (params?.with) {
-            this.buildWithColumns(tableConfig, params.with, jsonColumns, columnIdentifiers);
-          }
-          return {
-            columns: sql.join(columnIdentifiers, sql`, `),
-            jsonColumns
-          };
-        })());
+          return columnIdentifiers.length ? sql.join(columnIdentifiers, sql`, `) : void 0;
+        })() : this.unwrapAllColumns(table4, selection));
         this.casing = new CasingCache(config?.casing);
       }
       async migrate(migrations, session, config) {
@@ -37717,20 +37667,24 @@ var init_dialect3 = __esm({
         tableConfig,
         queryConfig: config,
         relationWhere,
-        mode
+        mode,
+        errorPath,
+        depth
       }) {
         const selection = [];
         const isSingle = mode === "first";
         const params = config === true ? void 0 : config;
+        const currentPath = errorPath ?? "";
+        const currentDepth = depth ?? 0;
         const limit = isSingle ? 1 : params?.limit;
         const offset = params?.offset;
-        const { columns, jsonColumns } = this.buildColumns(table4, tableConfig, selection, params);
-        const where = params?.where && relationWhere ? and(relationFilterToSQL(table4, params.where), relationWhere) : params?.where ? relationFilterToSQL(table4, params.where) : relationWhere;
+        const columns = this.buildColumns(table4, selection, params);
+        const where = params?.where && relationWhere ? and(relationsFilterToSQL(table4, params.where), relationWhere) : params?.where ? relationsFilterToSQL(table4, params.where) : relationWhere;
         const order = params?.orderBy ? relationsOrderToSQL(table4, params.orderBy) : void 0;
         const extras = params?.extras ? relationExtrasToSQL(table4, params.extras) : void 0;
         if (extras)
           selection.push(...extras.selection);
-        const selectionSet = sql.join([columns, extras].filter((e) => !!e), sql`, `);
+        const selectionArr = columns ? [columns] : [];
         const joins = params ? (() => {
           const { with: joins2 } = params;
           if (!joins2)
@@ -37740,28 +37694,32 @@ var init_dialect3 = __esm({
             return;
           return sql.join(
             withEntries.map(([k, join]) => {
-              const relation = tableConfig.relations[k];
-              if (relation.$brand === "AggregatedField") {
-                relation.onTable(table4);
-                const query2 = relation.getSQL();
+              selectionArr.push(sql`${sql.identifier(k)}.${sql.identifier("r")} as ${sql.identifier(k)}`);
+              if (is(tableConfig.relations[k], AggregatedField)) {
+                const relation2 = tableConfig.relations[k];
+                relation2.onTable(table4);
+                const query2 = relation2.getSQL();
                 selection.push({
                   key: k,
-                  field: relation
+                  field: relation2
                 });
                 return sql`, lateral(${query2}) as ${sql.identifier(k)}`;
               }
+              const relation = tableConfig.relations[k];
               const isSingle2 = is(relation, One);
-              const targetTable = relation.targetTable;
-              const relationFilter = relationToSQL(relation);
+              const targetTable = aliasedTable(relation.targetTable, `d${currentDepth + 1}`);
+              const relationFilter = relationToSQL(relation, table4, targetTable);
               const innerQuery = this.buildRelationalQuery({
                 table: targetTable,
                 mode: isSingle2 ? "first" : "many",
                 schema: schema4,
                 queryConfig: join,
-                tableConfig: schema4[tableNamesMap[getTableUniqueName(targetTable)]],
+                tableConfig: schema4[tableNamesMap[getTableUniqueName(relation.targetTable)]],
                 tableNamesMap,
                 tables,
-                relationWhere: relationFilter
+                relationWhere: relationFilter,
+                errorPath: `${currentPath.length ? `${currentPath}.` : ""}${k}`,
+                depth: currentDepth + 1
               });
               selection.push({
                 field: targetTable,
@@ -37769,11 +37727,23 @@ var init_dialect3 = __esm({
                 selection: innerQuery.selection,
                 isArray: !isSingle2
               });
-              return sql`, lateral(select ${isSingle2 ? sql`json_object(${jsonColumns[k]}) as ${sql.identifier("r")}` : sql`coalesce(json_arrayagg(json_object(${jsonColumns[k]})), json_array()) as ${sql.identifier("r")}`} from (${innerQuery}) as ${sql.identifier("t")}) as ${schema4[k]}`;
+              const jsonColumns = sql.join(
+                innerQuery.selection.map((s) => sql`${sql.raw(this.escapeString(s.key))}, ${sql.identifier(s.key)}`),
+                sql`, `
+              );
+              return sql`, lateral(select ${isSingle2 ? sql`json_object(${jsonColumns}) as ${sql.identifier("r")}` : sql`coalesce(json_arrayagg(json_object(${jsonColumns})), json_array()) as ${sql.identifier("r")}`} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)}`;
             })
           );
         })() : void 0;
-        const query = sql`select ${selectionSet} from ${table4}${sql`${joins}`.if(joins)}${sql` where ${where}`.if(where)}${sql` order by ${order}`.if(order)}${sql` limit ${limit}`.if(limit !== void 0)}${sql` offset ${offset}`.if(offset !== void 0)}`;
+        if (extras?.sql)
+          selectionArr.push(extras.sql);
+        if (!selectionArr.length) {
+          throw new DrizzleError({
+            message: `No fields selected for table "${tableConfig.tsName}"${currentPath ? ` ("${currentPath}")` : ""}`
+          });
+        }
+        const selectionSet = sql.join(selectionArr, sql`, `);
+        const query = sql`select ${selectionSet} from ${table4[IsAlias] ? sql`${sql`${sql.identifier(table4[Schema] ?? "")}.`.if(table4[Schema])}${sql.identifier(table4[OriginalName])} as ${table4}` : table4}${sql`${joins}`.if(joins)}${sql` where ${where}`.if(where)}${sql` order by ${order}`.if(order)}${sql` limit ${limit}`.if(limit !== void 0)}${sql` offset ${offset}`.if(offset !== void 0)}`;
         return {
           sql: query,
           selection