Merge pull request #91 from ddemaree/master

Fixed superclass mismatch error on ActiveRecord 3.2 RC
This commit is contained in:
Ben Mabey 2012-01-08 20:44:33 -08:00
commit 98675ee71d

View file

@ -29,7 +29,15 @@ module ActiveRecord
end
end
MYSQL_ADAPTER_PARENT = USE_ARJDBC_WORKAROUND ? JdbcAdapter : AbstractAdapter
# ActiveRecord 3.1 support
if defined?(AbstractMysqlAdapter)
MYSQL_ADAPTER_PARENT = USE_ARJDBC_WORKAROUND ? JdbcAdapter : AbstractMysqlAdapter
MYSQL2_ADAPTER_PARENT = AbstractMysqlAdapter
else
MYSQL_ADAPTER_PARENT = USE_ARJDBC_WORKAROUND ? JdbcAdapter : AbstractAdapter
MYSQL2_ADAPTER_PARENT = AbstractAdapter
end
SQLITE_ADAPTER_PARENT = USE_ARJDBC_WORKAROUND ? JdbcAdapter : SQLiteAdapter
POSTGRE_ADAPTER_PARENT = USE_ARJDBC_WORKAROUND ? JdbcAdapter : AbstractAdapter
@ -39,7 +47,7 @@ module ActiveRecord
end
end
class Mysql2Adapter < AbstractAdapter
class Mysql2Adapter < MYSQL2_ADAPTER_PARENT
def truncate_table(table_name)
execute("TRUNCATE TABLE #{quote_table_name(table_name)};")
end