diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-12-10 00:03:24 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-12-10 00:03:24 +0100 |
| commit | d22fa412c4ec3d52c3a1d41bfb9f968bbbf3a94e (patch) | |
| tree | 27495229af76de3996f8a2996dee1c6e52cc93c2 /phpBB/develop | |
| parent | 8a357181492ef7c41ed6289ef1c5e8e0e4bdd6be (diff) | |
| parent | ec90f2b380a598a3dbf7ada0e95878d9d1b85cbe (diff) | |
| download | forums-d22fa412c4ec3d52c3a1d41bfb9f968bbbf3a94e.tar forums-d22fa412c4ec3d52c3a1d41bfb9f968bbbf3a94e.tar.gz forums-d22fa412c4ec3d52c3a1d41bfb9f968bbbf3a94e.tar.bz2 forums-d22fa412c4ec3d52c3a1d41bfb9f968bbbf3a94e.tar.xz forums-d22fa412c4ec3d52c3a1d41bfb9f968bbbf3a94e.zip | |
Merge pull request #3220 from nickvergessen/ticket/13421
Ticket/13421 Introduce an interface for db\tools.php
Diffstat (limited to 'phpBB/develop')
| -rw-r--r-- | phpBB/develop/create_schema_files.php | 4 | ||||
| -rw-r--r-- | phpBB/develop/mysql_upgrader.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 7ef86ad7fc..e4102a02e7 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -49,9 +49,9 @@ $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($db, true), $phpbb_root_path, $phpEx, $table_prefix); +$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); $schema_data = $schema_generator->get_schema(); -$dbms_type_map = phpbb\db\tools::get_dbms_type_map(); +$dbms_type_map = phpbb\db\tools\tools::get_dbms_type_map(); $fp = fopen($schema_path . 'schema.json', 'wb'); fwrite($fp, json_encode($schema_data, JSON_PRETTY_PRINT)); diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php index 5c558f0b8e..ff4e38fb0a 100644 --- a/phpBB/develop/mysql_upgrader.php +++ b/phpBB/develop/mysql_upgrader.php @@ -63,9 +63,9 @@ echo "USE $dbname;$newline$newline"; @set_time_limit(0); require($phpbb_root_path . 'includes/db/schema_data.' . $phpEx); -require($phpbb_root_path . 'phpbb/db/tools.' . $phpEx); +require($phpbb_root_path . 'phpbb/db/tools/tools.' . $phpEx); -$dbms_type_map = phpbb\db\tools::get_dbms_type_map(); +$dbms_type_map = phpbb\db\tools\tools::get_dbms_type_map(); foreach ($schema_data as $table_name => $table_data) { |