diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-01-10 13:11:20 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-01-10 13:12:03 +0100 |
| commit | 86620c1e80e2282c671eb3825a3b87e445e8b043 (patch) | |
| tree | d49847326713d8883544930c6100ec37175a5a02 /phpBB/develop | |
| parent | 3cfbe7bb4fd7d046a7beb85baed7e94e3b1abca6 (diff) | |
| parent | ba477f77c728f161ed184b218ef1a8b2ad1d1eb3 (diff) | |
| download | forums-86620c1e80e2282c671eb3825a3b87e445e8b043.tar forums-86620c1e80e2282c671eb3825a3b87e445e8b043.tar.gz forums-86620c1e80e2282c671eb3825a3b87e445e8b043.tar.bz2 forums-86620c1e80e2282c671eb3825a3b87e445e8b043.tar.xz forums-86620c1e80e2282c671eb3825a3b87e445e8b043.zip | |
Merge branch 'develop-ascraeus' into develop
Conflicts:
phpBB/develop/create_schema_files.php
phpBB/develop/mysql_upgrader.php
Diffstat (limited to 'phpBB/develop')
| -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 e4102a02e7..5c5bfe6171 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\tools($db, true), $phpbb_root_path, $phpEx, $table_prefix); $schema_data = $schema_generator->get_schema(); -$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 ff4e38fb0a..51fbd75c10 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/tools.' . $phpEx); - -$dbms_type_map = phpbb\db\tools\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\tools($db, true), $phpbb_root_path, $phpEx, $table_prefix); +$schema_data = $schema_generator->get_schema(); +$dbms_type_map = \phpbb\db\tools\tools::get_dbms_type_map(); foreach ($schema_data as $table_name => $table_data) { |