修复 PostgreSQL replace() 没有更新字段值 (#634)

* 修复 PostgreSQL replace() 没有更新字段值 * 更新测试
imiphp · Nov 7, 2023 · b3e6027 · b3e6027
1 parent b3757da
commit b3e6027
Show file tree

Hide file tree

Showing 6 changed files with 134 additions and 4 deletions.
diff --git a/src/Components/pgsql/src/Db/Query/Builder/InsertBuilder.php b/src/Components/pgsql/src/Db/Query/Builder/InsertBuilder.php
@@ -4,7 +4,6 @@
 
 namespace Imi\Pgsql\Db\Query\Builder;
 
-use Imi\Db\Query\QueryOption;
 use Imi\Util\ArrayUtil;
 
 class InsertBuilder extends BaseBuilder
@@ -14,7 +13,6 @@ public function build(...$args): string
         parent::build(...$args);
         $query = $this->query;
         $params = &$this->params;
-        /** @var QueryOption $option */
         $option = $query->getOption();
         [$data] = $args;
         if (null === $data)

diff --git a/src/Components/pgsql/src/Db/Query/Builder/ReplaceBuilder.php b/src/Components/pgsql/src/Db/Query/Builder/ReplaceBuilder.php
@@ -4,6 +4,8 @@
 
 namespace Imi\Pgsql\Db\Query\Builder;
 
+use Imi\Util\ArrayUtil;
+
 class ReplaceBuilder extends InsertBuilder
 {
     public function build(...$args): string
@@ -14,11 +16,34 @@ public function build(...$args): string
             throw new \InvalidArgumentException('pgsql replace must set unique fields');
         }
         $query = $this->query;
-        $setItems = [];
+        [$data] = $args;
+        if (null === $data)
+        {
+            $data = $query->getOption()->saveData;
+        }
+        if ($data instanceof \Traversable)
+        {
+            $data = iterator_to_array($data);
+        }
+        if (ArrayUtil::isAssoc($data))
+        {
+            $setItems = [];
+            foreach ($data as $k => $_)
+            {
+                if (!\in_array($k, $uniqueFields))
+                {
+                    $fieldName = $query->fieldQuote($k);
+                    $setItems[] = $fieldName . ' = excluded.' . $fieldName;
+                }
+            }
+        }
+        else
+        {
+            throw new \InvalidArgumentException('replace() only supports key-value arrays');
+        }
         foreach ($uniqueFields as &$fieldName)
         {
             $fieldName = $query->fieldQuote($fieldName);
-            $setItems[] = $fieldName . ' = excluded.' . $fieldName;
         }
 
         return parent::build(...$args) . ' ON CONFLICT (' . implode(',', $uniqueFields) . ') DO UPDATE SET ' . implode(',', $setItems);

diff --git a/src/Components/pgsql/tests/Unit/Db/QueryCurdBaseTest.php b/src/Components/pgsql/tests/Unit/Db/QueryCurdBaseTest.php
@@ -222,6 +222,52 @@ public function testInsert(): array
         ];
     }
 
+    public function testReplace(): void
+    {
+        ['id' => $id] = $this->testInsert();
+
+        $data = [
+            'id'        => $id,
+            'title'     => 'title1',
+            'content'   => 'content2',
+            'time'      => '2019-06-22 00:00:00',
+        ];
+
+        $query = Db::query($this->poolName);
+        try
+        {
+            $query->from('tb_article')->replace($data);
+            $this->assertTrue(false);
+        }
+        catch (\InvalidArgumentException $e)
+        {
+            $this->assertEquals('pgsql replace must set unique fields', $e->getMessage());
+        }
+        $query->from('tb_article')->replace($data, ['id']);
+        $record = $query->from('tb_article')->where('id', '=', $id)->select()->get();
+        Assert::assertEquals($data, $record);
+
+        $data = [
+            'id'        => $id,
+            'title'     => 'title3',
+            'content'   => 'content4',
+            'time'      => '2019-06-23 00:00:00',
+        ];
+        $query->from('tb_article')->replace($data, ['id']);
+        $record = $query->from('tb_article')->where('id', '=', $id)->select()->get();
+        Assert::assertEquals($data, $record);
+
+        try
+        {
+            $query->from('tb_article')->replace(array_values($data), ['id']);
+            $this->assertTrue(false);
+        }
+        catch (\InvalidArgumentException $e)
+        {
+            $this->assertEquals('replace() only supports key-value arrays', $e->getMessage());
+        }
+    }
+
     public function testUpdate(): void
     {
         $data = [

diff --git a/src/Components/pgsql/tests/Unit/Model/ModelTest.php b/src/Components/pgsql/tests/Unit/Model/ModelTest.php
@@ -176,6 +176,22 @@ public function testSave(): void
             'bId'   => 2,
             'value' => 'yurun',
         ], $record3->toArray());
+
+        $record4 = NoIncPk::newInstance();
+        $record4->setAId(1);
+        $record4->setBId(2);
+        $record4->setValue('yurun2');
+        $record4->save();
+        $record5 = NoIncPk::find([
+            'a_id' => 1,
+            'b_id' => 2,
+        ]);
+        $this->assertNotNull($record5);
+        $this->assertEquals([
+            'aId'   => 1,
+            'bId'   => 2,
+            'value' => 'yurun2',
+        ], $record5->toArray());
     }
 
     public function testDelete(): void

diff --git a/tests/unit/Component/Tests/Db/DbBaseTest.php b/tests/unit/Component/Tests/Db/DbBaseTest.php
@@ -81,6 +81,35 @@ public function testInsert(): array
         ];
     }
 
+    public function testReplace(): void
+    {
+        ['id' => $id] = $this->testInsert();
+
+        $data = [
+            'id'        => $id,
+            'title'     => 'title1',
+            'content'   => 'content2',
+            'time'      => '2019-06-22 00:00:00',
+            'member_id' => 1,
+        ];
+
+        $query = Db::query($this->poolName);
+        $query->from('tb_article')->replace($data);
+        $record = $query->from('tb_article')->where('id', '=', $id)->select()->get();
+        Assert::assertEquals($data, $record);
+
+        $data = [
+            'id'        => $id,
+            'title'     => 'title3',
+            'content'   => 'content4',
+            'time'      => '2019-06-23 00:00:00',
+            'member_id' => 2,
+        ];
+        $query->from('tb_article')->replace($data);
+        $record = $query->from('tb_article')->where('id', '=', $id)->select()->get();
+        Assert::assertEquals($data, $record);
+    }
+
     /**
      * @depends testInsert
      */

diff --git a/tests/unit/Component/Tests/ModelTest.php b/tests/unit/Component/Tests/ModelTest.php
@@ -201,6 +201,22 @@ public function testSave(): void
             'bId'   => 2,
             'value' => 'yurun',
         ], $record3->toArray());
+
+        $record4 = NoIncPk::newInstance();
+        $record4->setAId(1);
+        $record4->setBId(2);
+        $record4->setValue('yurun2');
+        $record4->save();
+        $record5 = NoIncPk::find([
+            'a_id' => 1,
+            'b_id' => 2,
+        ]);
+        $this->assertNotNull($record5);
+        $this->assertEquals([
+            'aId'   => 1,
+            'bId'   => 2,
+            'value' => 'yurun2',
+        ], $record5->toArray());
     }
 
     public function testDelete(): void