Land rapid7#7104, Update ActiveRecord syntax for framework db cred iteration

wchen-r7 · wchen-r7 · commit 6d8dd24e419e · 2016-07-17T17:57:06.000-05:00
diff --git a/lib/msf/core/db_manager/cred.rb b/lib/msf/core/db_manager/cred.rb
@@ -2,7 +2,7 @@ module Msf::DBManager::Cred
   # This methods returns a list of all credentials in the database
   def creds(wspace=workspace)
   ::ActiveRecord::Base.connection_pool.with_connection {
-    Mdm::Cred.includes({:service => :host}).where("hosts.workspace_id = ?", wspace.id)
+    Mdm::Cred.where("hosts.workspace_id = ?", wspace.id).joins(:service => :host)
   }
   end
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ module Msf::DBManager::Cred`
`2`	`2`	`# This methods returns a list of all credentials in the database`
`3`	`3`	`def creds(wspace=workspace)`
`4`	`4`	`::ActiveRecord::Base.connection_pool.with_connection {`
`5`		`- Mdm::Cred.includes({:service => :host}).where("hosts.workspace_id = ?", wspace.id)`
	`5`	`+ Mdm::Cred.where("hosts.workspace_id = ?", wspace.id).joins(:service => :host)`
`6`	`6`	`}`
`7`	`7`	`end`
`8`	`8`