activerecord-advantage-adapter 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d10f6102f8391080901ec11c4394d7b47cfab4b7072f2ca7255e44a05c138a3
-  data.tar.gz: 7aece77305d027f0d6e1ceec3fd3b0e07a3a10c92eccd24d853ab3a504a17881
+  metadata.gz: b1bdc562c7440301244b1a6a48e97f9d5859bcfb10ff1ad1fdfef14c0bfbc47e
+  data.tar.gz: 843fcbe3aa8c55be30d7d07315980871e190340ed35938f1ca8e7feddf72f57a
 SHA512:
-  metadata.gz: b5cfeeb5eb5080e7ccb15594e4b0d2e0cb3defdbdbb94b8b9d8c39b0c09128f69c332e506f28ce9d84f8db7698a700f202403aa1be74abdbc3692b143cd76309
-  data.tar.gz: c5c2245d339343294ea183cb5c1cd2a76f88619c275f26683bcf9bcac841550f65ec3e2b52e4696534030b4b1b10d897ed765ef5d79af7ac1e898c332bf990d6
+  metadata.gz: 130731dda15fddc1d5f990b5fa8930e810f0c242893049beff250fee337530228c2dc893087fed2a0241183e6323317d99befdd44deb668197519a518e8047c5
+  data.tar.gz: 2336ed9446e64f67465074831efab9df081eb208056915d4b27780a90714f84c7690095b7856d25d237092e7fa03d4a74898f73326c35c2ea06558920fbc6c46

data/activerecord-advantage-adapter.gemspec

@@ -1,7 +1,7 @@
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-pkg_version = "0.1.6"
+pkg_version = "0.1.7"
 
 Gem::Specification.new do |spec|
   spec.name = 'activerecord-advantage-adapter'
@@ -39,8 +39,8 @@ Gem::Specification.new do |spec|
                    'activerecord-advantage-adapter.gemspec']
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.17'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '~> 2.2.10'
+  spec.add_development_dependency 'rake', '~> 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
 
   spec.add_runtime_dependency 'advantage', '~> 0.1', '>= 0.1.2'

data/lib/active_record/connection_adapters/advantage_adapter.rb

@@ -20,8 +20,8 @@
 #
 #====================================================
 
-require "active_record/connection_adapters/abstract_adapter"
-require "arel/visitors/advantage.rb"
+require 'active_record/connection_adapters/abstract_adapter'
+require 'arel/visitors/advantage'
 
 # Singleton class to hold a valid instance of the AdvantageInterface across all connections
 class ADS
@@ -62,6 +62,23 @@ module ActiveRecord
     end
   end
 
+  # copied and modified from "relation/calculations.rb"
+  module Calculations
+    def count(column_name = nil)
+      if block_given?
+        unless column_name.nil?
+          raise ArgumentError, "Column name argument is not supported when a block is passed."
+        end
+        super()
+      elsif column_name.nil?
+        # ADS doesn't like counting multiple columns, so if there is no column, force the primary_key
+        calculate(:count, self.primary_key)
+      else
+        calculate(:count, column_name)
+      end
+    end
+  end
+
   module ConnectionAdapters
     class AdvantageException < StandardError
       attr_reader :errno
@@ -240,7 +257,7 @@ module ActiveRecord
         log(sql, 'delete', binds) { exec_query(sql, binds) }
       end
 
-      def exec_query(sql, name = "SQL", _binds = [])
+      def exec_query(sql, name = "SQL", _binds = [], **_options)
         cols, record = execute(sql, name)
         ActiveRecord::Result.new(cols, record)
       end
@@ -456,9 +473,9 @@ SQL
       protected
 
       # Execute a query
-      def select(sql, name = nil, binds = []) #:nodoc:
+      def select(sql, name = nil, binds = [], **options) #:nodoc:
         if Rails::VERSION::MAJOR >= 4
-          exec_query(sql, name, binds)
+          exec_query(sql, name, binds, **options)
         else
           exec_query(sql, name, binds).to_hash
         end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-advantage-adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Edgar Sherman
 - Jon Adams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-10 00:00:00.000000000 Z
+date: 2023-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +95,7 @@ metadata:
   homepage_uri: http://devzone.advantagedatabase.com
   source_code_uri: https://github.com/t12nslookup/activerecord-advantage-adapter/
   changelog_uri: https://github.com/t12nslookup/activerecord-advantage-adapter/blob/main/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -110,8 +110,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: ActiveRecord driver for Advantage
 test_files: []