Added check for database set up in acts_as_authentic to avoid errors …

…during initial migrations
jesseclark · Nov 14, 2008 · 97c6668 · 97c6668
1 parent ebdebfa
commit 97c6668
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
@@ -1,3 +1,7 @@
+== 1.1.2 released 2008-11-13
+
+* Added check for database set up in acts_as_authentic to prevent errors during migrations.
+
 == 1.1.1 released 2008-11-13
 
 * Removed ActiveRecord dependency.

diff --git a/lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/config.rb b/lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/config.rb
@@ -82,6 +82,13 @@ def first_column_to_exist(*columns_to_check) # :nodoc:
           end
 
           def acts_as_authentic_with_config(options = {})
+            # Stop all configuration if the DB is not set up
+            begin
+              column_names
+            rescue Exception
+              return
+            end
+
             options[:session_class] ||= "#{name}Session"
             options[:crypto_provider] ||= CryptoProviders::Sha512
             options[:login_field] ||= first_column_to_exist(:login, :username, :email)