lib/sequel_rails/railtie.rb in sequel-rails-0.6.0 vs lib/sequel_rails/railtie.rb in sequel-rails-0.6.1

@@ -32,11 +32,11 @@
       "Sequel::NoMatchingRow" => :not_found,
       "Sequel::ValidationFailed" => :unprocessable_entity,
       "Sequel::NoExistingObject" => :unprocessable_entity
     )
 
-    config.sequel = ActiveSupport::OrderedOptions.new
+    config.sequel = ::SequelRails::Configuration.new
 
     rake_tasks do |app|
       if app.config.sequel.load_database_tasks
         load "sequel_rails/railties/database.rake"
       end
@@ -63,12 +63,14 @@
       ::SequelRails.setup ::Rails.env
     end
 
     # Support overwriting crucial steps in subclasses
     def configure_sequel(app)
-      app.config.sequel = ::SequelRails::Configuration.for(
-        ::Rails.root, app.config.database_configuration
-      ).merge!(app.config.sequel)
+      app.config.sequel.merge!(
+        :root => ::Rails.root,
+        :raw => app.config.database_configuration
+      )
+      ::SequelRails.configuration = app.config.sequel
     end
 
     def setup_i18n_support(app)
       ::Sequel::Model.send :include, ::SequelRails::I18nSupport
     end