Remove active_record patch

[#46141013]

Version 3.2.12 of activerecord contains the changes that the original
patch made so the patch is no longer needed.

Author: limhoff-r7

lib/msf/core/db_manager.rb

@@ -92,9 +92,6 @@ def initialize_database_support
 
 			initialize_metasploit_data_models
 
-			# Patches issues with ActiveRecord
-			require "msf/core/patches/active_record"
-
 			@usable = true
 
 		rescue ::Exception => e

lib/msf/core/patches/active_record.rb

@@ -1,7 +1,5 @@
 require 'spec_helper'
 
-# include patch under test
-require 'msf/core/patches/active_record'
 # helps with environment configuration to use for connection to database
 require 'metasploit/framework'
 
@@ -33,9 +31,9 @@ def database_configurations_pathname
 		ActiveRecord::Base.clear_all_connections!
 	end
 
-	context '#active_thread_connection?' do
-		subject(:active_thread_connection?) do
-			connection_pool.active_thread_connection?
+	context '#active_connection?' do
+		subject(:active_connection?) do
+			connection_pool.active_connection?
 		end
 
 		# Let! so that Thread is captured before creating and entering new Threads
@@ -47,50 +45,22 @@ def database_configurations_pathname
 			ActiveRecord::Base.connection_pool.connection
 		end
 
-		context 'with connection id' do
-			subject(:active_thread_connection?) do
-				connection_pool.active_thread_connection?(connection_id)
-			end
-
-			context 'with connection id from other thread that has connection' do
-				let(:connection_id) do
-					main_thread.object_id
-				end
-
-				it 'should be true' do
-					thread = Thread.new do
-						Thread.current.should_not == main_thread
-
-						expect(active_thread_connection?).to be_true
-					end
-
-					thread.join
-				end
-			end
+		context 'in thread with connection' do
+			it { should be_true }
 		end
 
-		context 'without connection id' do
-			context 'in thread with connection' do
-				it { should be_true }
-			end
-
-			context 'in thread without connection' do
-				it 'should be false' do
-					thread = Thread.new do
-						Thread.current.should_not == main_thread
-						expect(active_thread_connection?).to be_false
-					end
-
-					thread.join
+		context 'in thread without connection' do
+			it 'should be false' do
+				thread = Thread.new do
+					Thread.current.should_not == main_thread
+					expect(active_connection?).to be_false
 				end
+
+				thread.join
 			end
 		end
 	end
 
-	context 'checkout' do
-
-	end
-
 	context '#with_connection' do
 		def reserved_connection_count
 			connection_pool.instance_variable_get(:@reserved_connections).length
@@ -110,19 +80,6 @@ def reserved_connection_count
 			connection_pool.with_connection { }
 		end
 
-		it 'should call #active_thread_connection? with #current_connection_id' do
-			current_connection_id = mock('Connection ID')
-			connection_pool.stub(:current_connection_id => current_connection_id)
-
-			connection_pool.should_receive(
-					:active_thread_connection?
-			).with(
-					current_connection_id
-			).and_call_original
-
-			connection_pool.with_connection { }
-		end
-
 		it 'should yield #connection' do
 			connection = mock('Connection')
 			connection_pool.stub(:connection => connection)
@@ -141,8 +98,8 @@ def reserved_connection_count
 				connection_pool.checkin connection
 			end
 
-			it 'should return true from #active_thread_connection?' do
-				expect(connection_pool.active_thread_connection?).to be_true
+			it 'should return true from #active_connection?' do
+				expect(connection_pool.active_connection?).to be_true
 			end
 
 			context 'with error' do
@@ -173,8 +130,8 @@ def reserved_connection_count
 		end
 
 		context 'without active thread connection' do
-			it 'should return false from #active_thread_connection?' do
-				expect(connection_pool.active_thread_connection?).to be_false
+			it 'should return false from #active_connection?' do
+				expect(connection_pool.active_connection?).to be_false
 			end
 
 			context 'with error' do