From 94109c9da8553912b548bfa6aefde8079a5bef59 Mon Sep 17 00:00:00 2001 From: Tigrov Date: Mon, 24 Mar 2025 20:40:19 +0700 Subject: [PATCH 1/3] Remove `getCacheKey()` and `getCacheTag()` from `Schema` --- src/Schema.php | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/src/Schema.php b/src/Schema.php index 6ad2d6e7..aaea4640 100644 --- a/src/Schema.php +++ b/src/Schema.php @@ -24,8 +24,6 @@ use function array_column; use function array_map; use function count; -use function md5; -use function serialize; use function strncasecmp; /** @@ -618,30 +616,6 @@ protected function findViewNames(string $schema = ''): array return $views; } - /** - * Returns the cache key for the specified table name. - * - * @param string $name the table name. - * - * @return array The cache key. - */ - protected function getCacheKey(string $name): array - { - return [self::class, ...$this->generateCacheKey(), $this->db->getQuoter()->getRawTableName($name)]; - } - - /** - * Returns the cache tag name. - * - * This allows {@see refresh()} to invalidate all cached table schemas. - * - * @return string The cache tag name. - */ - protected function getCacheTag(): string - { - return md5(serialize([self::class, ...$this->generateCacheKey()])); - } - /** * @throws Throwable */ From ac1d1df2211d0be4fe43234ae11c6f8ea2d58a22 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Mon, 24 Mar 2025 13:41:33 +0000 Subject: [PATCH 2/3] Apply fixes from StyleCI --- src/Connection.php | 1 - tests/QueryBuilderTest.php | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Connection.php b/src/Connection.php index 4b83b208..44c25646 100644 --- a/src/Connection.php +++ b/src/Connection.php @@ -10,7 +10,6 @@ use Yiisoft\Db\Schema\Quoter; use Yiisoft\Db\Schema\QuoterInterface; use Yiisoft\Db\Schema\SchemaInterface; - use Yiisoft\Db\Sqlite\Column\ColumnFactory; use function str_starts_with; diff --git a/tests/QueryBuilderTest.php b/tests/QueryBuilderTest.php index 705f86ec..06c82041 100644 --- a/tests/QueryBuilderTest.php +++ b/tests/QueryBuilderTest.php @@ -281,10 +281,10 @@ public function testBuildWithQuery(): void $db = $this->getConnection(); $qb = $db->getQueryBuilder(); - $with1Query = (new query($db))->select('id')->from('t1')->where('expr = 1'); - $with2Query = (new query($db))->select('id')->from('t2')->innerJoin('a1', 't2.id = a1.id')->where('expr = 2'); - $with3Query = (new query($db))->select('id')->from('t3')->where('expr = 3'); - $query = (new query($db)) + $with1Query = (new Query($db))->select('id')->from('t1')->where('expr = 1'); + $with2Query = (new Query($db))->select('id')->from('t2')->innerJoin('a1', 't2.id = a1.id')->where('expr = 2'); + $with3Query = (new Query($db))->select('id')->from('t3')->where('expr = 3'); + $query = (new Query($db)) ->withQuery($with1Query, 'a1') ->withQuery($with2Query->union($with3Query), 'a2') ->from('a2'); From 71886a781248d98dfdf4ede43f21320e8271b4ea Mon Sep 17 00:00:00 2001 From: Tigrov Date: Mon, 24 Mar 2025 21:36:30 +0700 Subject: [PATCH 3/3] Add line to CHANGELOG.md [skip ci] --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50283fb7..0440f6ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ - Chg #343: Remove `yiisoft/json` dependency (@Tigrov) - Enh #345: Refactor according changes in `db` package (@Tigrov) - New #344: Add `caseSensitive` option to like condition (@vjik) +- Enh #347: Remove `getCacheKey()` and `getCacheTag()` methods from `Schema` class (@Tigrov) ## 1.2.0 March 21, 2024