Structure: removed unused parameter

Author: dg

Diff for: src/Database/IStructure.php

@@ -58,13 +58,13 @@ function getPrimaryKeySequence(string $table): ?string;
 	 * Returns hasMany reference.
 	 * If a targetTable is not provided, returns references for all tables.
 	 */
-	function getHasManyReference(string $table, ?string $targetTable = null): ?array;
+	function getHasManyReference(string $table): ?array;
 
 	/**
 	 * Returns belongsTo reference.
 	 * If a column is not provided, returns references for all columns.
 	 */
-	function getBelongsToReference(string $table, ?string $column = null): ?array;
+	function getBelongsToReference(string $table): ?array;
 
 	/**
 	 * Rebuilds database structure cache.

Diff for: src/Database/Structure.php

@@ -114,41 +114,19 @@ public function getPrimaryKeySequence(string $table): ?string
 	}
 
 
-	public function getHasManyReference(string $table, ?string $targetTable = null): ?array
+	public function getHasManyReference(string $table): array
 	{
 		$this->needStructure();
 		$table = $this->resolveFQTableName($table);
-
-		if ($targetTable) {
-			$targetTable = $this->resolveFQTableName($targetTable);
-			foreach ($this->structure['hasMany'][$table] as $key => $value) {
-				if (strtolower($key) === $targetTable) {
-					return $this->structure['hasMany'][$table][$key];
-				}
-			}
-
-			return null;
-
-		} else {
-			return $this->structure['hasMany'][$table] ?? [];
-		}
+		return $this->structure['hasMany'][$table] ?? [];
 	}
 
 
-	public function getBelongsToReference(string $table, ?string $column = null): ?array
+	public function getBelongsToReference(string $table): array
 	{
 		$this->needStructure();
 		$table = $this->resolveFQTableName($table);
-
-		if ($column) {
-			$column = strtolower($column);
-			return isset($this->structure['belongsTo'][$table][$column])
-				? [$this->structure['belongsTo'][$table][$column], $column]
-				: null;
-
-		} else {
-			return $this->structure['belongsTo'][$table] ?? [];
-		}
+		return $this->structure['belongsTo'][$table] ?? [];
 	}
 
 

Diff for: tests/Database/Helpers.parseColumnType.phpt

@@ -29,6 +29,6 @@ Assert::same(['type' => 'DECIMAL', 'length' => 10, 'scale' => 2, 'parameters' =>
 $result = Helpers::parseColumnType("ENUM('value1','value2')");
 Assert::same(['type' => 'ENUM', 'length' => null, 'scale' => null, 'parameters' => "'value1','value2'"], $result);
 
-// Test omitted typ
+// Test omitted type
 $result = Helpers::parseColumnType('');
 Assert::same(['type' => null, 'length' => null, 'scale' => null, 'parameters' => null], $result);

Diff for: tests/Database/Reflection.columns.sqlite.phpt

@@ -289,8 +289,8 @@ $expectedColumns = [
 		'autoIncrement' => false,
 		'primary' => false,
 	],
-	'empty' => [
-		'name' => 'empty',
+	'omitted' => [
+		'name' => 'omitted',
 		'table' => 'types',
 		'nativeType' => 'BLOB',
 		'size' => null,

Diff for: tests/Database/ResultSet.normalizeRow.sqlite.phpt

@@ -46,7 +46,7 @@ Assert::equal([
 	'boolean' => true,
 	'date' => new DateTime('2012-10-13'),
 	'datetime' => new DateTime('2012-10-13 10:10:10'),
-	'empty' => 'a',
+	'omitted' => 'a',
 ], (array) $res->fetch());
 
 Assert::equal([
@@ -77,7 +77,7 @@ Assert::equal([
 	'boolean' => false,
 	'date' => new DateTime('1970-01-01'),
 	'datetime' => new DateTime('1970-01-01 00:00:00'),
-	'empty' => '',
+	'omitted' => '',
 ], (array) $res->fetch());
 
 Assert::same([
@@ -108,7 +108,7 @@ Assert::same([
 	'boolean' => null,
 	'date' => null,
 	'datetime' => null,
-	'empty' => null,
+	'omitted' => null,
 ], (array) $res->fetch());
 
 

Diff for: tests/Database/Structure.phpt

@@ -148,11 +148,6 @@ class StructureTestCase extends TestCase
 		Assert::same([
 			'Books' => ['author_id', 'translator_id'],
 		], $this->structure->getHasManyReference('authors'));
-
-		Assert::same(
-			['author_id', 'translator_id'],
-			$this->structure->getHasManyReference('authors', 'books'),
-		);
 	}
 
 
@@ -169,13 +164,6 @@ class StructureTestCase extends TestCase
 			'tag_id' => 'tags',
 			'book_id' => 'Books',
 		], $this->structure->getBelongsToReference('books_x_tags'));
-
-		Assert::same(
-			['Books', 'book_id'],
-			$this->structure->getBelongsToReference('books_x_tags', 'book_id'),
-		);
-
-		Assert::null($this->structure->getBelongsToReference('books_x_tags', 'non_exist'));
 	}
 
 

Diff for: tests/Database/files/sqlite-nette_test3.sql

@@ -26,7 +26,7 @@ CREATE TEMPORARY TABLE types (
 	[boolean] BOOLEAN,
 	[date] DATE,
 	[datetime] DATETIME,
-	[empty]
+	[omitted]
 );
 
 
@@ -59,7 +59,7 @@ INSERT INTO types VALUES
 	1, --boolean
 	1350079200, --date
 	1350115810, --datetime
-	'a' --empty
+	'a' --omitted
 );
 
 
@@ -91,7 +91,7 @@ INSERT INTO types VALUES (
 	0, --boolean
 	-3600, --date
 	-3600, --datetime
-	'' --empty
+	'' --omitted
 );
 
 
@@ -123,5 +123,5 @@ INSERT INTO types VALUES (
 	NULL, --boolean
 	NULL, --date
 	NULL, --datetime
-	NULL --empty
+	NULL --omitted
 );