Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/database/src/DatabaseInitializer.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ className: Connection::class,
return new GenericDatabase(
connection: $connection,
transactionManager: new GenericTransactionManager($connection),
serializerFactory: new SerializerFactory($container),
serializerFactory: $container->get(SerializerFactory::class),
);
}
}
4 changes: 3 additions & 1 deletion packages/database/src/GenericDatabase.php
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,12 @@ private function resolveBindings(Query $query): array
{
$bindings = [];

$serializerFactory = $this->serializerFactory->in($this->context);

foreach ($query->bindings as $key => $value) {
if ($value instanceof Query) {
$value = $value->execute();
} elseif ($serializer = $this->serializerFactory->in($this->context)->forValue($value)) {
} elseif ($serializer = $serializerFactory->forValue($value)) {
$value = $serializer->serialize($value);
}

Expand Down
2 changes: 2 additions & 0 deletions tests/Integration/Container/TaggedDynamicInitializerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
use Tempest\Database\Config\SQLiteConfig;
use Tempest\Database\Database;
use Tempest\Database\DatabaseInitializer;
use Tempest\Mapper\SerializerFactory;

final class TaggedDynamicInitializerTest extends TestCase
{
public function test_resolve(): void
{
$container = new GenericContainer();
$container->singleton(SerializerFactory::class, new SerializerFactory($container));
$container->addInitializer(DatabaseInitializer::class);

$container->config(new SQLiteConfig(
Expand Down