Closes #43: Equality expression not reversible in OneToMany

squeryl · Jan 21, 2011 · 8235eee · 8235eee
1 parent 9dec46f
commit 8235eee
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/src/main/scala/org/squeryl/dsl/QueryDsl.scala b/src/main/scala/org/squeryl/dsl/QueryDsl.scala
@@ -322,23 +322,10 @@ trait QueryDsl
         _.selectElement.origin.asInstanceOf[ViewExpressionNode[_]].view == v
       ).headOption != None
 
-    /**
-     * returns a (FieldMetaData, FieldMetaData) where ._1 is the id of the KeyedEntity on the left or right side,
-     * and where ._2 is the foreign key of the association object/table
-     */
-    private def _splitEquality(ee: EqualityExpression) =
-      if(ee.left._fieldMetaData.parentMetaData.clasz == aClass) {
-        assert(ee.right._fieldMetaData.isIdFieldOfKeyedEntity)
-        (ee.right._fieldMetaData, ee.left._fieldMetaData)
-      }
-      else {
-        assert(ee.left._fieldMetaData.isIdFieldOfKeyedEntity)
-        (ee.left._fieldMetaData, ee.right._fieldMetaData)
-      }
 
-    private val (leftPkFmd, leftFkFmd) = _splitEquality(_leftEqualityExpr)
+    private val (leftPkFmd, leftFkFmd) = _splitEquality(_leftEqualityExpr, thisTable)
 
-    private val (rightPkFmd, rightFkFmd) = _splitEquality(_rightEqualityExpr)
+    private val (rightPkFmd, rightFkFmd) = _splitEquality(_rightEqualityExpr, thisTable)
 
     val leftForeignKeyDeclaration =
       schema._createForeignKeyDeclaration(leftFkFmd.columnName, leftPkFmd.columnName)
@@ -526,8 +513,7 @@ trait QueryDsl
       //that refer to FieldSelectElement, who in turn refer to the FieldMetaData
 
       // now the Tuple with the left and right FieldMetaData 
-      (ee_.left.asInstanceOf[SelectElementReference[_]].selectElement.asInstanceOf[FieldSelectElement].fieldMataData,
-       ee_.right.asInstanceOf[SelectElementReference[_]].selectElement.asInstanceOf[FieldSelectElement].fieldMataData)
+      _splitEquality(ee.get, rightTable)
     }
 
     val foreignKeyDeclaration =
@@ -577,6 +563,20 @@ trait QueryDsl
     }
   }
 
+  /**
+   * returns a (FieldMetaData, FieldMetaData) where ._1 is the id of the KeyedEntity on the left or right side,
+   * and where ._2 is the foreign key of the association object/table
+   */
+  private def _splitEquality(ee: EqualityExpression, rightTable: Table[_]) =
+    if(ee.left._fieldMetaData.parentMetaData.clasz == rightTable.classOfT) {
+      assert(ee.right._fieldMetaData.isIdFieldOfKeyedEntity)
+      (ee.right._fieldMetaData, ee.left._fieldMetaData)
+    }
+    else {
+      assert(ee.left._fieldMetaData.isIdFieldOfKeyedEntity)
+      (ee.left._fieldMetaData, ee.right._fieldMetaData)
+    }
+
   // Composite key syntactic sugar :
 
   def compositeKey[A1,A2](a1: A1, a2: A2) =

diff --git a/src/test/scala/org/squeryl/tests/mutablerelations/SchoolDbMutableRelations.scala b/src/test/scala/org/squeryl/tests/mutablerelations/SchoolDbMutableRelations.scala
@@ -59,15 +59,15 @@ object SchoolDb2 extends Schema {
 
   val courseAssignments =
     manyToManyRelation(professors, courses).
-    via[CourseAssignment]((p,c,a) => (p.id === a.professorId, a.courseId === c.id))
+    via[CourseAssignment]((p,c,a) => (a.professorId === p.id, a.courseId === c.id))
 
   val courseSubscriptions =
     manyToManyRelation(courses, students).
     via[CourseSubscription]((c,s,cs) => (cs.studentId === s.id, c.id === cs.courseId))
 
   val subjectToCourses =
     oneToManyRelation(subjects, courses).
-    via((s,c) => s.id === c.subjectId)
+    via((s,c) => c.subjectId === s.id)
 
   // the default constraint for all foreign keys in this schema :
   override def applyDefaultForeignKeyPolicy(foreignKeyDeclaration: ForeignKeyDeclaration) =