diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-09-29 09:42:19 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-09-29 10:36:32 -0700 |
commit | b3c7766df71938ca05e026d1cb78b12158fd49dc (patch) | |
tree | 22bde1fb35f9567910a535ff18f7c8d2155ae144 /activerecord/lib/active_record/connection_adapters | |
parent | 258f7b586e68ab8e6421ea3e43707ada5db20fc9 (diff) | |
download | rails-b3c7766df71938ca05e026d1cb78b12158fd49dc.tar.gz rails-b3c7766df71938ca05e026d1cb78b12158fd49dc.tar.bz2 rails-b3c7766df71938ca05e026d1cb78b12158fd49dc.zip |
just require sqlite3 when the database adapter is required
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb index e5e92f2b1c..2b08fdae57 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb @@ -1,4 +1,5 @@ require 'active_record/connection_adapters/sqlite_adapter' +require 'sqlite3' module ActiveRecord class Base @@ -20,10 +21,6 @@ module ActiveRecord raise ArgumentError, 'adapter name should be "sqlite3"' end - unless self.class.const_defined?(:SQLite3) - require_library_or_gem(config[:adapter]) - end - db = SQLite3::Database.new( config[:database], :results_as_hash => true |