activerecord-advantage-adapter 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0b104f4e9d8fb204bc6249aa06448f5881292745123dd94c2def2eee9254dad
-  data.tar.gz: 3e64e4089e520711b10ca37cb3b3404834c2b939d65a50898e19d1735c4f3d50
+  metadata.gz: 2d10f6102f8391080901ec11c4394d7b47cfab4b7072f2ca7255e44a05c138a3
+  data.tar.gz: 7aece77305d027f0d6e1ceec3fd3b0e07a3a10c92eccd24d853ab3a504a17881
 SHA512:
-  metadata.gz: 6f100c25e14250e25e93ecadfe20f1bbe2c5ee1e42d3980924771111cc7ac5a094a3ab2f2db057bbd2ac8630ca195e15a60892fbc8dd47eb90ef2f4c8c324204
-  data.tar.gz: 3ecae6463a95d48e9e1f9ef194fe8adde8333e39c74f9d90d405fd63acc64a59cbdcfb91b0fdea786ce1dca00f5dff93c142dbfaf8fef62a4465a8af65fae4bc
+  metadata.gz: b5cfeeb5eb5080e7ccb15594e4b0d2e0cb3defdbdbb94b8b9d8c39b0c09128f69c332e506f28ce9d84f8db7698a700f202403aa1be74abdbc3692b143cd76309
+  data.tar.gz: c5c2245d339343294ea183cb5c1cd2a76f88619c275f26683bcf9bcac841550f65ec3e2b52e4696534030b4b1b10d897ed765ef5d79af7ac1e898c332bf990d6

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.6"
 
 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', '~> 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.add_runtime_dependency 'activerecord', '>= 3.2.0'
-
 end

data/lib/active_record/connection_adapters/advantage_adapter.rb

@@ -433,6 +433,26 @@ 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

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-advantage-adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Edgar Sherman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-28 00:00:00.000000000 Z
+date: 2022-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,7 +94,7 @@ 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
+  changelog_uri: https://github.com/t12nslookup/activerecord-advantage-adapter/blob/main/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths: