1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

[ticket/16955] Clean up code in db classes

PHPBB3-16955
This commit is contained in:
Marc Alexander
2022-12-27 14:13:23 +01:00
parent 3bc100c9a0
commit 948023078b
26 changed files with 277 additions and 327 deletions

View File

@@ -51,25 +51,30 @@ class factory
// Return the appropriate DB extractor
if ($this->db instanceof \phpbb\db\driver\mssql_base)
{
return $this->container->get('dbal.extractor.extractors.mssql_extractor');
$extractor = $this->container->get('dbal.extractor.extractors.mssql_extractor');
}
else if ($this->db instanceof \phpbb\db\driver\mysql_base)
{
return $this->container->get('dbal.extractor.extractors.mysql_extractor');
$extractor = $this->container->get('dbal.extractor.extractors.mysql_extractor');
}
else if ($this->db instanceof \phpbb\db\driver\oracle)
{
return $this->container->get('dbal.extractor.extractors.oracle_extractor');
$extractor = $this->container->get('dbal.extractor.extractors.oracle_extractor');
}
else if ($this->db instanceof \phpbb\db\driver\postgres)
{
return $this->container->get('dbal.extractor.extractors.postgres_extractor');
$extractor = $this->container->get('dbal.extractor.extractors.postgres_extractor');
}
else if ($this->db instanceof \phpbb\db\driver\sqlite3)
{
return $this->container->get('dbal.extractor.extractors.sqlite3_extractor');
$extractor = $this->container->get('dbal.extractor.extractors.sqlite3_extractor');
}
else
{
throw new \InvalidArgumentException('Invalid database driver given');
}
throw new \InvalidArgumentException('Invalid database driver given');
/** @var \phpbb\db\extractor\extractor_interface $extractor */
return $extractor;
}
}