Revert "Remove methods with NotSupportedException"

yiisoft · Aug 22, 2023 · d07b871 · d07b871
1 parent adfae64
commit d07b871
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 36 deletions.
diff --git a/src/QueryBuilder/AbstractDMLQueryBuilder.php b/src/QueryBuilder/AbstractDMLQueryBuilder.php
@@ -109,6 +109,16 @@ public function insert(string $table, QueryInterface|array $columns, array &$par
             . (!empty($placeholders) ? ' VALUES (' . implode(', ', $placeholders) . ')' : ' ' . $values);
     }
 
+    public function insertWithReturningPks(string $table, QueryInterface|array $columns, array &$params = []): string
+    {
+        throw new NotSupportedException(__METHOD__ . '() is not supported by this DBMS.');
+    }
+
+    public function resetSequence(string $table, int|string|null $value = null): string
+    {
+        throw new NotSupportedException(__METHOD__ . '() is not supported by this DBMS.');
+    }
+
     public function update(string $table, array $columns, array|string $condition, array &$params = []): string
     {
         [$lines, $params] = $this->prepareUpdateSets($table, $columns, $params);
@@ -119,6 +129,15 @@ public function update(string $table, array $columns, array|string $condition, a
         return $where === '' ? $sql : $sql . ' ' . $where;
     }
 
+    public function upsert(
+        string $table,
+        QueryInterface|array $insertColumns,
+        bool|array $updateColumns,
+        array &$params
+    ): string {
+        throw new NotSupportedException(__METHOD__ . ' is not supported by this DBMS.');
+    }
+
     /**
      * Prepare select-subQuery and field names for `INSERT INTO ... SELECT` SQL statement.
      *

diff --git a/tests/AbstractQueryBuilderTest.php b/tests/AbstractQueryBuilderTest.php
@@ -1918,8 +1918,6 @@ public function testResetSequenceNoAssociatedException(): void
         $qb = $db->getQueryBuilder();
 
         if ($db->getDriverName() === 'db') {
-            self::markTestSkipped('AbstractDMLQueryBuilder::resetSequence() was removed');
-
             $this->expectException(NotSupportedException::class);
             $this->expectExceptionMessage(
                 'Yiisoft\Db\QueryBuilder\AbstractDMLQueryBuilder::resetSequence() is not supported by this DBMS.'
@@ -1944,8 +1942,6 @@ public function testResetSequenceTableNoExistException(): void
         $qb = $db->getQueryBuilder();
 
         if ($db->getDriverName() === 'db') {
-            self::markTestSkipped('AbstractDMLQueryBuilder::resetSequence() was removed');
-
             $this->expectException(NotSupportedException::class);
             $this->expectExceptionMessage(
                 'Yiisoft\Db\QueryBuilder\AbstractDMLQueryBuilder::resetSequence() is not supported by this DBMS.'

diff --git a/tests/Db/Command/CommandTest.php b/tests/Db/Command/CommandTest.php
@@ -645,8 +645,6 @@ public function testRenameTable(): void
 
     public function testResetSequence(): void
     {
-        self::markTestSkipped('AbstractDMLQueryBuilder::resetSequence() was removed');
-
         $db = $this->getConnection();
 
         $this->expectException(NotSupportedException::class);
@@ -702,8 +700,6 @@ public function testUpdate(): void
 
     public function testUpsert(): void
     {
-        self::markTestSkipped('AbstractDMLQueryBuilder::upsert() was removed');
-
         $db = $this->getConnection();
 
         $command = $db->createCommand();

diff --git a/tests/Db/QueryBuilder/QueryBuilderTest.php b/tests/Db/QueryBuilder/QueryBuilderTest.php
@@ -209,8 +209,6 @@ public function testInsertWithReturningPks(
         string $expectedSQL,
         array $expectedParams
     ): void {
-        self::markTestSkipped('AbstractDMLQueryBuilder::insertWithReturningPks() was removed');
-
         $db = $this->getConnection();
 
         $qb = $db->getQueryBuilder();
@@ -228,8 +226,6 @@ public function testInsertWithReturningPks(
      */
     public function testResetSequence(): void
     {
-        self::markTestSkipped('AbstractDMLQueryBuilder::resetSequence() was removed');
-
         $db = $this->getConnection();
 
         $qb = $db->getQueryBuilder();
@@ -278,8 +274,6 @@ public function testUpsert(
         string|array $expectedSQL,
         array $expectedParams
     ): void {
-        self::markTestSkipped('AbstractDMLQueryBuilder::upsert() was removed');
-
         $db = $this->getConnection();
 
         $actualParams = [];
@@ -300,8 +294,6 @@ public function testUpsertExecute(
         array|QueryInterface $insertColumns,
         array|bool $updateColumns
     ): void {
-        self::markTestSkipped('AbstractDMLQueryBuilder::upsert() was removed');
-
         $db = $this->getConnection();
 
         $this->expectException(NotSupportedException::class);

diff --git a/tests/Support/Stub/DMLQueryBuilder.php b/tests/Support/Stub/DMLQueryBuilder.php
@@ -4,28 +4,8 @@
 
 namespace Yiisoft\Db\Tests\Support\Stub;
 
-use Yiisoft\Db\Exception\NotSupportedException;
-use Yiisoft\Db\Query\QueryInterface;
 use Yiisoft\Db\QueryBuilder\AbstractDMLQueryBuilder;
 
 final class DMLQueryBuilder extends AbstractDMLQueryBuilder
 {
-    public function insertWithReturningPks(string $table, QueryInterface|array $columns, array &$params = []): string
-    {
-        throw new NotSupportedException(__METHOD__ . '() is not supported by this DBMS.');
-    }
-
-    public function resetSequence(string $table, int|string|null $value = null): string
-    {
-        throw new NotSupportedException(__METHOD__ . '() is not supported by this DBMS.');
-    }
-
-    public function upsert(
-        string $table,
-        QueryInterface|array $insertColumns,
-        bool|array $updateColumns,
-        array &$params
-    ): string {
-        throw new NotSupportedException(__METHOD__ . '() is not supported by this DBMS.');
-    }
 }