Add insertEx additional test + bugfix for oracle (#205)

darkdef · web-flow · commit 004bd94d81e7 · 2023-01-05T19:26:02.000+03:00
* Add insertEx additional test + bugfix for oracle

* Rename method insertEx

* Rename method insertEx. Part 2
diff --git a/src/CommandPDO.php b/src/CommandPDO.php
@@ -18,10 +18,10 @@ final class CommandPDO extends AbstractCommandPDO
     /**
      * @inheritDoc
      */
-    public function insertEx(string $table, array $columns): bool|array
+    public function insertWithReturningPks(string $table, array $columns): bool|array
     {
         $params = [];
-        $sql = $this->queryBuilder()->insertEx($table, $columns, $params);
+        $sql = $this->queryBuilder()->insertWithReturningPks($table, $columns, $params);
 
         $this->setSql($sql)->bindValues($params);
         $this->prepare(false);
diff --git a/src/DMLQueryBuilder.php b/src/DMLQueryBuilder.php
@@ -31,7 +31,7 @@ public function __construct(
         parent::__construct($queryBuilder, $quoter, $schema);
     }
 
-    public function insertEx(string $table, QueryInterface|array $columns, array &$params = []): string
+    public function insertWithReturningPks(string $table, QueryInterface|array $columns, array &$params = []): string
     {
         $sql = $this->insert($table, $columns, $params);
 
diff --git a/tests/Provider/QueryBuilderProvider.php b/tests/Provider/QueryBuilderProvider.php
@@ -265,7 +265,7 @@ public function insert(): array
         return $insert;
     }
 
-    public function insertEx(): array
+    public function insertWithReturningPks(): array
     {
         $db = $this->getConnection();
 
diff --git a/tests/QueryBuilderTest.php b/tests/QueryBuilderTest.php
@@ -445,16 +445,16 @@ public function testInsert(
     }
 
     /**
-     * @dataProvider \Yiisoft\Db\Pgsql\Tests\Provider\QueryBuilderProvider::insertEx()
+     * @dataProvider \Yiisoft\Db\Pgsql\Tests\Provider\QueryBuilderProvider::insertWithReturningPks()
      */
-    public function testInsertEx(
+    public function testInsertWithReturningPks(
         string $table,
         array|QueryInterface $columns,
         array $params,
         string $expectedSQL,
         array $expectedParams
     ): void {
-        parent::testInsertEx($table, $columns, $params, $expectedSQL, $expectedParams);
+        parent::testInsertWithReturningPks($table, $columns, $params, $expectedSQL, $expectedParams);
     }
 
     /**
diff --git a/tests/Support/Fixture/pgsql.sql b/tests/Support/Fixture/pgsql.sql
@@ -16,6 +16,7 @@ DROP TABLE IF EXISTS "constraints" CASCADE;
 DROP TABLE IF EXISTS "bool_values" CASCADE;
 DROP TABLE IF EXISTS "animal" CASCADE;
 DROP TABLE IF EXISTS "default_pk" CASCADE;
+DROP TABLE IF EXISTS "notauto_pk" CASCADE;
 DROP TABLE IF EXISTS "document" CASCADE;
 DROP TABLE IF EXISTS "comment" CASCADE;
 DROP TABLE IF EXISTS "dossier";
@@ -182,6 +183,13 @@ CREATE TABLE "default_pk" (
   type varchar(255) not null
 );
 
+CREATE TABLE "notauto_pk" (
+  id_1 INTEGER,
+  id_2 INTEGER,
+  type VARCHAR(255) NOT NULL,
+  PRIMARY KEY (id_1, id_2)
+);
+
 CREATE TABLE "document" (
   id serial primary key,
   title varchar(255) not null,

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function __construct(`
`31`	`31`	`parent::__construct($queryBuilder, $quoter, $schema);`
`32`	`32`	`}`
`33`	`33`
`34`		`- public function insertEx(string $table, QueryInterface\|array $columns, array &$params = []): string`
	`34`	`+ public function insertWithReturningPks(string $table, QueryInterface\|array $columns, array &$params = []): string`
`35`	`35`	`{`
`36`	`36`	`$sql = $this->insert($table, $columns, $params);`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ public function insert(): array`
`265`	`265`	`return $insert;`
`266`	`266`	`}`
`267`	`267`
`268`		`- public function insertEx(): array`
	`268`	`+ public function insertWithReturningPks(): array`
`269`	`269`	`{`
`270`	`270`	`$db = $this->getConnection();`
`271`	`271`