From 8176cc69efc68bdac1b26117a1b353cb19411d1b Mon Sep 17 00:00:00 2001 From: Dwight van Tuyl Date: Thu, 28 Apr 2011 07:25:20 +0800 Subject: [PATCH] Fixed ActiveRecord connection when racked in an application with it's own ActiveRecord connection --- Gemfile | 1 + lib/casserver/server.rb | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 1aa98e4b..6281f000 100644 --- a/Gemfile +++ b/Gemfile @@ -1,2 +1,3 @@ source "http://rubygems.org" gemspec + diff --git a/lib/casserver/server.rb b/lib/casserver/server.rb index d70b06ed..5bc2f8a9 100644 --- a/lib/casserver/server.rb +++ b/lib/casserver/server.rb @@ -252,10 +252,9 @@ def self.init_logger! end def self.init_database! - #CASServer::Model::Base.establish_connection(config[:database]) - ActiveRecord::Base.establish_connection(config[:database]) - + unless config[:disable_auto_migrations] + ActiveRecord::Base.establish_connection(config[:database]) print_cli_message "Running migrations to make sure your database schema is up to date..." prev_db_log = ActiveRecord::Base.logger ActiveRecord::Base.logger = Logger.new(STDOUT) @@ -264,6 +263,8 @@ def self.init_database! ActiveRecord::Base.logger = prev_db_log print_cli_message "Your database is now up to date." end + + CASServer::Model::Base.establish_connection(config[:database]) end configure do