activerecord-jdbc-alt-adapter 80.0.0.rc1-java → 80.1.0.rc1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af1013cc5645ba0826a27708509821f2f209c2a1458a210fb0e08b8c009d97b9
-  data.tar.gz: b359f9f151a47ba7b10f8416a90bec25c09147a56b76957f4c6bf849156a8a3f
+  metadata.gz: 633e3fdf964a200968304873babd37145c39fdcacf75c0e29bd78e75df99bad0
+  data.tar.gz: 979e73fa4890863a4eea2adfbe66667cf17c0aa3bb510fdc99ca4a794977768b
 SHA512:
-  metadata.gz: d05fd360ff0fcd095f5658159d6007b62cb176b30ab43713a6030df3281f18420ec41a781733921075152d3750490af54bcd6dfbe6857c074a727527b4ec67f8
-  data.tar.gz: 0b30b95dd040bb21713d18d9ac3558a30d85b3139d7cd665054a20a2bbedab253e15b85fcb360aaf8f27045683f0507ab2b98805b2c7e8abb03f79b9f0af64b8
+  metadata.gz: 4ac0755284b9164a031dae9e2b3bcaebd65380d32637a85abeb09ce11ff63ca6c95f69d50e02398fb47fc87cf4a89522bd33768eb38e2d4b603d4ffe42918837
+  data.tar.gz: 14c8650cbc96db74c2d58d331d33e9cf8ed1a9d74ddb944dd150c166a890d24b53e8474c02de2ce894b8199b6070453fd145e124670bbd0659b00046bad79686

data/.github/workflows/main.yml

@@ -30,6 +30,8 @@ jobs:
         ruby-version: ['jruby-10.0.6.0']
         db: ['mssql']
         test_targets: ['test_mssql']
+        prepared_statements: ['true', 'false']
+        ar_version: ["8-1-stable-dev"]
 
     # NOTE: using a specific tag, it fails with 2019-latest.
     # it seems the issue is related to some changes in mssql tools
@@ -55,6 +57,8 @@ jobs:
       JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M"
       SQLUSER: SA
       SQLPASS: Password12!
+      PREPARED_STATEMENTS: ${{ matrix.prepared_statements }}
+      AR_VERSION: ${{ matrix.ar_version }}
 
     steps:
       - uses: actions/checkout@v3
@@ -85,10 +89,12 @@ jobs:
         ruby-version: ['jruby-10.0.6.0']
         db: ['sqlite3']
         test_targets: ['test_sqlite3']
+        ar_version: ["8-1-stable-dev"]
 
     env:
       DB: ${{ matrix.db }}
       JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M --dev"
+      AR_VERSION: ${{ matrix.ar_version }}
 
     steps:
       - uses: actions/checkout@v4
@@ -116,6 +122,7 @@ jobs:
         test_targets: ["db:postgresql test_postgresql"]
         prepared_statements: ['false', 'true']
         insert_returning: ['false', 'true']
+        ar_version: ["8-1-stable-dev"]
 
     services:
       postgres:
@@ -132,6 +139,7 @@ jobs:
       JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M"
       PREPARED_STATEMENTS: ${{ matrix.prepared_statements }}
       INSERT_RETURNING: ${{ matrix.insert_returning }}
+      AR_VERSION: ${{ matrix.ar_version }}
       PGHOST: localhost
       PGPORT: 5432
       PGUSER: postgres
@@ -160,7 +168,7 @@ jobs:
         ruby-version: [ 'jruby-10.0.6.0' ]
         db: [ 'mssql' ]
         test_targets: [ "rails:test_mssql" ]
-        ar_version: ["8-0-stable-dev"]
+        ar_version: ["8-1-stable-dev"]
 
     services:
       mssql:
@@ -216,7 +224,7 @@ jobs:
         ruby-version: ['jruby-10.0.6.0']
         db: ['sqlite3']
         test_targets: ["rails:test_sqlite3"]
-        ar_version: ["8-0-stable-dev"]
+        ar_version: ["8-1-stable-dev"]
 
     env:
       DB: ${{ matrix.db }}
@@ -248,7 +256,7 @@ jobs:
         ruby-version: [ 'jruby-10.0.6.0' ]
         db: [ 'postgresql' ]
         test_targets: [ "rails:test_postgresql" ]
