From 787349ac734a6867efa63a8d0852b0ea3895cb37 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Mon, 2 Sep 2024 23:13:59 +0200
Subject: [PATCH] removed IStructure (BC break)

---
 .../Conventions/DiscoveredConventions.php     |  4 +-
 src/Database/Explorer.php                     |  4 +-
 src/Database/IStructure.php                   | 78 -------------------
 src/Database/Structure.php                    |  3 +-
 src/Database/Table/SqlBuilder.php             |  4 +-
 ...edConventions.getBelongsToReference().phpt | 14 ++--
 ...eredConventions.getHasManyReference().phpt | 14 ++--
 .../DiscoveredConventions.getPrimary().phpt   |  2 +-
 8 files changed, 23 insertions(+), 100 deletions(-)
 delete mode 100644 src/Database/IStructure.php

diff --git a/src/Database/Conventions/DiscoveredConventions.php b/src/Database/Conventions/DiscoveredConventions.php
index 272b942ac..930a889b4 100644
--- a/src/Database/Conventions/DiscoveredConventions.php
+++ b/src/Database/Conventions/DiscoveredConventions.php
@@ -10,7 +10,7 @@
 namespace Nette\Database\Conventions;
 
 use Nette\Database\Conventions;
-use Nette\Database\IStructure;
+use Nette\Database\Structure;
 
 
 /**
@@ -19,7 +19,7 @@
 class DiscoveredConventions implements Conventions
 {
 	public function __construct(
-		protected readonly IStructure $structure,
+		protected readonly Structure $structure,
 	) {
 	}
 
diff --git a/src/Database/Explorer.php b/src/Database/Explorer.php
index 9196df240..f26c23fec 100644
--- a/src/Database/Explorer.php
+++ b/src/Database/Explorer.php
@@ -34,7 +34,7 @@ class Explorer
 	private int $transactionDepth = 0;
 	private ?Cache $cache = null;
 	private ?Conventions $conventions = null;
-	private ?IStructure $structure = null;
+	private ?Structure $structure = null;
 
 
 	public function __construct(
@@ -392,7 +392,7 @@ public function getConventions(): Conventions
 
 
 	/** @internal */
-	public function getStructure(): IStructure
+	public function getStructure(): Structure
 	{
 		return $this->structure ??= new Structure($this->getDatabaseEngine(), $this->getCache());
 	}
