Merge remote branch 'miloops/master' into miloops

Conflicts:
	spec/connections/mysql_connection.rb
	spec/connections/postgresql_connection.rb
	spec/connections/sqlite3_connection.rb

3 files changed, 7 insertions, 6 deletions

diff --git a/spec/connections/mysql_connection.rb b/spec/connections/mysql_connection.rb
index bcba2b3843..66a53b5037 100644
--- a/spec/connections/mysql_connection.rb
+++ b/spec/connections/mysql_connection.rb
@@ -1,6 +1,6 @@
-require "rubygems"
-require "activerecord"
 puts "Using native MySQL"
+require "active_record"
+require 'logger'
 
 ActiveRecord::Base.logger = Logger.new("debug.log")
 
diff --git a/spec/connections/postgresql_connection.rb b/spec/connections/postgresql_connection.rb
index 01d65f09dc..0fb6dfe065 100644
--- a/spec/connections/postgresql_connection.rb
+++ b/spec/connections/postgresql_connection.rb
@@ -1,6 +1,6 @@
-require "rubygems"
-require "activerecord"
 puts "Using native PostgreSQL"
+require "active_record"
+require 'logger'
 
 ActiveRecord::Base.logger = Logger.new("debug.log")
 
diff --git a/spec/connections/sqlite3_connection.rb b/spec/connections/sqlite3_connection.rb
index 9e9503e0ca..e8eeee17d0 100644
--- a/spec/connections/sqlite3_connection.rb
+++ b/spec/connections/sqlite3_connection.rb
@@ -1,6 +1,6 @@
-require "rubygems"
-require "activerecord"
 puts "Using native SQLite3"
+require "active_record"
+require 'logger'
 
 ActiveRecord::Base.logger = Logger.new("debug.log")
 
@@ -16,6 +16,7 @@ ActiveRecord::Base.configurations = {
 
 unless File.exist?(db_file)
   puts "SQLite3 database not found at #{db_file}. Rebuilding it."
+  require 'fileutils'
   FileUtils.mkdir_p(File.dirname(db_file))
   sqlite_command = %Q{sqlite3 "#{db_file}" "create table a (a integer); drop table a;"}
   puts "Executing '#{sqlite_command}'"