Add table prefixes in the MANY_TO_MANY query, including using the 'through'

table instead of the target table.

diff --git a/framework/Rdo/lib/Horde/Rdo/Base.php b/framework/Rdo/lib/Horde/Rdo/Base.php
index a905a1c..be8bfc6 100644 (file)
--- a/framework/Rdo/lib/Horde/Rdo/Base.php
+++ b/framework/Rdo/lib/Horde/Rdo/Base.php
@@ -130,11 +130,10 @@ abstract class Horde_Rdo_Base implements IteratorAggregate {
             $key = $mapper->primaryKey;
             $query = new Horde_Rdo_Query();
             $on = isset($rel['on']) ? $rel['on'] : $m->primaryKey;
-            var_dump($key, array($on => new Horde_Rdo_Query_Literal($on), $key => $this->$key));
             $query->addRelationship($field, array('mapper' => $mapper,
                                                   'table' => $rel['through'],
                                                   'type' => Horde_Rdo::MANY_TO_MANY,
-                                                  'query' => array($on => new Horde_Rdo_Query_Literal($on), $key => $this->$key)));
+                                                  'query' => array("$m->table.$on" => new Horde_Rdo_Query_Literal($rel['through'] . '.' . $on), $key => $this->$key)));
             $this->_fields[$field] = $m->find($query);
             break;
         }