activerecord-advantage-adapter 0.1.4 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0b104f4e9d8fb204bc6249aa06448f5881292745123dd94c2def2eee9254dad
-  data.tar.gz: 3e64e4089e520711b10ca37cb3b3404834c2b939d65a50898e19d1735c4f3d50
+  metadata.gz: b1bdc562c7440301244b1a6a48e97f9d5859bcfb10ff1ad1fdfef14c0bfbc47e
+  data.tar.gz: 843fcbe3aa8c55be30d7d07315980871e190340ed35938f1ca8e7feddf72f57a
 SHA512:
-  metadata.gz: 6f100c25e14250e25e93ecadfe20f1bbe2c5ee1e42d3980924771111cc7ac5a094a3ab2f2db057bbd2ac8630ca195e15a60892fbc8dd47eb90ef2f4c8c324204
-  data.tar.gz: 3ecae6463a95d48e9e1f9ef194fe8adde8333e39c74f9d90d405fd63acc64a59cbdcfb91b0fdea786ce1dca00f5dff93c142dbfaf8fef62a4465a8af65fae4bc
+  metadata.gz: 130731dda15fddc1d5f990b5fa8930e810f0c242893049beff250fee337530228c2dc893087fed2a0241183e6323317d99befdd44deb668197519a518e8047c5
+  data.tar.gz: 2336ed9446e64f67465074831efab9df081eb208056915d4b27780a90714f84c7690095b7856d25d237092e7fa03d4a74898f73326c35c2ea06558920fbc6c46

data/activerecord-advantage-adapter.gemspec

@@ -1,49 +1,48 @@
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-pkg_version = "0.1.4"
+pkg_version = "0.1.7"
 
 Gem::Specification.new do |spec|
-  spec.name = "activerecord-advantage-adapter"
+  spec.name = 'activerecord-advantage-adapter'
   spec.version = pkg_version
-  spec.authors = ["Edgar Sherman", "Jon Adams"]
-  spec.email = ["advantage@sybase.com", "t12nslookup@googlemail.com"]
+  spec.authors = ['Edgar Sherman', 'Jon Adams']
+  spec.email = ['advantage@sybase.com', 't12nslookup@googlemail.com']
 
-  spec.summary = %q{ActiveRecord driver for Advantage}
-  spec.description = %q{ActiveRecord driver for the Advantage Database connector}
-  spec.homepage = "http://devzone.advantagedatabase.com"
-  spec.license = "Apache-2.0"
+  spec.summary = 'ActiveRecord driver for Advantage'
+  spec.description = 'ActiveRecord driver for the Advantage Database connector'
+  spec.homepage = 'http://devzone.advantagedatabase.com'
+  spec.license = 'Apache-2.0'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
-    spec.metadata["allowed_push_host"] = "https://rubygems.org"
+    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
-    spec.metadata["homepage_uri"] = spec.homepage
+    spec.metadata['homepage_uri'] = spec.homepage
     # Changed to the github project, as this is the actively maintained source, now.
-    spec.metadata["source_code_uri"] = "https://github.com/t12nslookup/activerecord-advantage-adapter/"
-    spec.metadata["changelog_uri"] = "https://github.com/t12nslookup/activerecord-advantage-adapter/CHANGELOG.md"
+    spec.metadata['source_code_uri'] = 'https://github.com/t12nslookup/activerecord-advantage-adapter/'
+    spec.metadata['changelog_uri'] = 'https://github.com/t12nslookup/activerecord-advantage-adapter/blob/main/CHANGELOG.md'
   else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-          "public gem pushes."
