drizzle-kit 0.28.1-661b6f2 → 0.28.1-66f461a

package/api.js

@@ -24033,7 +24033,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)
@@ -24043,14 +24043,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(
@@ -24075,7 +24075,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;
@@ -24084,7 +24084,7 @@ function relationFilterToSQL(table4, filter2) {
     if (value === void 0)
       continue;
     switch (target) {
-      case "$raw": {
+      case "RAW": {
         if (value) {
           parts.push(
             value(table4[Columns], operators)
@@ -24092,30 +24092,25 @@ function relationFilterToSQL(table4, filter2) {
         }
         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 +24151,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 +24184,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,
@@ -24686,8 +24685,8 @@ __export(dist_exports, {
   param: () => param,
   placeholder: () => placeholder,
   relationExtrasToSQL: () => relationExtrasToSQL,
-  relationFilterToSQL: () => relationFilterToSQL,
   relationToSQL: () => relationToSQL,
+  relationsFilterToSQL: () => relationsFilterToSQL,
   relationsOrderToSQL: () => relationsOrderToSQL,
   sql: () => sql,
   sum: () => sum,
@@ -25223,11 +25222,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 +25838,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];
+        const selectionArr = columns ? [columns] : [];
         const joins = params ? (() => {
           const { with: joins2 } = params;
           if (!joins2)
@@ -25878,8 +25878,8 @@ var init_dialect = __esm({
               }
               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)}`
               );
@@ -25888,10 +25888,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,
@@ -25906,8 +25908,13 @@ var init_dialect = __esm({
         })() : 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
@@ -31368,11 +31375,8 @@ var init_dialect2 = __esm({
               field: column4.column
             });
           }
-          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);
       }
       escapeName(name2) {
@@ -31919,15 +31923,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 = this.buildColumns(table4, selection, params);
-        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 extras = params?.extras ? relationExtrasToSQL(table4, params.extras) : void 0;
         if (extras)
@@ -31954,17 +31962,19 @@ var init_dialect2 = __esm({
               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,
@@ -31983,8 +31993,14 @@ var init_dialect2 = __esm({
             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
@@ -36843,11 +36859,8 @@ var init_dialect3 = __esm({
               sql`${table4[column4.tsName]} as ${sql.identifier(column4.tsName)}`
             );
           }
-          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) {
@@ -37649,20 +37662,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 = this.buildColumns(table4, selection, params);
-        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 extras = params?.extras ? relationExtrasToSQL(table4, params.extras) : void 0;
         if (extras)
           selection.push(...extras.selection);
-        const selectionArr = [columns];
+        const selectionArr = columns ? [columns] : [];
         const joins = params ? (() => {
           const { with: joins2 } = params;
           if (!joins2)
@@ -37685,17 +37702,19 @@ var init_dialect3 = __esm({
               }
               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,
@@ -37713,8 +37732,13 @@ var init_dialect3 = __esm({
         })() : 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}${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

package/api.mjs

@@ -24038,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)
@@ -24048,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(
@@ -24080,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;
@@ -24089,7 +24089,7 @@ function relationFilterToSQL(table4, filter2) {
     if (value === void 0)
       continue;
     switch (target) {
-      case "$raw": {
+      case "RAW": {
         if (value) {
           parts.push(
             value(table4[Columns], operators)
@@ -24097,30 +24097,25 @@ function relationFilterToSQL(table4, filter2) {
         }
         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: {
@@ -24161,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;
@@ -24192,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,
@@ -24691,8 +24690,8 @@ __export(dist_exports, {
   param: () => param,
   placeholder: () => placeholder,
   relationExtrasToSQL: () => relationExtrasToSQL,
-  relationFilterToSQL: () => relationFilterToSQL,
   relationToSQL: () => relationToSQL,
+  relationsFilterToSQL: () => relationsFilterToSQL,
   relationsOrderToSQL: () => relationsOrderToSQL,
   sql: () => sql,
   sum: () => sum,
@@ -25228,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) {
@@ -25847,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];
+        const selectionArr = columns ? [columns] : [];
         const joins = params ? (() => {
           const { with: joins2 } = params;
           if (!joins2)
@@ -25883,8 +25883,8 @@ var init_dialect = __esm({
               }
               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)}`
               );
@@ -25893,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,
@@ -25911,8 +25913,13 @@ var init_dialect = __esm({
         })() : 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
@@ -31373,11 +31380,8 @@ var init_dialect2 = __esm({
               field: column4.column
             });
           }
-          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);
       }
       escapeName(name2) {
@@ -31924,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 = this.buildColumns(table4, selection, params);
-        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 extras = params?.extras ? relationExtrasToSQL(table4, params.extras) : void 0;
         if (extras)
@@ -31959,17 +31967,19 @@ var init_dialect2 = __esm({
               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,
@@ -31988,8 +31998,14 @@ var init_dialect2 = __esm({
             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
@@ -36848,11 +36864,8 @@ var init_dialect3 = __esm({
               sql`${table4[column4.tsName]} as ${sql.identifier(column4.tsName)}`
             );
           }
-          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) {
@@ -37654,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 = this.buildColumns(table4, selection, params);
-        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 extras = params?.extras ? relationExtrasToSQL(table4, params.extras) : void 0;
         if (extras)
           selection.push(...extras.selection);
-        const selectionArr = [columns];
+        const selectionArr = columns ? [columns] : [];
         const joins = params ? (() => {
           const { with: joins2 } = params;
           if (!joins2)
@@ -37690,17 +37707,19 @@ var init_dialect3 = __esm({
               }
               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,
@@ -37718,8 +37737,13 @@ var init_dialect3 = __esm({
         })() : 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}${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

package/bin.cjs

@@ -89646,7 +89646,7 @@ init_utils2();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "0.28.1-661b6f2";
+  const envVersion = "0.28.1-66f461a";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-kit",
-	"version": "0.28.1-661b6f2",
+	"version": "0.28.1-66f461a",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",