NTDB join reference edit, after making JOIN or calling ref() on Activ…

…eRow, it does lookup for foreign key column name in referenced table, not just primary key of referenced table
nette · Dec 30, 2015 · ec9ef62 · ec9ef62
1 parent 6dd5dda
commit ec9ef62
Show file tree

Hide file tree

Showing 4 changed files with 147 additions and 104 deletions.
diff --git a/src/Database/Conventions/DiscoveredConventions.php b/src/Database/Conventions/DiscoveredConventions.php
@@ -32,9 +32,15 @@ public function getPrimary($table)
 	}
 
 
+	public function getForeign($table, $key)
+	{
+		return $this->structure->getForeignKey($table, $key);
+	}
+
+
 	public function getHasManyReference($nsTable, $key)
 	{
-		$candidates = $columnCandidates = [];
+		$candidates = $columnCandidates = array();
 		$targets = $this->structure->getHasManyReference($nsTable);
 		$table = preg_replace('#^(.*\.)?(.*)$#', '$2', $nsTable);
 
@@ -46,13 +52,13 @@ public function getHasManyReference($nsTable, $key)
 
 			foreach ($targetColumns as $targetColumn) {
 				if (stripos($targetColumn, $table) !== FALSE) {
-					$columnCandidates[] = $candidate = [$targetNsTable, $targetColumn];
+					$columnCandidates[] = $candidate = array($targetNsTable, $targetColumn);
 					if (strcmp($targetTable, $key) === 0 || strcmp($targetNsTable, $key) === 0) {
 						return $candidate;
 					}
 				}
 
-				$candidates[] = [$targetTable, [$targetNsTable, $targetColumn]];
+				$candidates[] = array($targetTable, array($targetNsTable, $targetColumn));
 			}
 		}
 
@@ -86,8 +92,8 @@ public function getBelongsToReference($table, $key)
 		$tableColumns = $this->structure->getBelongsToReference($table);
 
 		foreach ($tableColumns as $column => $targetTable) {
-			if (stripos($column, $key) !== FALSE) {
-				return [$targetTable, $column];
+			if (stripos($column, $key) !== FALSE || stripos($targetTable, $key) !== FALSE) {	//@TODO not official code
+				return array($targetTable, $column);
 			}
 		}
 

diff --git a/src/Database/Structure.php b/src/Database/Structure.php
@@ -63,6 +63,19 @@ public function getPrimaryKey($table)
 		return $this->structure['primary'][$table];
 	}
 
+	//@NOTE not official code
+	//Get foreign keys by table and return local column name in referenced table.
+	//@TODO cache getForeignKeys($table) call
+	public function getForeignKey($table, $column)
+	{
+		foreach($this->connection->getSupplementalDriver()->getForeignKeys($table) as $row) {
+			if($row["local"] == $column) {
+				return $row["foreign"];
+			}
+		}
+
+		return NULL;
+	}
 
 	public function getPrimaryKeySequence($table)
 	{
@@ -105,7 +118,7 @@ public function getHasManyReference($table, $targetTable = NULL)
 
 		} else {
 			if (!isset($this->structure['hasMany'][$table])) {
-				return [];
+				return array();
 			}
 			return $this->structure['hasMany'][$table];
 		}
@@ -126,7 +139,7 @@ public function getBelongsToReference($table, $column = NULL)
 
 		} else {
 			if (!isset($this->structure['belongsTo'][$table])) {
-				return [];
+				return array();
 			}
 			return $this->structure['belongsTo'][$table];
 		}
@@ -152,7 +165,7 @@ protected function needStructure()
 			return;
 		}
 
-		$this->structure = $this->cache->load('structure', [$this, 'loadStructure']);
+		$this->structure = $this->cache->load('structure', array($this, 'loadStructure'));
 	}
 
 
@@ -163,7 +176,7 @@ public function loadStructure()
 	{
 		$driver = $this->connection->getSupplementalDriver();
 
-		$structure = [];
+		$structure = array();
 		$structure['tables'] = $driver->getTables();
 
 		foreach ($structure['tables'] as $tablePair) {
@@ -198,7 +211,7 @@ public function loadStructure()
 
 	protected function analyzePrimaryKey(array $columns)
 	{
-		$primary = [];
+		$primary = array();
 		foreach ($columns as $column) {
 			if ($column['primary']) {
 				$primary[] = $column['name'];