Skip to content

Commit 8a7c1b9

Browse files
dgdg
committed
removed IStructure (BC break)
1 parent b5fd2b5 commit 8a7c1b9

File tree

8 files changed

+23
-100
lines changed

8 files changed

+23
-100
lines changed

‎src/Database/Conventions/DiscoveredConventions.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
namespace Nette\Database\Conventions;
1111

1212
use Nette\Database\Conventions;
13-
use Nette\Database\IStructure;
13+
use Nette\Database\Structure;
1414
use function count, preg_replace, strcmp, stripos, strtolower;
1515

1616

@@ -20,7 +20,7 @@
2020
class DiscoveredConventions implements Conventions
2121
{
2222
public function __construct(
23-
protected readonly IStructure $structure,
23+
protected readonly Structure $structure,
2424
) {
2525
}
2626

‎src/Database/Explorer.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class Explorer
4646
private int $transactionDepth = 0;
4747
private ?Cache $cache = null;
4848
private ?Conventions $conventions = null;
49-
private ?IStructure $structure = null;
49+
private ?Structure $structure = null;
5050

5151

5252
public function __construct(
@@ -466,7 +466,7 @@ public function getConventions(): Conventions
466466

467467

468468
/** @internal */
469-
public function getStructure(): IStructure
469+
public function getStructure(): Structure
470470
{
471471
return $this->structure ??= new Structure($this->getDatabaseEngine(), $this->getCache());
472472
}

‎src/Database/IStructure.php‎

Lines changed: 0 additions & 78 deletions
This file was deleted.

‎src/Database/Structure.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515

1616
/**
1717
* Provides database structure metadata with caching.
18+
* @internal
1819
*/
19-
class Structure implements IStructure
20+
class Structure
2021
{
2122
/** @var array{tables: array, columns: array, primary: array, aliases: array, hasMany: array, belongsTo: array} */
2223
protected array $structure;

‎src/Database/Table/SqlBuilder.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
use Nette\Database\Conventions;
1414
use Nette\Database\Drivers\Engine;
1515
use Nette\Database\Explorer;
16-
use Nette\Database\IStructure;
1716
use Nette\Database\SqlLiteral;
17+
use Nette\Database\Structure;
1818
use function array_flip, array_keys, array_map, array_merge, array_pop, array_shift, array_unshift, array_values, count, end, explode, hash, implode, is_array, is_string, json_encode, key, preg_match, preg_match_all, preg_replace, preg_replace_callback, rtrim, str_contains, str_repeat, strlen, strtoupper, substr, substr_count, substr_replace, trim;
1919
use const PREG_OFFSET_CAPTURE, PREG_SET_ORDER;
2020

@@ -49,7 +49,7 @@ class SqlBuilder
4949
protected array $aliases = [];
5050
protected string $currentAlias = '';
5151
private readonly Engine $engine;
52-
private readonly IStructure $structure;
52+
private readonly Structure $structure;
5353
private array $cacheTableList = [];
5454
private array $expandingJoins = [];
5555

‎tests/Database/Conventions/DiscoveredConventions.getBelongsToReference().phpt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require __DIR__ . '/../../bootstrap.php';
1313

1414

1515
test('basic test', function () {
16-
$structure = Mockery::mock(Nette\Database\IStructure::class);
16+
$structure = Mockery::mock(Nette\Database\Structure::class);
1717
$structure->shouldReceive('getBelongsToReference')->with('books')->andReturn([
1818
'author_id' => 'authors',
1919
'translator_id' => 'authors',
@@ -26,7 +26,7 @@ test('basic test', function () {
2626
});
2727

2828
test('basic test', function () {
29-
$structure = Mockery::mock(Nette\Database\IStructure::class);
29+
$structure = Mockery::mock(Nette\Database\Structure::class);
3030
$structure->shouldReceive('getBelongsToReference')->with('public.books')->andReturn([
3131
'author_id' => 'public.authors',
3232
'translator_id' => 'public.authors',
@@ -39,7 +39,7 @@ test('basic test', function () {
3939
});
4040

4141
test('tests order of table columns with foreign keys', function () {
42-
$structure = Mockery::mock(Nette\Database\IStructure::class);
42+
$structure = Mockery::mock(Nette\Database\Structure::class);
4343
$structure->shouldReceive('getBelongsToReference')->with('books')->andReturn([
4444
'translator_id' => 'authors',
4545
'author_id' => 'authors',
@@ -52,7 +52,7 @@ test('tests order of table columns with foreign keys', function () {
5252

5353

5454
test('tests case insensivity', function () {
55-
$structure = Mockery::mock(Nette\Database\IStructure::class);
55+
$structure = Mockery::mock(Nette\Database\Structure::class);
5656
$structure->shouldReceive('getBelongsToReference')->with('books')->andReturn([
5757
'author_id' => 'authors',
5858
'translator_id' => 'authors',
@@ -65,7 +65,7 @@ test('tests case insensivity', function () {
6565

6666

6767
test('tests case insensivity and prefixes', function () {
68-
$structure = Mockery::mock(Nette\Database\IStructure::class);
68+
$structure = Mockery::mock(Nette\Database\Structure::class);
6969
$structure->shouldReceive('getBelongsToReference')->with('nBooks')->andReturn([
7070
'authorId' => 'nAuthors',
7171
'translatorId' => 'nAuthors',
@@ -79,7 +79,7 @@ test('tests case insensivity and prefixes', function () {
7979

8080

8181
test('tests rebuilt', function () {
82-
$structure = Mockery::mock(Nette\Database\IStructure::class);
82+
$structure = Mockery::mock(Nette\Database\Structure::class);
8383
$structure->shouldReceive('isRebuilt')->andReturn(false);
8484
$structure->shouldReceive('rebuild');
8585
$structure->shouldReceive('getBelongsToReference')->andReturn([])->once();
@@ -96,7 +96,7 @@ test('tests rebuilt', function () {
9696

9797

9898
test('tests already rebuilt structure', function () {
99-
$structure = Mockery::mock(Nette\Database\IStructure::class);
99+
$structure = Mockery::mock(Nette\Database\Structure::class);
100100
$structure->shouldReceive('isRebuilt')->andReturn(true);
101101
$structure->shouldReceive('getBelongsToReference')->with('books')->andReturn([])->once();
102102

‎tests/Database/Conventions/DiscoveredConventions.getHasManyReference().phpt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require __DIR__ . '/../../bootstrap.php';
1313

1414

1515
test('basic test singular', function () {
16-
$structure = Mockery::mock(Nette\Database\IStructure::class);
16+
$structure = Mockery::mock(Nette\Database\Structure::class);
1717
$structure->shouldReceive('getHasManyReference')->with('author')->andReturn([
1818
'book' => ['author_id', 'translator_id'],
1919
'book_topics' => ['author_id'],
@@ -43,7 +43,7 @@ test('basic test singular', function () {
4343

4444

4545
test('basic test singular with schema', function () {
46-
$structure = Mockery::mock(Nette\Database\IStructure::class);
46+
$structure = Mockery::mock(Nette\Database\Structure::class);
4747
$structure->shouldReceive('getHasManyReference')->with('public.author')->andReturn([
4848
'public.book' => ['author_id', 'translator_id'],
4949
'public.book_topics' => ['author_id'],
@@ -88,7 +88,7 @@ test('basic test singular with schema', function () {
8888

8989

9090
test('basic test plural', function () {
91-
$structure = Mockery::mock(Nette\Database\IStructure::class);
91+
$structure = Mockery::mock(Nette\Database\Structure::class);
9292
$structure->shouldReceive('getHasManyReference')->with('authors')->andReturn([
9393
'books' => ['author_id', 'translator_id'],
9494
])->once();
@@ -112,7 +112,7 @@ test('basic test plural', function () {
112112

113113

114114
test('tests column match with source table', function () {
115-
$structure = Mockery::mock(Nette\Database\IStructure::class);
115+
$structure = Mockery::mock(Nette\Database\Structure::class);
116116
$structure->shouldReceive('getHasManyReference')->with('author')->andReturn([
117117
'book' => ['author_id', 'tran_id'],
118118
])->once();
@@ -139,7 +139,7 @@ test('tests column match with source table', function () {
139139

140140

141141
test('tests case insensivity and prefixes', function () {
142-
$structure = Mockery::mock(Nette\Database\IStructure::class);
142+
$structure = Mockery::mock(Nette\Database\Structure::class);
143143
$structure->shouldReceive('getHasManyReference')->with('nAuthors')->andReturn([
144144
'nBooks' => ['authorId', 'translatorId'],
145145
])->once();
@@ -151,7 +151,7 @@ test('tests case insensivity and prefixes', function () {
151151

152152

153153
test('tests rebuilt', function () {
154-
$structure = Mockery::mock(Nette\Database\IStructure::class);
154+
$structure = Mockery::mock(Nette\Database\Structure::class);
155155
$structure->shouldReceive('isRebuilt')->andReturn(false);
156156
$structure->shouldReceive('rebuild');
157157
$structure->shouldReceive('getHasManyReference')->with('author')->andReturn([])->once();
@@ -165,7 +165,7 @@ test('tests rebuilt', function () {
165165

166166

167167
test('tests already rebuilt structure', function () {
168-
$structure = Mockery::mock(Nette\Database\IStructure::class);
168+
$structure = Mockery::mock(Nette\Database\Structure::class);
169169
$structure->shouldReceive('isRebuilt')->andReturn(true);
170170
$structure->shouldReceive('getHasManyReference')->with('author')->andReturn([])->once();
171171

‎tests/Database/Conventions/DiscoveredConventions.getPrimary().phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require __DIR__ . '/../../bootstrap.php';
1313

1414

1515
test('', function () {
16-
$structure = Mockery::mock(Nette\Database\IStructure::class);
16+
$structure = Mockery::mock(Nette\Database\Structure::class);
1717
$structure->shouldReceive('getPrimaryKey')->with('books_x_tags')->andReturn(['book_id', 'tag_id']);
1818

1919
$conventions = new DiscoveredConventions($structure);

0 commit comments

Comments
 (0)