activerecord-jdbc-alt-adapter 51.7.0-java → 52.2.0-java

data/src/java/arjdbc/util/DateTimeUtils.java

@@ -51,9 +51,6 @@ import static arjdbc.util.StringHelper.decByte;
  * @author kares
  */
 public abstract class DateTimeUtils {
-
-    private static final GJChronology CHRONO_ITALY_UTC = GJChronology.getInstance(DateTimeZone.UTC);
-
     public static RubyTime toTime(final ThreadContext context, final IRubyObject value) {
         if (!(value instanceof RubyTime)) { // unlikely
             return (RubyTime) TypeConverter.convertToTypeWithCheck(value, context.runtime.getTime(), "to_time");
@@ -221,11 +218,9 @@ public abstract class DateTimeUtils {
         final int hours = time.getHours();
         final int minutes = time.getMinutes();
         final int seconds = time.getSeconds();
-        int nanos = time.getNanos(); // max 999-999-999
-        final int millis = nanos / 1000000;
-        nanos = nanos % 1000000;
+        final int nanos = time.getNanos(); // max 999-999-999
 
-        DateTime dateTime = new DateTime(2000, 1, 1, hours, minutes, seconds, millis, defaultZone);
+        DateTime dateTime = new DateTime(2000, 1, 1, hours, minutes, seconds, defaultZone);
         return RubyTime.newTime(context.runtime, dateTime, nanos);
     }
 
@@ -238,11 +233,9 @@ public abstract class DateTimeUtils {
         final int hours = timestamp.getHours();
         final int minutes = timestamp.getMinutes();
         final int seconds = timestamp.getSeconds();
-        int nanos = timestamp.getNanos(); // max 999-999-999
-        final int millis = nanos / 1000000;
-        nanos = nanos % 1000000;
+        final int nanos = timestamp.getNanos(); // max 999-999-999
 
-        DateTime dateTime = new DateTime(year, month, day, hours, minutes, seconds, millis, defaultZone);
+        DateTime dateTime = new DateTime(year, month, day, hours, minutes, seconds, 0, defaultZone);
         return RubyTime.newTime(context.runtime, dateTime, nanos);
     }
 
@@ -267,15 +260,6 @@ public abstract class DateTimeUtils {
         return newDate(context, year, month, day, ISOChronology.getInstance(zone));
     }
 
-    @SuppressWarnings("deprecation")
-    public static IRubyObject newDate(final ThreadContext context, final Date date) {
-        final int year = date.getYear() + 1900;
-        final int month = date.getMonth() + 1;
-        final int day = date.getDate();
-
-        return newDate(context, year, month, day, CHRONO_ITALY_UTC);
-    }
-
     // @Deprecated
     public static Timestamp convertToTimestamp(final RubyFloat value) {
         final Timestamp timestamp = new Timestamp(value.getLongValue() * 1000); // millis
@@ -333,19 +317,24 @@ public abstract class DateTimeUtils {
         // month
         end = nonDigitIndex(str, start, len);
         month = extractIntValue(str, start, end);
-
-        //sep = str.charAt(end);
-        //if ( sep != '-' ) {
-        //    throw new NumberFormatException("expected date to be dash-separated, got '" + sep + "'");
-        //}
-
         start = end + 1; // Skip '-'
 
         // day of month
         end = nonDigitIndex(str, start, len);
         day = extractIntValue(str, start, end);
 
-        return newDate(context, year, month, day, ISOChronology.getInstance(defaultZone));
+        start = end + 1; // Skip possible space
+        boolean bcEra = false;
+        if ( start + 1 < len ) {
+            final char e1 = str.charAt(start);
+            if ( e1 == 'B' && str.charAt(start + 1) == 'C' ) bcEra = true;
+        }
+
+        if ( bcEra ) year = -1 * year; // no + 1 since we use GJChronology
+
+        DateTime dateTime = new DateTime(year, month, day, 0, 0, 0, GJChronology.getInstance(defaultZone));
+        final Ruby runtime = context.runtime;
+        return runtime.getClass("Date").newInstance(context, Java.getInstance(runtime, dateTime), Block.NULL_BLOCK);
     }
 
     public static IRubyObject parseTime(final ThreadContext context, final CharSequence str, final DateTimeZone defaultZone)
@@ -570,7 +559,7 @@ public abstract class DateTimeUtils {
     }
 
     private static IRubyObject newDate(final ThreadContext context, final int year, final int month, final int day,
-                                       final Chronology chronology) {
+                                       final ISOChronology chronology) {
         // NOTE: JRuby really needs a native date.rb until than its a bit costly going from ...
         // java.sql.Date -> allocating a DateTime proxy, help a bit by shooting at the internals
         //

data/src/java/arjdbc/util/PG.java

@@ -0,0 +1,8 @@
+package arjdbc.util;
+
+/**
+ * Marker interface used to point out it is used for PG emulation support (used by mini_sql and
+ * potentially other libraries).
+ */
+public @interface PG {
+}

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-alt-adapter
 version: !ruby/object:Gem::Version
-  version: 51.7.0
+  version: 52.2.0
 platform: java
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-17 00:00:00.000000000 Z
+date: 2019-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.7
+        version: 5.2.3
   name: activerecord
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.7
-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.
+        version: 5.2.3
+description: 'Fork of the ActiveRecord JDBC adapter with support for SQL Server/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
   used with JRuby built upon Java''s JDBC API for database access. Provides (ActiveRecord)
   built-in adapters: MySQL, PostgreSQL and SQLite3 as well as adapters for popular
   databases such as Oracle, SQLServer, DB2, FireBird and even Java (embed) databases:
   Derby, HSQLDB and H2. It allows to connect to virtually any JDBC-compliant database
-  with your JRuby on Rails application. This fork supports SQL Server/Azure SQL.'
+  with your JRuby on Rails application.'
 email:
 - nick@nicksieger.com
 - ola.bini@gmail.com
@@ -76,7 +76,6 @@ files:
 - lib/active_record/connection_adapters/sqlite3_adapter.rb
 - lib/active_record/connection_adapters/sqlserver_adapter.rb
 - lib/activerecord-jdbc-adapter.rb
-- lib/activerecord-jdbc-alt-adapter.rb
 - lib/arel/visitors/compat.rb
 - lib/arel/visitors/db2.rb
 - lib/arel/visitors/derby.rb
@@ -139,6 +138,7 @@ files:
 - lib/arjdbc/mssql/adapter.rb
 - lib/arjdbc/mssql/column.rb
 - lib/arjdbc/mssql/connection_methods.rb
+- lib/arjdbc/mssql/database_limits.rb
 - lib/arjdbc/mssql/database_statements.rb
 - lib/arjdbc/mssql/errors.rb
 - lib/arjdbc/mssql/explain_support.rb
@@ -190,6 +190,7 @@ files:
 - lib/arjdbc/tasks/hsqldb_database_tasks.rb
 - lib/arjdbc/tasks/jdbc_database_tasks.rb
 - lib/arjdbc/tasks/mssql_database_tasks.rb
+- lib/arjdbc/tasks/sqlite_database_tasks_patch.rb
 - lib/arjdbc/util/quoted_cache.rb
 - lib/arjdbc/util/serialized_attributes.rb
 - lib/arjdbc/util/table_copier.rb
@@ -243,6 +244,7 @@ files:
 - src/java/arjdbc/util/CallResultSet.java
 - src/java/arjdbc/util/DateTimeUtils.java
 - src/java/arjdbc/util/ObjectSupport.java
+- src/java/arjdbc/util/PG.java
 - src/java/arjdbc/util/QuotingUtils.java
 - src/java/arjdbc/util/StringCache.java
 - src/java/arjdbc/util/StringHelper.java
@@ -270,7 +272,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project:
+rubygems_version: 2.7.6
 signing_key:
 specification_version: 4
 summary: ActiveRecord JDBC adapter, for use within JRuby on Rails and SQL Server

data/lib/activerecord-jdbc-alt-adapter.rb

@@ -1 +0,0 @@
-require 'arjdbc'