activerecord-advantage-adapter 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d10f6102f8391080901ec11c4394d7b47cfab4b7072f2ca7255e44a05c138a3
-  data.tar.gz: 7aece77305d027f0d6e1ceec3fd3b0e07a3a10c92eccd24d853ab3a504a17881
+  metadata.gz: 0b99c457f121d0e626de75648f383a4c74e4e1068de8299fa4676f6174bb90c3
+  data.tar.gz: 2ef0863fd117d012ec8bf3fcc62daff584f66d28124db927d159c3113fbbcbc6
 SHA512:
-  metadata.gz: b5cfeeb5eb5080e7ccb15594e4b0d2e0cb3defdbdbb94b8b9d8c39b0c09128f69c332e506f28ce9d84f8db7698a700f202403aa1be74abdbc3692b143cd76309
-  data.tar.gz: c5c2245d339343294ea183cb5c1cd2a76f88619c275f26683bcf9bcac841550f65ec3e2b52e4696534030b4b1b10d897ed765ef5d79af7ac1e898c332bf990d6
+  metadata.gz: 04d3efce90e1c6cd0c8a4cf13c5a3f2b0f7152e97c401e2341463ce9e59e0c26b809eb39c506207e25e705cbe4b1e33e8641dceea9e8dd4dac1f3d9ed043b25b
+  data.tar.gz: 316c0e9ec840e759fa74e63767f7314ab4873e12a0b6abc2bf269e3e16b59e620f4f9be84226f8934b5f59c8a2619af472a8d349632f6d9d6e1ef35f495ba45a

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.8"
 
 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
@@ -309,6 +326,14 @@ module ActiveRecord
         select(sql, name).map { |row| strip_or_self(row['TABLE_NAME']) }
       end
 
+      if Rails::VERSION::MAJOR == 5
+        # this really needs fixing, in the case where a database contains views, but that requires
+        # a "data dictionary", and I'm testing against a collection of "database tables"
+        def views(_name = nil)
+          []
+        end
+      end
+
       # Return a list of columns
       def columns(table_name, _name = nil) #:nodoc:
         table_structure(table_name).map do |field|
@@ -456,9 +481,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
@@ -486,17 +511,49 @@ SQL
         options.include?(:default) && !(options[:null] == false && options[:default].nil?)
       end
 
+
       private
 
+      def type_map
+        @type_map ||= Type::TypeMap.new.tap { |m| initialize_type_map(m) }
+      end
+
+      # copied from "connection_adapters/abstract_adapter.rb"
+      def register_class(mapping, key, klass)
+        mapping.register_type(key) do |*args|
+          klass.new
+        end
+      end
+
       # Used in the lookup_cast_type procedure
-      def initialize_type_map(m = type_map)
-        super
+      def initialize_type_map(m)
+        register_class m, %r(boolean)i, Type::Boolean
+        register_class m, %r(char)i, Type::String
+        register_class m, %r(binary)i, Type::Binary
+        register_class m, %r(text)i, Type::Text
+        register_class m, %r(date)i, Type::Date
+        register_class m, %r(time)i, Type::Time
+        register_class m, %r(datetime)i, Type::DateTime
+        register_class m, %r(float)i, Type::Float
+        register_class m, %r(int)i, Type::Integer
+        register_class m, %r(decimal)i, Type::Decimal
+
+        m.alias_type %r(logical)i, "boolean"
+        m.alias_type %r(numeric)i, "decimal"
+        m.alias_type %r(string)i, "char"
         m.alias_type %r(memo)i, "char"
+        m.alias_type %r(image)i, "binary"
+        m.alias_type %r(varchar)i, "char"
+        m.alias_type %r(timestamp)i, "datetime"
+        m.alias_type %r(number)i, "decimal"
+        m.alias_type %r(money)i, "decimal"
+        m.alias_type %r(double)i, "float"
+
         m.alias_type %r(long binary)i, "binary"
         m.alias_type %r(integer)i, "int"
         m.alias_type %r(short)i, "int"
         m.alias_type %r(autoinc)i, "int"
-        m.alias_type %r(logical)i, "boolean"
+        m.alias_type %r(raw)i, "binary"
       end
 
       # Connect

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.8
 platform: ruby
 authors:
 - Edgar Sherman
 - Jon Adams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-10 00:00:00.000000000 Z
+date: 2023-06-23 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
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: ActiveRecord driver for Advantage
 test_files: []