-        ar_version: ["8-0-stable-dev"]
+        ar_version: ["8-1-stable-dev"]
         prepared_statements: [ 'false', 'true' ]
 
     services:

data/activerecord-jdbc-adapter.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |gem|
   gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files = gem.files.grep(%r{^test/})
 
-  gem.add_dependency "activerecord", "~> 8.0"
+  gem.add_dependency "activerecord", "~> 8.1.0"
 
   #gem.add_development_dependency 'test-unit', '2.5.4'
   #gem.add_development_dependency 'test-unit-context', '>= 0.3.0'

data/activerecord-jdbc-alt-adapter.gemspec

@@ -43,7 +43,7 @@ Gem::Specification.new do |gem|
   gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files = gem.files.grep(%r{^test/})
 
-  gem.add_dependency "activerecord", "~> 8.0.0"
+  gem.add_dependency "activerecord", "~> 8.1.0"
 
   #gem.add_development_dependency 'test-unit', '2.5.4'
   #gem.add_development_dependency 'test-unit-context', '>= 0.3.0'

data/lib/arjdbc/abstract/database_statements.rb

@@ -10,13 +10,7 @@ module ArJdbc
       NO_BINDS = [].freeze
 
       def exec_insert(sql, name = nil, binds = NO_BINDS, pk = nil, sequence_name = nil, returning: nil)
-        if preventing_writes?
-          raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"
-        end
-
-        mark_transaction_written_if_write(sql)
-
-        binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
+        sql = preprocess_query(sql)
 
         type_casted_binds = type_casted_binds(binds)
 
@@ -36,13 +30,7 @@ module ArJdbc
       # It appears that at this point (AR 5.0) "prepare" should only ever be true
       # if prepared statements are enabled
       def internal_exec_query(sql, name = nil, binds = NO_BINDS, prepare: false, async: false, allow_retry: false, materialize_transactions: true)
-        if preventing_writes? && write_query?(sql)
-          raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"
-        end
-
-        mark_transaction_written_if_write(sql)
-
-        binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
+        sql = preprocess_query(sql)
 
         # puts "[1]internal----->sql: #{sql}, binds: #{binds}"
         type_casted_binds = type_casted_binds(binds)
@@ -52,7 +40,7 @@ module ArJdbc
           if without_prepared_statement?(binds)
             log(sql, name, async: async) { conn.execute_query(sql) }
           else
-            log(sql, name, type_casted_binds, async: async) do
+            log(sql, name, binds, type_casted_binds, async: async) do
               # this is different from normal AR that always caches
               cached_statement = fetch_cached_statement(sql) if prepare && @jdbc_statement_cache_enabled
               conn.execute_prepared_query(sql, binds, cached_statement)
@@ -62,11 +50,7 @@ module ArJdbc
       end
 
       def exec_update(sql, name = 'SQL', binds = NO_BINDS)
-        if preventing_writes?
-          raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"
-        end
-
-        mark_transaction_written_if_write(sql)
+        sql = preprocess_query(sql)
 
         binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
 
@@ -103,12 +87,6 @@ module ArJdbc
           ActiveRecord::Relation::QueryAttribute.new(nil, type_cast(value, column), ActiveModel::Type::Value.new)
         end
       end
-
-      def preprocess_query(sql)
-        check_if_write_query(sql) if respond_to?(:check_if_write_query, true)
-        mark_transaction_written_if_write(sql) if respond_to?(:mark_transaction_written_if_write, true)
-        sql
-      end
     end
   end
 end

data/lib/arjdbc/mssql/adapter.rb

@@ -29,6 +29,7 @@ require 'arjdbc/mssql/transaction'
 require 'arjdbc/mssql/errors'
 require 'arjdbc/mssql/schema_creation'
 require 'arjdbc/mssql/database_limits'
+require "arjdbc/mssql/type_metadata"
 
 require "arjdbc/mssql/adapter_hash_config"
 

data/lib/arjdbc/mssql/column.rb

@@ -6,12 +6,12 @@ module ActiveRecord
     class MSSQLColumn < Column
       attr_reader :table_name
 
