迁移测试 ModelFieldType

NHZEX · liu21st · commit 6811bbd232c2 · 2025-05-20T21:38:11.000+08:00
diff --git a/src/db/connector/Pgsql.php b/src/db/connector/Pgsql.php
@@ -111,6 +111,28 @@ protected function supportSavepoint(): bool
         return true;
     }
 
+    protected function getFieldType(string $type): string
+    {
+        // 将字段类型转换为小写以进行比较
+        $type = strtolower($type);
+
+        return match (true) {
+            str_starts_with($type, 'set') => 'set',
+            str_starts_with($type, 'enum') => 'enum',
+            str_starts_with($type, 'bigint'),
+            str_contains($type, 'numeric') => 'bigint',
+            str_contains($type, 'float') || str_contains($type, 'double') ||
+            str_contains($type, 'decimal') || str_contains($type, 'real') ||
+            str_contains($type, 'int') || str_contains($type, 'serial') ||
+            str_contains($type, 'bit') => 'int',
+            str_contains($type, 'bool') => 'bool',
+            str_starts_with($type, 'timestamp') => 'timestamp',
+            str_starts_with($type, 'datetime') => 'datetime',
+            str_starts_with($type, 'date') => 'date',
+            default => 'string',
+        };
+    }
+
     public function insert(BaseQuery $query, bool $getLastInsID = false)
     {
         // 分析查询表达式
diff --git a/tests/TestCaseBase.php b/tests/TestCaseBase.php
@@ -10,6 +10,7 @@
 use think\db\ConnectionInterface;
 use think\db\connector\Pgsql;
 use think\facade\Db;
+use think\Model;
 use function version_compare;
 
 /**
@@ -21,6 +22,15 @@ class TestCaseBase extends TestCase
     protected static string $connectName;
     protected bool $isPgScriptInstalled = false;
 
+    protected static function initModelSupport(): void
+    {
+        // todo 需要一个重置能力更安全
+        Model::maker(function (Model $model) {
+            $model->setConnection(static::$connectName);
+            var_dump('maker:' . __FUNCTION__ . '-' . $model::class . '-' . spl_object_id($model));
+        });
+    }
+
     public function __get(string $name)
     {
         if ($name === 'connectName') {
@@ -55,6 +65,18 @@ protected static function compatibleInsertAll(BaseQuery $query, array $data): vo
         }
     }
 
+    protected static function compatibleModelInsertAll(Model $query, array $data): void
+    {
+        if ($query->getConnection() === 'pgsql') {
+            // 当前驱动批量插入不兼容，会产生类型错误，修复后可以移除兼容性
+            foreach ($data as $datum) {
+                (clone $query)->insert($datum);
+            }
+        } else {
+            $query->insertAll($data);
+        }
+    }
+
     protected function proxyAssertMatchesRegularExpression(string $pattern, string $string, string $message = '')
     {
         if (version_compare(Version::id(), '9.1', '>=')) {
diff --git a/tests/db/migrations/20250520095311_model_field_type.php b/tests/db/migrations/20250520095311_model_field_type.php
@@ -0,0 +1,64 @@
+<?php
+
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class ModelFieldType extends AbstractMigration
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * https://book.cakephp.org/phinx/0/en/migrations.html#the-change-method
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change(): void
+    {
+        $adapterType = $this->getAdapter()->getAdapterType();
+
+        $this
+            ->table('test_field_type', ['id' => false, 'primary_key' => ['id']])
+            ->addColumn(
+                'id',
+                'integer',
+                [
+                    'identity' => true,
+                    'signed'   => false, // MySQL用UNSIGNED, PostgreSQL需要容错
+                    'null'     => false,
+                ]
+            )
+            ->addColumn(
+                't_json',
+                'json',
+                [
+                    'null'    => true,
+                    'default' => null,
+                ])
+            ->addColumn(
+                't_php',
+                'text',
+                [  // 改用text类型更通用
+                   'limit'   => 512,
+                   'null'    => true,
+                   'default' => null,
+                ]
+            )
+            ->addColumn(
+                'bigint',
+                $adapterType === 'pgsql' ? 'decimal' : 'biginteger',
+                [
+                    'signed'  => false,
+                    'null'    => true,
+                    'default' => null,
+                    'after'   => 't_php', // 可选字段排序
+                    'precision' => $adapterType === 'pgsql' ? 20 : null, // PG BIGINT 最大19位
+                ]
+            )
+            ->create();
+    }
+}
diff --git a/tests/orm/ModelFieldTypeBase.php b/tests/orm/ModelFieldTypeBase.php
@@ -3,40 +3,49 @@
 
 namespace tests\orm;
 
-use PHPUnit\Framework\TestCase;
 use tests\stubs\FieldTypeModel;
 use tests\stubs\TestFieldJsonDTO;
 use tests\stubs\TestFieldPhpDTO;
-use think\facade\Db;
+use tests\TestCaseBase;
 
-class ModelFieldTypeTest extends TestCase
+class ModelFieldTypeBase extends TestCaseBase
 {
-    public static function setUpBeforeClass(): void
+    protected function provideTestData(): array
     {
-        Db::execute('DROP TABLE IF EXISTS `test_field_type`;');
-        Db::execute(
-            <<<SQL
-CREATE TABLE `test_field_type` (
-     `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-     `t_json` json DEFAULT NULL,
-     `t_php` varchar(512) DEFAULT NULL,
-     `bigint` bigint UNSIGNED DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-SQL
-        );
-    }
-
-    public function testFieldTypeSelect()
-    {
-        $data = [
+        return [
             ['id' => 1, 't_json' => '{"num1": 1, "str1": "a"}', 't_php' => (string) (new TestFieldPhpDTO(1, 'a')), 'bigint' => '0'],
             ['id' => 2, 't_json' => '{"num1": 2, "str1": "b"}', 't_php' => (string) (new TestFieldPhpDTO(2, 'b')), 'bigint' => '244791959321042944'],
             ['id' => 3, 't_json' => '{"num1": 3, "str1": "c"}', 't_php' => (string) (new TestFieldPhpDTO(3, 'c')), 'bigint' => '18374686479671623679'],
         ];
+    }
+
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
+
+        self::initModelSupport();
+    }
 
-        (new FieldTypeModel())->insertAll($data);
+    public function testInitData(): array
+    {
+        $this->db->execute('TRUNCATE TABLE test_field_type;');
+
+        $data = $this->provideTestData();
+        self::compatibleModelInsertAll(new FieldTypeModel(), $data);
+
+        return $data;
+    }
+
+    /**
+     * @depends testInitData
+     */
+    public function testFieldTypeSelect(array $data)
+    {
+        var_dump($this->db->getTableFieldsInfo('test_field_type'));
+        var_dump($this->db->getSchemaInfo('test_field_type'));
+        var_dump($this->db->getFieldBindType('bigint'));
 
-        $result = Db::table('test_field_type')->select();
+        $result = $this->db->table('test_field_type')->setFieldType(['bigint' => 'string'])->select();
         $this->assertNotEmpty($result->count());
         foreach ($data as $index => $item) {
             $this->assertEquals($item, $result[$index]);
@@ -52,7 +61,7 @@ public function testFieldTypeSelect()
     }
 
     /**
-     * @depends testFieldTypeSelect
+     * @depends testInitData
      */
     public function testFieldReadAndWrite()
     {
@@ -69,9 +78,6 @@ public function testFieldReadAndWrite()
         $this->assertEquals($result->id, $result->t_php->getId());
     }
 
-    /**
-     * @depends testFieldTypeSelect
-     */
     public function testFieldReadInvalid()
     {
 
diff --git a/tests/orm/ModelOneToOneBase.php b/tests/orm/ModelOneToOneBase.php
@@ -6,7 +6,6 @@
 use tests\stubs\ProfileModel;
 use tests\stubs\UserModel;
 use tests\TestCaseBase;
-use think\Model;
 
 /**
  * 模型一对一关联
@@ -17,11 +16,7 @@ public static function setUpBeforeClass(): void
     {
         parent::setUpBeforeClass();
 
-        // todo 需要一个重置能力更安全
-        Model::maker(function (Model $model) {
-            $model->setConnection(static::$connectName);
-            var_dump('maker:' . __FUNCTION__ . '-' . $model::class . '-' . spl_object_id($model));
-        });
+        self::initModelSupport();
     }
 
     public function setUp(): void
diff --git a/tests/orm/MysqlModelFieldTypeTest.php b/tests/orm/MysqlModelFieldTypeTest.php
@@ -0,0 +1,9 @@
+<?php
+declare(strict_types=1);
+
+namespace tests\orm;
+
+class MysqlModelFieldTypeTest extends ModelFieldTypeBase
+{
+    protected static string $connectName = 'mysql';
+}
diff --git a/tests/orm/PgsqlModelFieldTypeTest.php b/tests/orm/PgsqlModelFieldTypeTest.php
@@ -0,0 +1,9 @@
+<?php
+declare(strict_types=1);
+
+namespace tests\orm;
+
+class PgsqlModelFieldTypeTest extends ModelFieldTypeBase
+{
+    protected static string $connectName = 'pgsql';
+}
