orchid-orm 1.31.1 → 1.31.3

package/dist/index.mjs

@@ -299,8 +299,8 @@ class BelongsToVirtualColumn extends VirtualColumn {
   }
 }
 const makeBelongsToMethod = (relation, relationName, query) => {
-  const primaryKeys = "columns" in relation.options ? relation.options.references : [relation.options.primaryKey];
-  const foreignKeys = "columns" in relation.options ? relation.options.columns : [relation.options.foreignKey];
+  const primaryKeys = relation.options.references;
+  const foreignKeys = relation.options.columns;
   const len = primaryKeys.length;
   const state = { query, primaryKeys, foreignKeys, len };
   const makeWhere = relationWhere(len, primaryKeys, foreignKeys);
@@ -617,8 +617,8 @@ const makeHasOneMethod = (table, relation, relationName, query) => {
       reverseJoin: reverseJoin2
     };
   }
-  const primaryKeys = "columns" in relation.options ? relation.options.columns : [relation.options.primaryKey];
-  const foreignKeys = "columns" in relation.options ? relation.options.references : [relation.options.foreignKey];
+  const primaryKeys = relation.options.columns;
+  const foreignKeys = relation.options.references;
   const state = { query, primaryKeys, foreignKeys };
   const len = primaryKeys.length;
   const reversedOn = {};
@@ -879,8 +879,8 @@ const makeHasManyMethod = (table, relation, relationName, query) => {
       reverseJoin: reverseJoin2
     };
   }
-  const primaryKeys = "columns" in relation.options ? relation.options.columns : [relation.options.primaryKey];
-  const foreignKeys = "columns" in relation.options ? relation.options.references : [relation.options.foreignKey];
+  const primaryKeys = relation.options.columns;
+  const foreignKeys = relation.options.references;
   const state = { query, primaryKeys, foreignKeys };
   const len = primaryKeys.length;
   const reversedOn = {};
@@ -977,7 +977,10 @@ const nestedInsert$1 = ({ query, primaryKeys, foreignKeys }) => {
             obj[foreignKeys[i2]] = selfData[primaryKeys[i2]];
           }
           queries.push(
-            _queryUpdate(t.where(item.where), obj)
+            _queryUpdate(
+              t.where(item.where),
+              obj
+            )
           );
         }
       }
@@ -1147,25 +1150,12 @@ const removeColumnName = (column) => {
   return cloned;
 };
 const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query) => {
-  let primaryKeys;
-  let foreignKeys;
-  let joinTable;
-  let throughForeignKeys;
-  let throughPrimaryKeys;
   const { options } = relation;
-  if ("columns" in options) {
-    primaryKeys = options.columns;
-    foreignKeys = options.references;
-    joinTable = options.through.table;
-    throughForeignKeys = options.through.columns;
-    throughPrimaryKeys = options.through.references;
-  } else {
-    primaryKeys = [options.primaryKey];
-    foreignKeys = [options.foreignKey];
-    joinTable = options.joinTable;
-    throughForeignKeys = [options.associationForeignKey];
-    throughPrimaryKeys = [options.associationPrimaryKey];
-  }
+  const primaryKeys = options.columns;
+  const foreignKeys = options.references;
+  const joinTable = options.through.table;
+  const throughForeignKeys = options.through.columns;
+  const throughPrimaryKeys = options.through.references;
   const { snakeCase } = table.internal;
   const foreignKeysFull = foreignKeys.map((key, i) => {
     if (snakeCase)