ajax-datatables-rails 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8603311c92aa4db99c7b94103de8ed606a61ffafaf630724517d479cd478331
-  data.tar.gz: 2baccc608a73493ecb7c28570075a9dda5919c91010db322e98a9c8d7032b4be
+  metadata.gz: df0c98573d156527bb34590ddac2fb860c53c578b3be69306d71db1123c0c1df
+  data.tar.gz: bef2b0041b0755590c3d98607f9234514e289ce654cb4b34399b0f50211c8500
 SHA512:
-  metadata.gz: e2097c47d5af467755b87bd09abe9551b1eeb6334476358508bc4615657b66c0ae2b38b7a4416475e3783f3e88f99d35be984c6c9a9e55e6ded40ee382f2ffbe
-  data.tar.gz: 4fbbaf7373f5acb5548ff354e5d191e195598302756e6051bd37a2876fee4e4f8450d3b535c7e98fd5654923740286d6c67b29d4570868d816200e7568cf2ecc
+  metadata.gz: dcb780dd2416b592daadce7774a2002e37e81535399638012a7ae958c5385a31b79a544a72c80b914f0f2d3ab42dc9b483ac5c2953de7e82270971b3982f245e
+  data.tar.gz: c52b3cdb779556d89251b4434419aa269966d80e56c97479a87986c96d7889005d9222a4b6bbdf604ca120a320c2ce26efefcfdb58f1ffac099bc8f06cc17719

data/.github/workflows/ci.yml

@@ -13,7 +13,7 @@ on:
 
 jobs:
   rspec:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     env:
       ORACLE_COOKIE: sqldev
@@ -23,7 +23,7 @@ jobs:
 
     services:
       postgres:
-        image: 'postgres:13'
+        image: 'postgres:16'
         ports: ['5432:5432']
         env:
           POSTGRES_PASSWORD: postgres
@@ -52,28 +52,35 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
+          - '3.3'
+          - '3.2'
           - '3.1'
           - '3.0'
           - '2.7'
+          - 'head'
         rails:
-          - rails_5.2.8
-          - rails_6.0.6
+          - rails_7.1.0
+          - rails_7.0.8
           - rails_6.1.7
-          - rails_7.0.4
+          - rails_6.0.6
         adapter:
           - sqlite3
           - postgresql
           - mysql2
           - oracle_enhanced
+          - postgis
+          # - trilogy
         exclude:
-          - ruby: '3.0'
-            rails: rails_5.2.8
-          - ruby: '3.1'
-            rails: rails_5.2.8
+          - rails: rails_7.1.0
+            adapter: oracle_enhanced
+
+          - rails: rails_7.1.0
+            adapter: postgis
+            ruby: 2.7'
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
@@ -88,19 +95,19 @@ jobs:
 
         # See: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md#mysql
         run: |
-          if [ "${DB_ADAPTER}" = "mysql2" ]; then
+          if [[ "${DB_ADAPTER}" == "mysql2" ]] || [[ "${DB_ADAPTER}" == "trilogy" ]]; then
             sudo systemctl start mysql.service
             mysql -u root -proot -e 'create database ajax_datatables_rails;'
           fi
 
-          if [ "${DB_ADAPTER}" = "oracle_enhanced" ]; then
+          if [[ "${DB_ADAPTER}" == "oracle_enhanced" ]]; then
             ./spec/install_oracle.sh
             # Fix error : libnnz11.so: cannot open shared object file: No such file or directory
             sudo ln -s ${ORACLE_HOME}/lib/libnnz11.so /usr/lib/libnnz11.so
           fi
 
       - name: Setup Ruby cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: vendor/bundle
           key: ${{ runner.os }}-gems-${{ matrix.ruby }}-${{ matrix.rails }}-${{ matrix.adapter }}-${{ hashFiles('**/Gemfile.lock') }}
@@ -109,16 +116,19 @@ jobs:
 
       - name: Bundle
         env:
+          RUBY_VERSION: ${{ matrix.ruby }}
           RAILS_VERSION: ${{ matrix.rails }}
           DB_ADAPTER: ${{ matrix.adapter }}
           BUNDLE_GEMFILE: gemfiles/${{ matrix.rails }}.gemfile
         run: |
-          gem install bundler
+          if [[ "${RUBY_VERSION}" != "2.7" ]]; then
+            gem install bundler
+          fi
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
 
       - name: RSpec & publish code coverage
