[PATCH 1/1] Fixed #1805 - Active::Record.allow_concurrency is deprecated

[James Turnbull]

Signed-off-by: James Turnbull <ja...@lovedthanlost.net>
---
CHANGELOG | 2 ++
lib/puppet/rails.rb | 1 -
spec/unit/rails.rb | 7 -------
3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d75b5bf..04dfad4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
0.24.x
+ Fixed #1805 - Active::Record.allow_concurrency is deprecated
+
Fixed #1695 - Solaris 10 zone provider doesn't properly handle unknown zone attributes in newer releases

Fixed #1776 - Trivial fix for gentoo service provider
diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb
index a021c77..0f40040 100644
--- a/lib/puppet/rails.rb
+++ b/lib/puppet/rails.rb
@@ -21,7 +21,6 @@ module Puppet::Rails
ActiveRecord::Base.logger.level = Logger::DEBUG
end

- ActiveRecord::Base.allow_concurrency = true
ActiveRecord::Base.verify_active_connections!

begin
diff --git a/spec/unit/rails.rb b/spec/unit/rails.rb
index 382f7c0..1acc0d6 100755
--- a/spec/unit/rails.rb
+++ b/spec/unit/rails.rb
@@ -37,7 +37,6 @@ describe Puppet::Rails, "when initializing any connection" do
ActiveRecord::Base.stubs(:logger).returns(logger)
logger.expects(:level=).with(Logger::DEBUG)

- ActiveRecord::Base.stubs(:allow_concurrency=)
ActiveRecord::Base.stubs(:verify_active_connections!)
ActiveRecord::Base.stubs(:establish_connection)
Puppet::Rails.stubs(:database_arguments)
@@ -45,12 +44,6 @@ describe Puppet::Rails, "when initializing any connection" do
Puppet::Rails.connect
end

- it "should set ActiveRecord::Base.allow_concurrency" do
- ActiveRecord::Base.expects(:allow_concurrency=).with(true)
-
- Puppet::Rails.connect
- end
-
it "should call ActiveRecord::Base.verify_active_connections!" do
ActiveRecord::Base.expects(:verify_active_connections!)

--
1.5.6.5