From 229a552c2f491fdc368f5008cefbf03c67a813f1 Mon Sep 17 00:00:00 2001 From: "Thomas E. Enebo" Date: Mon, 8 Apr 2024 10:42:05 -0400 Subject: [PATCH 1/6] Update version for release --- lib/arjdbc/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/arjdbc/version.rb b/lib/arjdbc/version.rb index c3dcbdb65..b0db35690 100644 --- a/lib/arjdbc/version.rb +++ b/lib/arjdbc/version.rb @@ -1,3 +1,3 @@ module ArJdbc - VERSION = '61.2' + VERSION = '61.3' end From a5aedee474a9e21665246745ca561827577fa88f Mon Sep 17 00:00:00 2001 From: "Thomas E. Enebo" Date: Tue, 9 Apr 2024 09:40:22 -0400 Subject: [PATCH 2/6] We accidentally removed RubyBigDecimal for a few point releases of JRuby 9.4. Work around by using another method which exists in all JRuby releases which support this arjdbc --- src/java/arjdbc/jdbc/RubyJdbcConnection.java | 2 +- src/java/arjdbc/sqlite3/SQLite3RubyJdbcConnection.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/arjdbc/jdbc/RubyJdbcConnection.java b/src/java/arjdbc/jdbc/RubyJdbcConnection.java index f702461af..07bdc6941 100644 --- a/src/java/arjdbc/jdbc/RubyJdbcConnection.java +++ b/src/java/arjdbc/jdbc/RubyJdbcConnection.java @@ -2712,7 +2712,7 @@ else if ( value instanceof RubyNumeric ) { } else { // e.g. `BigDecimal '42.00000000000000000001'` statement.setBigDecimal(index, - RubyBigDecimal.newInstance(context, context.runtime.getModule("BigDecimal"), value).getValue()); + RubyBigDecimal.newInstance(context, context.runtime.getModule("BigDecimal"), value, RubyFixnum.newFixnum(context.runtime, Integer.MAX_VALUE)).getValue()); } } diff --git a/src/java/arjdbc/sqlite3/SQLite3RubyJdbcConnection.java b/src/java/arjdbc/sqlite3/SQLite3RubyJdbcConnection.java index 4e14a9156..1d88ebea2 100644 --- a/src/java/arjdbc/sqlite3/SQLite3RubyJdbcConnection.java +++ b/src/java/arjdbc/sqlite3/SQLite3RubyJdbcConnection.java @@ -478,7 +478,7 @@ else if ( value instanceof RubyNumeric ) { statement.setDouble(index, ((RubyNumeric) value).getDoubleValue()); } else { // e.g. `BigDecimal '42.00000000000000000001'` - RubyBigDecimal val = RubyBigDecimal.newInstance(context, context.runtime.getModule("BigDecimal"), value); + RubyBigDecimal val = RubyBigDecimal.newInstance(context, context.runtime.getModule("BigDecimal"), value, RubyFixnum.newFixnum(context.runtime, Integer.MAX_VALUE)); statement.setString(index, val.getValue().toString()); } } From 10b8a0612612f9e161e4030669b7d7a10bc6ca67 Mon Sep 17 00:00:00 2001 From: "Thomas E. Enebo" Date: Tue, 9 Apr 2024 10:06:35 -0400 Subject: [PATCH 3/6] Make sure this runs on last 9.4 JRuby --- .github/workflows/ruby.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index d80ae9379..369a0a725 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -243,7 +243,7 @@ jobs: strategy: fail-fast: false matrix: - ruby-version: ['jruby-9.3.7.0'] + ruby-version: ['jruby-9.4.6.0'] db: ['sqlite3'] test_targets: ['test_sqlite3'] From 93e787936a1100487cc1461140044ca729d9c3b2 Mon Sep 17 00:00:00 2001 From: "Thomas E. Enebo" Date: Tue, 9 Apr 2024 10:29:43 -0400 Subject: [PATCH 4/6] hmm try other workflows to see if there is a bigger issue --- .github/workflows/ruby.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 369a0a725..6104f2619 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - ruby-version: ['jruby-9.3.7.0'] + ruby-version: ['jruby-9.4.6.0'] db: ['mysql2'] test_targets: ["rails:test_mysql2"] ar_version: ["6-1-stable"] @@ -69,7 +69,7 @@ jobs: strategy: fail-fast: false matrix: - ruby-version: [ 'jruby-9.3.7.0' ] + ruby-version: ['jruby-9.4.6.0'] db: [ 'postgresql' ] test_targets: [ "rails:test_postgresql" ] ar_version: ["6-1-stable"] @@ -119,7 +119,7 @@ jobs: strategy: fail-fast: false matrix: - ruby-version: ['jruby-9.3.7.0'] + ruby-version: ['jruby-9.4.6.0'] db: ['sqlite3'] test_targets: ["rails:test_sqlite3"] ar_version: ["6-1-stable"] @@ -151,7 +151,7 @@ jobs: strategy: fail-fast: false matrix: - ruby-version: ['jruby-9.3.7.0'] + ruby-version: ['jruby-9.4.6.0'] db: ['mysql2'] test_targets: ["db:mysql test_mysql2"] prepared_statements: ['false', 'true'] @@ -196,7 +196,7 @@ jobs: strategy: fail-fast: false matrix: - ruby-version: ['jruby-9.3.7.0'] + ruby-version: ['jruby-9.4.6.0'] db: ['postgresql'] test_targets: ["db:postgresql test_postgresql"] prepared_statements: ['false', 'true'] From 86bc10fd72a812abbc9762a1bee03951e0b30445 Mon Sep 17 00:00:00 2001 From: "Thomas E. Enebo" Date: Tue, 9 Apr 2024 10:45:19 -0400 Subject: [PATCH 5/6] something with bundler I don't want to figure out. Go back to 9.3 --- .github/workflows/ruby.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 6104f2619..a7f153a1e 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - ruby-version: ['jruby-9.4.6.0'] + ruby-version: ['jruby-9.3.13.0'] db: ['mysql2'] test_targets: ["rails:test_mysql2"] ar_version: ["6-1-stable"] @@ -69,7 +69,7 @@ jobs: strategy: fail-fast: false matrix: - ruby-version: ['jruby-9.4.6.0'] + ruby-version: ['jruby-9.3.13.0'] db: [ 'postgresql' ] test_targets: [ "rails:test_postgresql" ] ar_version: ["6-1-stable"] @@ -119,7 +119,7 @@ jobs: strategy: fail-fast: false matrix: - ruby-version: ['jruby-9.4.6.0'] + ruby-version: ['jruby-9.3.13.0'] db: ['sqlite3'] test_targets: ["rails:test_sqlite3"] ar_version: ["6-1-stable"] @@ -151,7 +151,7 @@ jobs: strategy: fail-fast: false matrix: - ruby-version: ['jruby-9.4.6.0'] + ruby-version: ['jruby-9.3.13.0'] db: ['mysql2'] test_targets: ["db:mysql test_mysql2"] prepared_statements: ['false', 'true'] @@ -196,7 +196,7 @@ jobs: strategy: fail-fast: false matrix: - ruby-version: ['jruby-9.4.6.0'] + ruby-version: ['jruby-9.3.13.0'] db: ['postgresql'] test_targets: ["db:postgresql test_postgresql"] prepared_statements: ['false', 'true'] @@ -243,7 +243,7 @@ jobs: strategy: fail-fast: false matrix: - ruby-version: ['jruby-9.4.6.0'] + ruby-version: ['jruby-9.3.13.0'] db: ['sqlite3'] test_targets: ['test_sqlite3'] From 79b532a133f84f6abee476b2588ed24fd18f9239 Mon Sep 17 00:00:00 2001 From: "Thomas E. Enebo" Date: Tue, 9 Apr 2024 12:18:10 -0400 Subject: [PATCH 6/6] Update for release --- lib/arjdbc/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/arjdbc/version.rb b/lib/arjdbc/version.rb index 232ab2367..a9a6183f2 100644 --- a/lib/arjdbc/version.rb +++ b/lib/arjdbc/version.rb @@ -1,3 +1,3 @@ module ArJdbc - VERSION = '70.1' + VERSION = '70.2' end