Skip to content

Make sure the parameter type is added for each indexed parameter #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shirshir wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make sure the parameter type is added for each indexed parameter #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/DoctrineMessageRepository/DoctrineMessageRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ public function persist(Message ...$messages): void

$insertValues = [];
$insertParameters = [];
$types = [];

foreach ($messages as $index => $message) {
$payload = $this->serializer->serializeMessage($message);
Expand All @@ -92,6 +93,13 @@ public function persist(Message ...$messages): void
$messageParameters[$this->indexParameter($column, $index)] = $payload['headers'][$header];
}

if ($this->binaryEventId) {
$types[$eventIdIndex] = ParameterType::BINARY;
}
if ($this->binaryAggregateRootId) {
$types[$aggregateRootIdIndex] = ParameterType::BINARY;
}

// Creates a values line like: (:event_id_1, :aggregate_root_id_1, ...)
$insertValues[] = implode(', ', $this->formatNamedParameters(array_keys($messageParameters)));

Expand All @@ -106,14 +114,6 @@ public function persist(Message ...$messages): void
implode("),\n(", $insertValues),
);

$types = [];
if ($this->binaryEventId) {
$types[$eventIdIndex] = ParameterType::BINARY;
}
if ($this->binaryAggregateRootId) {
$types[$aggregateRootIdIndex] = ParameterType::BINARY;
}

try {
$this->connection->executeStatement($insertQuery, $insertParameters, $types);
} catch (Throwable $exception) {
Expand Down
15 changes: 7 additions & 8 deletions src/DoctrineMessageRepository/DoctrineUuidV4MessageRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ public function persist(Message ...$messages): void

$insertValues = [];
$insertParameters = [];
$types = [];
$isBinaryId = $this->uuidEncoder instanceof BinaryUuidEncoder;

foreach ($messages as $index => $message) {
$payload = $this->serializer->serializeMessage($message);
Expand All @@ -88,6 +90,11 @@ public function persist(Message ...$messages): void
$messageParameters[$this->indexParameter($column, $index)] = $payload['headers'][$header];
}

if ($isBinaryId) {
$types[$eventIdIndex] = ParameterType::BINARY;
$types[$aggregateRootIdIndex] = ParameterType::BINARY;
}

// Creates a values line like: (:event_id_1, :aggregate_root_id_1, ...)
$insertValues[] = implode(', ', $this->formatNamedParameters(array_keys($messageParameters)));

Expand All @@ -102,14 +109,6 @@ public function persist(Message ...$messages): void
implode("),\n(", $insertValues),
);

$types = [];
if ($this->uuidEncoder instanceof BinaryUuidEncoder) {
$types = [
$eventIdIndex => ParameterType::BINARY,
$aggregateRootIdIndex => ParameterType::BINARY,
];
}

try {
$this->connection->executeStatement($insertQuery, $insertParameters, $types);
} catch (Throwable $exception) {
Expand Down
9 changes: 5 additions & 4 deletions src/MessageRepositoryTestTooling/BinaryUuidTestTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,16 @@ public function it_uses_correct_parameter_types_for_binary_fields(): void
}

$repository = $this->messageRepository();
$message = $this->createMessage('payload');
$message1 = $this->createMessage('payload1');
$message2 = $this->createMessage('payload2');

$repository->persist($message);
$repository->persist($message1, $message2);
$this->assertWarnings('persist()');

$repository->retrieveAll($message->aggregateRootId());
$repository->retrieveAll($message1->aggregateRootId());
$this->assertWarnings('retrieveAll()');

$repository->retrieveAllAfterVersion($message->aggregateRootId(), 1);
$repository->retrieveAllAfterVersion($message1->aggregateRootId(), 1);
$this->assertWarnings('retrieveAllAfterVersion()');
}

Expand Down