-        uses: paambaati/codeclimate-action@v2.7.5
+        uses: paambaati/codeclimate-action@v5.0.0
         env:
           RAILS_VERSION: ${{ matrix.rails }}
           DB_ADAPTER: ${{ matrix.adapter }}

data/Appraisals

@@ -2,7 +2,7 @@
 
 require 'yaml'
 
-rails_versions = YAML.load(File.read('appraisal.yml'))
+rails_versions = YAML.safe_load(File.read('appraisal.yml'))
 
 rails_versions.each do |version, gems|
   appraise "rails_#{version}" do

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## 1.5.0 (2024-04-08)
+
+* Drop support of Rails 5.2
+* Add support for grouped results (merge: [#419](https://github.com/jbox-web/ajax-datatables-rails/pull/419))
+* Fix server-side out of order ajax responses (merge: [#418](https://github.com/jbox-web/ajax-datatables-rails/pull/418))
+* Add support for postgis adapter (merge: [#417](https://github.com/jbox-web/ajax-datatables-rails/pull/417))
+* Add support for trilogy adapter (merge: [#423](https://github.com/jbox-web/ajax-datatables-rails/pull/423))
+* Add support for Rails 7.1
+* Add support for Ruby 3.3
+
+This is the last version to support Rails 6.0.x and Ruby 2.7.x.
+
 ## 1.4.0 (2022-12-18)
 
 * Improve tests

data/Gemfile

@@ -5,3 +5,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'appraisal', git: 'https://github.com/n-rodriguez/appraisal.git', branch: 'wip/combustion'
+gem 'combustion', git: 'https://github.com/pat/combustion.git'

data/README.md

@@ -11,8 +11,8 @@
 
 It's tested against :
 
-* Rails 5.2.4 / 6.0.3 / 6.1.0
-* Ruby 2.5.x / 2.6.x / 2.7.x
+* Rails 6.0.6 / 6.1.7 / 7.0.4
+* Ruby 2.7 / 3.0 / 3.1
 * SQLite3
 * Postgresql 13
 * MySQL 8

data/ajax-datatables-rails.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
 
   s.files = `git ls-files`.split("\n")
 
-  s.add_runtime_dependency 'rails', '>= 5.2'
+  s.add_runtime_dependency 'rails', '>= 6.0'
   s.add_runtime_dependency 'zeitwerk'
 
   s.add_development_dependency 'activerecord-oracle_enhanced-adapter'

data/appraisal.yml

@@ -1,56 +1,131 @@
 ---
-5.2.8:
+6.0.6:
   sqlite3:
-    version: ~> 1.3.0
+    version: ~> 1.4.0
     install_if: '-> { ENV["DB_ADAPTER"] == "sqlite3" }'
   mysql2:
     version: ''
     install_if: '-> { ENV["DB_ADAPTER"] == "mysql2" }'
+  activerecord-trilogy-adapter:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "trilogy" }'
   activerecord-oracle_enhanced-adapter:
-    version: ~> 5.2.0
+    version: ~> 6.0.0
     install_if: '-> { ENV["DB_ADAPTER"] == "oracle_enhanced" }'
   ruby-oci8:
     version: ''
     install_if: '-> { ENV["DB_ADAPTER"] == "oracle_enhanced" }'
+  activerecord-postgis-adapter:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "postgis" }'
+  base64:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+  bigdecimal:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+  mutex_m:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+  drb:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
 
-6.0.6:
+
+6.1.7:
   sqlite3:
     version: ~> 1.4.0
     install_if: '-> { ENV["DB_ADAPTER"] == "sqlite3" }'
   mysql2:
     version: ''
     install_if: '-> { ENV["DB_ADAPTER"] == "mysql2" }'
+  activerecord-trilogy-adapter:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "trilogy" }'
   activerecord-oracle_enhanced-adapter:
-    version: ~> 6.0.0
+    version: ~> 6.1.0
     install_if: '-> { ENV["DB_ADAPTER"] == "oracle_enhanced" }'
   ruby-oci8:
     version: ''
     install_if: '-> { ENV["DB_ADAPTER"] == "oracle_enhanced" }'
+  activerecord-postgis-adapter:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "postgis" }'
+  base64:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+  bigdecimal:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+  mutex_m:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+  drb:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
 
-6.1.7:
+
+7.0.8:
   sqlite3:
     version: ~> 1.4.0
     install_if: '-> { ENV["DB_ADAPTER"] == "sqlite3" }'
   mysql2:
     version: ''
     install_if: '-> { ENV["DB_ADAPTER"] == "mysql2" }'
+  activerecord-trilogy-adapter:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "trilogy" }'
   activerecord-oracle_enhanced-adapter:
-    version: ~> 6.1.0
+    version: ~> 7.0.0
     install_if: '-> { ENV["DB_ADAPTER"] == "oracle_enhanced" }'
   ruby-oci8:
     version: ''
     install_if: '-> { ENV["DB_ADAPTER"] == "oracle_enhanced" }'
+  activerecord-postgis-adapter:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "postgis" }'
+  base64:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+  bigdecimal:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+  mutex_m:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+  drb:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+
 
-7.0.4:
+7.1.0:
   sqlite3:
     version: ~> 1.4.0
     install_if: '-> { ENV["DB_ADAPTER"] == "sqlite3" }'
   mysql2:
     version: ''
     install_if: '-> { ENV["DB_ADAPTER"] == "mysql2" }'
-  activerecord-oracle_enhanced-adapter:
-    version: ~> 7.0.0
-    install_if: '-> { ENV["DB_ADAPTER"] == "oracle_enhanced" }'
-  ruby-oci8:
+  activerecord-trilogy-adapter:
     version: ''
-    install_if: '-> { ENV["DB_ADAPTER"] == "oracle_enhanced" }'
+    install_if: '-> { ENV["DB_ADAPTER"] == "trilogy" }'
+  # activerecord-oracle_enhanced-adapter:
+  #   version: ~> 7.0.0
+  #   install_if: '-> { ENV["DB_ADAPTER"] == "oracle_enhanced" }'
+  # ruby-oci8:
+  #   version: ''
+  #   install_if: '-> { ENV["DB_ADAPTER"] == "oracle_enhanced" }'
+  activerecord-postgis-adapter:
+    version: ''
+    install_if: '-> { ENV["DB_ADAPTER"] == "postgis" }'
+  base64:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+  bigdecimal:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+  mutex_m:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'
+  drb:
+    version: ''
+    install_if: '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }'

data/gemfiles/rails_6.0.6.gemfile

@@ -3,6 +3,7 @@
 source "https://rubygems.org"
 
 gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion"
+gem "combustion", git: "https://github.com/pat/combustion.git"
 gem "rails", "6.0.6"
 
 install_if -> { ENV["DB_ADAPTER"] == "sqlite3" } do
@@ -13,9 +14,24 @@ install_if -> { ENV["DB_ADAPTER"] == "mysql2" } do
   gem "mysql2"
 end
 
+install_if -> { ENV["DB_ADAPTER"] == "trilogy" } do
+  gem "activerecord-trilogy-adapter"
+end
+
 install_if -> { ENV["DB_ADAPTER"] == "oracle_enhanced" } do
   gem "activerecord-oracle_enhanced-adapter", "~> 6.0.0"
   gem "ruby-oci8"
 end
 
+install_if -> { ENV["DB_ADAPTER"] == "postgis" } do
+  gem "activerecord-postgis-adapter"
+end
+
+install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") } do
+  gem "base64"
+  gem "bigdecimal"
+  gem "mutex_m"
+  gem "drb"
+end
+
 gemspec path: "../"

data/gemfiles/rails_6.1.7.gemfile

@@ -3,6 +3,7 @@
 source "https://rubygems.org"
 
 gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion"
+gem "combustion", git: "https://github.com/pat/combustion.git"
 gem "rails", "6.1.7"
 
 install_if -> { ENV["DB_ADAPTER"] == "sqlite3" } do
@@ -13,9 +14,24 @@ install_if -> { ENV["DB_ADAPTER"] == "mysql2" } do
   gem "mysql2"
 end
 
+install_if -> { ENV["DB_ADAPTER"] == "trilogy" } do
+  gem "activerecord-trilogy-adapter"
+end
+
 install_if -> { ENV["DB_ADAPTER"] == "oracle_enhanced" } do
   gem "activerecord-oracle_enhanced-adapter", "~> 6.1.0"
   gem "ruby-oci8"
 end
 
+install_if -> { ENV["DB_ADAPTER"] == "postgis" } do
+  gem "activerecord-postgis-adapter"
+end
+
+install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") } do
+  gem "base64"
+  gem "bigdecimal"
+  gem "mutex_m"
+  gem "drb"
+end
+
 gemspec path: "../"

data/gemfiles/{rails_7.0.4.gemfile → rails_7.0.8.gemfile}

@@ -3,7 +3,8 @@
 source "https://rubygems.org"
 
 gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion"
-gem "rails", "7.0.4"
+gem "combustion", git: "https://github.com/pat/combustion.git"
+gem "rails", "7.0.8"
 
 install_if -> { ENV["DB_ADAPTER"] == "sqlite3" } do
   gem "sqlite3", "~> 1.4.0"
@@ -13,9 +14,24 @@ install_if -> { ENV["DB_ADAPTER"] == "mysql2" } do
   gem "mysql2"
 end
 
+install_if -> { ENV["DB_ADAPTER"] == "trilogy" } do
+  gem "activerecord-trilogy-adapter"
+end
+
 install_if -> { ENV["DB_ADAPTER"] == "oracle_enhanced" } do
   gem "activerecord-oracle_enhanced-adapter", "~> 7.0.0"
   gem "ruby-oci8"
 end
 
+install_if -> { ENV["DB_ADAPTER"] == "postgis" } do
+  gem "activerecord-postgis-adapter"
+end
+
+install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") } do
+  gem "base64"
+  gem "bigdecimal"
+  gem "mutex_m"
+  gem "drb"
+end
+
 gemspec path: "../"

data/gemfiles/rails_7.1.0.gemfile

@@ -0,0 +1,32 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion"
+gem "combustion", git: "https://github.com/pat/combustion.git"
+gem "rails", "7.1.0"
+
+install_if -> { ENV["DB_ADAPTER"] == "sqlite3" } do
+  gem "sqlite3", "~> 1.4.0"
+end
+
+install_if -> { ENV["DB_ADAPTER"] == "mysql2" } do
+  gem "mysql2"
+end
+
+install_if -> { ENV["DB_ADAPTER"] == "trilogy" } do
+  gem "activerecord-trilogy-adapter"
+end
+
+install_if -> { ENV["DB_ADAPTER"] == "postgis" } do
+  gem "activerecord-postgis-adapter"
+end
+
+install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") } do
+  gem "base64"
+  gem "bigdecimal"
+  gem "mutex_m"
+  gem "drb"
+end
+
+gemspec path: "../"

data/lib/ajax-datatables-rails/base.rb

@@ -77,7 +77,7 @@ module AjaxDatatablesRails
         recordsTotal:    records_total_count,
         recordsFiltered: records_filtered_count,
         data:            sanitize_data(data),
-      }.merge(additional_data)
+      }.merge(draw_id).merge(additional_data)
     end
 
     # User helper methods
