Fix method resetSequence(). (#99)

terabytesoftw · web-flow · commit b20b2bbf580f · 2022-10-14T11:02:48.000-03:00
* Fix method `resetSequence()`.
diff --git a/src/DMLQueryBuilder.php b/src/DMLQueryBuilder.php
@@ -217,10 +217,8 @@ protected function prepareInsertValues(string $table, array|QueryInterface $colu
 
     /**
      * @throws InvalidArgumentException
-     *
-     * @psalm-suppress RiskyCast
      */
-    public function resetSequence(string $tableName, array|int|string|null $value = null): string
+    public function resetSequence(string $tableName, int|string $value = null): string
     {
         $tableSchema = $this->schema->getTableSchema($tableName);
 
@@ -229,13 +227,12 @@ public function resetSequence(string $tableName, array|int|string|null $value =
         }
 
         $sequenceName = $tableSchema->getSequenceName();
+
         if ($sequenceName === null) {
             throw new InvalidArgumentException("There is no sequence associated with table: $tableName");
         }
 
-        if ($value !== null) {
-            $value = (int) $value;
-        } elseif (count($tableSchema->getPrimaryKey()) > 1) {
+        if ($value === null && count($tableSchema->getPrimaryKey()) > 1) {
             throw new InvalidArgumentException("Can't reset sequence for composite primary key in table: $tableName");
         }
 
diff --git a/tests/QueryBuilderTest.php b/tests/QueryBuilderTest.php
@@ -266,6 +266,22 @@ public function testResetSequence(): void
         $db->createCommand($sql)->execute();
         $result = $db->createCommand($checkSql)->queryScalar();
         $this->assertEquals(4, $result);
+
+        $sql = $qb->resetSequence('item', '1');
+        $expected = <<<SQL
+declare
+    lastSeq number := 1;
+begin
+    if lastSeq IS NULL then lastSeq := 1; end if;
+    execute immediate 'DROP SEQUENCE "item_SEQ"';
+    execute immediate 'CREATE SEQUENCE "item_SEQ" START WITH ' || lastSeq || ' INCREMENT BY 1 NOMAXVALUE NOCACHE';
+end;
+SQL;
+        $this->assertEquals($expected, $sql);
+
+        $db->createCommand($sql)->execute();
+        $result = $db->createCommand($checkSql)->queryScalar();
+        $this->assertEquals(1, $result);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -217,10 +217,8 @@ protected function prepareInsertValues(string $table, array\|QueryInterface $colu`
`217`	`217`
`218`	`218`	`/**`
`219`	`219`	`* @throws InvalidArgumentException`
`220`		`- *`
`221`		`- * @psalm-suppress RiskyCast`
`222`	`220`	`*/`
`223`		`- public function resetSequence(string $tableName, array\|int\|string\|null $value = null): string`
	`221`	`+ public function resetSequence(string $tableName, int\|string $value = null): string`
`224`	`222`	`{`
`225`	`223`	`$tableSchema = $this->schema->getTableSchema($tableName);`
`226`	`224`
`@@ -229,13 +227,12 @@ public function resetSequence(string $tableName, array\|int\|string\|null $value =`
`229`	`227`	`}`
`230`	`228`
`231`	`229`	`$sequenceName = $tableSchema->getSequenceName();`
	`230`	`+`
`232`	`231`	`if ($sequenceName === null) {`
`233`	`232`	`throw new InvalidArgumentException("There is no sequence associated with table: $tableName");`
`234`	`233`	`}`
`235`	`234`
`236`		`- if ($value !== null) {`
`237`		`- $value = (int) $value;`
`238`		`- } elseif (count($tableSchema->getPrimaryKey()) > 1) {`
	`235`	`+ if ($value === null && count($tableSchema->getPrimaryKey()) > 1) {`
`239`	`236`	`throw new InvalidArgumentException("Can't reset sequence for composite primary key in table: $tableName");`
`240`	`237`	`}`
`241`	`238`