-      def initialize(name, raw_default, sql_type_metadata = nil, null = true, table_name = nil, default_function = nil, collation = nil, comment: nil)
+      def initialize(name, cast_type, raw_default, sql_type_metadata = nil, null = true, table_name = nil, default_function = nil, collation = nil, comment: nil)
         @table_name = table_name
 
         default_val, default_fun = extract_default(raw_default)
 
-        super(name, default_val, sql_type_metadata, null, default_fun, collation: collation, comment: comment)
+        super(name, cast_type, default_val, sql_type_metadata, null, default_fun, collation: collation, comment: comment)
       end
 
       def extract_default(value)

data/lib/arjdbc/mssql/database_statements.rb

@@ -92,12 +92,12 @@ module ActiveRecord
           end
         end
 
-        def internal_exec_query(sql, name = 'SQL', binds = [], prepare: false, async: false, allow_retry: false)
+        def internal_exec_query(sql, name = 'SQL', binds = [], prepare: false, async: false, allow_retry: false, materialize_transactions: true)
           sql = preprocess_query(sql)
 
           # binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
 
-          # puts "[1]internal----->sql: #{sql}, binds: #{binds}"
+          # puts "[1]internal_exec_query----->sql: #{sql}, binds: #{binds}"
           type_casted_binds = type_casted_binds(binds)
           # puts "[2]internal----->sql: #{type_casted_binds.size}, binds: #{type_casted_binds}"
 
@@ -112,7 +112,7 @@ module ActiveRecord
               end
             end
           else
-            log(sql, name, type_casted_binds) do
+            log(sql, name, binds, type_casted_binds, async: async) do
               with_raw_connection do |conn|
                 # this is different from normal AR that always caches
                 cached_statement = fetch_cached_statement(sql) if prepare && @jdbc_statement_cache_enabled
@@ -144,7 +144,7 @@ module ActiveRecord
           else
             log(sql, name, binds, type_casted_binds) do
               with_raw_connection do |conn|
-                result = conn.execute_prepared_update(sql, type_casted_binds)
+                result = conn.execute_prepared_update(sql, binds)
                 verified!
                 result
               end
@@ -198,6 +198,7 @@ module ActiveRecord
 
 
         def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notification_payload:, batch:)
+          # puts "perform_query----->sql: #{sql}, binds: #{binds}"
           result = conditional_indentity_insert(sql) { raw_connection.execute(sql) }
 
           count = 0

data/lib/arjdbc/mssql/schema_creation.rb

@@ -55,7 +55,7 @@ module ActiveRecord
         end
 
         def add_column_options!(sql, options)
-          sql << " DEFAULT #{quote_default_expression(options[:default], options[:column])}" if options_include_default?(options)
+          sql << " DEFAULT #{quote_default_expression_for_column_definition(options[:default], options[:column])}" if options_include_default?(options)
 
           sql << ' NOT NULL' if options[:null] == false
 

data/lib/arjdbc/mssql/schema_statements.rb

@@ -419,6 +419,10 @@ module ActiveRecord
           field
         end
 
+        def fetch_type_metadata(sql_type)
+          MSSQL::TypeMetadata.new(super(sql_type))
+        end
+
         def create_db_edition_options(options = {})
           edition_config = options.select { |k, _v| k.match?('azure') }
 

data/lib/arjdbc/mssql/type_metadata.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module ConnectionAdapters
+    module MSSQL
+      class TypeMetadata < DelegateClass(SqlTypeMetadata)
+        undef to_yaml if method_defined?(:to_yaml)
+
+        include Deduplicable
+
+        def initialize(type_metadata)
+          super(type_metadata)
+        end
+
+        def ==(other)
+          other.is_a?(TypeMetadata) &&
+            __getobj__ == other.__getobj__
+        end
+
+        alias eql? ==
+
+        def hash
+          TypeMetadata.hash ^
+            __getobj__.hash
+        end
+
+        private
+
+        def deduplicated
+          __setobj__(__getobj__.deduplicate)
+          super
+        end
+      end
+    end
+  end
+end

data/lib/arjdbc/mssql/types/binary_types.rb

@@ -20,12 +20,13 @@ module ActiveRecord
 
         # This is the Rails binary type
         class VarbinaryMax < ActiveRecord::Type::Binary
