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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e84b54bc11898d1512c4eef346ee60a6f310efb072b2566524caa3d8a3cbf27c
-  data.tar.gz: ee626a6778a58bdc56aa366619ffe80528cee99119152a1ecf4686cfc041f2a2
+  metadata.gz: 633e3fdf964a200968304873babd37145c39fdcacf75c0e29bd78e75df99bad0
+  data.tar.gz: 979e73fa4890863a4eea2adfbe66667cf17c0aa3bb510fdc99ca4a794977768b
 SHA512:
-  metadata.gz: 9e4b283987223aff1540b1e3cd55f36dac4d0755af34c1a2ea7076bd4e92b5a5209609b536ef9e9f56e09b8ad199308720f1b93f6dc8529854e582dbb3f43977
-  data.tar.gz: a32fa2c34cdaa642a5e6f7a26acc3e301ecc6a8d06f794d124ff1f9ce8c4fcf8f7e340941856ee3bee99c82da9d8c10957d99247f28bfa83841f4edc3c41ab41
+  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

data/lib/arjdbc/abstract/database_statements.rb

@@ -40,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)

data/lib/arjdbc/mssql/database_statements.rb

@@ -97,7 +97,7 @@ module ActiveRecord
 
           # 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/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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-alt-adapter
 version: !ruby/object:Gem::Version
-  version: 80.1.0.beta1
+  version: 80.1.0.rc1
 platform: java
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek, Jesse Chavez, and JRuby contributors