Added support for Trilogy

ankane · Sep 14, 2023 · 4fe22fa · 4fe22fa
1 parent 5f573d7
commit 4fe22fa
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.1 (unreleased)
+
+- Added support for Trilogy
+
 ## 0.3.0 (2023-07-02)
 
 - Dropped support for Ruby < 3 and Active Record < 6.1

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

diff --git a/gemfiles/activerecord61.gemfile b/gemfiles/activerecord61.gemfile
@@ -7,5 +7,6 @@ gem "minitest", ">= 5"
 gem "activerecord", "~> 6.1.0"
 gem "pg"
 gem "mysql2"
+gem "activerecord-trilogy-adapter"
 gem "sqlite3"
 gem "railties", require: false
diff --git a/gemfiles/activerecord71.gemfile b/gemfiles/activerecord71.gemfile
@@ -7,5 +7,6 @@ gem "minitest", ">= 5"
 gem "activerecord", "7.1.0.beta1"
 gem "pg"
 gem "mysql2"
+gem "trilogy"
 gem "sqlite3"
 gem "railties", "7.1.0.beta1", require: false
diff --git a/lib/rollup/utils.rb b/lib/rollup/utils.rb
@@ -41,7 +41,7 @@ def postgresql?
       end
 
       def mysql?
-        adapter_name =~ /mysql/i
+        adapter_name =~ /mysql|trilogy/i
       end
 
       def sqlite?

diff --git a/test/support/active_record.rb b/test/support/active_record.rb
@@ -8,7 +8,11 @@ def postgresql?
 end
 
 def mysql?
-  $adapter == "mysql"
+  $adapter == "mysql" || $adapter == "trilogy"
+end
+
+def trilogy?
+  $adapter == "trilogy"
 end
 
 def sqlite?
@@ -36,6 +40,13 @@ def dimensions_supported?
 
 if postgresql?
   ActiveRecord::Base.establish_connection adapter: "postgresql", database: "rollup_test"
+elsif trilogy?
+  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: "rollup_test", host: "127.0.0.1"
 elsif mysql?
   ActiveRecord::Base.establish_connection adapter: "mysql2", database: "rollup_test"
 else