diff --git a/src/Database/IStructure.php b/src/Database/IStructure.php
deleted file mode 100644
index 8c09e7497..000000000
--- a/src/Database/IStructure.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * This file is part of the Nette Framework (https://nette.org)
- * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
- */
-
-declare(strict_types=1);
-
-namespace Nette\Database;
-
-
-/**
- * Provides cached reflection for database structure.
- */
-interface IStructure
-{
-	public const
-		FIELD_TEXT = 'string',
-		FIELD_BINARY = 'bin',
-		FIELD_BOOL = 'bool',
-		FIELD_INTEGER = 'int',
-		FIELD_FLOAT = 'float',
-		FIELD_DECIMAL = 'decimal',
-		FIELD_DATE = 'date',
-		FIELD_TIME = 'time',
-		FIELD_DATETIME = 'datetime',
-		FIELD_UNIX_TIMESTAMP = 'timestamp',
-		FIELD_TIME_INTERVAL = 'timeint';
-
-	/**
-	 * Returns tables list.
-	 */
-	function getTables(): array;
-
-	/**
-	 * Returns table columns list.
-	 */
-	function getColumns(string $table): array;
-
-	/**
-	 * Returns table primary key.
-	 * @return string|string[]|null
-	 */
-	function getPrimaryKey(string $table): string|array|null;
-
-	/**
-	 * Returns autoincrement primary key name.
-	 */
-	function getPrimaryAutoincrementKey(string $table): ?string;
-
-	/**
-	 * Returns table primary key sequence.
-	 */
-	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;
-
-	/**
-	 * Returns belongsTo reference.
-	 * If a column is not provided, returns references for all columns.
-	 */
-	function getBelongsToReference(string $table, ?string $column = null): ?array;
-
-	/**
-	 * Rebuilds database structure cache.
-	 */
-	function rebuild(): void;
-
-	/**
-	 * Returns true if database cached structure has been rebuilt.
-	 */
-	function isRebuilt(): bool;
-}
diff --git a/src/Database/Structure.php b/src/Database/Structure.php
index e219c842a..41427c684 100644
--- a/src/Database/Structure.php
+++ b/src/Database/Structure.php
@@ -14,8 +14,9 @@
 
 /**
  * Cached reflection of database structure.
+ * @internal
  */
-class Structure implements IStructure
+class Structure
 {
 	/** @var array{tables: array, columns: array, primary: array, aliases: array, hasMany: array, belongsTo: array} */
 	protected array $structure;
diff --git a/src/Database/Table/SqlBuilder.php b/src/Database/Table/SqlBuilder.php
index 368c9ee6a..303de5fc6 100644
--- a/src/Database/Table/SqlBuilder.php
+++ b/src/Database/Table/SqlBuilder.php
@@ -13,8 +13,8 @@
 use Nette\Database\Conventions;
 use Nette\Database\Drivers\Engine;
 use Nette\Database\Explorer;
-use Nette\Database\IStructure;
 use Nette\Database\SqlLiteral;
+use Nette\Database\Structure;
 
 
 /**
@@ -47,7 +47,7 @@ class SqlBuilder
 	protected array $aliases = [];
 	protected string $currentAlias = '';
 	private readonly Engine $engine;
-	private readonly IStructure $structure;
+	private readonly Structure $structure;
 	private array $cacheTableList = [];
 	private array $expandingJoins = [];
 
diff --git a/tests/Database/Conventions/DiscoveredConventions.getBelongsToReference().phpt b/tests/Database/Conventions/DiscoveredConventions.getBelongsToReference().phpt
index 7234910f3..5b3ec9430 100644
--- a/tests/Database/Conventions/DiscoveredConventions.getBelongsToReference().phpt
+++ b/tests/Database/Conventions/DiscoveredConventions.getBelongsToReference().phpt
@@ -13,7 +13,7 @@ require __DIR__ . '/../../bootstrap.php';
 
 
 test('basic test', function () {
-	$structure = Mockery::mock(Nette\Database\IStructure::class);
+	$structure = Mockery::mock(Nette\Database\Structure::class);
 	$structure->shouldReceive('getBelongsToReference')->with('books')->andReturn([
 		'author_id' => 'authors',
 		'translator_id' => 'authors',
@@ -26,7 +26,7 @@ test('basic test', function () {
 });
 
 test('basic test', function () {
-	$structure = Mockery::mock(Nette\Database\IStructure::class);
+	$structure = Mockery::mock(Nette\Database\Structure::class);
 	$structure->shouldReceive('getBelongsToReference')->with('public.books')->andReturn([
 		'author_id' => 'public.authors',
 		'translator_id' => 'public.authors',
@@ -39,7 +39,7 @@ test('basic test', function () {
 });
 
 test('tests order of table columns with foreign keys', function () {
-	$structure = Mockery::mock(Nette\Database\IStructure::class);
+	$structure = Mockery::mock(Nette\Database\Structure::class);
 	$structure->shouldReceive('getBelongsToReference')->with('books')->andReturn([
 		'translator_id' => 'authors',
 		'author_id' => 'authors',
@@ -52,7 +52,7 @@ test('tests order of table columns with foreign keys', function () {
 
 
 test('tests case insensivity', function () {
-	$structure = Mockery::mock(Nette\Database\IStructure::class);
+	$structure = Mockery::mock(Nette\Database\Structure::class);
 	$structure->shouldReceive('getBelongsToReference')->with('books')->andReturn([
 		'author_id' => 'authors',
 		'translator_id' => 'authors',
@@ -65,7 +65,7 @@ test('tests case insensivity', function () {
 
 
 test('tests case insensivity and prefixes', function () {
-	$structure = Mockery::mock(Nette\Database\IStructure::class);
+	$structure = Mockery::mock(Nette\Database\Structure::class);
 	$structure->shouldReceive('getBelongsToReference')->with('nBooks')->andReturn([
 		'authorId' => 'nAuthors',
 		'translatorId' => 'nAuthors',
@@ -79,7 +79,7 @@ test('tests case insensivity and prefixes', function () {
 
 
 test('tests rebuilt', function () {
-	$structure = Mockery::mock(Nette\Database\IStructure::class);
+	$structure = Mockery::mock(Nette\Database\Structure::class);
 	$structure->shouldReceive('isRebuilt')->andReturn(false);
 	$structure->shouldReceive('rebuild');
 	$structure->shouldReceive('getBelongsToReference')->andReturn([])->once();
@@ -96,7 +96,7 @@ test('tests rebuilt', function () {
 
 
 test('tests already rebuilt structure', function () {
-	$structure = Mockery::mock(Nette\Database\IStructure::class);
+	$structure = Mockery::mock(Nette\Database\Structure::class);
 	$structure->shouldReceive('isRebuilt')->andReturn(true);
 	$structure->shouldReceive('getBelongsToReference')->with('books')->andReturn([])->once();
 
diff --git a/tests/Database/Conventions/DiscoveredConventions.getHasManyReference().phpt b/tests/Database/Conventions/DiscoveredConventions.getHasManyReference().phpt
index a7dc0255d..ed14a18ab 100644
--- a/tests/Database/Conventions/DiscoveredConventions.getHasManyReference().phpt
+++ b/tests/Database/Conventions/DiscoveredConventions.getHasManyReference().phpt
@@ -13,7 +13,7 @@ require __DIR__ . '/../../bootstrap.php';
 
 
 test('basic test singular', function () {
-	$structure = Mockery::mock(Nette\Database\IStructure::class);
+	$structure = Mockery::mock(Nette\Database\Structure::class);
 	$structure->shouldReceive('getHasManyReference')->with('author')->andReturn([
 		'book' => ['author_id', 'translator_id'],
 		'book_topics' => ['author_id'],
@@ -43,7 +43,7 @@ test('basic test singular', function () {
 
 
 test('basic test singular with schema', function () {
-	$structure = Mockery::mock(Nette\Database\IStructure::class);
+	$structure = Mockery::mock(Nette\Database\Structure::class);
 	$structure->shouldReceive('getHasManyReference')->with('public.author')->andReturn([
 		'public.book' => ['author_id', 'translator_id'],
 		'public.book_topics' => ['author_id'],
@@ -88,7 +88,7 @@ test('basic test singular with schema', function () {
 
 
 test('basic test plural', function () {
-	$structure = Mockery::mock(Nette\Database\IStructure::class);
+	$structure = Mockery::mock(Nette\Database\Structure::class);
 	$structure->shouldReceive('getHasManyReference')->with('authors')->andReturn([
 		'books' => ['author_id', 'translator_id'],
 	])->once();
@@ -112,7 +112,7 @@ test('basic test plural', function () {
 
 
 test('tests column match with source table', function () {
-	$structure = Mockery::mock(Nette\Database\IStructure::class);
+	$structure = Mockery::mock(Nette\Database\Structure::class);
 	$structure->shouldReceive('getHasManyReference')->with('author')->andReturn([
 		'book' => ['author_id', 'tran_id'],
 	])->once();
@@ -139,7 +139,7 @@ test('tests column match with source table', function () {
 
 
 test('tests case insensivity and prefixes', function () {
-	$structure = Mockery::mock(Nette\Database\IStructure::class);
+	$structure = Mockery::mock(Nette\Database\Structure::class);
 	$structure->shouldReceive('getHasManyReference')->with('nAuthors')->andReturn([
 		'nBooks' => ['authorId', 'translatorId'],
 	])->once();
@@ -151,7 +151,7 @@ test('tests case insensivity and prefixes', function () {
 
 
 test('tests rebuilt', function () {
-	$structure = Mockery::mock(Nette\Database\IStructure::class);
+	$structure = Mockery::mock(Nette\Database\Structure::class);
 	$structure->shouldReceive('isRebuilt')->andReturn(false);
 	$structure->shouldReceive('rebuild');
 	$structure->shouldReceive('getHasManyReference')->with('author')->andReturn([])->once();
@@ -165,7 +165,7 @@ test('tests rebuilt', function () {
 
 
 test('tests already rebuilt structure', function () {
-	$structure = Mockery::mock(Nette\Database\IStructure::class);
+	$structure = Mockery::mock(Nette\Database\Structure::class);
 	$structure->shouldReceive('isRebuilt')->andReturn(true);
 	$structure->shouldReceive('getHasManyReference')->with('author')->andReturn([])->once();
 
diff --git a/tests/Database/Conventions/DiscoveredConventions.getPrimary().phpt b/tests/Database/Conventions/DiscoveredConventions.getPrimary().phpt
index 196c4e0e6..f68b38f5c 100644
--- a/tests/Database/Conventions/DiscoveredConventions.getPrimary().phpt
+++ b/tests/Database/Conventions/DiscoveredConventions.getPrimary().phpt
@@ -13,7 +13,7 @@ require __DIR__ . '/../../bootstrap.php';
 
 
 test('', function () {
-	$structure = Mockery::mock(Nette\Database\IStructure::class);
+	$structure = Mockery::mock(Nette\Database\Structure::class);
 	$structure->shouldReceive('getPrimaryKey')->with('books_x_tags')->andReturn(['book_id', 'tag_id']);
 
 	$conventions = new DiscoveredConventions($structure);