diff --git a/Gemfile b/Gemfile index e979abf83..4c8f4358f 100644 --- a/Gemfile +++ b/Gemfile @@ -69,6 +69,9 @@ if File.exist?(database_file) when /mysql2/ gem 'mysql2', '~> 0.5.0' gem "with_advisory_lock" + when /trilogy/ + gem 'trilogy', '~> 2.9.0' + gem "with_advisory_lock" when /postgresql/ gem 'pg', '~> 1.5.3' when /sqlite3/ diff --git a/lib/redmine/database.rb b/lib/redmine/database.rb index b3cbdc661..13c92b8a4 100644 --- a/lib/redmine/database.rb +++ b/lib/redmine/database.rb @@ -58,7 +58,7 @@ module Redmine # Returns true if the database is MySQL def mysql? - /mysql/i.match?(ActiveRecord::Base.connection.adapter_name) + /mysql|trilogy/i.match?(ActiveRecord::Base.connection.adapter_name) end def mysql_version