@@ -137,17 +137,26 @@ module AjaxDatatablesRails
     end
 
     def records_total_count
-      fetch_records.count(:all)
+      numeric_count fetch_records.count(:all)
     end
 
     def records_filtered_count
-      filter_records(fetch_records).count(:all)
+      numeric_count filter_records(fetch_records).count(:all)
+    end
+
+    def numeric_count(count)
+      count.is_a?(Hash) ? count.values.size : count
     end
 
     def global_search_delimiter
       GLOBAL_SEARCH_DELIMITER
     end
 
+    # See: https://datatables.net/manual/server-side#Returned-data
+    def draw_id
+      params[:draw].present? ? { draw: params[:draw].to_i } : {}
+    end
+
     def raw_records_error_text
       <<-ERROR
 

data/lib/ajax-datatables-rails/datatable/column.rb

@@ -68,6 +68,7 @@ module AjaxDatatablesRails
       DB_ADAPTER_TYPE_CAST = {
         mysql:           TYPE_CAST_MYSQL,
         mysql2:          TYPE_CAST_MYSQL,
+        trilogy:         TYPE_CAST_MYSQL,
         sqlite:          TYPE_CAST_SQLITE,
         sqlite3:         TYPE_CAST_SQLITE,
         oracle:          TYPE_CAST_ORACLE,

data/lib/ajax-datatables-rails/datatable/simple_order.rb

@@ -45,9 +45,9 @@ module AjaxDatatablesRails
         return unless sort_nulls_last?
 
         case @adapter
-        when :pg, :postgresql, :postgres, :oracle
+        when :pg, :postgresql, :postgres, :oracle, :postgis
           'NULLS LAST'
-        when :mysql, :mysql2, :sqlite, :sqlite3
+        when :mysql, :mysql2, :trilogy, :sqlite, :sqlite3
           'IS NULL'
         else
           raise "unsupported database adapter: #{@adapter}"

data/lib/ajax-datatables-rails/version.rb

@@ -8,7 +8,7 @@ module AjaxDatatablesRails
 
   module VERSION
     MAJOR = 1
-    MINOR = 4
+    MINOR = 5
     TINY  = 0
     PRE   = nil
 

data/spec/ajax-datatables-rails/base_spec.rb

@@ -181,6 +181,7 @@ RSpec.describe AjaxDatatablesRails::Base do
         data = datatable.as_json
         expect(data[:recordsTotal]).to eq 5
         expect(data[:recordsFiltered]).to eq 5
+        expect(data[:draw]).to eq 1
         expect(data[:data]).to be_a(Array)
         expect(data[:data].size).to eq 5
       end
@@ -192,6 +193,7 @@ RSpec.describe AjaxDatatablesRails::Base do
           data = datatable.as_json
           expect(data[:recordsTotal]).to eq 5
           expect(data[:recordsFiltered]).to eq 5
+          expect(data[:draw]).to eq 1
           expect(data[:data]).to be_a(Array)
           expect(data[:data].size).to eq 5
           expect(data[:foo]).to eq 'bar'

data/spec/ajax-datatables-rails/datatable/column_spec.rb

@@ -168,6 +168,11 @@ RSpec.describe AjaxDatatablesRails::Datatable::Column do
       expect(column.send(:type_cast)).to eq('VARCHAR')
     end
 
+    it 'returns VARCHAR if :db_adapter is :postgis' do
+      expect(datatable).to receive(:db_adapter) { :postgis }
+      expect(column.send(:type_cast)).to eq('VARCHAR')
+    end
+
     it 'returns VARCHAR2(4000) if :db_adapter is :oracle' do
       expect(datatable).to receive(:db_adapter) { :oracle }
       expect(column.send(:type_cast)).to eq('VARCHAR2(4000)')
@@ -183,6 +188,11 @@ RSpec.describe AjaxDatatablesRails::Datatable::Column do
       expect(column.send(:type_cast)).to eq('CHAR')
     end
 
+    it 'returns CHAR if :db_adapter is :trilogy' do
+      expect(datatable).to receive(:db_adapter) { :trilogy }
+      expect(column.send(:type_cast)).to eq('CHAR')
+    end
+
     it 'returns CHAR if :db_adapter is :mysql' do
       expect(datatable).to receive(:db_adapter) { :mysql }
       expect(column.send(:type_cast)).to eq('CHAR')

data/spec/ajax-datatables-rails/datatable/simple_order_spec.rb

@@ -42,6 +42,14 @@ RSpec.describe AjaxDatatablesRails::Datatable::SimpleOrder do
         end
       end
 
+      context 'with postgis database adapter' do
+        before { parent.db_adapter = :postgis }
+
+        it 'sql query' do
+          expect(nulls_last_order.query('email')).to eq('email DESC NULLS LAST')
+        end
+      end
+
       context 'with sqlite database adapter' do
         before { parent.db_adapter = :sqlite }
 

data/spec/ajax-datatables-rails/orm/active_record_count_records_spec.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
+
+  let(:datatable) { ComplexDatatable.new(sample_params) }
+  let(:records) { User.all }
+
+  describe '#records_total_count' do
+    context 'ungrouped results' do
+      it 'returns the count' do
+        expect(datatable.send(:records_total_count)).to eq records.count
+      end
+    end
+
+    context 'grouped results' do
+      let(:datatable) { GroupedDatatable.new(sample_params) }
+
+      it 'returns the count' do
+        expect(datatable.send(:records_total_count)).to eq records.count
+      end
+    end
+  end
+
+
+  describe '#records_filtered_count' do
+    context 'ungrouped results' do
+      it 'returns the count' do
+        expect(datatable.send(:records_filtered_count)).to eq records.count
+      end
+    end
+
+    context 'grouped results' do
+      let(:datatable) { GroupedDatatable.new(sample_params) }
+
+      it 'returns the count' do
+        expect(datatable.send(:records_filtered_count)).to eq records.count
+      end
+    end
+  end
+end

data/spec/ajax-datatables-rails/orm/active_record_filter_records_spec.rb

@@ -202,6 +202,16 @@ RSpec.describe AjaxDatatablesRails::ORM::ActiveRecord do
             )
           end
         end
