Stubbed out another new ActiveRecord dependency
This commit is contained in:
parent
e9c4948d0a
commit
0ad1b746f0
|
@ -51,8 +51,9 @@ require 'rubygems' unless File.directory?("#{RAILS_ROOT}/vendor/rails")
|
||||||
|
|
||||||
require 'active_support'
|
require 'active_support'
|
||||||
require 'action_controller'
|
require 'action_controller'
|
||||||
require 'active_record_stub'
|
|
||||||
require 'instiki_errors'
|
require_dependency 'instiki_errors'
|
||||||
|
require_dependency 'active_record_stub'
|
||||||
|
|
||||||
# Environment specific configuration
|
# Environment specific configuration
|
||||||
require_dependency "environments/#{RAILS_ENV}"
|
require_dependency "environments/#{RAILS_ENV}"
|
||||||
|
|
|
@ -2,8 +2,6 @@
|
||||||
# Since ActiveRecord may not be present in Instiki runtime environment, this
|
# Since ActiveRecord may not be present in Instiki runtime environment, this
|
||||||
# file provides a stub replacement for it
|
# file provides a stub replacement for it
|
||||||
|
|
||||||
unless defined? ActiveRecord::Base
|
|
||||||
|
|
||||||
module ActiveRecord
|
module ActiveRecord
|
||||||
class Base
|
class Base
|
||||||
|
|
||||||
|
@ -17,6 +15,15 @@ module ActiveRecord
|
||||||
false
|
false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# dependency in actionpack/lib/action_controller/benchmarking.rb
|
||||||
|
def self.connection
|
||||||
|
return ConnectionStub
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
|
module ConnectionStub
|
||||||
|
def self.reset_runtime
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue