From 32af162414f2e092afa004b74a0be64fa53e7834 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Mon, 14 Sep 2009 02:50:12 -0700 Subject: Require active_support and active_record by name in LOAD_PATH instead of gem name (deprecated) --- lib/arel.rb | 4 ++-- spec/connections/mysql_connection.rb | 3 ++- spec/connections/postgresql_connection.rb | 3 ++- spec/connections/sqlite3_connection.rb | 5 +++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/arel.rb b/lib/arel.rb index 54a31b6ed0..b67186a308 100644 --- a/lib/arel.rb +++ b/lib/arel.rb @@ -1,11 +1,11 @@ $LOAD_PATH.unshift(File.dirname(__FILE__)) require 'rubygems' -require 'activesupport' +require 'active_support' require 'active_support/dependencies' require 'active_support/core_ext/class/attribute_accessors' require 'active_support/core_ext/module/delegation' -require 'activerecord' +require 'active_record' require 'active_record/connection_adapters/abstract/quoting' require 'arel/algebra' diff --git a/spec/connections/mysql_connection.rb b/spec/connections/mysql_connection.rb index a58ddc35ef..dbece8646f 100644 --- a/spec/connections/mysql_connection.rb +++ b/spec/connections/mysql_connection.rb @@ -1,5 +1,6 @@ -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 e376d33ec6..0fb6dfe065 100644 --- a/spec/connections/postgresql_connection.rb +++ b/spec/connections/postgresql_connection.rb @@ -1,5 +1,6 @@ -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}'" -- cgit v1.2.3