Merge pull request #153 from scottwillson/master

Use correct SQLite3Adapter superclass in Rails 4
DatabaseCleaner · Feb 15, 2013 · 9f898fc · 9f898fc
2 parents f80af0d + 650bb11
commit 9f898fc
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/database_cleaner/active_record/truncation.rb b/lib/database_cleaner/active_record/truncation.rb
@@ -195,7 +195,11 @@ class SQLiteAdapter < AbstractAdapter
       MYSQL2_ADAPTER_PARENT = AbstractAdapter
     end
 
-    SQLITE_ADAPTER_PARENT = USE_ARJDBC_WORKAROUND ? JdbcAdapter : SQLiteAdapter
+    if defined?(SQLite3Adapter) && SQLite3Adapter.superclass == ActiveRecord::ConnectionAdapters::AbstractAdapter
+      SQLITE_ADAPTER_PARENT = USE_ARJDBC_WORKAROUND ? JdbcAdapter : AbstractAdapter
+    else
+      SQLITE_ADAPTER_PARENT = USE_ARJDBC_WORKAROUND ? JdbcAdapter : SQLiteAdapter
+    end
     POSTGRE_ADAPTER_PARENT = USE_ARJDBC_WORKAROUND ? JdbcAdapter : AbstractAdapter
 
     class MysqlAdapter < MYSQL_ADAPTER_PARENT