We want our Rails models in Puppet to work under Rails 2 or 3, but we
don't want the deprecation warnings since we can't control what version
of Rails the client is running.

DEPRECATION WARNING: Base.named_scope has been deprecated, please use
Base.scope instead

Reviewed-by: Nick Lewis <n...@puppetlabs.com>
Signed-off-by: Matt Robinson <m...@puppetlabs.com>
---
 lib/puppet/rails/inventory_node.rb |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/lib/puppet/rails/inventory_node.rb 
b/lib/puppet/rails/inventory_node.rb
index 52f8621..da7e610 100644
--- a/lib/puppet/rails/inventory_node.rb
+++ b/lib/puppet/rails/inventory_node.rb
@@ -3,6 +3,11 @@ require 'puppet/rails/inventory_fact'
 class Puppet::Rails::InventoryNode < ::ActiveRecord::Base
   has_many :facts, :class_name => "Puppet::Rails::InventoryFact", :foreign_key 
=> :node_id, :dependent => :delete_all
 
+  if Puppet::Util.activerecord_version >= 3.0
+    # Prevents "DEPRECATION WARNING: Base.named_scope has been deprecated, 
please use Base.scope instead"
+    ActiveRecord::NamedScope::ClassMethods.module_eval { alias :named_scope 
:scope }
+  end
+
   named_scope :has_fact_with_value, lambda { |name,value|
     {
       :conditions => ["inventory_facts.name = ? AND inventory_facts.value = 
?", name, value],
-- 
1.7.3.1

-- 
You received this message because you are subscribed to the Google Groups 
"Puppet Developers" group.
To post to this group, send email to puppet-dev@googlegroups.com.
To unsubscribe from this group, send email to 
puppet-dev+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/puppet-dev?hl=en.

Reply via email to