diff options
| author | Nicofuma <github@nicofuma.fr> | 2015-02-09 17:11:09 +0100 |
|---|---|---|
| committer | Nicofuma <github@nicofuma.fr> | 2015-02-09 17:11:09 +0100 |
| commit | acf3744297303324490c484156f0bf808e532883 (patch) | |
| tree | 5dfae513699ce84bbdf0028842732695df7c7e47 /phpBB/develop | |
| parent | b0c910e49c31e086f19f983bb9d7d5051d34fac8 (diff) | |
| parent | 74d1b1812f512ae232a063a2574d62d3f5491f46 (diff) | |
| download | forums-acf3744297303324490c484156f0bf808e532883.tar forums-acf3744297303324490c484156f0bf808e532883.tar.gz forums-acf3744297303324490c484156f0bf808e532883.tar.bz2 forums-acf3744297303324490c484156f0bf808e532883.tar.xz forums-acf3744297303324490c484156f0bf808e532883.zip | |
Merge pull request #3332 from nickvergessen/ticket/10748-mssql
[ticket/10748] Split MS SQL from the db tools file into it's own
Diffstat (limited to 'phpBB/develop')
| -rw-r--r-- | phpBB/develop/create_schema_files.php | 5 | ||||
| -rw-r--r-- | phpBB/develop/mysql_upgrader.php | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 5c5bfe6171..8dce97144d 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -49,7 +49,10 @@ $classes = $finder->core_path('phpbb/') ->get_classes(); $db = new \phpbb\db\driver\sqlite(); -$schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $db, new \phpbb\db\tools\tools($db, true), $phpbb_root_path, $phpEx, $table_prefix); +$factory = new \phpbb\db\tools\factory(); +$db_tools = $factory->get($db, true); + +$schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $db, $db_tools, $phpbb_root_path, $phpEx, $table_prefix); $schema_data = $schema_generator->get_schema(); $fp = fopen($schema_path . 'schema.json', 'wb'); diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php index 51fbd75c10..543b520caa 100644 --- a/phpBB/develop/mysql_upgrader.php +++ b/phpBB/develop/mysql_upgrader.php @@ -67,7 +67,10 @@ $classes = $finder->core_path('phpbb/') ->directory('/db/migration/data') ->get_classes(); -$schema_generator = new \phpbb\db\migration\schema_generator($classes, $config, $db, new \phpbb\db\tools\tools($db, true), $phpbb_root_path, $phpEx, $table_prefix); +$factory = new \phpbb\db\tools\factory(); +$db_tools = $factory->get($db, true); + +$schema_generator = new \phpbb\db\migration\schema_generator($classes, $config, $db, $db_tools, $phpbb_root_path, $phpEx, $table_prefix); $schema_data = $schema_generator->get_schema(); $dbms_type_map = \phpbb\db\tools\tools::get_dbms_type_map(); |