aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/database_update.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-07-28 18:13:44 +0200
committerAndreas Fischer <bantu@phpbb.com>2014-07-28 18:13:44 +0200
commite992eab4c3f39d22acacac70c95c62b942ca36ff (patch)
treecb4111d8c139694480856527ceb8aeffd5820994 /phpBB/install/database_update.php
parentd8867bb40de290a4c7377444dac0f5d07950e88a (diff)
parentae350bda4276d245a8480242a8c803a840922ece (diff)
downloadforums-e992eab4c3f39d22acacac70c95c62b942ca36ff.tar
forums-e992eab4c3f39d22acacac70c95c62b942ca36ff.tar.gz
forums-e992eab4c3f39d22acacac70c95c62b942ca36ff.tar.bz2
forums-e992eab4c3f39d22acacac70c95c62b942ca36ff.tar.xz
forums-e992eab4c3f39d22acacac70c95c62b942ca36ff.zip
Merge pull request #2780 from Nicofuma/ticket/12870
[ticket/12870] phpbbcli.php db:migrate can not update from 3.0.12 to 3.1 * Nicofuma/ticket/12870: [ticket/12870] Add doc block [ticket/12870] Create the migrations table with a method in the migrator [ticket/12870] Add $config['version'] in phpbb_extension_manager_test [ticket/12870] Create the migrations table in db:migrate
Diffstat (limited to 'phpBB/install/database_update.php')
-rw-r--r--phpBB/install/database_update.php20
1 files changed, 2 insertions, 18 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index c54c84cdbc..517143792a 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -177,25 +177,9 @@ define('IN_DB_UPDATE', true);
// End startup code
-// Make sure migrations have been installed.
-$db_tools = $phpbb_container->get('dbal.tools');
-if (!$db_tools->sql_table_exists($table_prefix . 'migrations'))
-{
- $db_tools->sql_create_table($table_prefix . 'migrations', array(
- 'COLUMNS' => array(
- 'migration_name' => array('VCHAR', ''),
- 'migration_depends_on' => array('TEXT', ''),
- 'migration_schema_done' => array('BOOL', 0),
- 'migration_data_done' => array('BOOL', 0),
- 'migration_data_state' => array('TEXT', ''),
- 'migration_start_time' => array('TIMESTAMP', 0),
- 'migration_end_time' => array('TIMESTAMP', 0),
- ),
- 'PRIMARY_KEY' => 'migration_name',
- ));
-}
-
$migrator = $phpbb_container->get('migrator');
+$migrator->create_migrations_table();
+
$phpbb_extension_manager = $phpbb_container->get('ext.manager');
$finder = $phpbb_extension_manager->get_finder();