+    raise 'RubyGems 2.0 or newer is required to protect against ' \
+          'public gem pushes.'
   end
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.files = Dir["{test,lib}/**/*",
-                   "LICENSE",
-                   "README",
-                   "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 "rspec", "~> 3.0"
-
-  spec.add_runtime_dependency "advantage", "~> 0.1", ">= 0.1.2"
+  # spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
+  #   `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  # end
+  spec.files = Dir['{test,lib}/**/*',
+                   'LICENSE',
+                   'README',
+                   'activerecord-advantage-adapter.gemspec']
+  spec.require_paths = ['lib']
+
+  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'
   # spec.add_runtime_dependency 'activerecord', '>= 3.2.0'
-
 end

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
@@ -433,12 +450,32 @@ SQL
         execute "ALTER TABLE #{quote_table_name(table_name)} DROP #{quote_column_name(column_name)}"
       end
 
+      if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR < 2
+        def combine_bind_parameters(
+          from_clause: [],
+          join_clause: [],
+          where_clause: [],
+          having_clause: [],
+          limit: nil,
+          offset: nil
+        ) # :nodoc:
+          result = []
+          result << limit if limit
+          result += from_clause if from_clause.any?
+          result += join_clause if join_clause.any?
+          result += where_clause if where_clause.any?
+          result += having_clause if having_clause.any?
+          result << offset if offset
+          result
+        end
+      end
+
       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

data/lib/arel/visitors/advantage.rb

@@ -13,7 +13,7 @@ module Arel
         end
 
         def visit_Arel_Nodes_Limit(o, collector)
-          collector << "TOP  "
+          collector << "TOP "
           visit o.expr, collector
           collector << " "
           collector
@@ -21,38 +21,63 @@ module Arel
 
         # copied from informix.rb
         def visit_Arel_Nodes_SelectStatement(o, collector)
-          collector << "SELECT "
+          collector << 'SELECT '
           collector = maybe_visit o.limit, collector
           collector = maybe_visit o.offset, collector
-          collector = o.cores.inject(collector) { |c, x|
+          collector = o.cores.inject(collector) do |c, x|
             visit_Arel_Nodes_SelectCore x, c
-          }
+          end
           if o.orders.any?
-            collector << "ORDER BY "
-            collector = inject_join o.orders, collector, ", "
+            collector << ' ORDER BY '
+            collector = inject_join o.orders, collector, ', '
           end
           collector
         end
 
         def visit_Arel_Nodes_SelectCore(o, collector)
-          collector = inject_join o.projections, collector, ", "
+          collector = maybe_visit o.set_quantifier, collector
+          collector = inject_join o.projections, collector, ', '
           if o.source && !o.source.empty?
-            collector << " FROM "
+            collector << ' FROM '
             collector = visit o.source, collector
           end
 
           if o.wheres.any?
-            collector << " WHERE "
-            collector = inject_join o.wheres, collector, " AND "
+            collector << ' WHERE '
+            collector = inject_join o.wheres, collector, ' AND '
           end
 
           if o.groups.any?
-            collector << "GROUP BY "
-            collector = inject_join o.groups, collector, ", "
+            collector << ' GROUP BY '
+            collector = inject_join o.groups, collector, ', '
           end
 
           collector
         end
+
+        def visit_Arel_Nodes_Distinct(o, collector)
+          collector << 'DISTINCT '
+        end
+
+        # Rails version > 5?
+        def unboundable?(value)
+          value.respond_to?(:unboundable?) && value.unboundable?
+        end
+
+        def visit_Arel_Nodes_NotEqual(o, collector)
+          right = o.right
+
+          return collector << ' 1=1' if unboundable?(right)
+
+          collector = visit o.left, collector
+
+          if right.nil?
+            collector << ' IS NOT NULL'
+          else
+            collector << ' <> '
+            visit right, collector
+          end
+        end
       else
         # Rails 3 or lower
         def visit_Arel_Nodes_Offset(o)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-advantage-adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.7
 platform: ruby
 authors:
 - Edgar Sherman
 - Jon Adams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-28 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
@@ -94,8 +94,8 @@ metadata:
   allowed_push_host: https://rubygems.org
   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/CHANGELOG.md
-post_install_message: 
+  changelog_uri: https://github.com/t12nslookup/activerecord-advantage-adapter/blob/main/CHANGELOG.md
+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: []