Make the v3.5.0 upgrade more robust

* If tables have already been renamed, skip the rename and continue. * Allows modules to handle migrations in a less brittle fashion.

Author: peakpg

lib/cms/upgrades/v3_5_0.rb

@@ -21,8 +21,14 @@ def v3_5_0_apply_namespace_to_block(module_name, model_class_name)
  table_prefix = module_name.underscore
  model_name = model_class_name.underscore
 
- rename_table model_name.pluralize, "#{table_prefix}_#{model_name.pluralize}"
- rename_table "#{model_name}_versions", "#{table_prefix}_#{model_name}_versions"
+ old_content_table = model_name.pluralize
+ new_content_table = "#{table_prefix}_#{model_name.pluralize}"
+ rename_table old_content_table, new_content_table if have_not_renamed(old_content_table, new_content_table)
+
+
+ old_versions_table = "#{model_name}_versions"
+ new_versions_table = "#{table_prefix}_#{model_name}_versions"
+ rename_table old_versions_table, new_versions_table if have_not_renamed(old_versions_table, new_versions_table)
  v3_5_0_standardize_version_id_column(table_prefix, model_name)
  v3_5_0_namespace_model_data(module_name, model_class_name)
  v3_5_0_update_connector_namespaces(module_name, model_class_name)
@@ -53,6 +59,21 @@ def v3_5_0_update_connector_namespaces(module_name, model_class_name)
  def v3_5_0_namespace_model(module_name, model_class_name)
  "#{module_name}::#{model_class_name}"
  end
+
+ private
+
+ # If we already renamed these tables, they should be skipped
+ def have_not_renamed(old_table, new_table)
+ unless table_exists?(old_table)
+ puts "Table #{old_table} does not exist. Skipping rename."
+ return false
+ end
+ unless !table_exists?(new_table)
+ puts "Table #{new_table} already exists. Skipping rename."
+ return false
+ end
+ true
+ end
  end
 
  # Add additional methods to ActiveRecord::Migration when this file is required.