From 3489412a03fec009bc42222f449077e6f14998a4 Mon Sep 17 00:00:00 2001
From: Nick Lewis <nick@puppetlabs.com>
Date: Wed, 9 Mar 2011 12:55:03 -0800
Subject: maint: Rename InventoryHost to InventoryNode

This had been conflating hosts and nodes, when nodes is the most accurate.
---
 lib/puppet/rails/inventory_node.rb | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 lib/puppet/rails/inventory_node.rb

(limited to 'lib/puppet/rails/inventory_node.rb')

diff --git a/lib/puppet/rails/inventory_node.rb b/lib/puppet/rails/inventory_node.rb
new file mode 100644
index 000000000..b3e321f94
--- /dev/null
+++ b/lib/puppet/rails/inventory_node.rb
@@ -0,0 +1,37 @@
+require 'puppet/rails/inventory_fact'
+
+class Puppet::Rails::InventoryNode < ::ActiveRecord::Base
+  has_many :facts, :class_name => "Puppet::Rails::InventoryFact", :dependent => :delete_all
+
+  named_scope :has_fact_with_value, lambda { |name,value|
+    {
+      :conditions => ["inventory_facts.name = ? AND inventory_facts.value = ?", name, value],
+      :joins => :facts
+    }
+  }
+
+  named_scope :has_fact_without_value, lambda { |name,value|
+    {
+      :conditions => ["inventory_facts.name = ? AND inventory_facts.value != ?", name, value],
+      :joins => :facts
+    }
+  }
+
+  named_scope :has_fact, lambda { |name|
+    {
+      :conditions => ["inventory_facts.name = ?", name],
+      :joins => :facts
+    }
+  }
+
+  def value_for(fact_name)
+    fact = facts.find_by_name(fact_name)
+    fact ? fact.value : nil
+  end
+
+  def facts_to_hash
+    facts.inject({}) do |fact_hash,fact|
+      fact_hash.merge(fact.name => fact.value)
+    end
+  end
+end
-- 
cgit 


From 8858e40839bd693420ddc791df6b51de79356d2a Mon Sep 17 00:00:00 2001
From: Nick Lewis <nick@puppetlabs.com>
Date: Fri, 11 Mar 2011 15:22:23 -0800
Subject: (#6689) Make inventory_active_record terminus search quickly

This terminus behaves the same on all supported DB platforms, by performing a
limited portion of its query in SQL, and the rest of the comparison in Ruby.
Its results are consistent with the YAML terminus.

Paired-With: Jesse Wolfe
---
 lib/puppet/rails/inventory_node.rb | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'lib/puppet/rails/inventory_node.rb')

diff --git a/lib/puppet/rails/inventory_node.rb b/lib/puppet/rails/inventory_node.rb
index b3e321f94..52f8621a4 100644
--- a/lib/puppet/rails/inventory_node.rb
+++ b/lib/puppet/rails/inventory_node.rb
@@ -1,7 +1,7 @@
 require 'puppet/rails/inventory_fact'
 
 class Puppet::Rails::InventoryNode < ::ActiveRecord::Base
-  has_many :facts, :class_name => "Puppet::Rails::InventoryFact", :dependent => :delete_all
+  has_many :facts, :class_name => "Puppet::Rails::InventoryFact", :foreign_key => :node_id, :dependent => :delete_all
 
   named_scope :has_fact_with_value, lambda { |name,value|
     {
@@ -17,18 +17,6 @@ class Puppet::Rails::InventoryNode < ::ActiveRecord::Base
     }
   }
 
-  named_scope :has_fact, lambda { |name|
-    {
-      :conditions => ["inventory_facts.name = ?", name],
-      :joins => :facts
-    }
-  }
-
-  def value_for(fact_name)
-    fact = facts.find_by_name(fact_name)
-    fact ? fact.value : nil
-  end
-
   def facts_to_hash
     facts.inject({}) do |fact_hash,fact|
       fact_hash.merge(fact.name => fact.value)
-- 
cgit