diff options
author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-12-29 03:46:39 +0000 |
---|---|---|
committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-12-29 03:46:39 +0000 |
commit | 93b910091f12eb94503e416d8fb57c48fe0df5c8 (patch) | |
tree | a5c334a27c4d3b344e90ee585421001d23c75735 /includes | |
parent | 22f0ba528f7b579868b793664cf9c7875b788fd1 (diff) | |
download | brdo-93b910091f12eb94503e416d8fb57c48fe0df5c8.tar.gz brdo-93b910091f12eb94503e416d8fb57c48fe0df5c8.tar.bz2 |
#1006478 by Stevel, mradcliffe, vwX, bfroehle: Fixed D6 to D7 upgrade on PostgreSQL stopped cold at update.php
Diffstat (limited to 'includes')
-rw-r--r-- | includes/update.inc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/includes/update.inc b/includes/update.inc index 30cfffdbd..27fa80a3f 100644 --- a/includes/update.inc +++ b/includes/update.inc @@ -155,6 +155,20 @@ function update_prepare_d7_bootstrap() { 'description' => $has_required_schema ? '' : 'Please update your Drupal 6 installation to the most recent version before attempting to upgrade to Drupal 7', ), ); + + // Make sure that the database environment is properly set up. + try { + db_run_tasks(db_driver()); + } + catch (DatabaseTaskException $e) { + $requirements['database tasks'] = array( + 'title' => 'Database environment', + 'value' => 'There is a problem with your database environment', + 'severity' => REQUIREMENT_ERROR, + 'description' => $e->getMessage(), + ); + } + update_extra_requirements($requirements); // Allow a D6 session to work, since the upgrade has not been performed yet. |