Skip to content

Commit 0d7faae

Browse files
committed
Merge branch 'master' into 3.2-merge
# Conflicts: # src/amqp/composer.json # src/async-queue/composer.json # src/cache/composer.json # src/circuit-breaker/composer.json # src/config-apollo/composer.json # src/config-center/composer.json # src/config-etcd/composer.json # src/config-nacos/composer.json # src/config/composer.json # src/constants/composer.json # src/consul/composer.json # src/crontab/composer.json # src/dag/composer.json # src/database-pgsql/composer.json # src/database-sqlite/composer.json # src/database/composer.json # src/db-connection/composer.json # src/db/composer.json # src/devtool/composer.json # src/di/composer.json # src/elasticsearch/composer.json # src/etcd/composer.json # src/exception-handler/composer.json # src/filesystem/composer.json # src/grpc-client/composer.json # src/grpc-server/composer.json # src/http-message/composer.json # src/http-server/composer.json # src/http2-client/composer.json # src/json-rpc/composer.json # src/kafka/composer.json # src/logger/composer.json # src/metric/composer.json # src/migration-generator/composer.json # src/model-cache/composer.json # src/model-listener/composer.json # src/nacos/composer.json # src/nats/composer.json # src/nsq/composer.json # src/paginator/composer.json # src/pool/composer.json # src/process/composer.json # src/rate-limit/composer.json # src/reactive-x/composer.json # src/redis/composer.json # src/resource-grpc/composer.json # src/resource/composer.json # src/retry/composer.json # src/rpc-client/composer.json # src/rpc-multiplex/composer.json # src/rpc-server/composer.json # src/rpc/composer.json # src/scout/composer.json # src/server/composer.json # src/service-governance-consul/composer.json # src/service-governance-nacos/composer.json # src/session/composer.json # src/signal/composer.json # src/snowflake/composer.json # src/socket/composer.json # src/socketio-server/composer.json # src/stringable/composer.json # src/super-globals/composer.json # src/support/composer.json # src/swagger/composer.json # src/task/composer.json # src/testing/composer.json # src/tracer/composer.json # src/translation/composer.json # src/utils/composer.json # src/validation/composer.json # src/view-engine/composer.json # src/view/composer.json # src/watcher/composer.json # src/websocket-client/composer.json # src/websocket-server/composer.json
2 parents c71e1bf + 4a40f81 commit 0d7faae

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"require": {
2121
"php": ">=8.2",
2222
"hyperf/collection": "~3.2.0",
23+
"hyperf/context": "~3.2.0",
2324
"hyperf/database": "~3.2.0",
2425
"hyperf/stringable": "~3.2.0",
2526
"hyperf/support": "~3.2.0"

tests/DatabaseSQLiteSchemaGrammarTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ public function testAddingForeignKey()
206206

207207
// because string return type in Hyperf\Database\Schema\Grammars\Grammar::compileForeign is a must
208208
// it has a redundancy statement
209-
$this->assertCount(2, $statements);
209+
$this->assertCount(1, $statements);
210210
$this->assertSame('create table "users" ("foo" varchar not null, "order_id" varchar not null, foreign key("order_id") references "orders"("id"), primary key ("foo"))', $statements[0]);
211211
}
212212

@@ -701,7 +701,7 @@ public function testAddingForeignUuid()
701701
$this->assertInstanceOf(ForeignIdColumnDefinition::class, $foreignUuid);
702702
// because string return type in Hyperf\Database\Schema\Grammars\Grammar::compileForeign is a must
703703
// it has a redundancy statement
704-
$this->assertSame(9, count($statements));
704+
$this->assertSame(5, count($statements));
705705
$this->assertSame('alter table "users" add column "foo" varchar not null', $statements[0]);
706706
$this->assertSame('alter table "users" add column "company_id" varchar not null', $statements[1]);
707707
$this->assertSame('alter table "users" add column "laravel_idea_id" varchar not null', $statements[2]);

0 commit comments

Comments
 (0)