-          def type
-            :binary
+          def initialize(**args)
+            super
+            @limit = 2_147_483_647
           end
 
-          def limit
-            @limit ||= 2_147_483_647
+          def type
+            :binary
           end
         end
 

data/lib/arjdbc/mssql/types/deprecated_types.rb

@@ -7,32 +7,35 @@ module ActiveRecord
       module Type
 
         class Text < ActiveRecord::Type::String
-          def type
-            :text_basic
+          def initialize(**args)
+            super
+            @limit = 2_147_483_647
           end
 
-          def limit
-            @limit ||= 2_147_483_647
+          def type
+            :text_basic
           end
         end
 
         class Ntext < ActiveRecord::Type::String
-          def type
-            :ntext
+          def initialize(**args)
+            super
+            @limit = 2_147_483_647
           end
 
-          def limit
-            @limit ||= 2_147_483_647
+          def type
+            :ntext
           end
         end
 
         class Image < ActiveRecord::Type::Binary
-          def type
-            :image
+          def initialize(**args)
+            super
+            @limit = 2_147_483_647
           end
 
-          def limit
-            @limit ||= 2_147_483_647
+          def type
+            :image
           end
         end
 

data/lib/arjdbc/mssql/types/string_types.rb

@@ -19,12 +19,13 @@ module ActiveRecord
         end
 
         class VarcharMax < ActiveRecord::Type::String
-          def type
-            :varchar_max
+          def initialize(**args)
+            super
+            @limit = 2_147_483_647
           end
 
-          def limit
-            @limit ||= 2_147_483_647
+          def type
+            :varchar_max
           end
         end
 
@@ -43,12 +44,13 @@ module ActiveRecord
 
         # This is  Rails logical text type
         class NvarcharMax < ActiveRecord::Type::String
-          def type
-            :text
+          def initialize(**args)
+            super
+            @limit = 2_147_483_647
           end
 
-          def limit
-            @limit ||= 2_147_483_647
+          def type
+            :text
           end
         end
 

data/lib/arjdbc/mssql.rb

@@ -6,4 +6,4 @@ module ArJdbc
   MsSQL = MSSQL # compatibility with 1.2
 end
 
-ArJdbc.warn_unsupported_adapter "mssql", [8, 0] # warns on AR >= 4.2
+ArJdbc.warn_unsupported_adapter "mssql", [8, 1] # warns on AR >= 4.2

data/lib/arjdbc/postgresql/adapter.rb

@@ -957,8 +957,6 @@ module ActiveRecord::ConnectionAdapters
     FEATURE_NOT_SUPPORTED = "0A000" # :nodoc:
 
     def execute_and_clear(sql, name, binds, prepare: false, async: false)
-      check_if_write_query(sql)
-
       if !prepare || without_prepared_statement?(binds)
         result = exec_no_cache(sql, name, binds, async: async)
       else
@@ -975,7 +973,6 @@ module ActiveRecord::ConnectionAdapters
 
     def exec_no_cache(sql, name, binds, async: false)
       materialize_transactions
-      mark_transaction_written_if_write(sql)
 
       # make sure we carry over any changes to ActiveRecord.default_timezone that have been
       # made since we established the connection
@@ -993,7 +990,6 @@ module ActiveRecord::ConnectionAdapters
 
     def exec_cache(sql, name, binds, async: false)
       materialize_transactions
-      mark_transaction_written_if_write(sql)
       update_typemap_for_default_timezone
 
       stmt_key = prepare_statement(sql, binds)

data/lib/arjdbc/postgresql/database_statements.rb

@@ -21,15 +21,15 @@ module ArJdbc
       def internal_exec_query(sql, name = nil, binds = [], prepare: false, async: false, allow_retry: false, materialize_transactions: true)
           sql = preprocess_query(sql)
 
-        # puts "[1]internal----->sql: #{sql}, binds: #{binds}"
+        # puts "[1]internal_exec_query----->sql: #{sql}, binds: #{binds}"
         type_casted_binds = type_casted_binds(binds)