+
+        context 'when db_adapter is trilogy' do
+          it 'can call #to_sql on returned object' do
+            result = datatable.build_conditions_for_selected_columns
+            expect(result).to respond_to(:to_sql)
+            expect(result.to_sql).to eq(
+              "CAST(`users`.`username` AS CHAR) LIKE '%doe%' AND CAST(`users`.`email` AS CHAR) LIKE '%example%'"
+            )
+          end
+        end
       end
     end
 

data/spec/dummy/config/database.yml

@@ -4,12 +4,12 @@ test:
   database: ajax_datatables_rails
   encoding: utf8
 
-<% if adapter == 'postgresql' %>
+<% if adapter == 'postgresql' || adapter == 'postgis' %>
   host: '127.0.0.1'
   port: 5432
   username: 'postgres'
   password: 'postgres'
-<% elsif adapter == 'mysql2' %>
+<% elsif adapter == 'mysql2' || adapter == 'trilogy' %>
   host: '127.0.0.1'
   port: 3306
   username: 'root'

data/spec/spec_helper.rb

@@ -73,11 +73,11 @@ class RunningSpec
   end
 
   def self.mysql?
-    ENV['DB_ADAPTER'] == 'mysql2'
+    ENV['DB_ADAPTER'] == 'mysql2' || ENV['DB_ADAPTER'] == 'trilogy'
   end
 
   def self.postgresql?
