lib/engineyard-serverside/lockfile_parser.rb in engineyard-serverside-1.5.23.ruby19.13 vs lib/engineyard-serverside/lockfile_parser.rb in engineyard-serverside-1.5.23.ruby19.14

- old
+ new

@@ -14,12 +14,18 @@ @contents = lockfile_contents parse end def any_database_adapter? - %w[mysql2 mysql do_mysql pg do_postgres].any? do |gem| - @contents.index(/^\s+#{gem}\s\([^\)]+\)$/) + any_ruby_adapter = %w[mysql2 mysql do_mysql pg do_postgres sqlite3].any? do |type| + @contents.index(/^\s+#{type}\s\([^\)]+\)$/) end + + any_jruby_adapter = %w[mysql postgresql sqlite3].any? do |type| + @contents.index(/^\s+jdbc-#{type}\s\([^\)]+\)$/) || @contents.index(/^\s+activerecord-jdbc#{type}-adapter\s\([^\)]+\)$/) + end + + any_ruby_adapter || any_jruby_adapter end def parse parse_from_metadata || parse_from_dependencies ||