Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2

2 files changed, 11 insertions, 1 deletions

diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb
index be6b7e933..20263f5c6 100644
--- a/config/initializers/apartment.rb
+++ b/config/initializers/apartment.rb
@@ -1,6 +1,6 @@
 Apartment.configure do |config|
   # set your options (described below) here
-  config.excluded_models = ["Referential", "User", "Import", "Delayed::Backend::ActiveRecord::Job"]        # these models will not be multi-tenanted, but remain in the global (public) namespace
+  config.excluded_models = ["Referential", "User", "Import", "ImportLogMessage", "Delayed::Backend::ActiveRecord::Job"]        # these models will not be multi-tenanted, but remain in the global (public) namespace
 
   # Dynamically get database names to migrate
   config.database_names = lambda{ Referential.select(:slug).map(&:slug) }
diff --git a/config/initializers/db_migrate_in_war.rb b/config/initializers/db_migrate_in_war.rb
new file mode 100644
index 000000000..ccba79773
--- /dev/null
+++ b/config/initializers/db_migrate_in_war.rb
@@ -0,0 +1,10 @@
+Rails.configuration.after_initialize do
+  Rails.logger.info "Migrating database"
+  ActiveRecord::Migrator.migrate("db/migrate/", nil)
+
+  Apartment.database_names.each do |db|
+    Rails.logger.info "Migrating #{db} schema"
+    Apartment::Migrator.migrate db
+  end
+end if ENV["CHOUETTE_RUN_MIGRATIONS"] == "true"
+