diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-01-10 13:06:46 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-01-10 13:06:46 +0100 |
| commit | ba477f77c728f161ed184b218ef1a8b2ad1d1eb3 (patch) | |
| tree | b527c3dc1a6f7cb1da05cdf1b2b09ed407e81dbb | |
| parent | 67c987f0d06cb0898d2589c7bc12fceb4e142d68 (diff) | |
| parent | d2a4d6624f9e994469fff8b37af51caa5de3287c (diff) | |
| download | forums-ba477f77c728f161ed184b218ef1a8b2ad1d1eb3.tar forums-ba477f77c728f161ed184b218ef1a8b2ad1d1eb3.tar.gz forums-ba477f77c728f161ed184b218ef1a8b2ad1d1eb3.tar.bz2 forums-ba477f77c728f161ed184b218ef1a8b2ad1d1eb3.tar.xz forums-ba477f77c728f161ed184b218ef1a8b2ad1d1eb3.zip | |
Merge pull request #3272 from nickvergessen/ticket/13307
[ticket/13307] Update mysql_upgrader.php to work without the schema_data...
| -rw-r--r-- | phpBB/develop/create_schema_files.php | 1 | ||||
| -rw-r--r-- | phpBB/develop/mysql_upgrader.php | 12 |
2 files changed, 8 insertions, 5 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 7ef86ad7fc..60ffe04330 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -51,7 +51,6 @@ $classes = $finder->core_path('phpbb/') $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_data = $schema_generator->get_schema(); -$dbms_type_map = phpbb\db\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..698be9d303 100644 --- a/phpBB/develop/mysql_upgrader.php +++ b/phpBB/develop/mysql_upgrader.php @@ -62,10 +62,14 @@ 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); - -$dbms_type_map = phpbb\db\tools::get_dbms_type_map(); +$finder = new \phpbb\finder(new \phpbb\filesystem(), $phpbb_root_path); +$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($db, true), $phpbb_root_path, $phpEx, $table_prefix); +$schema_data = $schema_generator->get_schema(); +$dbms_type_map = \phpbb\db\tools::get_dbms_type_map(); foreach ($schema_data as $table_name => $table_data) { |