Changeset 615

Show
Ignore:
Timestamp:
09/10/07 20:46:49 (1 year ago)
Author:
duane.johns..@gmail.com
Message:

Conform merb_active_record gem to new ORM registration API

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/merb_active_record/lib/merb_active_record.rb

    r580 r615  
    22if defined?(Merb::Plugins) 
    33  if Merb::Server.app_loaded? 
    4     puts "Warning: The merb_active_record gem should be loaded before the application" 
     4    puts "Warning: The merb_active_record gem must be loaded before the application" 
     5  else 
     6    require "merb/orms/active_record/connection" 
     7    Merb::Orms::ActiveRecord.connect 
     8    Merb::Orms::ActiveRecord.register_session_type 
    59  end 
    6   require 'active_record' 
    7   require "merb_active_record/initialize" 
    8   require "merb_active_record/session" 
    9   Merb::Controller.class_eval do 
    10     include ::Merb::ActiveRecordSessionMixin 
    11     puts "Using ActiveRecord database sessions" 
    12   end 
    13   Merb::Plugins.add_rakefiles "merb_active_record/merbtasks" 
     10  # Merb::Plugins.add_rakefiles "merb_sequel/merbtasks" 
    1411end