Merge branch 'master' into podman_docker

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

Appraisals

@@ -7,6 +7,10 @@
   appraise "gemfile-#{ar_version.split('.').first(2).join}" do
     gem 'activerecord', "~> #{ar_version}"
     # so we are targeting the ruby version indirectly through active record
+    # trilogy adapter is built into Rails 7.1+; older versions need the gem
+    if ar_version < "7.1"
+      gem "activerecord-trilogy-adapter"
+    end
     if ar_version < "7.0"
       gem "sqlite3", "~> 1.6.9"
     elsif ar_version < "8.0"

Gemfile

@@ -6,15 +6,19 @@ gemspec
 
 gem "activerecord", "~> 7.2"
 
-if ENV["BUNDLE_INSTALL_SQLITE3"] == "1"
+if ENV["BUNDLE_INSTALL_SQLITE3"] == "1" || File.basename($PROGRAM_NAME) == "appraisal"
   gem "sqlite3", "~> 1.6.9"
 end
 
-if ENV["BUNDLE_INSTALL_MYSQL"] == "1"
+if ENV["BUNDLE_INSTALL_MYSQL"] == "1" || File.basename($PROGRAM_NAME) == "appraisal"
   gem "mysql2"
 end
 
-if ENV["BUNDLE_INSTALL_POSTGRES"] == "1"
+if ENV["BUNDLE_INSTALL_TRILOGY"] == "1" || File.basename($PROGRAM_NAME) == "appraisal"
+  gem "trilogy"
+end
+
+if ENV["BUNDLE_INSTALL_POSTGRES"] == "1" || File.basename($PROGRAM_NAME) == "appraisal"
   gem "pg"
 end
 

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/instance_methods_builder.rb

@@ -494,7 +494,7 @@ def ordered_by_ancestry_and(order)
         end
 
         def child_ancestry_sql
-          #{format_module}.child_ancestry_sql(table_name, #{column.inspect}, :#{pk}, connection.adapter_name.downcase)
+          #{format_module}.child_ancestry_sql(table_name, #{column.inspect}, :#{pk}, connection.adapter_name.downcase, integer_pk: #{integer_pk.inspect})
         end
 
         def ancestry_depth_sql

lib/ancestry/ltree.rb

@@ -74,7 +74,7 @@ def self.replace_ancestry_sql(column, old_ancestry, new_ancestry, _klass)
       end
     end
 
-    def self.child_ancestry_sql(table_name, ancestry_column, primary_key, adapter)
+    def self.child_ancestry_sql(table_name, ancestry_column, primary_key, adapter, integer_pk: true)
       col = "#{table_name}.#{ancestry_column}"
       pk = "#{table_name}.#{primary_key}"
       "CASE WHEN #{col} = '' THEN #{pk}::text::ltree ELSE #{col} || #{pk}::text::ltree END"

lib/ancestry/materialized_path.rb

@@ -64,7 +64,7 @@ def self.replace_ancestry_sql(column, old_ancestry, new_ancestry, klass)
       Arel.sql(replace_sql)
     end
 
-    def self.child_ancestry_sql(table_name, ancestry_column, primary_key, adapter)
+    def self.child_ancestry_sql(table_name, ancestry_column, primary_key, adapter, integer_pk: true)
       pk_sql = concat(adapter, "#{table_name}.#{primary_key}")
       full_sql = concat(adapter, "#{table_name}.#{ancestry_column}", "'#{DELIMITER}'", "#{table_name}.#{primary_key}")
       %{
@@ -79,7 +79,7 @@ def self.child_ancestry_sql(table_name, ancestry_column, primary_key, adapter)
     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

@@ -38,7 +38,7 @@ def self.child_ancestry_value(ancestry_value, id)
     end
 
     # trailing delimiter: col || pk || '/'
-    def self.child_ancestry_sql(table_name, ancestry_column, primary_key, adapter)
+    def self.child_ancestry_sql(table_name, ancestry_column, primary_key, adapter, integer_pk: true)
       concat(adapter, "#{table_name}.#{ancestry_column}", "#{table_name}.#{primary_key}", "'/'")
     end
 
@@ -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},'/')"