diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/common.inc | 3 | ||||
| -rw-r--r-- | includes/database/database.inc | 4 | ||||
| -rw-r--r-- | includes/install.inc | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/includes/common.inc b/includes/common.inc index 75f6f820b..781e27a9c 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -4798,9 +4798,10 @@ function drupal_get_schema_unprocessed($module, $table = NULL) { if (!is_null($table) && isset($schema[$table])) { return $schema[$table]; } - else { + else if (!empty($schema)) { return $schema; } + return array(); } /** diff --git a/includes/database/database.inc b/includes/database/database.inc index 22bd8fe2e..f298376ff 100644 --- a/includes/database/database.inc +++ b/includes/database/database.inc @@ -2130,7 +2130,9 @@ function db_close(array $options = array()) { * A Schema API table definition array. */ function db_create_table(&$ret, $name, $table) { - return Database::getConnection()->schema()->createTable($ret, $name, $table); + if (!db_table_exists($name)) { + return Database::getConnection()->schema()->createTable($ret, $name, $table); + } } /** diff --git a/includes/install.inc b/includes/install.inc index 0e68a1b06..e8efe4b07 100644 --- a/includes/install.inc +++ b/includes/install.inc @@ -586,8 +586,9 @@ function drupal_install_modules($module_list = array(), $disable_modules_install */ function _drupal_install_module($module) { if (drupal_get_installed_schema_version($module, TRUE) == SCHEMA_UNINSTALLED) { - module_load_install($module); drupal_load('module', $module); + drupal_install_schema($module); + // Now allow the module to perform install tasks. module_invoke($module, 'install'); $versions = drupal_get_schema_versions($module); drupal_set_installed_schema_version($module, $versions ? max($versions) : SCHEMA_INSTALLED); @@ -663,6 +664,8 @@ function drupal_uninstall_modules($module_list = array()) { // Uninstall the module. module_load_install($module); module_invoke($module, 'uninstall'); + drupal_uninstall_schema($module); + watchdog('system', '%module module uninstalled.', array('%module' => $module), WATCHDOG_INFO); // Now remove the menu links for all paths declared by this module. |