Oversight.

diff --git a/DataAccess/DataMapper/Helpers/AbstractPopulationHelper.php b/DataAccess/DataMapper/Helpers/AbstractPopulationHelper.php
index c7bc679..a2f1ea6 100644 (file)
--- a/DataAccess/DataMapper/Helpers/AbstractPopulationHelper.php
+++ b/DataAccess/DataMapper/Helpers/AbstractPopulationHelper.php
@@ -318,7 +318,7 @@ class AbstractPopulationHelper
     {\r
         //TODO: check if tables are the same and return a constant for that\r
         //echo '!!! ' . $tableA . ' needs ' . $nameB . ' : ' . $tableB . ' needs ' . $nameA . ' !!!<br />';\r
-                \r
+        $dbName = $db->query('select database()')->fetchColumn();\r
         if($tableA === $tableB)\r
         {\r
             return self::REFERENCE_SELF;\r
@@ -326,7 +326,8 @@ class AbstractPopulationHelper
         \r
         // first look in table A for a reference to B\r
         $statement = $db->prepare(sprintf(\r
-            'SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA`="divinelegy" AND `TABLE_NAME`="%s"',\r
+            'SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA`="%s" AND `TABLE_NAME`="%s"',\r
+            $dbName,\r
             $tableA));\r
 \r
         $statement->execute();\r
@@ -344,7 +345,8 @@ class AbstractPopulationHelper
         \r
         // now look in table b for a reference to a\r
         $statement = $db->prepare(sprintf(\r
-            'SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA`="divinelegy" AND `TABLE_NAME`="%s"',\r
+            'SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA`="%s" AND `TABLE_NAME`="%s"',\r
+            $dbName,\r
             $tableB));\r
 \r
         $statement->execute();\r