fix relation handling when source table equals foreign table

[m6w6/pq-gateway] / lib / pq / Gateway / Table.php

diff --git a/lib/pq/Gateway/Table.php b/lib/pq/Gateway/Table.php
index 472d0038008a129184d6815ea232e75dc14fcadd..2789963a35f2ee0ac38620820004a84d0979d35e 100644 (file)
--- a/lib/pq/Gateway/Table.php
+++ b/lib/pq/Gateway/Table.php
@@ -360,10 +360,12 @@ class Table implements \SplSubject
                        return $this->onResult(null);
                }
                
-               return $this->find(
-                       array($rel->foreignColumn . "=" => $foreign->{$rel->referencedColumn}),
-                       $order, $limit, $offset
-               );
+               $where = array();
+               foreach ($rel as $key => $ref) {
+                       $where["$key="] = $foreign->$ref;
+               }
+               
+               return $this->find($where, $order, $limit, $offset);
        }
        
        /**
@@ -379,9 +381,11 @@ class Table implements \SplSubject
                        return $this->onResult(null);
                }
                
-               return $this->find(
-                       array($rel->referencedColumn . "=" => $foreign->{$rel->foreignColumn})
-               );
+               $where = array();
+               foreach ($rel as $key => $ref) {
+                       $where["$ref="] = $foreign->$key;
+               }
+               return $this->find($where);
        }
        
        /**
@@ -401,12 +405,27 @@ class Table implements \SplSubject
                        if (!($relation instanceof Table\Reference)) {
                                $relation = static::resolve($relation)->getRelation($this->getName());
                        }
-                       $query->write("JOIN", $relation->foreignTable)->write("ON")->criteria(
-                               array(
-                                       "{$relation->referencedTable}.{$relation->referencedColumn}=" => 
-                                               new QueryExpr("{$relation->foreignTable}.{$relation->foreignColumn}")
-                               )
-                       );
+                       if ($this->getName() === $relation->foreignTable) {
+                               $query->write("JOIN", $relation->referencedTable)->write("ON");
+                               foreach ($relation as $key => $ref) {
+                                       $query->criteria(
+                                               array(
+                                                       "{$relation->referencedTable}.{$ref}=" => 
+                                                               new QueryExpr("{$relation->foreignTable}.{$key}")
+                                               )
+                                       );
+                               }
+                       } else {
+                               $query->write("JOIN", $relation->foreignTable)->write("ON");
+                               foreach ($relation as $key => $ref) {
+                                       $query->criteria(
+                                               array(
+                                                       "{$relation->referencedTable}.{$ref}=" => 
+                                                               new QueryExpr("{$relation->foreignTable}.{$key}")
+                                               )
+                                       );
+                               }
+                       }
                }
                if ($where) {
                        $query->write("WHERE")->criteria($where);