Browse files

Merge remote branch 'fmalamitsas/master'

  • Loading branch information...
2 parents 14d9a33 + f4efb61 commit 0d2760bb9adce17a4a94b888fc511119799dcadc @pat pat committed Jul 2, 2010
Showing with 2 additions and 1 deletion.
  1. +2 −1 lib/thinking_sphinx/adapters/abstract_adapter.rb
View
3 lib/thinking_sphinx/adapters/abstract_adapter.rb
@@ -12,7 +12,8 @@ def setup
def self.detect(model)
case model.connection.class.name
when "ActiveRecord::ConnectionAdapters::MysqlAdapter",
- "ActiveRecord::ConnectionAdapters::MysqlplusAdapter"
+ "ActiveRecord::ConnectionAdapters::MysqlplusAdapter",
+ "ActiveRecord::ConnectionAdapters::Mysql2Adapter"
ThinkingSphinx::MysqlAdapter.new model
when "ActiveRecord::ConnectionAdapters::PostgreSQLAdapter"
ThinkingSphinx::PostgreSQLAdapter.new model

0 comments on commit 0d2760b

Please sign in to comment.