Merge pull request stefankroes#751 from kbrock/optional_mysql

Add trilogy adapter support and make mysql2 optional

Author: kbrock

.github/workflows/run_test_suite.yml

@@ -147,3 +147,9 @@ jobs:
           ANCESTRY_COLUMN_TYPE: binary
         run: |
           bundle exec rake
+      - name: run trilogy tests
+        if: matrix.mysql
+        env:
+          DB: trilogy
+        run: |
+          bundle exec rake

Gemfile

@@ -5,6 +5,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem "activerecord", "~> 7.2"
-gem "mysql2"
+gem "mysql2" if ENV["BUNDLE_INSTALL_MYSQL"] == "1" || File.basename($PROGRAM_NAME) == "appraisal"
+gem "trilogy"
 gem "pg"
 gem "sqlite3", "~> 1.6.9"

gemfiles/gemfile_72.gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 7.2.1"
 gem "mysql2"
+gem "trilogy"
 gem "pg"
 gem "sqlite3", "< 2.0"
 

lib/ancestry/class_methods.rb

@@ -275,7 +275,7 @@ def self._rebuild_counter_cache!(klass, column, counter_col, verbose: false)
           ).count
         end
 
-      if %w(mysql mysql2).include?(klass.connection.adapter_name.downcase)
+      if %w(mysql mysql2 trilogy).include?(klass.connection.adapter_name.downcase)
         klass.connection.execute %{
           UPDATE #{tbl} AS dest
           LEFT JOIN (

lib/ancestry/materialized_path.rb

@@ -79,7 +79,7 @@ def self.child_ancestry_sql(table_name, ancestry_column, primary_key, adapter, i
     def self.construct_root_id_sql(table_name, ancestry_column, primary_key, adapter)
       col = table_name ? "#{table_name}.#{ancestry_column}" : ancestry_column.to_s
       pk = table_name ? "#{table_name}.#{primary_key}" : primary_key.to_s
-      if %w(mysql mysql2).include?(adapter)
+      if %w(mysql mysql2 trilogy).include?(adapter)
         "CASE WHEN #{col} IS NULL THEN #{pk} ELSE CAST(SUBSTRING_INDEX(#{col}, '/', 1) AS UNSIGNED) END"
       elsif %w(pg postgresql postgis).include?(adapter)
         "CASE WHEN #{col} IS NULL THEN #{pk} ELSE CAST(SUBSTR(#{col}, 1, STRPOS(#{col}||'/', '/')-1) AS INTEGER) END"
@@ -92,7 +92,7 @@ def self.construct_root_id_sql(table_name, ancestry_column, primary_key, adapter
     # MP1: ancestry is NULL (root) or "1/2/3" (parent_id=3)
     def self.construct_parent_id_sql(table_name, ancestry_column, adapter)
       col = table_name ? "#{table_name}.#{ancestry_column}" : ancestry_column.to_s
-      if %w(mysql mysql2).include?(adapter)
+      if %w(mysql mysql2 trilogy).include?(adapter)
         "CASE WHEN #{col} IS NULL THEN NULL ELSE CAST(SUBSTRING_INDEX(#{col}, '/', -1) AS UNSIGNED) END"
       else
         "CASE WHEN #{col} IS NULL THEN NULL ELSE CAST(SUBSTR(#{col}, LENGTH(RTRIM(#{col}, REPLACE(#{col}, '/', ''))) + 1) AS INTEGER) END"
@@ -106,7 +106,7 @@ def self.construct_depth_sql(table_name, ancestry_column)
 
     # mp1 roots are NULL — need NULLS FIRST or COALESCE to sort roots before children
     def self.ordered_by_ancestry(arel_column, adapter)
-      if %w(mysql mysql2 sqlite sqlite3).include?(adapter)
+      if %w(mysql mysql2 trilogy sqlite sqlite3).include?(adapter)
         Arel::Nodes::Ascending.new(arel_column)
       elsif ActiveRecord::VERSION::STRING >= "6.1"
         Arel::Nodes::Ascending.new(arel_column).nulls_first

lib/ancestry/materialized_path2.rb

@@ -57,7 +57,7 @@ def self.indirects_condition(attr, child_ancestry)
     def self.construct_root_id_sql(table_name, ancestry_column, primary_key, adapter)
       col = table_name ? "#{table_name}.#{ancestry_column}" : ancestry_column.to_s
       pk = table_name ? "#{table_name}.#{primary_key}" : primary_key.to_s
-      if %w(mysql mysql2).include?(adapter)
+      if %w(mysql mysql2 trilogy).include?(adapter)
         "CASE WHEN #{col} = '/' THEN #{pk} ELSE CAST(SUBSTRING_INDEX(SUBSTRING(#{col}, 2), '/', 1) AS UNSIGNED) END"
       elsif %w(pg postgresql postgis).include?(adapter)
         "CASE WHEN #{col} = '/' THEN #{pk} ELSE CAST(SUBSTR(#{col}, 2, STRPOS(SUBSTR(#{col},2), '/')-1) AS INTEGER) END"
@@ -70,7 +70,7 @@ def self.construct_root_id_sql(table_name, ancestry_column, primary_key, adapter
     # MP2: ancestry is "/" (root) or "/1/2/3/" (parent_id=3)
     def self.construct_parent_id_sql(table_name, ancestry_column, adapter)
       col = table_name ? "#{table_name}.#{ancestry_column}" : ancestry_column.to_s
-      if %w(mysql mysql2).include?(adapter)
+      if %w(mysql mysql2 trilogy).include?(adapter)
         "CASE WHEN #{col} = '/' THEN NULL ELSE CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(#{col}, '/', -2), '/', 1) AS UNSIGNED) END"
       else
         trimmed = "RTRIM(#{col},'/')"

lib/ancestry/materialized_path3.rb

@@ -36,7 +36,7 @@ def self.generate(ancestor_ids)
     def self.construct_root_id_sql(table_name, ancestry_column, primary_key, adapter)
       col = table_name ? "#{table_name}.#{ancestry_column}" : ancestry_column.to_s
       pk = table_name ? "#{table_name}.#{primary_key}" : primary_key.to_s
-      if %w(mysql mysql2).include?(adapter)
+      if %w(mysql mysql2 trilogy).include?(adapter)
         "CASE WHEN #{col} = '' THEN #{pk} ELSE CAST(SUBSTRING_INDEX(#{col}, '/', 1) AS UNSIGNED) END"
       elsif %w(pg postgresql postgis).include?(adapter)
         "CASE WHEN #{col} = '' THEN #{pk} ELSE CAST(SUBSTR(#{col}, 1, STRPOS(#{col}, '/')-1) AS INTEGER) END"
@@ -49,7 +49,7 @@ def self.construct_root_id_sql(table_name, ancestry_column, primary_key, adapter
     # MP3: ancestry is "" (root) or "1/2/3/" (parent_id=3)
     def self.construct_parent_id_sql(table_name, ancestry_column, adapter)
       col = table_name ? "#{table_name}.#{ancestry_column}" : ancestry_column.to_s
-      if %w(mysql mysql2).include?(adapter)
+      if %w(mysql mysql2 trilogy).include?(adapter)
         "CASE WHEN #{col} = '' THEN NULL ELSE CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(#{col}, '/', -2), '/', 1) AS UNSIGNED) END"
       else
         trimmed = "RTRIM(#{col},'/')"

test/database.ci.yml

@@ -20,3 +20,6 @@ mysql2: &mysql
   encoding: utf8
 mysql:
   <<: *mysql
+trilogy:
+  <<: *mysql
+  adapter: trilogy

test/database.example.yml

@@ -19,3 +19,9 @@ mysql2:
   database: ancestry_test
   username: ancestry
   password: ancestry
+trilogy:
+  adapter: trilogy
+  host: localhost
+  database: ancestry_test
+  username: ancestry
+  password: ancestry

test/environment.rb

@@ -214,7 +214,7 @@ def self.postgres?
   end
 
   def self.mysql?
-    db_type == "mysql2"
+    db_type == "mysql2" || db_type == "trilogy"
   end
 
   # SQLite virtual columns require Rails 7.2+ (PR #49346), PG/MySQL require 7.0+
@@ -262,6 +262,7 @@ def self.db_type
     when "sqlite", "sqlite3" then "sqlite3"
     when "pg", "postgresql"  then "pg"
     when "mysql", "mysql2"   then "mysql2"
+    when "trilogy"            then "trilogy"
     else
       ENV["DB"]
     end