drivers: removed historical code in getForeignKeys() also [Closes #281]

nette · Jan 19, 2022 · 2664573 · 2664573
1 parent 24d46ec
commit 2664573
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 23 deletions.
diff --git a/src/Database/Drivers/MsSqlDriver.php b/src/Database/Drivers/MsSqlDriver.php
@@ -198,14 +198,16 @@ public function getForeignKeys(string $table): array
 			WHERE
 				tab1.name = {$this->connection->quote($table_name)}";
 
-		foreach ($this->connection->query($query) as $id => $row) {
-			$keys[$id]['name'] = $row['fk_name'];
-			$keys[$id]['local'] = $row['column'];
-			$keys[$id]['table'] = $table_schema . '.' . $row['referenced_table'];
-			$keys[$id]['foreign'] = $row['referenced_column'];
+		foreach ($this->connection->query($query) as $row) {
+			$keys[] = [
+				'name' => $row['fk_name'],
+				'local' => $row['column'],
+				'table' => $table_schema . '.' . $row['referenced_table'],
+				'foreign' => $row['referenced_column'],
+			];
 		}
 
-		return array_values($keys);
+		return $keys;
 	}
 
 

diff --git a/src/Database/Drivers/MySqlDriver.php b/src/Database/Drivers/MySqlDriver.php
@@ -173,15 +173,17 @@ public function getForeignKeys(string $table): array
 		$query = 'SELECT CONSTRAINT_NAME, COLUMN_NAME, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME FROM information_schema.KEY_COLUMN_USAGE '
 			. 'WHERE TABLE_SCHEMA = DATABASE() AND REFERENCED_TABLE_NAME IS NOT NULL AND TABLE_NAME = ' . $this->connection->quote($table);
 
-		foreach ($this->connection->query($query) as $id => $row) {
+		foreach ($this->connection->query($query) as $row) {
 			$row = array_change_key_case((array) $row, CASE_LOWER);
-			$keys[$id]['name'] = $row['constraint_name']; // foreign key name
-			$keys[$id]['local'] = $row['column_name']; // local columns
-			$keys[$id]['table'] = $row['referenced_table_name']; // referenced table
-			$keys[$id]['foreign'] = $row['referenced_column_name']; // referenced columns
+			$keys[] = [
+				'name' => $row['constraint_name'], // foreign key name
+				'local' => $row['column_name'], // local columns
+				'table' => $row['referenced_table_name'], // referenced table
+				'foreign' => $row['referenced_column_name'], // referenced columns
+			];
 		}
 
-		return array_values($keys);
+		return $keys;
 	}
 
 

diff --git a/src/Database/Drivers/SqliteDriver.php b/src/Database/Drivers/SqliteDriver.php
@@ -206,17 +206,15 @@ public function getForeignKeys(string $table): array
 	{
 		$keys = [];
 		foreach ($this->connection->query("PRAGMA foreign_key_list({$this->delimite($table)})") as $row) {
-			$keys[$row['id']]['name'] = $row['id']; // foreign key name
-			$keys[$row['id']]['local'] = $row['from']; // local columns
-			$keys[$row['id']]['table'] = $row['table']; // referenced table
-			$keys[$row['id']]['foreign'] = $row['to']; // referenced columns
-
-			if ($keys[$row['id']]['foreign'][0] == null) {
-				$keys[$row['id']]['foreign'] = null;
-			}
+			$keys[] = [
+				'name' => $row['id'], // foreign key name
+				'local' => $row['from'], // local columns
+				'table' => $row['table'], // referenced table
+				'foreign' => $row['to'], // referenced columns
+			];
 		}
 
-		return array_values($keys);
+		return $keys;
 	}
 
 

diff --git a/src/Database/Drivers/SqlsrvDriver.php b/src/Database/Drivers/SqlsrvDriver.php
@@ -213,10 +213,10 @@ public function getForeignKeys(string $table): array
 			WHERE
 				tl.name = {$this->connection->quote($table)}
 		") as $row) {
-			$keys[$row->name] = (array) $row;
+			$keys[] = (array) $row;
 		}
 
-		return array_values($keys);
+		return $keys;
 	}