-    ENV['DB_ADAPTER'] == 'postgresql'
+    ENV['DB_ADAPTER'] == 'postgresql' || ENV['DB_ADAPTER'] == 'postgis'
   end
 end
 

data/spec/support/datatables/grouped_datatable_array.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class GroupedDatatable < ComplexDatatable
+
+  def get_raw_records
+    User.all.group(:id)
+  end
+end

data/spec/support/helpers/params.rb

@@ -70,9 +70,9 @@ end
 
 def nulls_last_sql(datatable)
   case datatable.db_adapter
-  when :pg, :postgresql, :postgres, :oracle
+  when :pg, :postgresql, :postgres, :oracle, :postgis
     'NULLS LAST'
-  when :mysql, :mysql2, :sqlite, :sqlite3
+  when :mysql, :mysql2, :trilogy, :sqlite, :sqlite3
     'IS NULL'
   else
     raise 'unsupported database adapter'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ajax-datatables-rails
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Joel Quenneville
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-18 00:00:00.000000000 Z
+date: 2024-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -311,10 +311,10 @@ files:
 - config.ru
 - doc/migrate.md
 - doc/webpack.md
-- gemfiles/rails_5.2.8.gemfile
 - gemfiles/rails_6.0.6.gemfile
 - gemfiles/rails_6.1.7.gemfile
