Merge pull request #212 from fortesinformatica/fix_travis

configure mysql adapter for jruby
collectiveidea · Sep 24, 2013 · 6182043 · 6182043
2 parents e4ff3b9 + 68604fb
commit 6182043
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/spec/db/database.yml b/spec/db/database.yml
@@ -13,7 +13,7 @@ postgresql:
   password: postgres
   min_messages: warning
 mysql:
-  adapter: mysql2
+  adapter: <%= defined?(JRUBY_VERSION) ? "jdbcmysql" : "mysql2" %>
   host: localhost
   username: root
   password: