activerecord-advantage-adapter 0.1.7 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1bdc562c7440301244b1a6a48e97f9d5859bcfb10ff1ad1fdfef14c0bfbc47e
-  data.tar.gz: 843fcbe3aa8c55be30d7d07315980871e190340ed35938f1ca8e7feddf72f57a
+  metadata.gz: 7288057984945ea0eff65cbaa632431020c0740b4ba6db36b6bdf72b797621f2
+  data.tar.gz: 48dfd45511b91853dd448e8acab83f8912c7abd048f684673489607210057fa2
 SHA512:
-  metadata.gz: 130731dda15fddc1d5f990b5fa8930e810f0c242893049beff250fee337530228c2dc893087fed2a0241183e6323317d99befdd44deb668197519a518e8047c5
-  data.tar.gz: 2336ed9446e64f67465074831efab9df081eb208056915d4b27780a90714f84c7690095b7856d25d237092e7fa03d4a74898f73326c35c2ea06558920fbc6c46
+  metadata.gz: 26ef46605ebc9155616ec9cab5739725be9c393d649ef97321aa59595b8b336db7b4f0557576987c1e3904726e69c52980d66b77b182852d2b0439a2f2149a98
+  data.tar.gz: 9ba384335aa4ec03501bf8cc6f7583d1a50c68c4214d415709bb6b2930338571b0271dd26f289f4e1a0779ac98b4ca52b303091815c871d65e7a1355b8a2e131

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.7"
+pkg_version = "1.0.0"
 
 Gem::Specification.new do |spec|
   spec.name = 'activerecord-advantage-adapter'
@@ -39,10 +39,12 @@ Gem::Specification.new do |spec|
                    'activerecord-advantage-adapter.gemspec']
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.7'
+
   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 'activerecord', '>= 7.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

@@ -36,28 +36,19 @@ class ADS
   end
 end
 
+if ActiveRecord::ConnectionAdapters.respond_to?(:register)
+  ActiveRecord::ConnectionAdapters.register(
+    "advantage",
+    "ActiveRecord::ConnectionAdapters::AdvantageAdapter",
+    "active_record/connection_adapters/advantage_adapter"
+  )
+end
+
 module ActiveRecord
   class Base
-    DEFAULT_CONFIG = { :username => "adssys", :password => nil }
-    # Main connection function to Advantage
-    # Connection Adapter takes four parameters:
-    # * :database (required, no default). Corresponds to "Data Source=" in connection string
-    # * :username (optional, default to 'adssys'). Correspons to "User ID=" in connection string
-    # * :password (optional, deafult to '')
-    # * :options (optional, defaults to ''). Corresponds to any additional options in connection string
-
     def self.advantage_connection(config)
-      config = DEFAULT_CONFIG.merge(config)
-
-      raise ArgumentError, "No data source was given. Please add a :database option." unless config.has_key?(:database)
-
-      connection_string = "data source=#{config[:database]};User ID=#{config[:username]};"
-      connection_string += "Password=#{config[:password]};" unless config[:password].nil?
-      connection_string += "#{config[:options]};" unless config[:options].nil?
-      connection_string += "DateFormat=YYYY-MM-DD;"
-
+      connection_string = ConnectionAdapters::AdvantageAdapter.build_connection_string(config)
       db = ADS.instance.api.ads_new_connection()
-
       ConnectionAdapters::AdvantageAdapter.new(db, logger, connection_string)
     end
   end
@@ -115,12 +106,32 @@ module ActiveRecord
     end
 
     class AdvantageAdapter < AbstractAdapter
-      def initialize(connection, logger, connection_string = "") #:nodoc:
-        super(connection, logger)
+      DEFAULT_CONFIG = { username: "adssys", password: nil }
+
+      def self.build_connection_string(config)
+        config = DEFAULT_CONFIG.merge(config.symbolize_keys)
+        cs = "data source=#{config[:database]};User ID=#{config[:username]};"
+        cs += "Password=#{config[:password]};" unless config[:password].nil?
+        cs += "#{config[:options]};" unless config[:options].nil?
+        cs += "DateFormat=YYYY-MM-DD;"
+        cs
+      end
+
+      def initialize(config_or_deprecated_connection, deprecated_logger = nil, deprecated_connection_string = "") #:nodoc:
+        if config_or_deprecated_connection.is_a?(Hash)
+          super(config_or_deprecated_connection)
+          config = config_or_deprecated_connection.symbolize_keys
+          raise ArgumentError, "No data source was given. Please add a :database option." unless config.key?(:database)
+          @connection_string = self.class.build_connection_string(config)
+          @connection = ADS.instance.api.ads_new_connection()
+        else
+          super(config_or_deprecated_connection, deprecated_logger)
+          @connection = config_or_deprecated_connection
+          @connection_string = deprecated_connection_string
+        end
         @prepared_statements = false
         @auto_commit = true
         @affected_rows = 0
-        @connection_string = connection_string
         @visitor = Arel::Visitors::Advantage.new self
         connect!
       end
@@ -148,9 +159,12 @@ module ActiveRecord
         super
       end
 
-      def reconnect! #:nodoc:
-        disconnect!
-        connect!
+      def reconnect!(restore_transactions: false) #:nodoc:
+        super
+      end
+
+      def write_query?(sql) #:nodoc:
+        false
       end
 
       def supports_count_distinct? #:nodoc:
@@ -186,11 +200,26 @@ module ActiveRecord
         }
       end
 
-      # Applies quotations around column names in generated queries
+      # AR 7.2 routes instance quote_column_name/quote_table_name through
+      # self.class.* (ClassMethods). Define both instance and class forms so
+      # the delegation chain never hits AbstractAdapter::ClassMethods which
+      # raises NotImplementedError.
+      def self.quote_column_name(name)
+        %("#{name}")
+      end
+
+      def self.quote_table_name(name)
+        %("#{name}")
+      end
+
       def quote_column_name(name) #:nodoc:
         %("#{name}")
       end
 
+      def quote_table_name(name) #:nodoc:
+        %("#{name}")
+      end
+
       def quoted_true #:nodoc:
         '1'
       end
@@ -200,24 +229,25 @@ module ActiveRecord
       end
 
       # Translate the exception if possible
-      def translate_exception(exception, message) #:nodoc:
+      # Accept both AR < 7.2 positional (message) and AR >= 7.2 keyword args
+      def translate_exception(exception, *positional, message: nil, sql: nil, binds: nil, **) #:nodoc:
+        message = message || positional.first
         return super unless exception.respond_to?(:errno)
 
         case exception.errno
         when 2121
           if exception.sql !~ /^SELECT/i
-            raise ActiveRecord::ActiveRecordError.new(message)
+            ActiveRecord::ActiveRecordError.new(message)
           else
             super
           end
         when 7076
-          raise InvalidForeignKey.new(message, exception)
+          InvalidForeignKey.new(message, exception)
         when 7057
-          raise RecordNotUnique.new(message, exception)
+          RecordNotUnique.new(message, exception)
         else
           super
         end
-        super
       end
 
       # The database update function.
@@ -274,8 +304,13 @@ module ActiveRecord
       end
 
       # Returns a query as an array of arrays
-      def select_rows(sql, name = nil)
-        exec_query(sql, name).rows
+      def select_rows(arel, name = nil, binds = [], **kwargs)
+        exec_query(arel, name, binds).rows
+      end
+
+      def internal_exec_query(sql, name = "SQL", binds = [], **_kwargs) #:nodoc:
+        cols, record = execute(sql, name)
+        ActiveRecord::Result.new(cols, record)
       end
 
       # Begin a transaction
@@ -301,17 +336,21 @@ module ActiveRecord
       end
 
       # Advantage does not support sizing of integers based on the sytax INTEGER(size).
-      def type_to_sql(type, limit = nil, precision = nil, scale = nil) #:nodoc:
+      # Accept both AR < 7.2 positional (limit, precision, scale) and AR >= 7.2 keyword args
+      def type_to_sql(type, *positional, limit: nil, precision: nil, scale: nil, **) #:nodoc:
+        limit     = limit     || positional[0]
+        precision = precision || positional[1]
+        scale     = scale     || positional[2]
         if native_database_types[type]
           if type == :integer
             'integer'
           elsif type == :string && !limit.nil?
             "varchar (#{limit})"
           else
-            super(type, limit, precision, scale)
+            super
           end
         else
-          super(type, limit, precision, scale)
+          super
         end
       end
 
@@ -326,6 +365,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|
@@ -426,7 +473,7 @@ SQL
 
       # Alter a column
       def change_column(table_name, column_name, type, options = {}) #:nodoc:
-        add_column_sql = "ALTER TABLE #{quote_table_name(table_name)} ALTER #{quote_column_name(column_name)} #{quote_column_name(column_name)} #{type_to_sql(type, type_options[:limit], type_options[:precision], type_options[:scale])}"
+        add_column_sql = "ALTER TABLE #{quote_table_name(table_name)} ALTER #{quote_column_name(column_name)} #{quote_column_name(column_name)} #{type_to_sql(type, limit: type_options[:limit], precision: type_options[:precision], scale: type_options[:scale])}"
         add_column_options!(add_column_sql, options)
         execute(add_column_sql)
       end
@@ -442,7 +489,7 @@ SQL
 
       # Rename a column
       def rename_column(table_name, column_name, new_column_name) #:nodoc:
-        execute "ALTER TABLE #{quote_table_name(table_name)} ALTER #{quote_column_name(column_name)} #{quote_column_name(new_column_name)} #{type_to_sql(type, type_options[:limit], type_options[:precision], type_options[:scale])}"
+        execute "ALTER TABLE #{quote_table_name(table_name)} ALTER #{quote_column_name(column_name)} #{quote_column_name(new_column_name)} #{type_to_sql(type, limit: type_options[:limit], precision: type_options[:precision], scale: type_options[:scale])}"
       end
 
       # Drop a column from a table
@@ -503,17 +550,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
@@ -523,6 +602,14 @@ SQL
           error = ADS.instance.api.ads_error(@connection)
           raise ActiveRecord::ActiveRecordError.new("#{error}: Cannot Establish Connection")
         end
+        @raw_connection = @connection
+      end
+
+      # AR 7.2 requires private #reconnect; called by the public reconnect!
+      def reconnect #:nodoc:
+        ADS.instance.api.ads_disconnect(@connection)
+        @connection = ADS.instance.api.ads_new_connection()
+        connect!
       end
 
       # The database execution function

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-advantage-adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 1.0.0
 platform: ruby
 authors:
 - Edgar Sherman
 - Jon Adams
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-31 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: advantage
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +108,6 @@ 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:
 rdoc_options: []
 require_paths:
 - lib
@@ -103,15 +115,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: ActiveRecord driver for Advantage
 test_files: []