Merge branch 'async'

diff --git a/lib/pq/Gateway/Table.php b/lib/pq/Gateway/Table.php
index e365e3772f836ce19a58bc8f2e7a788b07a4f4ee..2789963a35f2ee0ac38620820004a84d0979d35e 100644 (file)
--- a/lib/pq/Gateway/Table.php
+++ b/lib/pq/Gateway/Table.php
@@ -405,14 +405,26 @@ class Table implements \SplSubject
                        if (!($relation instanceof Table\Reference)) {
                                $relation = static::resolve($relation)->getRelation($this->getName());
                        }
-                       $query->write("JOIN", $relation->foreignTable)->write("ON");
-                       foreach ($relation as $key => $ref) {
-                               $query->criteria(
-                                       array(
-                                               "{$relation->referencedTable}.{$ref}=" => 
-                                                       new QueryExpr("{$relation->foreignTable}.{$key}")
-                                       )
-                               );
+                       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) {

diff --git a/tests/setup.inc b/tests/setup.inc
index ec2236bf19f9d0131bbf7ecf3dc6511311c72354..bdee9d3ac2da135ab436f61e7644b14ac4df6296 100644 (file)
--- a/tests/setup.inc
+++ b/tests/setup.inc
@@ -3,7 +3,7 @@
 ini_set("date.timezone", "UTC");
 ini_set("error_reporting", E_ALL);
 
-const PQ_TEST_DSN = "";
+define("PQ_TEST_DSN", getenv("PQ_TEST_DSN"));
 
 const PQ_TEST_SETUP_SQL = <<<SQL
        create extension if not exists hstore;