From 1942d5da00bb65c5db677deb1544876f227ffc57 Mon Sep 17 00:00:00 2001 From: auooru Date: Sun, 18 May 2025 23:53:26 +0800 Subject: [PATCH 01/22] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20pgsql=20=E5=8D=95?= =?UTF-8?q?=E6=B5=8B=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- phpunit.xml | 9 ++ tests/bootstrap.php | 24 +++++ tests/functions.php | 73 ++++++++++++++ tests/orm/{DbTest.php => BaseDbTest.php} | 121 ++++++++++++----------- tests/orm/MysqlDbTest.php | 9 ++ tests/orm/PgsqlDbTest.php | 22 +++++ 6 files changed, 199 insertions(+), 59 deletions(-) rename tests/orm/{DbTest.php => BaseDbTest.php} (53%) create mode 100644 tests/orm/MysqlDbTest.php create mode 100644 tests/orm/PgsqlDbTest.php diff --git a/phpunit.xml b/phpunit.xml index bb93b3c9..87f92af5 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -8,6 +8,10 @@ convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" + displayDetailsOnTestsThatTriggerDeprecations="true" + displayDetailsOnTestsThatTriggerErrors="true" + displayDetailsOnTestsThatTriggerNotices="true" + displayDetailsOnTestsThatTriggerWarnings="true" processIsolation="false" stopOnError="false" stopOnFailure="false" @@ -30,5 +34,10 @@ + + + + + diff --git a/tests/bootstrap.php b/tests/bootstrap.php index cce8e7d3..3d11e185 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -55,5 +55,29 @@ // 数据库调试模式 'debug' => false, ], + 'pgsql' => [ + // 数据库类型 + 'type' => 'pgsql', + // 主机地址 + 'hostname' => getenv('TESTS_DB_PGSQL_HOSTNAME'), + // 主机端口 + 'hostport' => getenv('TESTS_DB_PGSQL_HOSTPORT'), + // 数据库名 + 'database' => getenv('TESTS_DB_PGSQL_DATABASE'), + // 用户名 + 'username' => getenv('TESTS_DB_PGSQL_USERNAME'), + // 密码 + 'password' => getenv('TESTS_DB_PGSQL_PASSWORD'), + // 数据库编码默认采用utf8 + 'charset' => 'utf8', + // 数据库表前缀 + 'prefix' => 'test_', + // 是否需要断线重连 + 'break_reconnect' => false, + // 断线标识字符串 + 'break_match_str' => [], + // 数据库调试模式 + 'debug' => false, + ], ], ]); diff --git a/tests/functions.php b/tests/functions.php index 35bc7c71..f0dc2be7 100644 --- a/tests/functions.php +++ b/tests/functions.php @@ -54,3 +54,76 @@ function mysql_kill_connection(string $name, $cid) { Db::connect($name)->execute("KILL {$cid}"); } + +global $pg_func_installed; +$pg_func_installed = []; + +function pg_server_version(string $name = 'pgsql'): string +{ + $pdo = Db::connect($name)->connect(); + $version = $pdo->getAttribute(\PDO::ATTR_SERVER_VERSION); + + return explode(' ', $version)[0]; +} + +function pg_install_func(string $name = 'pgsql'): void +{ + global $pg_func_installed; + + if ($pg_func_installed[$name] ?? false) { + return; + } + + /** @var \PDO $pdo */ + $pdo = Db::connect($name)->connect(); + + $file_path = version_compare(pg_server_version($name), '12.0', '>=') + ? __DIR__ . '/../src/db/connector/pgsql12.sql' + : __DIR__ . '/../src/db/connector/pgsql.sql'; + + $content = file_get_contents($file_path); + $statements = preg_split('/;\s*(?=CREATE|COMMENT|DROP)/i', $content); + + $pdo->beginTransaction(); + try { + foreach ($statements as $stmt) { + $stmt = trim($stmt); + if (!empty($stmt)) { + $pdo->exec($stmt); + } + } + $pdo->commit(); + } catch (\Throwable $exception) { + $pdo->rollBack(); + throw $exception; + } + + $pg_func_installed[$name] = true; +} + +function pg_reset_function(string $name = 'pgsql'): void +{ + global $pg_func_installed; + + /** @var \PDO $pdo */ + $pdo = Db::connect($name)->connect(); + + $statements = [ + "DROP FUNCTION IF EXISTS public.table_msg(a_table_name varchar)", + "DROP FUNCTION IF EXISTS public.table_msg(a_schema_name varchar, a_table_name varchar)", + "DROP FUNCTION IF EXISTS pgsql_type(a_type varchar)", + "DROP TYPE IF EXISTS public.tablestruct CASCADE", + ]; + $pdo->beginTransaction(); + try { + foreach ($statements as $statement) { + $pdo->exec($statement); + } + $pdo->commit(); + } catch (\Throwable $exception) { + $pdo->rollBack(); + throw $exception; + } + + $pg_func_installed[$name] = false; +} diff --git a/tests/orm/DbTest.php b/tests/orm/BaseDbTest.php similarity index 53% rename from tests/orm/DbTest.php rename to tests/orm/BaseDbTest.php index e5fcdcb5..c3863c74 100644 --- a/tests/orm/DbTest.php +++ b/tests/orm/BaseDbTest.php @@ -4,6 +4,7 @@ namespace tests\orm; +use think\db\ConnectionInterface; use function array_column; use function array_keys; use function array_unique; @@ -17,102 +18,101 @@ use think\Exception as ThinkException; use think\facade\Db; -class DbTest extends Base +abstract class BaseDbTest extends Base { - protected static $testUserData; + public ConnectionInterface $db; + protected string $dbName; - public static function setUpBeforeClass(): void + protected function provideTestData(): array { - Db::execute('DROP TABLE IF EXISTS `test_user`;'); - Db::execute( - <<<'SQL' -CREATE TABLE `test_user` ( - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, - `type` tinyint(4) NOT NULL DEFAULT '0', - `username` varchar(32) NOT NULL, - `nickname` varchar(32) NOT NULL, - `password` varchar(64) NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -SQL - ); - } - - public function setUp(): void - { - Db::execute('TRUNCATE TABLE `test_user`;'); - self::$testUserData = [ - ['id' => 1, 'type' => 3, 'username' => 'qweqwe', 'nickname' => 'asdasd', 'password' => '123123'], - ['id' => 2, 'type' => 2, 'username' => 'rtyrty', 'nickname' => 'fghfgh', 'password' => '456456'], + return [ + ['id' => 1, 'type' => 3, 'username' => 'qw"e"qwe', 'nickname' => 'asdasd', 'password' => '123123'], + ['id' => 2, 'type' => 2, 'username' => 'rt"yrty', 'nickname' => 'fghfgh', 'password' => '456456'], ['id' => 3, 'type' => 1, 'username' => 'uiouio', 'nickname' => 'jkljkl', 'password' => '789789'], ['id' => 5, 'type' => 2, 'username' => 'qazqaz', 'nickname' => 'wsxwsx', 'password' => '098098'], ['id' => 7, 'type' => 2, 'username' => 'rfvrfv', 'nickname' => 'tgbtgb', 'password' => '765765'], ]; - Db::table('test_user')->insertAll(self::$testUserData); } - public function testColumn() + public function setUp(): void { - $users = self::$testUserData; + $this->db = Db::connect($this->dbName); + } + public function testInitUsers(): array + { + $this->db->execute('TRUNCATE TABLE test_user;'); + + $userData = $this->provideTestData(); + $this->db->table('test_user')->insertAll($userData); + + return $userData; + } + + /** + * @depends testInitUsers + */ + public function testColumn(array $users) + { // 获取全部列 - $result = Db::table('test_user')->column('*', 'id'); + $result = $this->db->table('test_user')->column('*', 'id'); $this->assertCount(5, $result); $this->assertEquals($users, array_values($result)); $this->assertEquals(array_column($users, 'id'), array_keys($result)); // 获取某一个字段 - $result = Db::table('test_user')->column('username'); + $result = $this->db->table('test_user')->column('username'); $this->assertEquals(array_column($users, 'username'), $result); // 获取某字段唯一 - $result = Db::table('test_user')->column('DISTINCT type'); + $result = $this->db->table('test_user')->order('type', 'desc')->column('DISTINCT type'); $expected = array_unique(array_column($users, 'type')); $this->assertEquals($expected, $result); // 字段别名 - $result = Db::table('test_user')->column('username as name2'); + $result = $this->db->table('test_user')->column('username as name2'); $expected = array_column($users, 'username'); $this->assertEquals($expected, $result); // 表别名 - $result = Db::table('test_user')->alias('test2')->column('test2.username'); + $result = $this->db->table('test_user')->alias('test2')->column('test2.username'); $expected = array_column($users, 'username'); $this->assertEquals($expected, $result); // 获取若干列 - $result = Db::table('test_user')->column('username,nickname', 'id'); + $result = $this->db->table('test_user')->column('username,nickname', 'id'); $expected = array_column_ex($users, ['username', 'nickname', 'id'], 'id'); $this->assertEquals($expected, $result); // 获取若干列不指定key时不报错 - $result = Db::table('test_user')->column('username,nickname,id'); + $result = $this->db->table('test_user')->column('username,nickname,id'); $expected = array_column_ex($users, ['username', 'nickname', 'id']); $this->assertEquals($expected, $result); // 数组方式获取 - $result = Db::table('test_user')->column(['username', 'nickname', 'type'], 'id'); + $result = $this->db->table('test_user')->column(['username', 'nickname', 'type'], 'id'); $expected = array_column_ex($users, ['username', 'nickname', 'type', 'id'], 'id'); $this->assertEquals($expected, $result); // 数组方式获取（单字段） - $result = Db::table('test_user')->column(['type'], 'id'); + $result = $this->db->table('test_user')->column(['type'], 'id'); $expected = array_column($users, 'type', 'id'); $this->assertEquals($expected, $result); // 数组方式获取（重命名字段） - $result = Db::table('test_user')->column(['username' => 'my_name', 'nickname'], 'id'); + $result = $this->db->table('test_user')->column(['username' => 'my_name', 'nickname'], 'id'); $expected = array_column_ex($users, ['username' => 'my_name', 'nickname', 'id'], 'id'); array_value_sort($result); array_value_sort($expected); $this->assertEquals($expected, $result); // 数组方式获取（定义表达式） - $result = Db::table('test_user') + $result = $this->db->table('test_user') ->column([ 'username' => 'my_name', 'nickname', - new Raw('`type`+1000 as type2'), + new Raw('type+1000 as type2'), ], 'id'); $expected = array_column_ex( $users, @@ -131,46 +131,49 @@ public function testColumn() $this->assertEquals($expected, $result); } - public function testWhereIn() + /** + * @depends testInitUsers + */ + public function testWhereIn(array $users) { $sqlLogs = []; Db::listen(function ($sql) use (&$sqlLogs) { $sqlLogs[] = $sql; }); - $expected = Collection::make(self::$testUserData)->whereIn('type', [1, 3])->values()->toArray(); - $result = Db::table('test_user')->whereIn('type', [1, 3])->column('*'); + $expected = Collection::make($users)->whereIn('type', [1, 3])->values()->toArray(); + $result = $this->db->table('test_user')->whereIn('type', [1, 3])->column('*'); $this->assertEquals($expected, $result); - $expected = Collection::make(self::$testUserData)->whereIn('type', [1])->values()->toArray(); - $result = Db::table('test_user')->whereIn('type', [1])->column('*'); + $expected = Collection::make($users)->whereIn('type', [1])->values()->toArray(); + $result = $this->db->table('test_user')->whereIn('type', [1])->column('*'); $this->assertEquals($expected, $result); - $expected = Collection::make(self::$testUserData)->whereIn('type', [1, ''])->values()->toArray(); - $result = Db::table('test_user')->whereIn('type', [1, ''])->column('*'); + $expected = Collection::make($users)->whereIn('type', [1, ''])->values()->toArray(); + $result = $this->db->table('test_user')->whereIn('type', [1, ''])->column('*'); $this->assertEquals($expected, $result); - $result = Db::table('test_user')->whereIn('type', [])->column('*'); + $result = $this->db->table('test_user')->whereIn('type', [])->column('*'); $this->assertEquals([], $result); - $expected = Collection::make(self::$testUserData)->whereNotIn('type', [1, 3])->values()->toArray(); - $result = Db::table('test_user')->whereNotIn('type', [1, 3])->column('*'); + $expected = Collection::make($users)->whereNotIn('type', [1, 3])->values()->toArray(); + $result = $this->db->table('test_user')->whereNotIn('type', [1, 3])->column('*'); $this->assertEquals($expected, $result); - $expected = Collection::make(self::$testUserData)->values()->toArray(); - $result = Db::table('test_user')->whereNotIn('type', [])->column('*'); + $expected = Collection::make($users)->values()->toArray(); + $result = $this->db->table('test_user')->whereNotIn('type', [])->column('*'); $this->assertEquals($expected, $result); - // 合并多余空格 - $sqlLogs = array_map(static fn ($str) => preg_replace('#\s{2,}#', ' ', $str), $sqlLogs); + // 合并多余空格，替换 "`" 是为了同时兼容 pg 与 mysql + $sqlLogs = array_map(static fn ($str) => preg_replace(['#\s{2,}#', '~`~'], [' ', ''], $str), $sqlLogs); $this->assertEquals([ - 'SELECT * FROM `test_user` WHERE `type` IN (1,3)', - 'SELECT * FROM `test_user` WHERE `type` = 1', - 'SELECT * FROM `test_user` WHERE `type` IN (1,0)', - 'SELECT * FROM `test_user` WHERE 0 = 1', - 'SELECT * FROM `test_user` WHERE `type` NOT IN (1,3)', - 'SELECT * FROM `test_user` WHERE 1 = 1', + 'SELECT * FROM test_user WHERE type IN (1,3)', + 'SELECT * FROM test_user WHERE type = 1', + 'SELECT * FROM test_user WHERE type IN (1,0)', + 'SELECT * FROM test_user WHERE 0 = 1', + 'SELECT * FROM test_user WHERE type NOT IN (1,3)', + 'SELECT * FROM test_user WHERE 1 = 1', ], $sqlLogs); } @@ -179,7 +182,7 @@ public function testException() $this->expectException(DbException::class); try { - Db::query('wrong syntax'); + $this->db->query('wrong syntax'); } catch (DbException $exception) { $this->assertInstanceOf(ThinkException::class, $exception); diff --git a/tests/orm/MysqlDbTest.php b/tests/orm/MysqlDbTest.php new file mode 100644 index 00000000..2b2478fd --- /dev/null +++ b/tests/orm/MysqlDbTest.php @@ -0,0 +1,9 @@ +db->execute('TRUNCATE TABLE "test_user";'); + + // 当前驱动批量插入不兼容，会产生类型错误 + $userData = $this->provideTestData(); + foreach ($userData as $datum) { + $this->db->table('test_user')->insert($datum); + } + + return $userData; + } +} From 83e51d40cd508c915769e6b6c00b5256d47d1433 Mon Sep 17 00:00:00 2001 From: auooru Date: Mon, 19 May 2025 12:10:25 +0800 Subject: [PATCH 02/22] =?UTF-8?q?=E5=A2=9E=E5=BC=BA=20pgsql=20=E5=8D=95?= =?UTF-8?q?=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/bootstrap.php | 20 ++ tests/functions.php | 36 ++++ tests/orm/BaseDbTransactionTest.php | 275 +++++++++++++++++++++++++++ tests/orm/DbTransactionTest.php | 240 ----------------------- tests/orm/ModelOneToOneTest.php | 1 + tests/orm/MysqlDbTransactionTest.php | 9 + tests/orm/PgsqlDbTransactionTest.php | 9 + 7 files changed, 350 insertions(+), 240 deletions(-) create mode 100644 tests/orm/BaseDbTransactionTest.php delete mode 100644 tests/orm/DbTransactionTest.php create mode 100644 tests/orm/MysqlDbTransactionTest.php create mode 100644 tests/orm/PgsqlDbTransactionTest.php diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 3d11e185..c0387bc7 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -79,5 +79,25 @@ // 数据库调试模式 'debug' => false, ], + 'pgsql_manage' => [ + // 数据库类型 + 'type' => 'pgsql', + // 主机地址 + 'hostname' => getenv('TESTS_DB_PGSQL_HOSTNAME'), + // 主机端口 + 'hostport' => getenv('TESTS_DB_PGSQL_HOSTPORT'), + // 数据库名 + 'database' => getenv('TESTS_DB_PGSQL_DATABASE'), + // 用户名 + 'username' => getenv('TESTS_DB_PGSQL_USERNAME'), + // 密码 + 'password' => getenv('TESTS_DB_PGSQL_PASSWORD'), + // 数据库编码默认采用utf8 + 'charset' => 'utf8', + // 数据库表前缀 + 'prefix' => 'test_', + // 数据库调试模式 + 'debug' => false, + ], ], ]); diff --git a/tests/functions.php b/tests/functions.php index f0dc2be7..a6b09a07 100644 --- a/tests/functions.php +++ b/tests/functions.php @@ -50,11 +50,47 @@ function query_mysql_connection_id(ConnectionInterface $connect): int return (int) $cid; } +function query_pgsql_connection_id(ConnectionInterface $connect): int +{ + $cid = $connect->query('SELECT pg_backend_pid() as cid')[0]['cid']; + + return (int) $cid; +} + +function query_connection_id(ConnectionInterface $connect): int +{ + if ($connect->getConfig('type') === 'mysql') { + return query_mysql_connection_id($connect); + } elseif ($connect->getConfig('type') === 'pgsql') { + return query_pgsql_connection_id($connect); + } else { + throw new \RuntimeException('Unsupported database type'); + } +} + + function mysql_kill_connection(string $name, $cid) { Db::connect($name)->execute("KILL {$cid}"); } +function pgsql_kill_connection(string $name, $cid) +{ + Db::connect($name)->execute("SELECT pg_terminate_backend({$cid})"); +} + +function kill_connection(string $name, $cid): void +{ + $connect = Db::connect($name); + if ($connect->getConfig('type') === 'mysql') { + mysql_kill_connection($name, $cid); + } elseif ($connect->getConfig('type') === 'pgsql') { + pgsql_kill_connection($name, $cid); + } else { + throw new \RuntimeException('Unsupported database type'); + } +} + global $pg_func_installed; $pg_func_installed = []; diff --git a/tests/orm/BaseDbTransactionTest.php b/tests/orm/BaseDbTransactionTest.php new file mode 100644 index 00000000..0fa28b31 --- /dev/null +++ b/tests/orm/BaseDbTransactionTest.php @@ -0,0 +1,275 @@ + 1, 'type' => 9, 'username' => '1-9-a'], + ['id' => 2, 'type' => 8, 'username' => '2-8-a'], + ['id' => 3, 'type' => 7, 'username' => '3-7-a'], + ]; + } + + public function setUp(): void + { + Db::listen(function ($sql, $time) { + echo "SQL: $sql [$time ms]\n"; + }); + $this->db = Db::connect($this->dbName, true); + $this->db->execute('TRUNCATE TABLE test_tran_a;'); + } + + protected function reconnect(): ConnectionInterface + { + return $this->db = Db::connect($this->dbName, true); + } + + protected static function insertAll(ConnectionInterface $db, string $table, array $data): void + { + if ($db instanceof Pgsql) { + foreach ($data as $datum) { + $db->table($table)->insert($datum); + } + } else { + $db->table($table)->insertAll($data); + } + } + + public function testTransaction() + { + $this->db->query('SELECT 1;'); + $this->db->table('test_tran_a')->startTrans(); + self::insertAll($this->db, 'test_tran_a', $this->provideTestData()); + $this->db->table('test_tran_a')->rollback(); + + $this->assertEmpty($this->db->table('test_tran_a')->column('*')); + + $this->db->execute('TRUNCATE TABLE test_tran_a;'); + $this->db->table('test_tran_a')->startTrans(); + self::insertAll($this->db, 'test_tran_a', $this->provideTestData()); + $this->db->table('test_tran_a')->commit(); + $this->assertEquals($this->provideTestData(), $this->db->table('test_tran_a')->column('*')); + $this->db->table('test_tran_a')->startTrans(); + $this->db->table('test_tran_a')->where('id', '=', 2)->update([ + 'username' => '2-8-b', + ]); + $this->db->table('test_tran_a')->commit(); + $this->assertEquals( + '2-8-b', + $this->db->table('test_tran_a')->where('id', '=', 2)->value('username') + ); + } + + public function testBreakReconnect() + { + // 初始化配置 + $oldConfig = Db::getConfig(); + $config = $oldConfig; + $config['connections'][$this->dbName]['break_reconnect'] = true; + $config['connections'][$this->dbName]['break_match_str'] = [ + 'query execution was interrupted', + 'no connection to the server', + ]; + Db::setConfig($config); + + $this->reconnect(); + try { + // 初始化数据 + self::insertAll($this->db, 'test_tran_a', $this->provideTestData()); + + $cid = query_connection_id($this->db); + kill_connection($this->dbName . '_manage', $cid); + // 触发重连 + $this->db->table('test_tran_a')->where('id', '=', 2)->value('username'); + + $newCid = query_connection_id($this->db); + $this->assertNotEquals($cid, $newCid); + $cid = $newCid; + + // 事务前重连 + kill_connection($this->dbName . '_manage', $cid); + $this->db->table('test_tran_a')->startTrans(); + $this->db->table('test_tran_a')->where('id', '=', 2)->update([ + 'username' => '2-8-b', + ]); + $this->db->table('test_tran_a')->commit(); + $newCid = query_connection_id($this->db); + $this->assertNotEquals($cid, $newCid); + $cid = $newCid; + $this->assertEquals( + '2-8-b', + $this->db->table('test_tran_a')->where('id', '=', 2)->value('username') + ); + + // 事务中不能重连 + try { + $this->db->table('test_tran_a')->startTrans(); + $this->db->table('test_tran_a')->where('id', '=', 2)->update([ + 'username' => '2-8-c', + ]); + kill_connection($this->dbName . '_manage', $cid); + $this->db->table('test_tran_a')->where('id', '=', 3)->update([ + 'username' => '3-7-b', + ]); + $this->db->table('test_tran_a')->commit(); + } catch (Throwable|Exception $exception) { + try { + $this->db->table('test_tran_a')->rollback(); + } catch (Exception $rollbackException) { + // Ignore exception + $this->proxyAssertMatchesRegularExpression( + $this->dbName === 'mysql' ? '~(server has gone away)~' : '~(no connection to the server)~', + $rollbackException->getMessage() + ); + } + // Ignore exception + $this->proxyAssertMatchesRegularExpression( + $this->dbName === 'mysql' ? '~(server has gone away)~' : '~(no connection to the server)~', + $exception->getMessage() + ); + } + // 预期应该没有发生任何更改 + $this->assertEquals( + '2-8-b', + $this->db->table('test_tran_a')->where('id', '=', 2)->value('username') + ); + $this->assertEquals( + '3-7-a', + $this->db->table('test_tran_a')->where('id', '=', 3)->value('username') + ); + } finally { + Db::setConfig($oldConfig); + $this->reconnect(); + } + } + + public function testTransactionSavepoint() + { + // 初始化数据 + $oldConnect = $this->db; + $oldConnect->query('select 1;'); + $newConnect = $this->reconnect(); + $newConnect->query('select 1;'); + self::assertNotEquals(spl_object_id($oldConnect), spl_object_id($newConnect)); + + self::insertAll($newConnect, 'test_tran_a', $this->provideTestData()); + + try { + $this->db->table('test_tran_a')->transaction(function () use ($newConnect, $oldConnect) { + // tran 1 + $newConnect->table('test_tran_a')->startTrans(); + $oldConnect->table('test_tran_a')->where('id', '=', 2)->update([ + 'username' => '2-8-c', + ]); + $newConnect->table('test_tran_a')->commit(); + // tran 2 + $newConnect->table('test_tran_a')->startTrans(); + $oldConnect->table('test_tran_a')->where('id', '=', 3)->update([ + 'username' => '3-7-b', + ]); + $newConnect->table('test_tran_a')->commit(); + }); + } finally { + $oldConnect->close(); + } + + // 预期变化 + $this->assertEquals( + '2-8-c', + $newConnect->table('test_tran_a')->where('id', '=', 2)->value('username') + ); + $this->assertEquals( + '3-7-b', + $newConnect->table('test_tran_a')->where('id', '=', 3)->value('username') + ); + } + + public function testTransactionSavepointBreakReconnect() + { + // 初始化配置 + $oldConfig = Db::getConfig(); + $config = $oldConfig; + $config['connections'][$this->dbName]['break_reconnect'] = true; + $config['connections'][$this->dbName]['break_match_str'] = [ + 'query execution was interrupted', + 'no connection to the server', + ]; + Db::setConfig($config); + // 初始化数据 + $oldConnect = $this->db; + $oldConnect->query('select 1;'); + $newConnect = $this->reconnect(); + $newConnect->query('select 1;'); + self::assertNotEquals(spl_object_id($oldConnect->getPdo()), spl_object_id($newConnect->getPdo())); + self::insertAll($newConnect, 'test_tran_a', $this->provideTestData()); + + // 事务中不能重连 + try { + // tran 0 + $newConnect->table('test_tran_a')->startTrans(); + $cid = query_connection_id($newConnect); + // tran 1 + $oldConnect->table('test_tran_a')->startTrans(); + $newConnect->table('test_tran_a')->where('id', '=', 2)->update([ + 'username' => '2-8-c', + ]); + $oldConnect->table('test_tran_a')->commit(); + // kill + kill_connection($this->dbName . '_manage', $cid); + // tran 2 + $oldConnect->table('test_tran_a')->startTrans(); + $newConnect->table('test_tran_a')->where('id', '=', 3)->update([ + 'username' => '3-7-b', + ]); + $oldConnect->table('test_tran_a')->commit(); + // tran 0 + $newConnect->table('test_tran_a')->commit(); + } catch (Throwable|Exception $exception) { + try { + $newConnect->table('test_tran_a')->rollback(); + } catch (Exception $rollbackException) { + // Ignore exception + $this->proxyAssertMatchesRegularExpression( + $this->dbName === 'mysql' ? '~(server has gone away)~' : '~(no connection to the server)~', + $rollbackException->getMessage() + ); + } + // Ignore exception + $this->proxyAssertMatchesRegularExpression( + $this->dbName === 'mysql' ? '~(server has gone away)~' : '~(no connection to the server)~', + $exception->getMessage() + ); + } finally { + $oldConnect->close(); + } + // 预期应该没有发生任何更改 + $this->assertEquals( + '2-8-a', + $this->db->table('test_tran_a')->where('id', '=', 2)->value('username') + ); + $this->assertEquals( + '3-7-a', + $this->db->table('test_tran_a')->where('id', '=', 3)->value('username') + ); + } +} diff --git a/tests/orm/DbTransactionTest.php b/tests/orm/DbTransactionTest.php deleted file mode 100644 index 2f6177cd..00000000 --- a/tests/orm/DbTransactionTest.php +++ /dev/null @@ -1,240 +0,0 @@ - 1, 'type' => 9, 'username' => '1-9-a'], - ['id' => 2, 'type' => 8, 'username' => '2-8-a'], - ['id' => 3, 'type' => 7, 'username' => '3-7-a'], - ]; - } - - public function testTransaction() - { - $testData = self::$testData; - $connect = Db::connect(); - - $connect->table('test_tran_a')->startTrans(); - $connect->table('test_tran_a')->insertAll($testData); - $connect->table('test_tran_a')->rollback(); - - $this->assertEmpty($connect->table('test_tran_a')->column('*')); - - $connect->execute('TRUNCATE TABLE `test_tran_a`;'); - $connect->table('test_tran_a')->startTrans(); - $connect->table('test_tran_a')->insertAll($testData); - $connect->table('test_tran_a')->commit(); - $this->assertEquals($testData, $connect->table('test_tran_a')->column('*')); - $connect->table('test_tran_a')->startTrans(); - $connect->table('test_tran_a')->where('id', '=', 2)->update([ - 'username' => '2-8-b', - ]); - $connect->table('test_tran_a')->commit(); - $this->assertEquals( - '2-8-b', - $connect->table('test_tran_a')->where('id', '=', 2)->value('username') - ); - } - - public function testBreakReconnect() - { - $testData = self::$testData; - // 初始化配置 - $config = Db::getConfig(); - $config['connections']['mysql']['break_reconnect'] = true; - $config['connections']['mysql']['break_match_str'] = [ - 'query execution was interrupted', - ]; - Db::setConfig($config); - // 初始化数据 - $connect = Db::connect(null, true); - $connect->table('test_tran_a')->insertAll($testData); - - $cid = query_mysql_connection_id($connect); - mysql_kill_connection('mysql_manage', $cid); - // 触发重连 - $connect->table('test_tran_a')->where('id', '=', 2)->value('username'); - - $newCid = query_mysql_connection_id($connect); - $this->assertNotEquals($cid, $newCid); - $cid = $newCid; - - // 事务前重连 - mysql_kill_connection('mysql_manage', $cid); - Db::table('test_tran_a')->startTrans(); - $connect->table('test_tran_a')->where('id', '=', 2)->update([ - 'username' => '2-8-b', - ]); - Db::table('test_tran_a')->commit(); - $newCid = query_mysql_connection_id($connect); - $this->assertNotEquals($cid, $newCid); - $cid = $newCid; - $this->assertEquals( - '2-8-b', - Db::table('test_tran_a')->where('id', '=', 2)->value('username') - ); - - // 事务中不能重连 - try { - Db::table('test_tran_a')->startTrans(); - $connect->table('test_tran_a')->where('id', '=', 2)->update([ - 'username' => '2-8-c', - ]); - mysql_kill_connection('mysql_manage', $cid); - $connect->table('test_tran_a')->where('id', '=', 3)->update([ - 'username' => '3-7-b', - ]); - Db::table('test_tran_a')->commit(); - } catch (Throwable|Exception $exception) { - try { - Db::table('test_tran_a')->rollback(); - } catch (Exception $rollbackException) { - // Ignore exception - $this->proxyAssertMatchesRegularExpression( - '~(server has gone away)~', - $rollbackException->getMessage() - ); - } - // Ignore exception - $this->proxyAssertMatchesRegularExpression( - '~(server has gone away)~', - $exception->getMessage() - ); - } - // 预期应该没有发生任何更改 - $this->assertEquals( - '2-8-b', - Db::table('test_tran_a')->where('id', '=', 2)->value('username') - ); - $this->assertEquals( - '3-7-a', - Db::table('test_tran_a')->where('id', '=', 3)->value('username') - ); - } - - public function testTransactionSavepoint() - { - $testData = self::$testData; - // 初始化数据 - $connect = Db::connect(null, true); - $connect->table('test_tran_a')->insertAll($testData); - - Db::table('test_tran_a')->transaction(function () use ($connect) { - $cid = query_mysql_connection_id($connect); - // tran 1 - Db::table('test_tran_a')->startTrans(); - $connect->table('test_tran_a')->where('id', '=', 2)->update([ - 'username' => '2-8-c', - ]); - Db::table('test_tran_a')->commit(); - // tran 2 - Db::table('test_tran_a')->startTrans(); - $connect->table('test_tran_a')->where('id', '=', 3)->update([ - 'username' => '3-7-b', - ]); - Db::table('test_tran_a')->commit(); - }); - - // 预期变化 - $this->assertEquals( - '2-8-c', - Db::table('test_tran_a')->where('id', '=', 2)->value('username') - ); - $this->assertEquals( - '3-7-b', - Db::table('test_tran_a')->where('id', '=', 3)->value('username') - ); - } - - public function testTransactionSavepointBreakReconnect() - { - $testData = self::$testData; - // 初始化配置 - $config = Db::getConfig(); - $config['connections']['mysql']['break_reconnect'] = true; - $config['connections']['mysql']['break_match_str'] = [ - 'query execution was interrupted', - ]; - Db::setConfig($config); - // 初始化数据 - $connect = Db::connect(null, true); - $connect->table('test_tran_a')->insertAll($testData); - - // 事务中不能重连 - try { - // tran 0 - Db::table('test_tran_a')->startTrans(); - $cid = query_mysql_connection_id($connect); - // tran 1 - Db::table('test_tran_a')->startTrans(); - $connect->table('test_tran_a')->where('id', '=', 2)->update([ - 'username' => '2-8-c', - ]); - Db::table('test_tran_a')->commit(); - // kill - mysql_kill_connection('mysql_manage', $cid); - // tran 2 - Db::table('test_tran_a')->startTrans(); - $connect->table('test_tran_a')->where('id', '=', 3)->update([ - 'username' => '3-7-b', - ]); - Db::table('test_tran_a')->commit(); - // tran 0 - Db::table('test_tran_a')->commit(); - } catch (Throwable|Exception $exception) { - try { - Db::table('test_tran_a')->rollback(); - } catch (Exception $rollbackException) { - // Ignore exception - $this->proxyAssertMatchesRegularExpression( - '~(server has gone away)~', - $rollbackException->getMessage() - ); - } - // Ignore exception - $this->proxyAssertMatchesRegularExpression( - '~(server has gone away)~', - $exception->getMessage() - ); - } - // 预期应该没有发生任何更改 - $this->assertEquals( - '2-8-a', - Db::table('test_tran_a')->where('id', '=', 2)->value('username') - ); - $this->assertEquals( - '3-7-a', - Db::table('test_tran_a')->where('id', '=', 3)->value('username') - ); - } -} diff --git a/tests/orm/ModelOneToOneTest.php b/tests/orm/ModelOneToOneTest.php index 5d4be715..bc4664b0 100644 --- a/tests/orm/ModelOneToOneTest.php +++ b/tests/orm/ModelOneToOneTest.php @@ -15,6 +15,7 @@ class ModelOneToOneTest extends TestCase { public static function setUpBeforeClass(): void { + self::markTestSkipped('冲突需要更改兼容性'); $sqlList = [ 'DROP TABLE IF EXISTS `test_user`;', 'CREATE TABLE `test_user` ( diff --git a/tests/orm/MysqlDbTransactionTest.php b/tests/orm/MysqlDbTransactionTest.php new file mode 100644 index 00000000..c3b5d4ee --- /dev/null +++ b/tests/orm/MysqlDbTransactionTest.php @@ -0,0 +1,9 @@ + Date: Mon, 19 May 2025 12:12:01 +0800 Subject: [PATCH 03/22] =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 3 +- .gitignore | 3 +- composer.json | 36 +++++++++++++- phinx.php | 32 ++++++++++++ .../migrations/20250517151353_test_user.php | 49 +++++++++++++++++++ tests/db/migrations/20250518164819_tran.php | 44 +++++++++++++++++ vendor-bin/phinx/composer.json | 5 ++ 7 files changed, 169 insertions(+), 3 deletions(-) create mode 100644 phinx.php create mode 100644 tests/db/migrations/20250517151353_test_user.php create mode 100644 tests/db/migrations/20250518164819_tran.php create mode 100644 vendor-bin/phinx/composer.json diff --git a/.gitattributes b/.gitattributes index 36c9cd12..162760ef 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,4 @@ /.github export-ignore /tests export-ignore -/phpunit.xml export-ignore \ No newline at end of file +/phpunit.xml export-ignore +/vendor-bin export-ignore \ No newline at end of file diff --git a/.gitignore b/.gitignore index 36e8429f..4bce57ca 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ composer.lock Thumbs.db /.idea /.vscode -/.settings \ No newline at end of file +/.settings +/vendor-bin/**/vendor/ \ No newline at end of file diff --git a/composer.json b/composer.json index 16ee6048..6b891534 100644 --- a/composer.json +++ b/composer.json @@ -21,6 +21,7 @@ "topthink/think-helper":"^3.1" }, "require-dev": { + "bamarni/composer-bin-plugin": "^1.8", "phpunit/phpunit": "^9.6|^10" }, "autoload": { @@ -40,6 +41,39 @@ "ext-mongodb": "provide mongodb support" }, "config": { - "sort-packages": true + "sort-packages": true, + "allow-plugins": { + "bamarni/composer-bin-plugin": true + } + }, + "scripts": { + "post-install-cmd": [ + "@composer bin phinx install --ansi" + ], + "phinx-update": [ + "@composer bin phinx update --ansi" + ], + "db-migrate": [ + "./vendor/bin/phinx migrate -e mysql", + "./vendor/bin/phinx migrate -e pgsql" + ], + "db-rollback": [ + "./vendor/bin/phinx rollback -f -e mysql", + "./vendor/bin/phinx rollback -f -e pgsql" + ], + "db-status": [ + "./vendor/bin/phinx status -e mysql", + "./vendor/bin/phinx status -e pgsql" + ], + "db-rebuild": [ + "@composer run db-rollback", + "@composer run db-migrate" + ] + }, + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + } } } diff --git a/phinx.php b/phinx.php new file mode 100644 index 00000000..df3c07fd --- /dev/null +++ b/phinx.php @@ -0,0 +1,32 @@ + [ + 'migrations' => '%%PHINX_CONFIG_DIR%%/tests/db/migrations', + 'seeds' => '%%PHINX_CONFIG_DIR%%/tests/db/seeds' + ], + 'environments' => [ + 'default_migration_table' => 'phinxlog', + 'default_environment' => '', + 'mysql' => [ + 'adapter' => 'mysql', + 'host' => getenv('TESTS_DB_MYSQL_HOSTNAME') ?: 'localhost', + 'name' => getenv('TESTS_DB_MYSQL_HOSTPORT') ?: 'tp_orm_test', + 'user' => getenv('TESTS_DB_MYSQL_DATABASE') ?: 'homestead', + 'pass' => getenv('TESTS_DB_MYSQL_USERNAME') ?: 'secret', + 'port' => getenv('TESTS_DB_MYSQL_PASSWORD') ?: '3306', + 'charset' => 'utf8', + ], + 'pgsql' => [ + 'adapter' => 'pgsql', + 'host' => getenv('TESTS_DB_PGSQL_HOSTNAME') ?: 'localhost', + 'name' => getenv('TESTS_DB_PGSQL_HOSTPORT') ?: 'tp_orm_test', + 'user' => getenv('TESTS_DB_PGSQL_DATABASE') ?: 'homestead', + 'pass' => getenv('TESTS_DB_PGSQL_USERNAME') ?: 'secret', + 'port' => getenv('TESTS_DB_PGSQL_PASSWORD') ?: '5432', + 'charset' => 'utf8', + ] + ], + 'version_order' => 'creation' +]; diff --git a/tests/db/migrations/20250517151353_test_user.php b/tests/db/migrations/20250517151353_test_user.php new file mode 100644 index 00000000..7e25e990 --- /dev/null +++ b/tests/db/migrations/20250517151353_test_user.php @@ -0,0 +1,49 @@ +table('test_user', ['id' => false, 'primary_key' => ['id']]) + ->addColumn('id', 'integer', [ + 'identity' => true, + 'signed' => false, + 'null' => false, + ]) + ->addColumn('type', 'integer', [ + 'limit' => 4, // 对应 MySQL 的 TINYINT(4) + 'default' => 0, + 'null' => false, + 'signed' => false, // 转换为 PostgreSQL 的 SMALLINT + ]) + ->addColumn('username', 'string', [ + 'limit' => 32, + 'null' => false, + ]) + ->addColumn('nickname', 'string', [ + 'limit' => 32, + 'null' => false, + ]) + ->addColumn('password', 'string', [ + 'limit' => 64, + 'null' => false, + ]) + ->create(); + } +} diff --git a/tests/db/migrations/20250518164819_tran.php b/tests/db/migrations/20250518164819_tran.php new file mode 100644 index 00000000..2876139d --- /dev/null +++ b/tests/db/migrations/20250518164819_tran.php @@ -0,0 +1,44 @@ +table('test_tran_a', [ + 'id' => false, + 'primary_key' => ['id'], + ]) + ->addColumn('id', 'integer', [ + 'signed' => false, + 'identity' => true, + 'null' => false, + ]) + ->addColumn('type', 'integer', [ + 'limit' => 2, // MySQL:TINYINT(4)，PG:SMALLINT + 'default' => 0, + 'signed' => false, + 'null' => false, + ]) + ->addColumn('username', 'string', [ + 'limit' => 32, + 'null' => false, + ]) + ->create(); + } +} diff --git a/vendor-bin/phinx/composer.json b/vendor-bin/phinx/composer.json new file mode 100644 index 00000000..6e7c5ff0 --- /dev/null +++ b/vendor-bin/phinx/composer.json @@ -0,0 +1,5 @@ +{ + "require-dev": { + "robmorgan/phinx": "^0.14" + } +} From 2ad84ee86c67b82da9c431b1dd4aa3ab41b4c4cb Mon Sep 17 00:00:00 2001 From: auooru Date: Mon, 19 May 2025 12:12:34 +0800 Subject: [PATCH 04/22] =?UTF-8?q?ci=20=E7=8E=AF=E5=A2=83=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=20pg=20=E6=9C=8D=E5=8A=A1=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/codecov.yml | 18 ++++++++++++++++++ .github/workflows/tests.yml | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 2b22254e..b939ef13 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -17,6 +17,19 @@ jobs: ports: - 3306:3306 options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 + postgres: + image: postgres:15 + env: + POSTGRES_USER: root + POSTGRES_PASSWORD: password + POSTGRES_DB: testing + ports: + - 5432:5432 + options: >- + --health-cmd "pg_isready -U root" + --health-interval 10s + --health-timeout 5s + --health-retries 5 steps: - name: Checkout @@ -61,6 +74,11 @@ jobs: TESTS_DB_MYSQL_USERNAME: root TESTS_DB_MYSQL_PASSWORD: password TESTS_DB_MYSQL_DATABASE: testing + TESTS_DB_PGSQL_HOST: 127.0.0.1 + TESTS_DB_PGSQL_PORT: 5432 + TESTS_DB_PGSQL_USERNAME: root + TESTS_DB_PGSQL_PASSWORD: password + TESTS_DB_PGSQL_DATABASE: testing - name: Codecov uses: codecov/codecov-action@v4 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index bea3c2b8..5af009f8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -29,6 +29,19 @@ jobs: ports: - 3306:3306 options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 + postgres: + image: postgres:15 + env: + POSTGRES_USER: root + POSTGRES_PASSWORD: password + POSTGRES_DB: testing + ports: + - 5432:5432 + options: >- + --health-cmd "pg_isready -U root" + --health-interval 10s + --health-timeout 5s + --health-retries 5 steps: - name: Checkout @@ -73,3 +86,8 @@ jobs: TESTS_DB_MYSQL_USERNAME: root TESTS_DB_MYSQL_PASSWORD: password TESTS_DB_MYSQL_DATABASE: testing + TESTS_DB_PGSQL_HOST: 127.0.0.1 + TESTS_DB_PGSQL_PORT: 5432 + TESTS_DB_PGSQL_USERNAME: root + TESTS_DB_PGSQL_PASSWORD: password + TESTS_DB_PGSQL_DATABASE: testing From 7c721ce3fd6235c17962a2b84b5de83b7092a6c3 Mon Sep 17 00:00:00 2001 From: auooru Date: Mon, 19 May 2025 12:16:46 +0800 Subject: [PATCH 05/22] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/codecov.yml | 16 ++++++++++++++++ .github/workflows/tests.yml | 16 ++++++++++++++++ phinx.php | 16 ++++++++-------- 3 files changed, 40 insertions(+), 8 deletions(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index b939ef13..26040022 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -66,6 +66,22 @@ jobs: - name: Install dependencies (composer.lock) run: composer install --prefer-dist --no-progress --no-suggest + - name: Run test suite + run: | + composer bin phinx install + composer run db-migrate + env: + TESTS_DB_MYSQL_HOST: 127.0.0.1 + TESTS_DB_MYSQL_PORT: 3306 + TESTS_DB_MYSQL_USERNAME: root + TESTS_DB_MYSQL_PASSWORD: password + TESTS_DB_MYSQL_DATABASE: testing + TESTS_DB_PGSQL_HOST: 127.0.0.1 + TESTS_DB_PGSQL_PORT: 5432 + TESTS_DB_PGSQL_USERNAME: root + TESTS_DB_PGSQL_PASSWORD: password + TESTS_DB_PGSQL_DATABASE: testing + - name: Run test suite run: composer exec -- phpunit --coverage-clover=coverage.xml -v env: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5af009f8..d8b95b61 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -78,6 +78,22 @@ jobs: - name: Install dependencies (composer.lock) run: composer install --prefer-dist --no-progress --no-suggest + - name: Run test suite + run: | + composer bin phinx install + composer run db-migrate + env: + TESTS_DB_MYSQL_HOST: 127.0.0.1 + TESTS_DB_MYSQL_PORT: 3306 + TESTS_DB_MYSQL_USERNAME: root + TESTS_DB_MYSQL_PASSWORD: password + TESTS_DB_MYSQL_DATABASE: testing + TESTS_DB_PGSQL_HOST: 127.0.0.1 + TESTS_DB_PGSQL_PORT: 5432 + TESTS_DB_PGSQL_USERNAME: root + TESTS_DB_PGSQL_PASSWORD: password + TESTS_DB_PGSQL_DATABASE: testing + - name: Run test suite run: composer exec -- phpunit env: diff --git a/phinx.php b/phinx.php index df3c07fd..f72f4934 100644 --- a/phinx.php +++ b/phinx.php @@ -12,19 +12,19 @@ 'mysql' => [ 'adapter' => 'mysql', 'host' => getenv('TESTS_DB_MYSQL_HOSTNAME') ?: 'localhost', - 'name' => getenv('TESTS_DB_MYSQL_HOSTPORT') ?: 'tp_orm_test', - 'user' => getenv('TESTS_DB_MYSQL_DATABASE') ?: 'homestead', - 'pass' => getenv('TESTS_DB_MYSQL_USERNAME') ?: 'secret', - 'port' => getenv('TESTS_DB_MYSQL_PASSWORD') ?: '3306', + 'name' => getenv('TESTS_DB_MYSQL_DATABASE') ?: 'tp_orm_test', + 'user' => getenv('TESTS_DB_MYSQL_USERNAME') ?: 'homestead', + 'pass' => getenv('TESTS_DB_MYSQL_PASSWORD') ?: 'secret', + 'port' => getenv('TESTS_DB_MYSQL_HOSTPORT') ?: '3306', 'charset' => 'utf8', ], 'pgsql' => [ 'adapter' => 'pgsql', 'host' => getenv('TESTS_DB_PGSQL_HOSTNAME') ?: 'localhost', - 'name' => getenv('TESTS_DB_PGSQL_HOSTPORT') ?: 'tp_orm_test', - 'user' => getenv('TESTS_DB_PGSQL_DATABASE') ?: 'homestead', - 'pass' => getenv('TESTS_DB_PGSQL_USERNAME') ?: 'secret', - 'port' => getenv('TESTS_DB_PGSQL_PASSWORD') ?: '5432', + 'name' => getenv('TESTS_DB_PGSQL_DATABASE') ?: 'tp_orm_test', + 'user' => getenv('TESTS_DB_PGSQL_USERNAME') ?: 'homestead', + 'pass' => getenv('TESTS_DB_PGSQL_PASSWORD') ?: 'secret', + 'port' => getenv('TESTS_DB_PGSQL_HOSTPORT') ?: '5432', 'charset' => 'utf8', ] ], From 78d9c1c7287837029c6aaf239e0b9e996d51c984 Mon Sep 17 00:00:00 2001 From: auooru Date: Mon, 19 May 2025 12:41:58 +0800 Subject: [PATCH 06/22] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/codecov.yml | 18 +++++++++--------- .github/workflows/tests.yml | 19 ++++++++++--------- phinx.php | 3 +-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 26040022..034e5fc2 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -66,18 +66,18 @@ jobs: - name: Install dependencies (composer.lock) run: composer install --prefer-dist --no-progress --no-suggest - - name: Run test suite + - name: Run DB Migrate run: | composer bin phinx install composer run db-migrate env: - TESTS_DB_MYSQL_HOST: 127.0.0.1 - TESTS_DB_MYSQL_PORT: 3306 + TESTS_DB_MYSQL_HOSTNAME: 127.0.0.1 + TESTS_DB_MYSQL_HOSTPORT: 3306 TESTS_DB_MYSQL_USERNAME: root TESTS_DB_MYSQL_PASSWORD: password TESTS_DB_MYSQL_DATABASE: testing - TESTS_DB_PGSQL_HOST: 127.0.0.1 - TESTS_DB_PGSQL_PORT: 5432 + TESTS_DB_PGSQL_HOSTNAME: 127.0.0.1 + TESTS_DB_PGSQL_HOSTPORT: 5432 TESTS_DB_PGSQL_USERNAME: root TESTS_DB_PGSQL_PASSWORD: password TESTS_DB_PGSQL_DATABASE: testing @@ -85,13 +85,13 @@ jobs: - name: Run test suite run: composer exec -- phpunit --coverage-clover=coverage.xml -v env: - TESTS_DB_MYSQL_HOST: 127.0.0.1 - TESTS_DB_MYSQL_PORT: 3306 + TESTS_DB_MYSQL_HOSTNAME: 127.0.0.1 + TESTS_DB_MYSQL_HOSTPORT: 3306 TESTS_DB_MYSQL_USERNAME: root TESTS_DB_MYSQL_PASSWORD: password TESTS_DB_MYSQL_DATABASE: testing - TESTS_DB_PGSQL_HOST: 127.0.0.1 - TESTS_DB_PGSQL_PORT: 5432 + TESTS_DB_PGSQL_HOSTNAME: 127.0.0.1 + TESTS_DB_PGSQL_HOSTPORT: 5432 TESTS_DB_PGSQL_USERNAME: root TESTS_DB_PGSQL_PASSWORD: password TESTS_DB_PGSQL_DATABASE: testing diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d8b95b61..4cf5df45 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -78,18 +78,19 @@ jobs: - name: Install dependencies (composer.lock) run: composer install --prefer-dist --no-progress --no-suggest - - name: Run test suite + - name: Run DB Migrate + continue-on-error: true run: | composer bin phinx install composer run db-migrate env: - TESTS_DB_MYSQL_HOST: 127.0.0.1 - TESTS_DB_MYSQL_PORT: 3306 + TESTS_DB_MYSQL_HOSTNAME: 127.0.0.1 + TESTS_DB_MYSQL_HOSTPORT: 3306 TESTS_DB_MYSQL_USERNAME: root TESTS_DB_MYSQL_PASSWORD: password TESTS_DB_MYSQL_DATABASE: testing - TESTS_DB_PGSQL_HOST: 127.0.0.1 - TESTS_DB_PGSQL_PORT: 5432 + TESTS_DB_PGSQL_HOSTNAME: 127.0.0.1 + TESTS_DB_PGSQL_HOSTPORT: 5432 TESTS_DB_PGSQL_USERNAME: root TESTS_DB_PGSQL_PASSWORD: password TESTS_DB_PGSQL_DATABASE: testing @@ -97,13 +98,13 @@ jobs: - name: Run test suite run: composer exec -- phpunit env: - TESTS_DB_MYSQL_HOST: 127.0.0.1 - TESTS_DB_MYSQL_PORT: 3306 + TESTS_DB_MYSQL_HOSTNAME: 127.0.0.1 + TESTS_DB_MYSQL_HOSTPORT: 3306 TESTS_DB_MYSQL_USERNAME: root TESTS_DB_MYSQL_PASSWORD: password TESTS_DB_MYSQL_DATABASE: testing - TESTS_DB_PGSQL_HOST: 127.0.0.1 - TESTS_DB_PGSQL_PORT: 5432 + TESTS_DB_PGSQL_HOSTNAME: 127.0.0.1 + TESTS_DB_PGSQL_HOSTPORT: 5432 TESTS_DB_PGSQL_USERNAME: root TESTS_DB_PGSQL_PASSWORD: password TESTS_DB_PGSQL_DATABASE: testing diff --git a/phinx.php b/phinx.php index f72f4934..ff111ade 100644 --- a/phinx.php +++ b/phinx.php @@ -1,7 +1,6 @@ [ 'migrations' => '%%PHINX_CONFIG_DIR%%/tests/db/migrations', 'seeds' => '%%PHINX_CONFIG_DIR%%/tests/db/seeds' From e8282559fb2ead6c1985533c91a715249711f823 Mon Sep 17 00:00:00 2001 From: auooru Date: Mon, 19 May 2025 13:12:10 +0800 Subject: [PATCH 07/22] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/tests.yml | 3 +-- tests/functions.php | 10 +++++++--- tests/orm/BaseDbTransactionTest.php | 6 +++--- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4cf5df45..ef70cc0e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -79,7 +79,6 @@ jobs: run: composer install --prefer-dist --no-progress --no-suggest - name: Run DB Migrate - continue-on-error: true run: | composer bin phinx install composer run db-migrate @@ -96,7 +95,7 @@ jobs: TESTS_DB_PGSQL_DATABASE: testing - name: Run test suite - run: composer exec -- phpunit + run: composer exec -- phpunit --testdox env: TESTS_DB_MYSQL_HOSTNAME: 127.0.0.1 TESTS_DB_MYSQL_HOSTPORT: 3306 diff --git a/tests/functions.php b/tests/functions.php index a6b09a07..682c12c3 100644 --- a/tests/functions.php +++ b/tests/functions.php @@ -94,12 +94,12 @@ function kill_connection(string $name, $cid): void global $pg_func_installed; $pg_func_installed = []; -function pg_server_version(string $name = 'pgsql'): string +function pg_server_version(string $name = 'pgsql', bool $raw = false): string { $pdo = Db::connect($name)->connect(); $version = $pdo->getAttribute(\PDO::ATTR_SERVER_VERSION); - return explode(' ', $version)[0]; + return $raw ? $version : explode(' ', $version)[0]; } function pg_install_func(string $name = 'pgsql'): void @@ -113,10 +113,14 @@ function pg_install_func(string $name = 'pgsql'): void /** @var \PDO $pdo */ $pdo = Db::connect($name)->connect(); - $file_path = version_compare(pg_server_version($name), '12.0', '>=') + $rawVersion = pg_server_version($name, true); + $version = pg_server_version($name); + $file_path = version_compare($version, '12.0', '>=') ? __DIR__ . '/../src/db/connector/pgsql12.sql' : __DIR__ . '/../src/db/connector/pgsql.sql'; + echo PHP_EOL, "> Installing PostgreSQL({$rawVersion}) functions from {$file_path}", PHP_EOL; + $content = file_get_contents($file_path); $statements = preg_split('/;\s*(?=CREATE|COMMENT|DROP)/i', $content); diff --git a/tests/orm/BaseDbTransactionTest.php b/tests/orm/BaseDbTransactionTest.php index 0fa28b31..494b8243 100644 --- a/tests/orm/BaseDbTransactionTest.php +++ b/tests/orm/BaseDbTransactionTest.php @@ -32,9 +32,9 @@ protected function provideTestData(): array public function setUp(): void { - Db::listen(function ($sql, $time) { - echo "SQL: $sql [$time ms]\n"; - }); + // Db::listen(function ($sql, $time) { + // echo "SQL: $sql [$time ms]\n"; + // }); $this->db = Db::connect($this->dbName, true); $this->db->execute('TRUNCATE TABLE test_tran_a;'); } From 45ccffd61dfed178cee6f71066079b4923159763 Mon Sep 17 00:00:00 2001 From: auooru Date: Mon, 19 May 2025 13:20:06 +0800 Subject: [PATCH 08/22] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpg=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/orm/BaseDbTest.php | 7 +++++++ tests/orm/BaseDbTransactionTest.php | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/tests/orm/BaseDbTest.php b/tests/orm/BaseDbTest.php index c3863c74..567780fe 100644 --- a/tests/orm/BaseDbTest.php +++ b/tests/orm/BaseDbTest.php @@ -17,6 +17,8 @@ use think\db\Raw; use think\Exception as ThinkException; use think\facade\Db; +use function tests\pg_install_func; +use function tests\pg_reset_function; abstract class BaseDbTest extends Base { @@ -37,6 +39,11 @@ protected function provideTestData(): array public function setUp(): void { $this->db = Db::connect($this->dbName); + + if ($this->dbName === 'pgsql') { + pg_reset_function(); + pg_install_func(); + } } public function testInitUsers(): array diff --git a/tests/orm/BaseDbTransactionTest.php b/tests/orm/BaseDbTransactionTest.php index 494b8243..3a7afef1 100644 --- a/tests/orm/BaseDbTransactionTest.php +++ b/tests/orm/BaseDbTransactionTest.php @@ -10,6 +10,8 @@ use think\db\connector\Pgsql; use function tests\kill_connection; use function tests\mysql_kill_connection; +use function tests\pg_install_func; +use function tests\pg_reset_function; use function tests\query_connection_id; use function tests\query_mysql_connection_id; use think\facade\Db; @@ -37,6 +39,11 @@ public function setUp(): void // }); $this->db = Db::connect($this->dbName, true); $this->db->execute('TRUNCATE TABLE test_tran_a;'); + + if ($this->dbName === 'pgsql') { + pg_reset_function(); + pg_install_func(); + } } protected function reconnect(): ConnectionInterface From 8cc0a9345afa417ed75427b65543e7e312ea6eab Mon Sep 17 00:00:00 2001 From: auooru Date: Mon, 19 May 2025 13:24:46 +0800 Subject: [PATCH 09/22] =?UTF-8?q?=E5=B0=9D=E8=AF=95=20pg=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/db/connector/Pgsql.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/db/connector/Pgsql.php b/src/db/connector/Pgsql.php index 665c4188..63dcca56 100644 --- a/src/db/connector/Pgsql.php +++ b/src/db/connector/Pgsql.php @@ -12,6 +12,7 @@ namespace think\db\connector; use PDO; +use think\db\BaseQuery; use think\db\PDOConnection; /** @@ -109,4 +110,11 @@ protected function supportSavepoint(): bool { return true; } + + public function getLastInsID(BaseQuery $query, ?string $sequence = null) + { + $insertId = $this->linkID->lastInsertId($sequence); + + return $this->autoInsIDType($query, $insertId); + } } From 3c6c394c15aaf4c23889ef87274acc47805d81de Mon Sep 17 00:00:00 2001 From: auooru Date: Mon, 19 May 2025 13:29:02 +0800 Subject: [PATCH 10/22] =?UTF-8?q?=E5=B0=9D=E8=AF=95=20pg=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/db/connector/Pgsql.php | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/src/db/connector/Pgsql.php b/src/db/connector/Pgsql.php index 63dcca56..1f941c58 100644 --- a/src/db/connector/Pgsql.php +++ b/src/db/connector/Pgsql.php @@ -111,6 +111,43 @@ protected function supportSavepoint(): bool return true; } + public function insert(BaseQuery $query, bool $getLastInsID = false) + { + // 分析查询表达式 + $options = $query->parseOptions(); + + // 生成SQL语句 + $sql = $this->builder->insert($query); + + // 执行操作 + $result = '' == $sql ? 0 : $this->pdoExecute($query, $sql); + + if ($result) { + // todo 应该改造为使用 returning 返回完全解决该问题 + $sequence = $options['sequence'] ?? null; + $lastInsId = $this->getLastInsID($query, $sequence); + + $data = $options['data']; + + if ($lastInsId) { + $pk = $query->getAutoInc(); + if ($pk && is_string($pk)) { + $data[$pk] = $lastInsId; + } + } + + $query->setOption('data', $data); + + $this->db->trigger('after_insert', $query); + + if ($getLastInsID && $lastInsId) { + return $lastInsId; + } + } + + return $result; + } + public function getLastInsID(BaseQuery $query, ?string $sequence = null) { $insertId = $this->linkID->lastInsertId($sequence); From 77ff35d554ae32aa6a9e71229d5dc26406eece45 Mon Sep 17 00:00:00 2001 From: auooru Date: Mon, 19 May 2025 13:32:44 +0800 Subject: [PATCH 11/22] =?UTF-8?q?=E5=85=88=E9=99=8D=E7=BA=A7=E5=90=8E?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/codecov.yml | 2 +- .github/workflows/tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 034e5fc2..2ef92d62 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -18,7 +18,7 @@ jobs: - 3306:3306 options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 postgres: - image: postgres:15 + image: postgres:13 env: POSTGRES_USER: root POSTGRES_PASSWORD: password diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ef70cc0e..51460a86 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -30,7 +30,7 @@ jobs: - 3306:3306 options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 postgres: - image: postgres:15 + image: postgres:13 env: POSTGRES_USER: root POSTGRES_PASSWORD: password From 3ab1a0d896b0299aaedf34799a2ac7ee71168a36 Mon Sep 17 00:00:00 2001 From: auooru Date: Mon, 19 May 2025 13:43:35 +0800 Subject: [PATCH 12/22] =?UTF-8?q?=E6=89=93=E5=8D=B0=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 6b891534..7c0b3b28 100644 --- a/composer.json +++ b/composer.json @@ -54,8 +54,8 @@ "@composer bin phinx update --ansi" ], "db-migrate": [ - "./vendor/bin/phinx migrate -e mysql", - "./vendor/bin/phinx migrate -e pgsql" + "./vendor/bin/phinx migrate -e mysql -vvv", + "./vendor/bin/phinx migrate -e pgsql -vvv" ], "db-rollback": [ "./vendor/bin/phinx rollback -f -e mysql", From 2de2b6c1c96e31d2a3bf91e508a843bc62432f18 Mon Sep 17 00:00:00 2001 From: auooru Date: Mon, 19 May 2025 13:50:13 +0800 Subject: [PATCH 13/22] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/codecov.yml | 2 +- .github/workflows/tests.yml | 2 +- src/db/connector/Pgsql.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 2ef92d62..034e5fc2 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -18,7 +18,7 @@ jobs: - 3306:3306 options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 postgres: - image: postgres:13 + image: postgres:15 env: POSTGRES_USER: root POSTGRES_PASSWORD: password diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 51460a86..ef70cc0e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -30,7 +30,7 @@ jobs: - 3306:3306 options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 postgres: - image: postgres:13 + image: postgres:15 env: POSTGRES_USER: root POSTGRES_PASSWORD: password diff --git a/src/db/connector/Pgsql.php b/src/db/connector/Pgsql.php index 1f941c58..1cc868c9 100644 --- a/src/db/connector/Pgsql.php +++ b/src/db/connector/Pgsql.php @@ -125,7 +125,7 @@ public function insert(BaseQuery $query, bool $getLastInsID = false) if ($result) { // todo 应该改造为使用 returning 返回完全解决该问题 $sequence = $options['sequence'] ?? null; - $lastInsId = $this->getLastInsID($query, $sequence); + $lastInsId = $getLastInsID ? $this->getLastInsID($query, $sequence) : null; $data = $options['data']; From 43c0d0abe8896caad3156d99b26bfaf5e916d245 Mon Sep 17 00:00:00 2001 From: auooru Date: Mon, 19 May 2025 13:56:19 +0800 Subject: [PATCH 14/22] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- phpunit.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phpunit.xml b/phpunit.xml index 87f92af5..472017c5 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -7,11 +7,12 @@ colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" - convertWarningsToExceptions="true" + convertWarningsToExceptions="false" displayDetailsOnTestsThatTriggerDeprecations="true" displayDetailsOnTestsThatTriggerErrors="true" displayDetailsOnTestsThatTriggerNotices="true" displayDetailsOnTestsThatTriggerWarnings="true" + failOnWarning="false" processIsolation="false" stopOnError="false" stopOnFailure="false" From 7f74e50994ed0e840090904c7fe672b83eb7cc2b Mon Sep 17 00:00:00 2001 From: auooru Date: Mon, 19 May 2025 14:01:06 +0800 Subject: [PATCH 15/22] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/orm/{BaseDbTest.php => DbTestBase.php} | 2 +- .../{BaseDbTransactionTest.php => DbTransactionTestBase.php} | 2 +- tests/orm/MysqlDbTest.php | 2 +- tests/orm/MysqlDbTransactionTest.php | 2 +- tests/orm/PgsqlDbTest.php | 2 +- tests/orm/PgsqlDbTransactionTest.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename tests/orm/{BaseDbTest.php => DbTestBase.php} (99%) rename tests/orm/{BaseDbTransactionTest.php => DbTransactionTestBase.php} (99%) diff --git a/tests/orm/BaseDbTest.php b/tests/orm/DbTestBase.php similarity index 99% rename from tests/orm/BaseDbTest.php rename to tests/orm/DbTestBase.php index 567780fe..19020feb 100644 --- a/tests/orm/BaseDbTest.php +++ b/tests/orm/DbTestBase.php @@ -20,7 +20,7 @@ use function tests\pg_install_func; use function tests\pg_reset_function; -abstract class BaseDbTest extends Base +abstract class DbTestBase extends Base { public ConnectionInterface $db; protected string $dbName; diff --git a/tests/orm/BaseDbTransactionTest.php b/tests/orm/DbTransactionTestBase.php similarity index 99% rename from tests/orm/BaseDbTransactionTest.php rename to tests/orm/DbTransactionTestBase.php index 3a7afef1..016e815f 100644 --- a/tests/orm/BaseDbTransactionTest.php +++ b/tests/orm/DbTransactionTestBase.php @@ -18,7 +18,7 @@ use Throwable; use function tests\query_pgsql_connection_id; -abstract class BaseDbTransactionTest extends Base +abstract class DbTransactionTestBase extends Base { protected ConnectionInterface $db; protected string $dbName; diff --git a/tests/orm/MysqlDbTest.php b/tests/orm/MysqlDbTest.php index 2b2478fd..2b9b8bc2 100644 --- a/tests/orm/MysqlDbTest.php +++ b/tests/orm/MysqlDbTest.php @@ -3,7 +3,7 @@ namespace tests\orm; -class MysqlDbTest extends BaseDbTest +class MysqlDbTest extends DbTestBase { protected string $dbName = 'mysql'; } diff --git a/tests/orm/MysqlDbTransactionTest.php b/tests/orm/MysqlDbTransactionTest.php index c3b5d4ee..ed7b6f7b 100644 --- a/tests/orm/MysqlDbTransactionTest.php +++ b/tests/orm/MysqlDbTransactionTest.php @@ -3,7 +3,7 @@ namespace tests\orm; -class MysqlDbTransactionTest extends BaseDbTransactionTest +class MysqlDbTransactionTest extends DbTransactionTestBase { protected string $dbName = 'mysql'; } diff --git a/tests/orm/PgsqlDbTest.php b/tests/orm/PgsqlDbTest.php index a8687ba7..c409334f 100644 --- a/tests/orm/PgsqlDbTest.php +++ b/tests/orm/PgsqlDbTest.php @@ -3,7 +3,7 @@ namespace tests\orm; -class PgsqlDbTest extends BaseDbTest +class PgsqlDbTest extends DbTestBase { protected string $dbName = 'pgsql'; diff --git a/tests/orm/PgsqlDbTransactionTest.php b/tests/orm/PgsqlDbTransactionTest.php index e2e05cce..5e41c76a 100644 --- a/tests/orm/PgsqlDbTransactionTest.php +++ b/tests/orm/PgsqlDbTransactionTest.php @@ -3,7 +3,7 @@ namespace tests\orm; -class PgsqlDbTransactionTest extends BaseDbTransactionTest +class PgsqlDbTransactionTest extends DbTransactionTestBase { protected string $dbName = 'pgsql'; } From 29a5801bd37d81df7a16b8f74f875a1f3cba3f5c Mon Sep 17 00:00:00 2001 From: auooru Date: Mon, 19 May 2025 14:48:42 +0800 Subject: [PATCH 16/22] =?UTF-8?q?=E8=B0=83=E6=95=B4=20phpunit=20=E7=89=88?= =?UTF-8?q?=E6=9C=AC=EF=BC=8C=E9=81=BF=E5=85=8D=E9=85=8D=E7=BD=AE=E5=90=84?= =?UTF-8?q?=E7=A7=8D=E7=BA=A6=E6=9D=9F=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + composer.json | 2 +- phpunit.xml | 10 +++------- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 4bce57ca..5a2d75d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ /vendor composer.phar composer.lock +.phpunit.result.cache .DS_Store Thumbs.db /.idea diff --git a/composer.json b/composer.json index 7c0b3b28..00e5a714 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8", - "phpunit/phpunit": "^9.6|^10" + "phpunit/phpunit": "^9.6" }, "autoload": { "psr-4": { diff --git a/phpunit.xml b/phpunit.xml index 472017c5..464f7650 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -5,19 +5,15 @@ beStrictAboutTestsThatDoNotTestAnything="false" bootstrap="tests/bootstrap.php" colors="true" + convertDeprecationsToExceptions="false" convertErrorsToExceptions="true" convertNoticesToExceptions="true" - convertWarningsToExceptions="false" - displayDetailsOnTestsThatTriggerDeprecations="true" - displayDetailsOnTestsThatTriggerErrors="true" - displayDetailsOnTestsThatTriggerNotices="true" - displayDetailsOnTestsThatTriggerWarnings="true" + convertWarningsToExceptions="true" failOnWarning="false" processIsolation="false" stopOnError="false" stopOnFailure="false" - verbose="true" - xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" + xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd" > From 06932587999d27dee0ec781a1ad974cc783c7b2d Mon Sep 17 00:00:00 2001 From: auooru Date: Tue, 20 May 2025 17:34:19 +0800 Subject: [PATCH 17/22] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=B5=8B=E8=AF=95=20Db?= =?UTF-8?q?JsonFields?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/Base.php | 28 +++++ .../migrations/20250519162501_test_goods.php | 43 +++++++ tests/orm/DbJsonFieldsBase.php | 101 +++++++++++++++++ tests/orm/DbJsonFieldsTest.php | 106 ------------------ tests/orm/MysqlDbJsonFieldsTest.php | 9 ++ tests/orm/PgsqlDbJsonFieldsTest.php | 19 ++++ 6 files changed, 200 insertions(+), 106 deletions(-) create mode 100644 tests/db/migrations/20250519162501_test_goods.php create mode 100644 tests/orm/DbJsonFieldsBase.php delete mode 100644 tests/orm/DbJsonFieldsTest.php create mode 100644 tests/orm/MysqlDbJsonFieldsTest.php create mode 100644 tests/orm/PgsqlDbJsonFieldsTest.php diff --git a/tests/Base.php b/tests/Base.php index 6c64c2b2..ee94dcca 100644 --- a/tests/Base.php +++ b/tests/Base.php @@ -6,10 +6,38 @@ use PHPUnit\Framework\TestCase; use PHPUnit\Runner\Version; +use think\db\BaseQuery; +use think\db\ConnectionInterface; +use think\db\connector\Pgsql; +use think\facade\Db; use function version_compare; class Base extends TestCase { + protected ConnectionInterface $db; + protected string $dbName; + + public function setUp(): void + { + $this->db = Db::connect($this->dbName); + + if ($this->dbName === 'pgsql') { + pg_reset_function(); + pg_install_func(); + } + } + + protected static function compatibleInsertAll(BaseQuery $query, array $data): void + { + if ($query->getConnection() instanceof 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/20250519162501_test_goods.php b/tests/db/migrations/20250519162501_test_goods.php new file mode 100644 index 00000000..4f000758 --- /dev/null +++ b/tests/db/migrations/20250519162501_test_goods.php @@ -0,0 +1,43 @@ +table('test_goods', [ + 'id' => false, + 'primary_key' => ['id'], + ]) + ->addColumn('id', 'integer', [ + 'signed' => false, + 'identity' => true, + 'null' => false, + ]) + ->addColumn('name', 'string', [ + 'limit' => 32, + 'default' => '', + 'null' => false, + ]) + ->addColumn('extend', 'json', [ + 'null' => true, + 'default' => null, + ]) + ->create(); + } +} diff --git a/tests/orm/DbJsonFieldsBase.php b/tests/orm/DbJsonFieldsBase.php new file mode 100644 index 00000000..73ae03cc --- /dev/null +++ b/tests/orm/DbJsonFieldsBase.php @@ -0,0 +1,101 @@ + 1, 'name' => '肥皂', 'extend' => '{"brand": "TP6", "standard": null, "type": "清洁"}'], + ['id' => 2, 'name' => '牙膏', 'extend' => '{"brand": "TP8", "standard": "大", "type": "清洁"}'], + ['id' => 3, 'name' => '牙刷', 'extend' => '{"brand": "TP8", "standard": "大", "type": "清洁"}'], + ['id' => 4, 'name' => '卫生纸', 'extend' => '{"brand": null, "standard": null, "type": "日用品" ,"amount": 20}'], + ['id' => 5, 'name' => '香肠', 'extend' => '{"brand": null, "weight": 480, "type": "食品" ,"pack": 1}'], + ]; + return array_map(fn ($item) => ['extend' => json_decode($item['extend'], true)] + $item, $data); + } + + public function testInitGoods(): array + { + $this->db->execute('TRUNCATE TABLE test_goods;'); + + $userData = $this->provideTestData(); + $this->db->table('test_goods')->json(['extend'])->insertAll($userData); + + return $userData; + } + + /** + * @test 测试当 json 字段的指定成员不存在 + * @depends testInitGoods + */ + public function testJsonFieldMemberNotExists(array $goods) + { + $collect = collect($goods); + + $data = $this->db->table('test_goods')->where('extend->weight', null)->select(); + $this->assertSame($data->count(), $collect->where('extend.weight', null)->count()); + + $data = $this->db->table('test_goods')->where('extend->amount', null)->select(); + $this->assertSame($data->count(), $collect->where('extend.amount', null)->count()); + + $data = $this->db->table('test_goods')->where('extend->pack', null)->select(); + $this->assertSame($data->count(), $collect->where('extend.pack', null)->count()); + } + + /** + * @test 测试当 json 字段的指定成员不存在或为 null + * @depends testInitGoods + */ + public function testJsonFieldMemberNotExistsOrNull(array $goods) + { + $collect = collect($this->provideTestData()); + + $data = $this->db->table('test_goods')->where('extend->brand', null)->select(); + $this->assertSame($data->count(), $collect->where('extend.brand', null)->count()); + + $data = $this->db->table('test_goods')->where('extend->standard', null)->select(); + $this->assertSame($data->count(), $collect->where('extend.standard', null)->count()); + } + + /** + * @test 测试搜索 json 字段指定成员为指定的值 + * @depends testInitGoods + */ + public function testJsonFieldMemberEqual(array $goods) + { + $collect = collect($goods); + + $data = $this->db->table('test_goods')->where('extend->brand', 'TP8')->select(); + $this->assertSame($data->count(), $collect->where('extend.brand', 'TP8')->count()); + + $data = $this->db->table('test_goods')->where('extend->standard', '大')->select(); + $this->assertSame($data->count(), $collect->where('extend.standard', '大')->count()); + + $data = $this->db->table('test_goods')->where('extend->type', '清洁')->select(); + $this->assertSame($data->count(), $collect->where('extend.type', '清洁')->count()); + } + + /** + * @test 测试搜索 json 字段指定成员不为指定的值 + * @depends testInitGoods + */ + public function testJsonFieldMemberNotEqual(array $goods) + { + $collect = collect($goods); + + $data = $this->db->table('test_goods')->where('extend->brand', '<>', 'TP8')->whereNull('extend->brand', "or")->select(); + $this->assertSame($data->count(), $collect->where('extend.brand', '<>', 'TP8')->count()); + + $data = $this->db->table('test_goods')->where('extend->standard', '<>', '大')->whereNull('extend->standard', "or")->select(); + $this->assertSame($data->count(), $collect->where('extend.standard', '<>', '大')->count()); + + $data = $this->db->table('test_goods')->where('extend->type', '<>', '清洁')->whereNull('extend->type', "or")->select(); + $this->assertSame($data->count(), $collect->where('extend.type', '<>', '清洁')->count()); + } +} diff --git a/tests/orm/DbJsonFieldsTest.php b/tests/orm/DbJsonFieldsTest.php deleted file mode 100644 index 10765974..00000000 --- a/tests/orm/DbJsonFieldsTest.php +++ /dev/null @@ -1,106 +0,0 @@ - 1, 'name' => '肥皂', 'extend' => '{"brand": "TP6", "standard": null, "type": "清洁"}'], - ['id' => 2, 'name' => '牙膏', 'extend' => '{"brand": "TP8", "standard": "大", "type": "清洁"}'], - ['id' => 3, 'name' => '牙刷', 'extend' => '{"brand": "TP8", "standard": "大", "type": "清洁"}'], - ['id' => 4, 'name' => '卫生纸', 'extend' => '{"brand": null, "standard": null, "type": "日用品" ,"amount": 20}'], - ['id' => 5, 'name' => '香肠', 'extend' => '{"brand": null, "weight": 480, "type": "食品" ,"pack": 1}'], - ]; - self::$testGoodsData = $data; - foreach ($data as &$item) { - $item['extend'] = json_decode($item['extend'], true); - } - self::$testGoodsDataCollect = collect($data); - Db::table(self::$table)->insertAll(self::$testGoodsData); - } - - /** - * @test 测试当 json 字段的指定成员不存在 - */ - public function testJsonFieldMemberNotExists() - { - $data = Db::table(self::$table)->where('extend->weight', null)->select(); - $this->assertSame($data->count(), self::$testGoodsDataCollect->where('extend.weight', null)->count()); - - $data = Db::table(self::$table)->where('extend->amount', null)->select(); - $this->assertSame($data->count(), self::$testGoodsDataCollect->where('extend.amount', null)->count()); - - $data = Db::table(self::$table)->where('extend->pack', null)->select(); - $this->assertSame($data->count(), self::$testGoodsDataCollect->where('extend.pack', null)->count()); - } - - /** - * @test 测试当 json 字段的指定成员不存在或为 null - */ - public function testJsonFieldMemberNotExistsOrNull() - { - $data = Db::table(self::$table)->where('extend->brand', null)->select(); - $this->assertSame($data->count(), self::$testGoodsDataCollect->where('extend.brand', null)->count()); - - $data = Db::table(self::$table)->where('extend->standard', null)->select(); - $this->assertSame($data->count(), self::$testGoodsDataCollect->where('extend.standard', null)->count()); - } - - /** - * @test 测试搜索 json 字段指定成员为指定的值 - */ - public function testJsonFieldMemberEqual() - { - $data = Db::table(self::$table)->where('extend->brand', 'TP8')->select(); - $this->assertSame($data->count(), self::$testGoodsDataCollect->where('extend.brand', 'TP8')->count()); - - $data = Db::table(self::$table)->where('extend->standard', '大')->select(); - $this->assertSame($data->count(), self::$testGoodsDataCollect->where('extend.standard', '大')->count()); - - $data = Db::table(self::$table)->where('extend->type', '清洁')->select(); - $this->assertSame($data->count(), self::$testGoodsDataCollect->where('extend.type', '清洁')->count()); - } - - /** - * @test 测试搜索 json 字段指定成员不为指定的值 - */ - public function testJsonFieldMemberNotEqual() - { - $data = Db::table(self::$table)->where('extend->brand', '<>', 'TP8')->whereNull('extend->brand', "or")->select(); - $this->assertSame($data->count(), self::$testGoodsDataCollect->where('extend.brand', '<>', 'TP8')->count()); - - $data = Db::table(self::$table)->where('extend->standard', '<>', '大')->whereNull('extend->standard', "or")->select(); - $this->assertSame($data->count(), self::$testGoodsDataCollect->where('extend.standard', '<>', '大')->count()); - - $data = Db::table(self::$table)->where('extend->type', '<>', '清洁')->whereNull('extend->type', "or")->select(); - $this->assertSame($data->count(), self::$testGoodsDataCollect->where('extend.type', '<>', '清洁')->count()); - } -} diff --git a/tests/orm/MysqlDbJsonFieldsTest.php b/tests/orm/MysqlDbJsonFieldsTest.php new file mode 100644 index 00000000..88dd42a4 --- /dev/null +++ b/tests/orm/MysqlDbJsonFieldsTest.php @@ -0,0 +1,9 @@ +db->execute('TRUNCATE TABLE test_goods;'); + + $userData = $this->provideTestData(); + self::compatibleInsertAll($this->db->table('test_goods')->json(['extend']), $userData); + + return $userData; + } +} From fd5c090e09389f9c346ce11b760c179f38d25183 Mon Sep 17 00:00:00 2001 From: auooru Date: Tue, 20 May 2025 17:36:27 +0800 Subject: [PATCH 18/22] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=B5=8B=E8=AF=95=20Mo?= =?UTF-8?q?delOneToOne?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/Base.php | 17 ++++- .../20250519165915_model_one_to_one.php | 74 +++++++++++++++++++ tests/orm/DbTestBase.php | 2 +- tests/orm/DbTransactionTestBase.php | 2 +- ...OneToOneTest.php => ModelOneToOneBase.php} | 46 ++++++------ tests/orm/MysqlDbJsonFieldsTest.php | 2 +- tests/orm/MysqlDbTest.php | 2 +- tests/orm/MysqlDbTransactionTest.php | 2 +- tests/orm/MysqlModelOneToOneTest.php | 9 +++ tests/orm/PgsqlDbJsonFieldsTest.php | 2 +- tests/orm/PgsqlDbTest.php | 2 +- tests/orm/PgsqlDbTransactionTest.php | 2 +- tests/orm/PgsqlModelOneToOneTest.php | 9 +++ tests/stubs/ProfileModel.php | 2 +- tests/stubs/UserModel.php | 2 +- 15 files changed, 139 insertions(+), 36 deletions(-) create mode 100644 tests/db/migrations/20250519165915_model_one_to_one.php rename tests/orm/{ModelOneToOneTest.php => ModelOneToOneBase.php} (53%) create mode 100644 tests/orm/MysqlModelOneToOneTest.php create mode 100644 tests/orm/PgsqlModelOneToOneTest.php diff --git a/tests/Base.php b/tests/Base.php index ee94dcca..ee4478bc 100644 --- a/tests/Base.php +++ b/tests/Base.php @@ -10,12 +10,25 @@ use think\db\ConnectionInterface; use think\db\connector\Pgsql; use think\facade\Db; +use think\Model; use function version_compare; +/** + * @property-read string $dbName; + */ class Base extends TestCase { protected ConnectionInterface $db; - protected string $dbName; + protected static string $dbName; + + public function __get(string $name) + { + if ($name === 'dbName') { + return static::$dbName; + } + + throw new \Exception('Undefined property: ' . static::class . '::$' . $name); + } public function setUp(): void { @@ -25,6 +38,8 @@ public function setUp(): void pg_reset_function(); pg_install_func(); } + + // var_dump(static::class . '-' . __FUNCTION__ . '-' . spl_object_id($this)); } protected static function compatibleInsertAll(BaseQuery $query, array $data): void diff --git a/tests/db/migrations/20250519165915_model_one_to_one.php b/tests/db/migrations/20250519165915_model_one_to_one.php new file mode 100644 index 00000000..624d3069 --- /dev/null +++ b/tests/db/migrations/20250519165915_model_one_to_one.php @@ -0,0 +1,74 @@ +table('orm_test_user', [ + 'id' => false, + 'primary_key' => ['id'], + ]) + ->addColumn('id', 'integer', [ + 'identity' => true, + 'signed' => true, + 'null' => false, + ]) + ->addColumn('account', 'string', [ + 'limit' => 255, + 'null' => false, + 'default' => '', + ])->create(); + + $this + ->table('orm_test_profile', [ + 'id' => false, + 'primary_key' => ['id'], + ]) + ->addColumn('id', 'integer', [ + 'identity' => true, + 'signed' => true, + 'null' => false, + ]) + ->addColumn('uid', 'integer', [ + 'signed' => true, + 'null' => false, + ]) + ->addColumn('email', 'string', [ + 'limit' => 255, + 'null' => false, + 'default' => '', + ]) + ->addColumn('nickname', 'string', [ + 'limit' => 255, + 'null' => false, + 'default' => '', + ]) + ->addColumn('update_time', 'datetime', [ + 'null' => false, + ]) + ->addColumn('delete_time', 'datetime', [ + 'null' => true, + 'default' => null, + ]) + ->addColumn('create_time', 'datetime', [ + 'null' => false, + ]) + ->create(); + } +} diff --git a/tests/orm/DbTestBase.php b/tests/orm/DbTestBase.php index 19020feb..fc1b0890 100644 --- a/tests/orm/DbTestBase.php +++ b/tests/orm/DbTestBase.php @@ -23,7 +23,7 @@ abstract class DbTestBase extends Base { public ConnectionInterface $db; - protected string $dbName; + protected static string $dbName; protected function provideTestData(): array { diff --git a/tests/orm/DbTransactionTestBase.php b/tests/orm/DbTransactionTestBase.php index 016e815f..74e5b16f 100644 --- a/tests/orm/DbTransactionTestBase.php +++ b/tests/orm/DbTransactionTestBase.php @@ -21,7 +21,7 @@ abstract class DbTransactionTestBase extends Base { protected ConnectionInterface $db; - protected string $dbName; + protected static string $dbName; protected function provideTestData(): array { diff --git a/tests/orm/ModelOneToOneTest.php b/tests/orm/ModelOneToOneBase.php similarity index 53% rename from tests/orm/ModelOneToOneTest.php rename to tests/orm/ModelOneToOneBase.php index bc4664b0..d02c58a5 100644 --- a/tests/orm/ModelOneToOneTest.php +++ b/tests/orm/ModelOneToOneBase.php @@ -4,40 +4,35 @@ namespace tests\orm; use PHPUnit\Framework\TestCase; +use tests\Base; use tests\stubs\ProfileModel; use tests\stubs\UserModel; +use think\db\Query; use think\facade\Db; +use think\Model; /** * 模型一对一关联 */ -class ModelOneToOneTest extends TestCase +abstract class ModelOneToOneBase extends Base { public static function setUpBeforeClass(): void { - self::markTestSkipped('冲突需要更改兼容性'); - $sqlList = [ - 'DROP TABLE IF EXISTS `test_user`;', - 'CREATE TABLE `test_user` ( - `id` int NOT NULL AUTO_INCREMENT, - `account` varchar(255) NOT NULL DEFAULT "", - PRIMARY KEY (`id`) - ) ENGINE = InnoDB DEFAULT CHARSET=utf8mb4;', - 'DROP TABLE IF EXISTS `test_profile`;', - 'CREATE TABLE `test_profile` ( - `id` int NOT NULL AUTO_INCREMENT, - `uid` int NOT NULL, - `email` varchar(255) NOT NULL DEFAULT "", - `nickname` varchar(255) NOT NULL DEFAULT "", - `update_time` datetime NOT NULL, - `delete_time` datetime DEFAULT NULL, - `create_time` datetime NOT NULL, - PRIMARY KEY (`id`) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;', - ]; - foreach ($sqlList as $sql) { - Db::execute($sql); - } + parent::setUpBeforeClass(); + + // todo 需要一个重置能力更安全 + Model::maker(function (Model $model) { + $model->setConnection(static::$dbName); + var_dump('maker:' . __FUNCTION__ . '-' . $model::class . '-' . spl_object_id($model)); + }); + } + + public function setUp(): void + { + parent::setUp(); + + $this->db->execute('TRUNCATE TABLE orm_test_user;'); + $this->db->execute('TRUNCATE TABLE orm_test_profile;'); } /** @@ -50,7 +45,8 @@ public function testBindAttr() $user = new UserModel(); $user->account = 'thinkphp'; - $user->profile = new ProfileModel(['email' => $email, 'nickname' => $nickname]); + $profile = new ProfileModel(['email' => $email, 'nickname' => $nickname]); + $user->profile = $profile; $user->together(['profile'])->save(); $userID = $user->id; diff --git a/tests/orm/MysqlDbJsonFieldsTest.php b/tests/orm/MysqlDbJsonFieldsTest.php index 88dd42a4..c3a3d654 100644 --- a/tests/orm/MysqlDbJsonFieldsTest.php +++ b/tests/orm/MysqlDbJsonFieldsTest.php @@ -5,5 +5,5 @@ class MysqlDbJsonFieldsTest extends DbJsonFieldsBase { - protected string $dbName = 'mysql'; + protected static string $dbName = 'mysql'; } diff --git a/tests/orm/MysqlDbTest.php b/tests/orm/MysqlDbTest.php index 2b9b8bc2..d1eb952b 100644 --- a/tests/orm/MysqlDbTest.php +++ b/tests/orm/MysqlDbTest.php @@ -5,5 +5,5 @@ class MysqlDbTest extends DbTestBase { - protected string $dbName = 'mysql'; + protected static string $dbName = 'mysql'; } diff --git a/tests/orm/MysqlDbTransactionTest.php b/tests/orm/MysqlDbTransactionTest.php index ed7b6f7b..28214552 100644 --- a/tests/orm/MysqlDbTransactionTest.php +++ b/tests/orm/MysqlDbTransactionTest.php @@ -5,5 +5,5 @@ class MysqlDbTransactionTest extends DbTransactionTestBase { - protected string $dbName = 'mysql'; + protected static string $dbName = 'mysql'; } diff --git a/tests/orm/MysqlModelOneToOneTest.php b/tests/orm/MysqlModelOneToOneTest.php new file mode 100644 index 00000000..43a76972 --- /dev/null +++ b/tests/orm/MysqlModelOneToOneTest.php @@ -0,0 +1,9 @@ + Date: Tue, 20 May 2025 17:48:29 +0800 Subject: [PATCH 19/22] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=9F=BA=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/Base.php | 15 +++++++----- tests/orm/DbJsonFieldsBase.php | 2 +- tests/orm/DbTestBase.php | 15 +----------- tests/orm/DbTransactionTestBase.php | 35 ++++++++++++---------------- tests/orm/ModelOneToOneBase.php | 3 ++- tests/orm/MysqlDbJsonFieldsTest.php | 2 +- tests/orm/MysqlDbTest.php | 2 +- tests/orm/MysqlDbTransactionTest.php | 2 +- tests/orm/MysqlModelOneToOneTest.php | 2 +- tests/orm/PgsqlDbJsonFieldsTest.php | 12 +--------- tests/orm/PgsqlDbTest.php | 15 +----------- tests/orm/PgsqlDbTransactionTest.php | 2 +- tests/orm/PgsqlModelOneToOneTest.php | 2 +- 13 files changed, 36 insertions(+), 73 deletions(-) diff --git a/tests/Base.php b/tests/Base.php index ee4478bc..0d7c6ea9 100644 --- a/tests/Base.php +++ b/tests/Base.php @@ -14,17 +14,18 @@ use function version_compare; /** - * @property-read string $dbName; + * @property string $connectName; */ class Base extends TestCase { protected ConnectionInterface $db; - protected static string $dbName; + protected static string $connectName; + protected bool $isPgScriptInstalled = false; public function __get(string $name) { - if ($name === 'dbName') { - return static::$dbName; + if ($name === 'connectName') { + return static::$connectName; } throw new \Exception('Undefined property: ' . static::class . '::$' . $name); @@ -32,11 +33,12 @@ public function __get(string $name) public function setUp(): void { - $this->db = Db::connect($this->dbName); + $this->db ??= Db::connect(static::$connectName); - if ($this->dbName === 'pgsql') { + if (static::$connectName === 'pgsql' && $this->isPgScriptInstalled) { pg_reset_function(); pg_install_func(); + $this->isPgScriptInstalled = true; } // var_dump(static::class . '-' . __FUNCTION__ . '-' . spl_object_id($this)); @@ -45,6 +47,7 @@ public function setUp(): void protected static function compatibleInsertAll(BaseQuery $query, array $data): void { if ($query->getConnection() instanceof Pgsql) { + // 当前驱动批量插入不兼容，会产生类型错误，修复后可以移除兼容性 foreach ($data as $datum) { (clone $query)->insert($datum); } diff --git a/tests/orm/DbJsonFieldsBase.php b/tests/orm/DbJsonFieldsBase.php index 73ae03cc..e0957aee 100644 --- a/tests/orm/DbJsonFieldsBase.php +++ b/tests/orm/DbJsonFieldsBase.php @@ -25,7 +25,7 @@ public function testInitGoods(): array $this->db->execute('TRUNCATE TABLE test_goods;'); $userData = $this->provideTestData(); - $this->db->table('test_goods')->json(['extend'])->insertAll($userData); + self::compatibleInsertAll($this->db->table('test_goods')->json(['extend']), $userData); return $userData; } diff --git a/tests/orm/DbTestBase.php b/tests/orm/DbTestBase.php index fc1b0890..82466b28 100644 --- a/tests/orm/DbTestBase.php +++ b/tests/orm/DbTestBase.php @@ -22,9 +22,6 @@ abstract class DbTestBase extends Base { - public ConnectionInterface $db; - protected static string $dbName; - protected function provideTestData(): array { return [ @@ -36,22 +33,12 @@ protected function provideTestData(): array ]; } - public function setUp(): void - { - $this->db = Db::connect($this->dbName); - - if ($this->dbName === 'pgsql') { - pg_reset_function(); - pg_install_func(); - } - } - public function testInitUsers(): array { $this->db->execute('TRUNCATE TABLE test_user;'); $userData = $this->provideTestData(); - $this->db->table('test_user')->insertAll($userData); + self::compatibleInsertAll($this->db->table('test_user'), $userData); return $userData; } diff --git a/tests/orm/DbTransactionTestBase.php b/tests/orm/DbTransactionTestBase.php index 74e5b16f..e3a1ba5a 100644 --- a/tests/orm/DbTransactionTestBase.php +++ b/tests/orm/DbTransactionTestBase.php @@ -21,7 +21,6 @@ abstract class DbTransactionTestBase extends Base { protected ConnectionInterface $db; - protected static string $dbName; protected function provideTestData(): array { @@ -34,21 +33,17 @@ protected function provideTestData(): array public function setUp(): void { + parent::setUp(); + // Db::listen(function ($sql, $time) { // echo "SQL: $sql [$time ms]\n"; // }); - $this->db = Db::connect($this->dbName, true); $this->db->execute('TRUNCATE TABLE test_tran_a;'); - - if ($this->dbName === 'pgsql') { - pg_reset_function(); - pg_install_func(); - } } protected function reconnect(): ConnectionInterface { - return $this->db = Db::connect($this->dbName, true); + return $this->db = Db::connect($this->connectName, true); } protected static function insertAll(ConnectionInterface $db, string $table, array $data): void @@ -92,8 +87,8 @@ public function testBreakReconnect() // 初始化配置 $oldConfig = Db::getConfig(); $config = $oldConfig; - $config['connections'][$this->dbName]['break_reconnect'] = true; - $config['connections'][$this->dbName]['break_match_str'] = [ + $config['connections'][$this->connectName]['break_reconnect'] = true; + $config['connections'][$this->connectName]['break_match_str'] = [ 'query execution was interrupted', 'no connection to the server', ]; @@ -105,7 +100,7 @@ public function testBreakReconnect() self::insertAll($this->db, 'test_tran_a', $this->provideTestData()); $cid = query_connection_id($this->db); - kill_connection($this->dbName . '_manage', $cid); + kill_connection($this->connectName . '_manage', $cid); // 触发重连 $this->db->table('test_tran_a')->where('id', '=', 2)->value('username'); @@ -114,7 +109,7 @@ public function testBreakReconnect() $cid = $newCid; // 事务前重连 - kill_connection($this->dbName . '_manage', $cid); + kill_connection($this->connectName . '_manage', $cid); $this->db->table('test_tran_a')->startTrans(); $this->db->table('test_tran_a')->where('id', '=', 2)->update([ 'username' => '2-8-b', @@ -134,7 +129,7 @@ public function testBreakReconnect() $this->db->table('test_tran_a')->where('id', '=', 2)->update([ 'username' => '2-8-c', ]); - kill_connection($this->dbName . '_manage', $cid); + kill_connection($this->connectName . '_manage', $cid); $this->db->table('test_tran_a')->where('id', '=', 3)->update([ 'username' => '3-7-b', ]); @@ -145,13 +140,13 @@ public function testBreakReconnect() } catch (Exception $rollbackException) { // Ignore exception $this->proxyAssertMatchesRegularExpression( - $this->dbName === 'mysql' ? '~(server has gone away)~' : '~(no connection to the server)~', + $this->connectName === 'mysql' ? '~(server has gone away)~' : '~(no connection to the server)~', $rollbackException->getMessage() ); } // Ignore exception $this->proxyAssertMatchesRegularExpression( - $this->dbName === 'mysql' ? '~(server has gone away)~' : '~(no connection to the server)~', + $this->connectName === 'mysql' ? '~(server has gone away)~' : '~(no connection to the server)~', $exception->getMessage() ); } @@ -216,8 +211,8 @@ public function testTransactionSavepointBreakReconnect() // 初始化配置 $oldConfig = Db::getConfig(); $config = $oldConfig; - $config['connections'][$this->dbName]['break_reconnect'] = true; - $config['connections'][$this->dbName]['break_match_str'] = [ + $config['connections'][$this->connectName]['break_reconnect'] = true; + $config['connections'][$this->connectName]['break_match_str'] = [ 'query execution was interrupted', 'no connection to the server', ]; @@ -242,7 +237,7 @@ public function testTransactionSavepointBreakReconnect() ]); $oldConnect->table('test_tran_a')->commit(); // kill - kill_connection($this->dbName . '_manage', $cid); + kill_connection($this->connectName . '_manage', $cid); // tran 2 $oldConnect->table('test_tran_a')->startTrans(); $newConnect->table('test_tran_a')->where('id', '=', 3)->update([ @@ -257,13 +252,13 @@ public function testTransactionSavepointBreakReconnect() } catch (Exception $rollbackException) { // Ignore exception $this->proxyAssertMatchesRegularExpression( - $this->dbName === 'mysql' ? '~(server has gone away)~' : '~(no connection to the server)~', + $this->connectName === 'mysql' ? '~(server has gone away)~' : '~(no connection to the server)~', $rollbackException->getMessage() ); } // Ignore exception $this->proxyAssertMatchesRegularExpression( - $this->dbName === 'mysql' ? '~(server has gone away)~' : '~(no connection to the server)~', + $this->connectName === 'mysql' ? '~(server has gone away)~' : '~(no connection to the server)~', $exception->getMessage() ); } finally { diff --git a/tests/orm/ModelOneToOneBase.php b/tests/orm/ModelOneToOneBase.php index d02c58a5..bf3bd74d 100644 --- a/tests/orm/ModelOneToOneBase.php +++ b/tests/orm/ModelOneToOneBase.php @@ -22,7 +22,7 @@ public static function setUpBeforeClass(): void // todo 需要一个重置能力更安全 Model::maker(function (Model $model) { - $model->setConnection(static::$dbName); + $model->setConnection(static::$connectName); var_dump('maker:' . __FUNCTION__ . '-' . $model::class . '-' . spl_object_id($model)); }); } @@ -31,6 +31,7 @@ public function setUp(): void { parent::setUp(); + // 每个测试执行前重置测试数据 $this->db->execute('TRUNCATE TABLE orm_test_user;'); $this->db->execute('TRUNCATE TABLE orm_test_profile;'); } diff --git a/tests/orm/MysqlDbJsonFieldsTest.php b/tests/orm/MysqlDbJsonFieldsTest.php index c3a3d654..40696af4 100644 --- a/tests/orm/MysqlDbJsonFieldsTest.php +++ b/tests/orm/MysqlDbJsonFieldsTest.php @@ -5,5 +5,5 @@ class MysqlDbJsonFieldsTest extends DbJsonFieldsBase { - protected static string $dbName = 'mysql'; + protected static string $connectName = 'mysql'; } diff --git a/tests/orm/MysqlDbTest.php b/tests/orm/MysqlDbTest.php index d1eb952b..ba54df2a 100644 --- a/tests/orm/MysqlDbTest.php +++ b/tests/orm/MysqlDbTest.php @@ -5,5 +5,5 @@ class MysqlDbTest extends DbTestBase { - protected static string $dbName = 'mysql'; + protected static string $connectName = 'mysql'; } diff --git a/tests/orm/MysqlDbTransactionTest.php b/tests/orm/MysqlDbTransactionTest.php index 28214552..c6af14dd 100644 --- a/tests/orm/MysqlDbTransactionTest.php +++ b/tests/orm/MysqlDbTransactionTest.php @@ -5,5 +5,5 @@ class MysqlDbTransactionTest extends DbTransactionTestBase { - protected static string $dbName = 'mysql'; + protected static string $connectName = 'mysql'; } diff --git a/tests/orm/MysqlModelOneToOneTest.php b/tests/orm/MysqlModelOneToOneTest.php index 43a76972..b9cf2182 100644 --- a/tests/orm/MysqlModelOneToOneTest.php +++ b/tests/orm/MysqlModelOneToOneTest.php @@ -5,5 +5,5 @@ class MysqlModelOneToOneTest extends ModelOneToOneBase { - protected static string $dbName = 'mysql'; + protected static string $connectName = 'mysql'; } diff --git a/tests/orm/PgsqlDbJsonFieldsTest.php b/tests/orm/PgsqlDbJsonFieldsTest.php index b3e0f97c..de42944c 100644 --- a/tests/orm/PgsqlDbJsonFieldsTest.php +++ b/tests/orm/PgsqlDbJsonFieldsTest.php @@ -5,15 +5,5 @@ class PgsqlDbJsonFieldsTest extends DbJsonFieldsBase { - protected static string $dbName = 'pgsql'; - - public function testInitGoods(): array - { - $this->db->execute('TRUNCATE TABLE test_goods;'); - - $userData = $this->provideTestData(); - self::compatibleInsertAll($this->db->table('test_goods')->json(['extend']), $userData); - - return $userData; - } + protected static string $connectName = 'pgsql'; } diff --git a/tests/orm/PgsqlDbTest.php b/tests/orm/PgsqlDbTest.php index bfa2dcbf..0554b38e 100644 --- a/tests/orm/PgsqlDbTest.php +++ b/tests/orm/PgsqlDbTest.php @@ -5,18 +5,5 @@ class PgsqlDbTest extends DbTestBase { - protected static string $dbName = 'pgsql'; - - public function testInitUsers(): array - { - $this->db->execute('TRUNCATE TABLE "test_user";'); - - // 当前驱动批量插入不兼容，会产生类型错误 - $userData = $this->provideTestData(); - foreach ($userData as $datum) { - $this->db->table('test_user')->insert($datum); - } - - return $userData; - } + protected static string $connectName = 'pgsql'; } diff --git a/tests/orm/PgsqlDbTransactionTest.php b/tests/orm/PgsqlDbTransactionTest.php index e36b4441..a2c9b7a5 100644 --- a/tests/orm/PgsqlDbTransactionTest.php +++ b/tests/orm/PgsqlDbTransactionTest.php @@ -5,5 +5,5 @@ class PgsqlDbTransactionTest extends DbTransactionTestBase { - protected static string $dbName = 'pgsql'; + protected static string $connectName = 'pgsql'; } diff --git a/tests/orm/PgsqlModelOneToOneTest.php b/tests/orm/PgsqlModelOneToOneTest.php index 13cc633d..6bf6a566 100644 --- a/tests/orm/PgsqlModelOneToOneTest.php +++ b/tests/orm/PgsqlModelOneToOneTest.php @@ -5,5 +5,5 @@ class PgsqlModelOneToOneTest extends ModelOneToOneBase { - protected static string $dbName = 'pgsql'; + protected static string $connectName = 'pgsql'; } From aee6af9848ac492453a2fa6cb55410d64fce57a9 Mon Sep 17 00:00:00 2001 From: auooru Date: Tue, 20 May 2025 17:52:22 +0800 Subject: [PATCH 20/22] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9F=BA=E7=B1=BB?= =?UTF-8?q?=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/{Base.php => TestCaseBase.php} | 3 +-- tests/orm/DbJsonFieldsBase.php | 6 ++---- tests/orm/DbTestBase.php | 17 +++++++---------- tests/orm/DbTransactionTestBase.php | 13 ++++--------- tests/orm/ModelOneToOneBase.php | 7 ++----- 5 files changed, 16 insertions(+), 30 deletions(-) rename tests/{Base.php => TestCaseBase.php} (97%) diff --git a/tests/Base.php b/tests/TestCaseBase.php similarity index 97% rename from tests/Base.php rename to tests/TestCaseBase.php index 0d7c6ea9..12f51b97 100644 --- a/tests/Base.php +++ b/tests/TestCaseBase.php @@ -10,13 +10,12 @@ use think\db\ConnectionInterface; use think\db\connector\Pgsql; use think\facade\Db; -use think\Model; use function version_compare; /** * @property string $connectName; */ -class Base extends TestCase +class TestCaseBase extends TestCase { protected ConnectionInterface $db; protected static string $connectName; diff --git a/tests/orm/DbJsonFieldsBase.php b/tests/orm/DbJsonFieldsBase.php index e0957aee..6b029a3f 100644 --- a/tests/orm/DbJsonFieldsBase.php +++ b/tests/orm/DbJsonFieldsBase.php @@ -2,11 +2,9 @@ namespace tests\orm; -use tests\Base; -use think\Collection; -use think\facade\Db; +use tests\TestCaseBase; -abstract class DbJsonFieldsBase extends Base +abstract class DbJsonFieldsBase extends TestCaseBase { protected function provideTestData(): array { diff --git a/tests/orm/DbTestBase.php b/tests/orm/DbTestBase.php index 82466b28..161b2dd0 100644 --- a/tests/orm/DbTestBase.php +++ b/tests/orm/DbTestBase.php @@ -4,23 +4,20 @@ namespace tests\orm; -use think\db\ConnectionInterface; +use tests\TestCaseBase; +use think\Collection; +use think\db\exception\DbException; +use think\db\Raw; +use think\Exception as ThinkException; +use think\facade\Db; use function array_column; use function array_keys; use function array_unique; use function array_values; use function tests\array_column_ex; use function tests\array_value_sort; -use tests\Base; -use think\Collection; -use think\db\exception\DbException; -use think\db\Raw; -use think\Exception as ThinkException; -use think\facade\Db; -use function tests\pg_install_func; -use function tests\pg_reset_function; -abstract class DbTestBase extends Base +abstract class DbTestBase extends TestCaseBase { protected function provideTestData(): array { diff --git a/tests/orm/DbTransactionTestBase.php b/tests/orm/DbTransactionTestBase.php index e3a1ba5a..35d19184 100644 --- a/tests/orm/DbTransactionTestBase.php +++ b/tests/orm/DbTransactionTestBase.php @@ -5,20 +5,15 @@ namespace tests\orm; use Exception; -use tests\Base; +use tests\TestCaseBase; use think\db\ConnectionInterface; use think\db\connector\Pgsql; -use function tests\kill_connection; -use function tests\mysql_kill_connection; -use function tests\pg_install_func; -use function tests\pg_reset_function; -use function tests\query_connection_id; -use function tests\query_mysql_connection_id; use think\facade\Db; use Throwable; -use function tests\query_pgsql_connection_id; +use function tests\kill_connection; +use function tests\query_connection_id; -abstract class DbTransactionTestBase extends Base +abstract class DbTransactionTestBase extends TestCaseBase { protected ConnectionInterface $db; diff --git a/tests/orm/ModelOneToOneBase.php b/tests/orm/ModelOneToOneBase.php index bf3bd74d..0d13a3dd 100644 --- a/tests/orm/ModelOneToOneBase.php +++ b/tests/orm/ModelOneToOneBase.php @@ -3,18 +3,15 @@ namespace tests\orm; -use PHPUnit\Framework\TestCase; -use tests\Base; use tests\stubs\ProfileModel; use tests\stubs\UserModel; -use think\db\Query; -use think\facade\Db; +use tests\TestCaseBase; use think\Model; /** * 模型一对一关联 */ -abstract class ModelOneToOneBase extends Base +abstract class ModelOneToOneBase extends TestCaseBase { public static function setUpBeforeClass(): void { From af2e03753e4ccdb985900ee25bdb43293de980ef Mon Sep 17 00:00:00 2001 From: auooru Date: Tue, 20 May 2025 18:58:30 +0800 Subject: [PATCH 21/22] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=B5=8B=E8=AF=95=20Mo?= =?UTF-8?q?delFieldType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/db/connector/Pgsql.php | 22 +++++++ tests/TestCaseBase.php | 22 +++++++ .../20250520095311_model_field_type.php | 64 +++++++++++++++++++ ...eldTypeTest.php => ModelFieldTypeBase.php} | 58 +++++++++-------- tests/orm/ModelOneToOneBase.php | 7 +- tests/orm/MysqlModelFieldTypeTest.php | 9 +++ tests/orm/PgsqlModelFieldTypeTest.php | 9 +++ 7 files changed, 159 insertions(+), 32 deletions(-) create mode 100644 tests/db/migrations/20250520095311_model_field_type.php rename tests/orm/{ModelFieldTypeTest.php => ModelFieldTypeBase.php} (72%) create mode 100644 tests/orm/MysqlModelFieldTypeTest.php create mode 100644 tests/orm/PgsqlModelFieldTypeTest.php diff --git a/src/db/connector/Pgsql.php b/src/db/connector/Pgsql.php index 1cc868c9..dd365582 100644 --- 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 index 12f51b97..ee0a5089 100644 --- 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 new file mode 100644 index 00000000..6158096d --- /dev/null +++ b/tests/db/migrations/20250520095311_model_field_type.php @@ -0,0 +1,64 @@ +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/ModelFieldTypeTest.php b/tests/orm/ModelFieldTypeBase.php similarity index 72% rename from tests/orm/ModelFieldTypeTest.php rename to tests/orm/ModelFieldTypeBase.php index 2843b092..c38bf970 100644 --- a/tests/orm/ModelFieldTypeTest.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( - << 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 index 0d13a3dd..9ab1ca70 100644 --- 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 new file mode 100644 index 00000000..8607011a --- /dev/null +++ b/tests/orm/MysqlModelFieldTypeTest.php @@ -0,0 +1,9 @@ + Date: Tue, 20 May 2025 19:05:31 +0800 Subject: [PATCH 22/22] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/TestCaseBase.php | 10 ++++++---- tests/orm/ModelFieldTypeBase.php | 4 ---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/TestCaseBase.php b/tests/TestCaseBase.php index ee0a5089..540166f5 100644 --- a/tests/TestCaseBase.php +++ b/tests/TestCaseBase.php @@ -20,7 +20,7 @@ class TestCaseBase extends TestCase { protected ConnectionInterface $db; protected static string $connectName; - protected bool $isPgScriptInstalled = false; + protected static bool $isResetPgScript = false; protected static function initModelSupport(): void { @@ -44,10 +44,12 @@ public function setUp(): void { $this->db ??= Db::connect(static::$connectName); - if (static::$connectName === 'pgsql' && $this->isPgScriptInstalled) { - pg_reset_function(); + if (static::$connectName === 'pgsql') { + if (self::$isResetPgScript === false) { + pg_reset_function(); + self::$isResetPgScript = true; + } pg_install_func(); - $this->isPgScriptInstalled = true; } // var_dump(static::class . '-' . __FUNCTION__ . '-' . spl_object_id($this)); diff --git a/tests/orm/ModelFieldTypeBase.php b/tests/orm/ModelFieldTypeBase.php index c38bf970..0df0670a 100644 --- a/tests/orm/ModelFieldTypeBase.php +++ b/tests/orm/ModelFieldTypeBase.php @@ -41,10 +41,6 @@ public function testInitData(): array */ 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 = $this->db->table('test_field_type')->setFieldType(['bigint' => 'string'])->select(); $this->assertNotEmpty($result->count()); foreach ($data as $index => $item) {