drizzle-kit 1.0.0-beta.1-94774b0 → 1.0.0-beta.1-34ee105

package/api.js

@@ -23568,37 +23568,65 @@ function processRelations(tablesConfig, tables) {
       if (!is(relation, Relation)) {
         continue;
       }
-      const relationPrintName = `relations -> ${tableConfig.name}: { ${relationFieldName}: r.${is(relation, One) ? "one" : "many"}.${relation.targetTableName}(...) }`;
-      if (typeof relation.alias === "string" && !relation.alias) {
+      let reverseRelation;
+      const {
+        targetTableName,
+        alias,
+        sourceColumns,
+        targetColumns,
+        throughTable,
+        sourceTable,
+        through,
+        targetTable,
+        where,
+        sourceColumnTableNames,
+        targetColumnTableNames
+      } = relation;
+      const relationPrintName = `relations -> ${tableConfig.name}: { ${relationFieldName}: r.${is(relation, One) ? "one" : "many"}.${targetTableName}(...) }`;
+      if (typeof alias === "string" && !alias) {
         throw new Error(`${relationPrintName}: "alias" cannot be an empty string - omit it if you don't need it`);
       }
-      if (relation.sourceColumns?.length === 0) {
-        throw new Error(`${relationPrintName}: "from" cannot be an empty array`);
+      if (sourceColumns?.length === 0) {
+        throw new Error(`${relationPrintName}: "from" cannot be empty`);
       }
-      if (relation.targetColumns?.length === 0) {
-        throw new Error(`${relationPrintName}: "to" cannot be an empty array`);
+      if (targetColumns?.length === 0) {
+        throw new Error(`${relationPrintName}: "to" cannot be empty`);
       }
-      if (relation.sourceColumns && relation.targetColumns) {
-        if (relation.sourceColumns.length !== relation.targetColumns.length && !relation.throughTable) {
+      if (sourceColumns && targetColumns) {
+        if (sourceColumns.length !== targetColumns.length && !throughTable) {
           throw new Error(
             `${relationPrintName}: "from" and "to" fields without "through" must have the same length`
           );
         }
-        if (relation.through) {
-          if (relation.through.source.length !== relation.sourceColumns.length || relation.through.target.length !== relation.targetColumns.length) {
+        for (const sName of sourceColumnTableNames) {
+          if (sName !== sourceTableName) {
+            throw new Error(
+              `${relationPrintName}: all "from" columns must belong to table "${sourceTableName}", found column of table "${sName}"`
+            );
+          }
+        }
+        for (const tName of targetColumnTableNames) {
+          if (tName !== targetTableName) {
+            throw new Error(
+              `${relationPrintName}: all "to" columns must belong to table "${targetTable}", found column of table "${tName}"`
+            );
+          }
+        }
+        if (through) {
+          if (through.source.length !== sourceColumns.length || through.target.length !== targetColumns.length) {
             throw new Error(
               `${relationPrintName}: ".through(column)" must be used either on all columns in "from" and "to" or not defined on any of them`
             );
           }
-          for (const column6 of relation.through.source) {
-            if (tables[column6._.tableName] !== relation.throughTable) {
+          for (const column6 of through.source) {
+            if (tables[column6._.tableName] !== throughTable) {
               throw new Error(
                 `${relationPrintName}: ".through(column)" must be used on the same table by all columns of the relation`
               );
             }
           }
-          for (const column6 of relation.through.target) {
-            if (tables[column6._.tableName] !== relation.throughTable) {
+          for (const column6 of through.target) {
+            if (tables[column6._.tableName] !== throughTable) {
               throw new Error(
                 `${relationPrintName}: ".through(column)" must be used on the same table by all columns of the relation`
               );
@@ -23607,54 +23635,52 @@ function processRelations(tablesConfig, tables) {
         }
         continue;
       }
-      if (relation.sourceColumns || relation.targetColumns) {
+      if (sourceColumns || targetColumns) {
         throw new Error(
           `${relationPrintName}: relation must have either both "from" and "to" defined, or none of them`
         );
       }
-      let reverseRelation;
-      const targetTableTsName = relation.targetTableName;
-      const reverseTableConfig = tablesConfig[targetTableTsName];
+      const reverseTableConfig = tablesConfig[targetTableName];
       if (!reverseTableConfig) {
         throw new Error(
-          `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and no reverse relations of table "${targetTableTsName}" were found"`
+          `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and no reverse relations of table "${targetTableName}" were found"`
         );
       }
-      if (relation.alias) {
+      if (alias) {
         const reverseRelations = Object.values(reverseTableConfig.relations).filter(
-          (it) => is(it, Relation) && it.alias === relation.alias && it !== relation
+          (it) => is(it, Relation) && it.alias === alias && it !== relation
         );
         if (reverseRelations.length > 1) {
           throw new Error(
-            `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and multiple relations with alias "${relation.alias}" found in table "${targetTableTsName}": ${reverseRelations.map((it) => `"${it.fieldName}"`).join(", ")}`
+            `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and multiple relations with alias "${alias}" found in table "${targetTableName}": ${reverseRelations.map((it) => `"${it.fieldName}"`).join(", ")}`
           );
         }
         reverseRelation = reverseRelations[0];
         if (!reverseRelation) {
           throw new Error(
-            `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and there is no reverse relation of table "${targetTableTsName}" with alias "${relation.alias}"`
+            `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and there is no reverse relation of table "${targetTableName}" with alias "${alias}"`
           );
         }
       } else {
         const reverseRelations = Object.values(reverseTableConfig.relations).filter(
-          (it) => is(it, Relation) && it.targetTable === relation.sourceTable && !it.alias && it !== relation
+          (it) => is(it, Relation) && it.targetTable === sourceTable && !it.alias && it !== relation
         );
         if (reverseRelations.length > 1) {
           throw new Error(
-            `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and multiple relations between "${targetTableTsName}" and "${sourceTableName}" were found.
+            `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and multiple relations between "${targetTableName}" and "${sourceTableName}" were found.
 Hint: you can specify "alias" on both sides of the relation with the same value`
           );
         }
         reverseRelation = reverseRelations[0];
         if (!reverseRelation) {
           throw new Error(
-            `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and no reverse relation of table "${targetTableTsName}" with target table "${sourceTableName}" was found`
+            `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and no reverse relation of table "${targetTableName}" with target table "${sourceTableName}" was found`
           );
         }
       }
       if (!reverseRelation.sourceColumns || !reverseRelation.targetColumns) {
         throw new Error(
-          `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and reverse relation "${targetTableTsName}.${reverseRelation.fieldName}" does not have "from"/"to" defined`
+          `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and reverse relation "${targetTableName}.${reverseRelation.fieldName}" does not have "from"/"to" defined`
         );
       }
       relation.sourceColumns = reverseRelation.targetColumns;
@@ -23664,8 +23690,8 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
         target: reverseRelation.through.source
       } : void 0;
       relation.throughTable = reverseRelation.throughTable;
-      relation.isReversed = !relation.where;
-      relation.where = relation.where ?? reverseRelation.where;
+      relation.isReversed = !where;
+      relation.where = where ?? reverseRelation.where;
     }
   }
   return tablesConfig;
@@ -24025,6 +24051,10 @@ var init_relations = __esm({
         __publicField(this, "through");
         __publicField(this, "throughTable");
         __publicField(this, "isReversed");
+        /** @internal */
+        __publicField(this, "sourceColumnTableNames", []);
+        /** @internal */
+        __publicField(this, "targetColumnTableNames", []);
         this.targetTableName = targetTableName;
         this.targetTable = targetTable;
       }
@@ -24040,12 +24070,14 @@ var init_relations = __esm({
         if (config?.from) {
           this.sourceColumns = (Array.isArray(config.from) ? config.from : [config.from]).map((it) => {
             this.throughTable ??= it._.through ? tables[it._.through._.tableName] : void 0;
+            this.sourceColumnTableNames.push(it._.tableName);
             return it._.column;
           });
         }
         if (config?.to) {
           this.targetColumns = (Array.isArray(config.to) ? config.to : [config.to]).map((it) => {
             this.throughTable ??= it._.through ? tables[it._.through._.tableName] : void 0;
+            this.targetColumnTableNames.push(it._.tableName);
             return it._.column;
           });
         }
@@ -24069,12 +24101,14 @@ var init_relations = __esm({
         if (config?.from) {
           this.sourceColumns = (Array.isArray(config.from) ? config.from : [config.from]).map((it) => {
             this.throughTable ??= it._.through ? tables[it._.through._.tableName] : void 0;
+            this.sourceColumnTableNames.push(it._.tableName);
             return it._.column;
           });
         }
         if (config?.to) {
           this.targetColumns = (Array.isArray(config.to) ? config.to : [config.to]).map((it) => {
             this.throughTable ??= it._.through ? tables[it._.through._.tableName] : void 0;
+            this.targetColumnTableNames.push(it._.tableName);
             return it._.column;
           });
         }

package/api.mjs

@@ -23573,37 +23573,65 @@ function processRelations(tablesConfig, tables) {
       if (!is(relation, Relation)) {
         continue;
       }
-      const relationPrintName = `relations -> ${tableConfig.name}: { ${relationFieldName}: r.${is(relation, One) ? "one" : "many"}.${relation.targetTableName}(...) }`;
-      if (typeof relation.alias === "string" && !relation.alias) {
+      let reverseRelation;
+      const {
+        targetTableName,
+        alias,
+        sourceColumns,
+        targetColumns,
+        throughTable,
+        sourceTable,
+        through,
+        targetTable,
+        where,
+        sourceColumnTableNames,
+        targetColumnTableNames
+      } = relation;
+      const relationPrintName = `relations -> ${tableConfig.name}: { ${relationFieldName}: r.${is(relation, One) ? "one" : "many"}.${targetTableName}(...) }`;
+      if (typeof alias === "string" && !alias) {
         throw new Error(`${relationPrintName}: "alias" cannot be an empty string - omit it if you don't need it`);
       }
-      if (relation.sourceColumns?.length === 0) {
-        throw new Error(`${relationPrintName}: "from" cannot be an empty array`);
+      if (sourceColumns?.length === 0) {
+        throw new Error(`${relationPrintName}: "from" cannot be empty`);
       }
-      if (relation.targetColumns?.length === 0) {
-        throw new Error(`${relationPrintName}: "to" cannot be an empty array`);
+      if (targetColumns?.length === 0) {
+        throw new Error(`${relationPrintName}: "to" cannot be empty`);
       }
-      if (relation.sourceColumns && relation.targetColumns) {
-        if (relation.sourceColumns.length !== relation.targetColumns.length && !relation.throughTable) {
+      if (sourceColumns && targetColumns) {
+        if (sourceColumns.length !== targetColumns.length && !throughTable) {
           throw new Error(
             `${relationPrintName}: "from" and "to" fields without "through" must have the same length`
           );
         }
-        if (relation.through) {
-          if (relation.through.source.length !== relation.sourceColumns.length || relation.through.target.length !== relation.targetColumns.length) {
+        for (const sName of sourceColumnTableNames) {
+          if (sName !== sourceTableName) {
+            throw new Error(
+              `${relationPrintName}: all "from" columns must belong to table "${sourceTableName}", found column of table "${sName}"`
+            );
+          }
+        }
+        for (const tName of targetColumnTableNames) {
+          if (tName !== targetTableName) {
+            throw new Error(
+              `${relationPrintName}: all "to" columns must belong to table "${targetTable}", found column of table "${tName}"`
+            );
+          }
+        }
+        if (through) {
+          if (through.source.length !== sourceColumns.length || through.target.length !== targetColumns.length) {
             throw new Error(
               `${relationPrintName}: ".through(column)" must be used either on all columns in "from" and "to" or not defined on any of them`
             );
           }
-          for (const column6 of relation.through.source) {
-            if (tables[column6._.tableName] !== relation.throughTable) {
+          for (const column6 of through.source) {
+            if (tables[column6._.tableName] !== throughTable) {
               throw new Error(
                 `${relationPrintName}: ".through(column)" must be used on the same table by all columns of the relation`
               );
             }
           }
-          for (const column6 of relation.through.target) {
-            if (tables[column6._.tableName] !== relation.throughTable) {
+          for (const column6 of through.target) {
+            if (tables[column6._.tableName] !== throughTable) {
               throw new Error(
                 `${relationPrintName}: ".through(column)" must be used on the same table by all columns of the relation`
               );
@@ -23612,54 +23640,52 @@ function processRelations(tablesConfig, tables) {
         }
         continue;
       }
-      if (relation.sourceColumns || relation.targetColumns) {
+      if (sourceColumns || targetColumns) {
         throw new Error(
           `${relationPrintName}: relation must have either both "from" and "to" defined, or none of them`
         );
       }
-      let reverseRelation;
-      const targetTableTsName = relation.targetTableName;
-      const reverseTableConfig = tablesConfig[targetTableTsName];
+      const reverseTableConfig = tablesConfig[targetTableName];
       if (!reverseTableConfig) {
         throw new Error(
-          `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and no reverse relations of table "${targetTableTsName}" were found"`
+          `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and no reverse relations of table "${targetTableName}" were found"`
         );
       }
-      if (relation.alias) {
+      if (alias) {
         const reverseRelations = Object.values(reverseTableConfig.relations).filter(
-          (it) => is(it, Relation) && it.alias === relation.alias && it !== relation
+          (it) => is(it, Relation) && it.alias === alias && it !== relation
         );
         if (reverseRelations.length > 1) {
           throw new Error(
-            `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and multiple relations with alias "${relation.alias}" found in table "${targetTableTsName}": ${reverseRelations.map((it) => `"${it.fieldName}"`).join(", ")}`
+            `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and multiple relations with alias "${alias}" found in table "${targetTableName}": ${reverseRelations.map((it) => `"${it.fieldName}"`).join(", ")}`
           );
         }
         reverseRelation = reverseRelations[0];
         if (!reverseRelation) {
           throw new Error(
-            `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and there is no reverse relation of table "${targetTableTsName}" with alias "${relation.alias}"`
+            `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and there is no reverse relation of table "${targetTableName}" with alias "${alias}"`
           );
         }
       } else {
         const reverseRelations = Object.values(reverseTableConfig.relations).filter(
-          (it) => is(it, Relation) && it.targetTable === relation.sourceTable && !it.alias && it !== relation
+          (it) => is(it, Relation) && it.targetTable === sourceTable && !it.alias && it !== relation
         );
         if (reverseRelations.length > 1) {
           throw new Error(
-            `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and multiple relations between "${targetTableTsName}" and "${sourceTableName}" were found.
+            `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and multiple relations between "${targetTableName}" and "${sourceTableName}" were found.
 Hint: you can specify "alias" on both sides of the relation with the same value`
           );
         }
         reverseRelation = reverseRelations[0];
         if (!reverseRelation) {
           throw new Error(
-            `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and no reverse relation of table "${targetTableTsName}" with target table "${sourceTableName}" was found`
+            `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and no reverse relation of table "${targetTableName}" with target table "${sourceTableName}" was found`
           );
         }
       }
       if (!reverseRelation.sourceColumns || !reverseRelation.targetColumns) {
         throw new Error(
-          `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and reverse relation "${targetTableTsName}.${reverseRelation.fieldName}" does not have "from"/"to" defined`
+          `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and reverse relation "${targetTableName}.${reverseRelation.fieldName}" does not have "from"/"to" defined`
         );
       }
       relation.sourceColumns = reverseRelation.targetColumns;
@@ -23669,8 +23695,8 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
         target: reverseRelation.through.source
       } : void 0;
       relation.throughTable = reverseRelation.throughTable;
-      relation.isReversed = !relation.where;
-      relation.where = relation.where ?? reverseRelation.where;
+      relation.isReversed = !where;
+      relation.where = where ?? reverseRelation.where;
     }
   }
   return tablesConfig;
@@ -24030,6 +24056,10 @@ var init_relations = __esm({
         __publicField(this, "through");
         __publicField(this, "throughTable");
         __publicField(this, "isReversed");
+        /** @internal */
+        __publicField(this, "sourceColumnTableNames", []);
+        /** @internal */
+        __publicField(this, "targetColumnTableNames", []);
         this.targetTableName = targetTableName;
         this.targetTable = targetTable;
       }
@@ -24045,12 +24075,14 @@ var init_relations = __esm({
         if (config?.from) {
           this.sourceColumns = (Array.isArray(config.from) ? config.from : [config.from]).map((it) => {
             this.throughTable ??= it._.through ? tables[it._.through._.tableName] : void 0;
+            this.sourceColumnTableNames.push(it._.tableName);
             return it._.column;
           });
         }
         if (config?.to) {
           this.targetColumns = (Array.isArray(config.to) ? config.to : [config.to]).map((it) => {
             this.throughTable ??= it._.through ? tables[it._.through._.tableName] : void 0;
+            this.targetColumnTableNames.push(it._.tableName);
             return it._.column;
           });
         }
@@ -24074,12 +24106,14 @@ var init_relations = __esm({
         if (config?.from) {
           this.sourceColumns = (Array.isArray(config.from) ? config.from : [config.from]).map((it) => {
             this.throughTable ??= it._.through ? tables[it._.through._.tableName] : void 0;
+            this.sourceColumnTableNames.push(it._.tableName);
             return it._.column;
           });
         }
         if (config?.to) {
           this.targetColumns = (Array.isArray(config.to) ? config.to : [config.to]).map((it) => {
             this.throughTable ??= it._.through ? tables[it._.through._.tableName] : void 0;
+            this.targetColumnTableNames.push(it._.tableName);
             return it._.column;
           });
         }

package/bin.cjs

@@ -93920,7 +93920,7 @@ init_utils5();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "1.0.0-beta.1-94774b0";
+  const envVersion = "1.0.0-beta.1-34ee105";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-kit",
-	"version": "1.0.0-beta.1-94774b0",
+	"version": "1.0.0-beta.1-34ee105",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",