Added support for Trilogy - closes #276

ankane · Sep 13, 2023 · d0ccde5 · d0ccde5
1 parent 6ec508d
commit d0ccde5
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 6.4.0 (unreleased)
+
+- Added support for Trilogy
+
 ## 6.3.0 (2023-07-02)
 
 - Dropped support for Ruby < 3 and Rails < 6.1

diff --git a/Gemfile b/Gemfile
@@ -7,5 +7,6 @@ gem "minitest"
 gem "activerecord", "~> 7.0.0"
 gem "pg"
 gem "mysql2"
+gem "activerecord-trilogy-adapter"
 gem "sqlite3"
 gem "ruby-prof", require: false
diff --git a/Rakefile b/Rakefile
@@ -1,7 +1,7 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
-ADAPTERS = %w(postgresql mysql sqlite enumerable redshift)
+ADAPTERS = %w(postgresql mysql trilogy sqlite enumerable redshift)
 
 ADAPTERS.each do |adapter|
   namespace :test do

diff --git a/gemfiles/activerecord61.gemfile b/gemfiles/activerecord61.gemfile
@@ -7,4 +7,5 @@ gem "minitest"
 gem "activerecord", "~> 6.1.0"
 gem "pg"
 gem "mysql2"
+gem "activerecord-trilogy-adapter"
 gem "sqlite3"
diff --git a/gemfiles/activerecord71.gemfile b/gemfiles/activerecord71.gemfile
@@ -7,4 +7,5 @@ gem "minitest"
 gem "activerecord", "7.1.0.beta1"
 gem "pg"
 gem "mysql2"
+gem "trilogy"
 gem "sqlite3"
diff --git a/lib/groupdate.rb b/lib/groupdate.rb
@@ -43,7 +43,7 @@ def self.register_adapter(name, adapter)
   end
 end
 
-Groupdate.register_adapter ["Mysql2", "Mysql2Spatial", "Mysql2Rgeo"], Groupdate::Adapters::MySQLAdapter
+Groupdate.register_adapter ["Mysql2", "Mysql2Spatial", "Mysql2Rgeo", "Trilogy"], Groupdate::Adapters::MySQLAdapter
 Groupdate.register_adapter ["PostgreSQL", "PostGIS", "Redshift"], Groupdate::Adapters::PostgreSQLAdapter
 Groupdate.register_adapter "SQLite", Groupdate::Adapters::SQLiteAdapter
 

diff --git a/test/adapters/trilogy.rb b/test/adapters/trilogy.rb
@@ -0,0 +1,6 @@
+if ActiveRecord::VERSION::STRING.to_f < 7.1
+  require "trilogy_adapter/connection"
+  ActiveRecord::Base.public_send :extend, TrilogyAdapter::Connection
+end
+
+ActiveRecord::Base.establish_connection adapter: "trilogy", database: "groupdate_test"