From 43bd628e0578974b7c22d712932554243daaf258 Mon Sep 17 00:00:00 2001 From: mildmojo Date: Mon, 1 Oct 2012 02:42:33 -0400 Subject: [PATCH] Fixes case-sensitive SQLite3 adapter name typos. The SQLite3 adapter name was referenced as `ActiveRecord::ConnectionAdapters::Sqlite3Adapter`, but the ActiveRecord class is spelled `SQLite3Adapter` (upper-case "SQL"). As a result, `active_record/adapters/sqlite3_adapter.rb` wasn't actually including the methods from `adapters/sqlite3_adapter.rb` into the AR adapter class. This adds a test for proper inheritance and fixes the spelling of `SQLite3Adapter`, unifying all references to the ActiveRecord version. --- .../active_record/adapters/sqlite3_adapter.rb | 4 ++-- lib/activerecord-import/adapters/sqlite3_adapter.rb | 2 +- test/active_record/connection_adapter_test.rb | 10 ++++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/activerecord-import/active_record/adapters/sqlite3_adapter.rb b/lib/activerecord-import/active_record/adapters/sqlite3_adapter.rb index f0940c8..c50b8ca 100644 --- a/lib/activerecord-import/active_record/adapters/sqlite3_adapter.rb +++ b/lib/activerecord-import/active_record/adapters/sqlite3_adapter.rb @@ -1,7 +1,7 @@ require "active_record/connection_adapters/sqlite3_adapter" require "activerecord-import/adapters/sqlite3_adapter" -class ActiveRecord::ConnectionAdapters::Sqlite3Adapter - include ActiveRecord::Import::Sqlite3Adapter +class ActiveRecord::ConnectionAdapters::SQLite3Adapter + include ActiveRecord::Import::SQLite3Adapter end diff --git a/lib/activerecord-import/adapters/sqlite3_adapter.rb b/lib/activerecord-import/adapters/sqlite3_adapter.rb index 0d298a4..2fb673d 100644 --- a/lib/activerecord-import/adapters/sqlite3_adapter.rb +++ b/lib/activerecord-import/adapters/sqlite3_adapter.rb @@ -1,4 +1,4 @@ -module ActiveRecord::Import::Sqlite3Adapter +module ActiveRecord::Import::SQLite3Adapter def next_value_for_sequence(sequence_name) %{nextval('#{sequence_name}')} end diff --git a/test/active_record/connection_adapter_test.rb b/test/active_record/connection_adapter_test.rb index ad3234c..a72daff 100644 --- a/test/active_record/connection_adapter_test.rb +++ b/test/active_record/connection_adapter_test.rb @@ -50,3 +50,13 @@ describe "ActiveRecord::ConnectionAdapter::AbstractAdapter" do end end + +describe "ActiveRecord::Import DB-specific adapter class" do + context "when ActiveRecord::Import is in use" do + it "should appear in the AR connection adapter class's ancestors" do + connection = ActiveRecord::Base.connection + import_class_name = 'ActiveRecord::Import::' + connection.class.name.demodulize + assert_include connection.class.ancestors, import_class_name.constantize + end + end +end \ No newline at end of file