-        # puts "[2]internal----->sql: #{type_casted_binds.size}, binds: #{type_casted_binds}"
+        # puts "[2]internal_exec_query----->sql: #{type_casted_binds.size}, binds: #{type_casted_binds}"
 
         with_raw_connection do |conn|
           if without_prepared_statement?(binds)
             log(sql, name, async: async) { conn.execute_query(sql) }
           else
-            log(sql, name, type_casted_binds, async: async) do
+            log(sql, name, binds, type_casted_binds, async: async) do
               # this is different from normal AR that always caches
               cached_statement = fetch_cached_statement(sql) if prepare && @jdbc_statement_cache_enabled
               conn.execute_prepared_query(sql, type_casted_binds, cached_statement)
@@ -39,6 +39,7 @@ module ArJdbc
       end
 
       def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notification_payload:, batch:)
+        # puts "perform_query----->sql: #{sql}, binds: #{binds}"
         result = raw_connection.execute(sql)
 
         count = 0

data/lib/arjdbc/postgresql/schema_statements.rb

@@ -11,6 +11,13 @@ module ArJdbc
         _arjdbc_array_parser.parse_pg_array(value)
       end
 
+      # Returns an array of the names of all schemas presently in the effective search path,
+      # in their priority order.
+      def current_schemas # :nodoc:
+        schemas = query_value("SELECT current_schemas(false)", "SCHEMA")
+        decode_string_array(schemas)
+      end
+
       private
 
       def _arjdbc_array_parser

data/lib/arjdbc/tasks/mssql_database_tasks.rb

@@ -4,7 +4,7 @@ require 'active_record/tasks/database_tasks'
 
 module ArJdbc
   module Tasks # :nodoc:
-    class MSSQLDatabaseTasks # :nodoc:
+    class MSSQLDatabaseTasks < ActiveRecord::Tasks::AbstractTasks # :nodoc:
       def self.using_database_configurations?
         true
       end
@@ -127,25 +127,5 @@ module ArJdbc
         msg
       end
     end
-
-    module DatabaseTasksMSSQL
-      extend ActiveSupport::Concern
-
-      module ClassMethods
-
-      def check_protected_environments!
-        super
-      rescue ActiveRecord::JDBCError => e
-        case e.message
-        when /cannot open database .* requested by the login/i
-        else
-          raise
-        end
-      end
-
-      end
-    end
-
-    ActiveRecord::Tasks::DatabaseTasks.send(:include, DatabaseTasksMSSQL)
   end
 end

data/lib/arjdbc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ArJdbc
-  VERSION = "80.0.0.rc1"
+  VERSION = "80.1.0.rc1"
 end

data/src/java/arjdbc/jdbc/RubyJdbcConnection.java

@@ -3186,9 +3186,11 @@ public class RubyJdbcConnection extends RubyObject {
 
             final IRubyObject type_metadata = adapter.callMethod(context, "fetch_type_metadata", sqlType);
 
+            final IRubyObject cast_type = adapter.callMethod(context, "lookup_cast_type", sqlType);
+
             // (name, default, sql_type_metadata = nil, null = true, table_name = nil, default_function = nil, collation = nil, comment: nil)
             final IRubyObject[] args = new IRubyObject[] {
-                columnName, defaultValue, type_metadata, nullable, tableName
+                columnName, cast_type, defaultValue, type_metadata, nullable, tableName
             };
             columns.append(context, Column.newInstance(context, args, Block.NULL_BLOCK));
         }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-alt-adapter
 version: !ruby/object:Gem::Version
-  version: 80.0.0.rc1
+  version: 80.1.0.rc1
 platform: java
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek, Jesse Chavez, and JRuby contributors
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 8.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 8.1.0
 description: 'Fork of the ActiveRecord JDBC adapter with support for SQL Server and
   Azure SQL, for more information and help look at the README file in the github repository.
   AR-JDBC is a database adapter for Rails'' ActiveRecord component designed to be
@@ -124,6 +124,7 @@ files:
 - lib/arjdbc/mssql/schema_statements.rb
 - lib/arjdbc/mssql/server_version.rb
 - lib/arjdbc/mssql/transaction.rb
+- lib/arjdbc/mssql/type_metadata.rb
 - lib/arjdbc/mssql/types.rb
 - lib/arjdbc/mssql/types/binary_types.rb
 - lib/arjdbc/mssql/types/date_and_time_types.rb