drizzle-kit 0.30.1-7db411e → 0.30.1-86fcd29

package/api.js

@@ -24837,24 +24837,40 @@ var init_primary_keys = __esm({
 function getOrderByOperators() {
   return orderByOperators;
 }
-function mapRelationalRow(row, buildQueryResultSelection, mapColumnValue = (value) => value, parseJson = false) {
+function mapRelationalRow(row, buildQueryResultSelection, mapColumnValue = (value) => value, parseJson = false, path2) {
   for (const selectionItem of buildQueryResultSelection) {
     const field = selectionItem.field;
     if (is(field, Table2)) {
-      if (row[selectionItem.key] === null)
+      const currentPath = `${path2 ? `${path2}.` : ""}${selectionItem.key}`;
+      if (row[selectionItem.key] === null) {
+        if (!selectionItem.isOptional) {
+          throw new DrizzleError({
+            message: `Unexpected null in relational query result on field "${currentPath}".
+Did you forget to mark relation as optional?`
+          });
+        }
         continue;
+      }
       if (parseJson)
         row[selectionItem.key] = JSON.parse(row[selectionItem.key]);
       if (selectionItem.isArray) {
         for (const item of row[selectionItem.key]) {
-          mapRelationalRow(item, selectionItem.selection, mapColumnValue);
+          mapRelationalRow(
+            item,
+            selectionItem.selection,
+            mapColumnValue,
+            false,
+            currentPath
+          );
         }
         continue;
       }
       mapRelationalRow(
         row[selectionItem.key],
         selectionItem.selection,
-        mapColumnValue
+        mapColumnValue,
+        false,
+        currentPath
       );
       continue;
     }
@@ -24905,7 +24921,7 @@ function defineRelations(schema5, relations) {
   );
 }
 function relationsFieldFilterToSQL(column5, filter2) {
-  if (typeof filter2 !== "object" || is(filter2, Placeholder))
+  if (typeof filter2 !== "object")
     return eq(column5, filter2);
   const entries = Object.entries(filter2);
   if (!entries.length)
@@ -24932,6 +24948,21 @@ function relationsFieldFilterToSQL(column5, filter2) {
         );
         continue;
       }
+      case "isNotNull":
+      case "isNull": {
+        if (!value)
+          continue;
+        parts.push(operators[target](column5));
+        continue;
+      }
+      case "in": {
+        parts.push(operators.inArray(column5, value));
+        continue;
+      }
+      case "notIn": {
+        parts.push(operators.notInArray(column5, value));
+        continue;
+      }
       default: {
         parts.push(
           operators[target](
@@ -25048,6 +25079,7 @@ var init_relations = __esm({
     init_table();
     init_column();
     init_entity();
+    init_errors();
     init_primary_keys();
     init_expressions();
     init_sql();
@@ -25247,7 +25279,8 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
         if (!this.query) {
           if (!this.table)
             throw new Error("Table must be set before building aggregate field");
-          this.query = sql`select count(*) as ${sql.identifier("r")} from ${this.table}`.mapWith(Number);
+          const table5 = this.table;
+          this.query = sql`select count(*) as ${sql.identifier("r")} from ${table5[IsAlias] ? sql`${sql`${sql.identifier(table5[Schema] ?? "")}.`.if(table5[Schema])}${sql.identifier(table5[OriginalName])} as ${table5}` : table5}`.mapWith(Number);
         }
         return this.query;
       }
@@ -25308,7 +25341,7 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
       }
       through(column5) {
         this._.through = column5;
-        return this;
+        throw new Error("Not implemented");
       }
       getSQL() {
         return this._.column.getSQL();
@@ -26071,7 +26104,7 @@ var init_dialect = __esm({
             sql`, `
           );
         });
-        __publicField(this, "buildColumns", (table5, tableConfig, selection, config) => config?.columns ? (() => {
+        __publicField(this, "buildColumns", (table5, selection, config) => config?.columns ? (() => {
           const entries = Object.entries(config.columns);
           const columnIdentifiers = [];
           let colSelectionMode;
@@ -26729,7 +26762,7 @@ var init_dialect = __esm({
         const offset = params?.offset;
         const where = params?.where && relationWhere ? and(relationsFilterToSQL(table5, params.where), relationWhere) : params?.where ? relationsFilterToSQL(table5, params.where) : relationWhere;
         const order = params?.orderBy ? relationsOrderToSQL(table5, params.orderBy) : void 0;
-        const columns = this.buildColumns(table5, tableConfig, selection, params);
+        const columns = this.buildColumns(table5, selection, params);
         const extras = params?.extras ? relationExtrasToSQL(table5, params.extras) : void 0;
         if (extras)
           selection.push(...extras.selection);
@@ -26777,7 +26810,8 @@ var init_dialect = __esm({
                 field: targetTable,
                 key: k,
                 selection: innerQuery.selection,
-                isArray: !isSingle2
+                isArray: !isSingle2,
+                isOptional: (relation.optional ?? false) || join !== true && !!join.where
               });
               return sql`left join lateral(select ${isSingle2 ? sql`row_to_json(${sql.identifier("t")}.*) ${sql.identifier("r")}` : sql`json_agg(row_to_json(${sql.identifier("t")}.*)) ${sql.identifier("r")}`} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)} on true`;
             }),
@@ -32833,7 +32867,7 @@ var init_dialect2 = __esm({
               }
               const relation = tableConfig.relations[k];
               const isSingle2 = is(relation, One);
-              const targetTable = relation.targetTable;
+              const targetTable = aliasedTable(relation.targetTable, `d${currentDepth + 1}`);
               const relationFilter = relationToSQL(relation, table5, targetTable);
               const innerQuery = this.buildRelationalQuery({
                 table: targetTable,
@@ -32852,7 +32886,8 @@ var init_dialect2 = __esm({
                 field: targetTable,
                 key: k,
                 selection: innerQuery.selection,
-                isArray: !isSingle2
+                isArray: !isSingle2,
+                isOptional: (relation.optional ?? false) || join !== true && !!join.where
               });
               const jsonColumns = sql.join(
                 innerQuery.selection.map((s) => {
@@ -37744,6 +37779,12 @@ var init_dialect3 = __esm({
             columnIdentifiers.push(
               sql`${table5[column5.tsName]} as ${sql.identifier(column5.tsName)}`
             );
+            selection.push(
+              {
+                key: column5.tsName,
+                field: column5.column
+              }
+            );
           }
           return columnIdentifiers.length ? sql.join(columnIdentifiers, sql`, `) : void 0;
         })() : this.unwrapAllColumns(table5, selection));
@@ -38565,7 +38606,8 @@ var init_dialect3 = __esm({
         relationWhere,
         mode,
         errorPath,
-        depth
+        depth,
+        isNested
       }) {
         const selection = [];
         const isSingle = mode === "first";
@@ -38599,7 +38641,7 @@ var init_dialect3 = __esm({
                   key: k,
                   field: relation2
                 });
-                return sql`, lateral(${query2}) as ${sql.identifier(k)}`;
+                return sql` left join lateral (${query2}) as ${sql.identifier(k)} on true`;
               }
               const relation = tableConfig.relations[k];
               const isSingle2 = is(relation, One);
@@ -38615,19 +38657,21 @@ var init_dialect3 = __esm({
                 tables,
                 relationWhere: relationFilter,
                 errorPath: `${currentPath.length ? `${currentPath}.` : ""}${k}`,
-                depth: currentDepth + 1
+                depth: currentDepth + 1,
+                isNested: true
               });
               selection.push({
                 field: targetTable,
                 key: k,
                 selection: innerQuery.selection,
-                isArray: !isSingle2
+                isArray: !isSingle2,
+                isOptional: (relation.optional ?? false) || join !== true && !!join.where
               });
               const jsonColumns = sql.join(
                 innerQuery.selection.map((s) => sql`${sql.raw(this.escapeString(s.key))}, ${sql.identifier(s.key)}`),
                 sql`, `
               );
-              return sql`, lateral(select ${isSingle2 ? sql`json_object(${jsonColumns}) as ${sql.identifier("r")}` : sql`coalesce(json_arrayagg(json_object(${jsonColumns})), json_array()) as ${sql.identifier("r")}`} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)}`;
+              return sql` left join lateral(select ${sql`${isSingle2 ? sql`json_object(${jsonColumns})` : sql`coalesce(json_arrayagg(json_object(${jsonColumns})), json_array())`} as ${sql.identifier("r")}`} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)} on true`;
             })
           );
         })() : void 0;
@@ -38638,6 +38682,9 @@ var init_dialect3 = __esm({
             message: `No fields selected for table "${tableConfig.tsName}"${currentPath ? ` ("${currentPath}")` : ""}`
           });
         }
+        if (isNested && order) {
+          selectionArr.push(sql`row_number() over (order by ${order})`);
+        }
         const selectionSet = sql.join(selectionArr, sql`, `);
         const query = sql`select ${selectionSet} from ${table5[IsAlias] ? sql`${sql`${sql.identifier(table5[Schema] ?? "")}.`.if(table5[Schema])}${sql.identifier(table5[OriginalName])} as ${table5}` : table5}${sql`${joins}`.if(joins)}${sql` where ${where}`.if(where)}${sql` order by ${order}`.if(order)}${sql` limit ${limit}`.if(limit !== void 0)}${sql` offset ${offset}`.if(offset !== void 0)}`;
         return {

package/api.mjs

@@ -24842,24 +24842,40 @@ var init_primary_keys = __esm({
 function getOrderByOperators() {
   return orderByOperators;
 }
-function mapRelationalRow(row, buildQueryResultSelection, mapColumnValue = (value) => value, parseJson = false) {
+function mapRelationalRow(row, buildQueryResultSelection, mapColumnValue = (value) => value, parseJson = false, path2) {
   for (const selectionItem of buildQueryResultSelection) {
     const field = selectionItem.field;
     if (is(field, Table2)) {
-      if (row[selectionItem.key] === null)
+      const currentPath = `${path2 ? `${path2}.` : ""}${selectionItem.key}`;
+      if (row[selectionItem.key] === null) {
+        if (!selectionItem.isOptional) {
+          throw new DrizzleError({
+            message: `Unexpected null in relational query result on field "${currentPath}".
+Did you forget to mark relation as optional?`
+          });
+        }
         continue;
+      }
       if (parseJson)
         row[selectionItem.key] = JSON.parse(row[selectionItem.key]);
       if (selectionItem.isArray) {
         for (const item of row[selectionItem.key]) {
-          mapRelationalRow(item, selectionItem.selection, mapColumnValue);
+          mapRelationalRow(
+            item,
+            selectionItem.selection,
+            mapColumnValue,
+            false,
+            currentPath
+          );
         }
         continue;
       }
       mapRelationalRow(
         row[selectionItem.key],
         selectionItem.selection,
-        mapColumnValue
+        mapColumnValue,
+        false,
+        currentPath
       );
       continue;
     }
@@ -24910,7 +24926,7 @@ function defineRelations(schema5, relations) {
   );
 }
 function relationsFieldFilterToSQL(column5, filter2) {
-  if (typeof filter2 !== "object" || is(filter2, Placeholder))
+  if (typeof filter2 !== "object")
     return eq(column5, filter2);
   const entries = Object.entries(filter2);
   if (!entries.length)
@@ -24937,6 +24953,21 @@ function relationsFieldFilterToSQL(column5, filter2) {
         );
         continue;
       }
+      case "isNotNull":
+      case "isNull": {
+        if (!value)
+          continue;
+        parts.push(operators[target](column5));
+        continue;
+      }
+      case "in": {
+        parts.push(operators.inArray(column5, value));
+        continue;
+      }
+      case "notIn": {
+        parts.push(operators.notInArray(column5, value));
+        continue;
+      }
       default: {
         parts.push(
           operators[target](
@@ -25053,6 +25084,7 @@ var init_relations = __esm({
     init_table();
     init_column();
     init_entity();
+    init_errors();
     init_primary_keys();
     init_expressions();
     init_sql();
@@ -25252,7 +25284,8 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
         if (!this.query) {
           if (!this.table)
             throw new Error("Table must be set before building aggregate field");
-          this.query = sql`select count(*) as ${sql.identifier("r")} from ${this.table}`.mapWith(Number);
+          const table5 = this.table;
+          this.query = sql`select count(*) as ${sql.identifier("r")} from ${table5[IsAlias] ? sql`${sql`${sql.identifier(table5[Schema] ?? "")}.`.if(table5[Schema])}${sql.identifier(table5[OriginalName])} as ${table5}` : table5}`.mapWith(Number);
         }
         return this.query;
       }
@@ -25313,7 +25346,7 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
       }
       through(column5) {
         this._.through = column5;
-        return this;
+        throw new Error("Not implemented");
       }
       getSQL() {
         return this._.column.getSQL();
@@ -26076,7 +26109,7 @@ var init_dialect = __esm({
             sql`, `
           );
         });
-        __publicField(this, "buildColumns", (table5, tableConfig, selection, config) => config?.columns ? (() => {
+        __publicField(this, "buildColumns", (table5, selection, config) => config?.columns ? (() => {
           const entries = Object.entries(config.columns);
           const columnIdentifiers = [];
           let colSelectionMode;
@@ -26734,7 +26767,7 @@ var init_dialect = __esm({
         const offset = params?.offset;
         const where = params?.where && relationWhere ? and(relationsFilterToSQL(table5, params.where), relationWhere) : params?.where ? relationsFilterToSQL(table5, params.where) : relationWhere;
         const order = params?.orderBy ? relationsOrderToSQL(table5, params.orderBy) : void 0;
-        const columns = this.buildColumns(table5, tableConfig, selection, params);
+        const columns = this.buildColumns(table5, selection, params);
         const extras = params?.extras ? relationExtrasToSQL(table5, params.extras) : void 0;
         if (extras)
           selection.push(...extras.selection);
@@ -26782,7 +26815,8 @@ var init_dialect = __esm({
                 field: targetTable,
                 key: k,
                 selection: innerQuery.selection,
-                isArray: !isSingle2
+                isArray: !isSingle2,
+                isOptional: (relation.optional ?? false) || join !== true && !!join.where
               });
               return sql`left join lateral(select ${isSingle2 ? sql`row_to_json(${sql.identifier("t")}.*) ${sql.identifier("r")}` : sql`json_agg(row_to_json(${sql.identifier("t")}.*)) ${sql.identifier("r")}`} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)} on true`;
             }),
@@ -32838,7 +32872,7 @@ var init_dialect2 = __esm({
               }
               const relation = tableConfig.relations[k];
               const isSingle2 = is(relation, One);
-              const targetTable = relation.targetTable;
+              const targetTable = aliasedTable(relation.targetTable, `d${currentDepth + 1}`);
               const relationFilter = relationToSQL(relation, table5, targetTable);
               const innerQuery = this.buildRelationalQuery({
                 table: targetTable,
@@ -32857,7 +32891,8 @@ var init_dialect2 = __esm({
                 field: targetTable,
                 key: k,
                 selection: innerQuery.selection,
-                isArray: !isSingle2
+                isArray: !isSingle2,
+                isOptional: (relation.optional ?? false) || join !== true && !!join.where
               });
               const jsonColumns = sql.join(
                 innerQuery.selection.map((s) => {
@@ -37749,6 +37784,12 @@ var init_dialect3 = __esm({
             columnIdentifiers.push(
               sql`${table5[column5.tsName]} as ${sql.identifier(column5.tsName)}`
             );
+            selection.push(
+              {
+                key: column5.tsName,
+                field: column5.column
+              }
+            );
           }
           return columnIdentifiers.length ? sql.join(columnIdentifiers, sql`, `) : void 0;
         })() : this.unwrapAllColumns(table5, selection));
@@ -38570,7 +38611,8 @@ var init_dialect3 = __esm({
         relationWhere,
         mode,
         errorPath,
-        depth
+        depth,
+        isNested
       }) {
         const selection = [];
         const isSingle = mode === "first";
@@ -38604,7 +38646,7 @@ var init_dialect3 = __esm({
                   key: k,
                   field: relation2
                 });
-                return sql`, lateral(${query2}) as ${sql.identifier(k)}`;
+                return sql` left join lateral (${query2}) as ${sql.identifier(k)} on true`;
               }
               const relation = tableConfig.relations[k];
               const isSingle2 = is(relation, One);
@@ -38620,19 +38662,21 @@ var init_dialect3 = __esm({
                 tables,
                 relationWhere: relationFilter,
                 errorPath: `${currentPath.length ? `${currentPath}.` : ""}${k}`,
-                depth: currentDepth + 1
+                depth: currentDepth + 1,
+                isNested: true
               });
               selection.push({
                 field: targetTable,
                 key: k,
                 selection: innerQuery.selection,
-                isArray: !isSingle2
+                isArray: !isSingle2,
+                isOptional: (relation.optional ?? false) || join !== true && !!join.where
               });
               const jsonColumns = sql.join(
                 innerQuery.selection.map((s) => sql`${sql.raw(this.escapeString(s.key))}, ${sql.identifier(s.key)}`),
                 sql`, `
               );
-              return sql`, lateral(select ${isSingle2 ? sql`json_object(${jsonColumns}) as ${sql.identifier("r")}` : sql`coalesce(json_arrayagg(json_object(${jsonColumns})), json_array()) as ${sql.identifier("r")}`} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)}`;
+              return sql` left join lateral(select ${sql`${isSingle2 ? sql`json_object(${jsonColumns})` : sql`coalesce(json_arrayagg(json_object(${jsonColumns})), json_array())`} as ${sql.identifier("r")}`} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)} on true`;
             })
           );
         })() : void 0;
@@ -38643,6 +38687,9 @@ var init_dialect3 = __esm({
             message: `No fields selected for table "${tableConfig.tsName}"${currentPath ? ` ("${currentPath}")` : ""}`
           });
         }
+        if (isNested && order) {
+          selectionArr.push(sql`row_number() over (order by ${order})`);
+        }
         const selectionSet = sql.join(selectionArr, sql`, `);
         const query = sql`select ${selectionSet} from ${table5[IsAlias] ? sql`${sql`${sql.identifier(table5[Schema] ?? "")}.`.if(table5[Schema])}${sql.identifier(table5[OriginalName])} as ${table5}` : table5}${sql`${joins}`.if(joins)}${sql` where ${where}`.if(where)}${sql` order by ${order}`.if(order)}${sql` limit ${limit}`.if(limit !== void 0)}${sql` offset ${offset}`.if(offset !== void 0)}`;
         return {

package/bin.cjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-kit",
-	"version": "0.30.1-7db411e",
+	"version": "0.30.1-86fcd29",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",