From f7f3ac76577d0fea27b399651ad9f280c8c59b6b Mon Sep 17 00:00:00 2001 From: Cameron Ball Date: Thu, 18 Dec 2014 23:36:45 +0800 Subject: [PATCH] Oversight. --- DataAccess/DataMapper/Helpers/AbstractPopulationHelper.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/DataAccess/DataMapper/Helpers/AbstractPopulationHelper.php b/DataAccess/DataMapper/Helpers/AbstractPopulationHelper.php index c7bc679..a2f1ea6 100644 --- a/DataAccess/DataMapper/Helpers/AbstractPopulationHelper.php +++ b/DataAccess/DataMapper/Helpers/AbstractPopulationHelper.php @@ -318,7 +318,7 @@ class AbstractPopulationHelper { //TODO: check if tables are the same and return a constant for that //echo '!!! ' . $tableA . ' needs ' . $nameB . ' : ' . $tableB . ' needs ' . $nameA . ' !!!
'; - + $dbName = $db->query('select database()')->fetchColumn(); if($tableA === $tableB) { return self::REFERENCE_SELF; @@ -326,7 +326,8 @@ class AbstractPopulationHelper // first look in table A for a reference to B $statement = $db->prepare(sprintf( - 'SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA`="divinelegy" AND `TABLE_NAME`="%s"', + 'SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA`="%s" AND `TABLE_NAME`="%s"', + $dbName, $tableA)); $statement->execute(); @@ -344,7 +345,8 @@ class AbstractPopulationHelper // now look in table b for a reference to a $statement = $db->prepare(sprintf( - 'SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA`="divinelegy" AND `TABLE_NAME`="%s"', + 'SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA`="%s" AND `TABLE_NAME`="%s"', + $dbName, $tableB)); $statement->execute(); -- 2.11.0