-- gemfiles/rails_7.0.4.gemfile
+- gemfiles/rails_7.0.8.gemfile
+- gemfiles/rails_7.1.0.gemfile
 - lib/ajax-datatables-rails.rb
 - lib/ajax-datatables-rails/active_record.rb
 - lib/ajax-datatables-rails/base.rb
@@ -337,6 +337,7 @@ files:
 - spec/ajax-datatables-rails/datatable/datatable_spec.rb
 - spec/ajax-datatables-rails/datatable/simple_order_spec.rb
 - spec/ajax-datatables-rails/datatable/simple_search_spec.rb
+- spec/ajax-datatables-rails/orm/active_record_count_records_spec.rb
 - spec/ajax-datatables-rails/orm/active_record_filter_records_spec.rb
 - spec/ajax-datatables-rails/orm/active_record_paginate_records_spec.rb
 - spec/ajax-datatables-rails/orm/active_record_sort_records_spec.rb
@@ -359,6 +360,7 @@ files:
 - spec/support/datatables/datatable_cond_unknown.rb
 - spec/support/datatables/datatable_custom_column.rb
 - spec/support/datatables/datatable_order_nulls_last.rb
+- spec/support/datatables/grouped_datatable_array.rb
 - spec/support/helpers/params.rb
 - spec/support/models/user.rb
 homepage: https://github.com/jbox-web/ajax-datatables-rails
@@ -384,7 +386,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.7
 signing_key:
 specification_version: 4
 summary: A gem that simplifies using datatables and hundreds of records via ajax

data/gemfiles/rails_5.2.8.gemfile

@@ -1,21 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion"
-gem "rails", "5.2.8"
-
-install_if -> { ENV["DB_ADAPTER"] == "sqlite3" } do
-  gem "sqlite3", "~> 1.3.0"
-end
-
-install_if -> { ENV["DB_ADAPTER"] == "mysql2" } do
-  gem "mysql2"
-end
-
-install_if -> { ENV["DB_ADAPTER"] == "oracle_enhanced" } do
-  gem "activerecord-oracle_enhanced-adapter", "~> 5.2.0"
-  gem "ruby-oci8"
-end
-
-gemspec path: "../"