activerecord-jdbc-adapter 50.8-java → 51.1-java

data/src/java/arjdbc/postgresql/PostgreSQLRubyJdbcConnection.java

@@ -27,6 +27,7 @@ package arjdbc.postgresql;
 
 import arjdbc.jdbc.Callable;
 import arjdbc.jdbc.DriverWrapper;
+import arjdbc.postgresql.PostgreSQLResult;
 import arjdbc.util.DateTimeUtils;
 import arjdbc.util.StringHelper;
 
@@ -54,7 +55,6 @@ import org.joda.time.DateTimeZone;
 import org.jruby.*;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.exceptions.RaiseException;
-import org.jruby.ext.bigdecimal.RubyBigDecimal;
 import org.jruby.javasupport.JavaUtil;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
@@ -100,7 +100,6 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
         POSTGRES_JDBC_TYPE_FOR.put("line", Types.OTHER);
         POSTGRES_JDBC_TYPE_FOR.put("lseg", Types.OTHER);
         POSTGRES_JDBC_TYPE_FOR.put("ltree", Types.OTHER);
-        POSTGRES_JDBC_TYPE_FOR.put("money", Types.OTHER);
         POSTGRES_JDBC_TYPE_FOR.put("numrange", Types.OTHER);
         POSTGRES_JDBC_TYPE_FOR.put("path", Types.OTHER);
         POSTGRES_JDBC_TYPE_FOR.put("point", Types.OTHER);
@@ -281,30 +280,6 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
         return mapExecuteResult(context, connection, resultSet).toARResult(context);
     }
 
-    @Override
-    protected void setArrayParameter(final ThreadContext context,
-                                     final Connection connection, final PreparedStatement statement,
-                                     final int index, final IRubyObject value,
-                                     final IRubyObject attribute, final int type) throws SQLException {
-
-        final String typeName = resolveArrayBaseTypeName(context, attribute);
-        final RubyArray valueForDB = (RubyArray) value.callMethod(context, "values");
-
-        Object[] values;
-        switch (typeName) {
-        case "datetime":
-        case "timestamp": {
-            values = PgDateTimeUtils.timestampStringArray(context, valueForDB);
-            break;
-        }
-        default:
-            values = valueForDB.toArray();
-            break;
-        }
-
-        statement.setArray(index, connection.createArrayOf(typeName, values));
-    }
-
     @Override
     protected void setBlobParameter(final ThreadContext context,
         final Connection connection, final PreparedStatement statement,
@@ -328,9 +303,47 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
         final Connection connection, final PreparedStatement statement,
         final int index, IRubyObject value,
         final IRubyObject attribute, final int type) throws SQLException {
-        // PGJDBC uses strings internally anyway, so using Timestamp doesn't do any good
-        String tsString = PgDateTimeUtils.timestampValueToString(context, value, null, true);
-        statement.setObject(index, tsString, Types.OTHER);
+
+        if ( value instanceof RubyFloat ) {
+            final double doubleValue = ( (RubyFloat) value ).getValue();
+            if ( Double.isInfinite(doubleValue) ) {
+                setTimestampInfinity(statement, index, doubleValue);
+                return;
+            }
+        }
+
+        RubyTime timeValue = toTime(context, value);
+
+        final Timestamp timestamp;
+
+        if (timeValue.getDateTime().getYear() > 0) {
+            timeValue = timeInDefaultTimeZone(context, timeValue);
+            DateTime dateTime = timeValue.getDateTime();
+            timestamp = new Timestamp(dateTime.getMillis());
+
+            if (timeValue.getNSec() > 0) timestamp.setNanos((int) (timestamp.getNanos() + timeValue.getNSec()));
+
+            statement.setTimestamp(index, timestamp, getCalendar(dateTime.getZone()));
+        }
+        else {
+            setTimestampBC(statement, index, timeValue);
+        }
+    }
+
+    private static void setTimestampBC(final PreparedStatement statement,
+                                       final int index, final RubyTime timeValue) throws SQLException {
+        DateTime dateTime = timeValue.getDateTime();
+        @SuppressWarnings("deprecated")
+        Timestamp timestamp = new Timestamp(dateTime.getYear() - 1900,
+                dateTime.getMonthOfYear() - 1,
+                dateTime.getDayOfMonth(),
+                dateTime.getHourOfDay(),
+                dateTime.getMinuteOfHour(),
+                dateTime.getSecondOfMinute(),
+                dateTime.getMillisOfSecond() * 1_000_000 + (int) timeValue.getNSec()
+        );
+
+        statement.setObject(index, timestamp);
     }
 
     private static void setTimestampInfinity(final PreparedStatement statement,
@@ -352,8 +365,7 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
         final int index, IRubyObject value,
         final IRubyObject attribute, final int type) throws SQLException {
         // to handle more fractional second precision than (default) 59.123 only
-        String timeStr = DateTimeUtils.timeString(context, value, getDefaultTimeZone(context), true);
-        statement.setObject(index, timeStr, Types.OTHER);
+        super.setTimestampParameter(context, connection, statement, index, value, attribute, type);
     }
 
     @Override
@@ -407,7 +419,8 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
                 break;
 
             case "enum":
-                statement.setObject(index, value.toString(), Types.OTHER);
+                // FIXME: This doesn't work but it gives a better error message than letting it be treated as a PGobject
+                statement.setObject(index, value.toString());
                 break;
 
             case "interval":
@@ -428,14 +441,6 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
                 }
                 break;
 
-            case "money":
-                if (value instanceof RubyBigDecimal) {
-                    statement.setBigDecimal(index, ((RubyBigDecimal) value).getValue());
-                } else {
-                    setPGobjectParameter(statement, index, value, columnType);
-                }
-                break;
-
             case "lseg":
                 pointValues = parseDoubles(value);
                 statement.setObject(index, new PGlseg(pointValues[0], pointValues[1], pointValues[2], pointValues[3]));
@@ -480,7 +485,7 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
         return points;
     }
 
-    private static Double[] parseDoubles(IRubyObject value) {
+    private Double[] parseDoubles(IRubyObject value) {
         Matcher matches = doubleValuePattern.matcher(value.toString());
         ArrayList<Double> doubles = new ArrayList<Double>(4); // Paths and polygons may be larger but this covers points/circles/boxes/line segments
 

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

@@ -28,10 +28,8 @@ import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.TimeZone;
 
-import org.joda.time.Chronology;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
-import org.joda.time.chrono.GJChronology;
 import org.joda.time.chrono.ISOChronology;
 import org.jruby.Ruby;
 import org.jruby.RubyFloat;
@@ -42,7 +40,6 @@ import org.jruby.runtime.Block;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
-import org.jruby.util.TypeConverter;
 
 import static arjdbc.util.StringHelper.decByte;
 
@@ -52,20 +49,6 @@ import static arjdbc.util.StringHelper.decByte;
  */
 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");
-        }
-        return (RubyTime) value;
-    }
-
-    public static DateTime dateTimeInZone(final DateTime dateTime, final DateTimeZone zone) {
-        if (zone == dateTime.getZone()) return dateTime;
-        return dateTime.withZone(zone);
-    }
-
     @SuppressWarnings("deprecation")
     public static ByteList timeToString(final Time time) {
         final ByteList str = new ByteList(8); // hh:mm:ss
@@ -221,11 +204,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 +219,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 +246,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
@@ -570,7 +540,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
         //
@@ -607,110 +577,4 @@ public abstract class DateTimeUtils {
         return n;
     }
 
-
-    private static final char[] ZEROS = {'0', '0', '0', '0', '0', '0'};
-    private static final char[][] NUMBERS;
-
-    static {
-        // maximum value is 60 (seconds)
-        NUMBERS = new char[60][];
-        for (int i = 0; i < NUMBERS.length; i++) {
-            NUMBERS[i] = ((i < 10 ? "0" : "") + Integer.toString(i)).toCharArray();
-        }
-    }
-
-    /**
-     * Converts a ruby timestamp to a java string, optionally with timezone and timezone adjustment
-     * @param context
-     * @param value the ruby value, typically a Time
-     * @param zone DateTimeZone to adjust to, optional
-     * @param withZone include timezone in the string?
-     * @return timestamp as string
-     */
-    public static String timestampTimeToString(final ThreadContext context,
-                                               final IRubyObject value, DateTimeZone zone, boolean withZone) {
-        RubyTime timeValue = toTime(context, value);
-        DateTime dt = timeValue.getDateTime();
-
-        StringBuilder sb = new StringBuilder(36);
-
-        int year = dt.getYear();
-        if (year <= 0) {
-            year--;
-        } else if (zone != null) {
-            dt = dateTimeInZone(dt, zone);
-            year = dt.getYear();
-        }
-
-        Chronology chrono = dt.getChronology();
-        long millis = dt.getMillis();
-
-        // always use 4 digits for year to avoid short dates being misinterpreted
-        sb.append(Math.abs(year));
-        int lead = 4 - sb.length();
-        if (lead > 0) sb.insert(0, ZEROS, 0, lead);
-        sb.append('-');
-        sb.append(NUMBERS[chrono.monthOfYear().get(millis)]);
-        sb.append('-');
-        sb.append(NUMBERS[chrono.dayOfMonth().get(millis)]);
-        if (year < 0) sb.append(" BC");
-        sb.append(' ');
-
-        appendTime(sb, chrono, millis, (int) timeValue.getUSec(), withZone);
-
-        return sb.toString();
-    }
-
-    /**
-     * Converts a ruby time to a java string, optionally with timezone and timezone adjustment
-     * @param context
-     * @param value the ruby value, typically a Time
-     * @param zone DateTimeZone to adjust to, optional
-     * @param withZone include timezone in the string?
-     * @return time as string
-     */
-    public static String timeString(final ThreadContext context,
-                                    final IRubyObject value, DateTimeZone zone, boolean withZone) {
-        StringBuilder sb = new StringBuilder(21);
-        RubyTime timeValue = toTime(context, value);
-        DateTime dt = timeValue.getDateTime();
-        if (zone != null) dt = dateTimeInZone(dt, zone);
-
-        appendTime(sb, dt.getChronology(), dt.getMillis(), (int) timeValue.getUSec(), withZone);
-        return sb.toString();
-    }
-
-    private static void appendTime(StringBuilder sb, Chronology chrono,
-                                   long millis, int usec, boolean withZone) {
-        sb.append(NUMBERS[chrono.hourOfDay().get(millis)]);
-        sb.append(':');
-        sb.append(NUMBERS[chrono.minuteOfHour().get(millis)]);
-        sb.append(':');
-        sb.append(NUMBERS[chrono.secondOfMinute().get(millis)]);
-
-        // PG has microsecond resolution. Change when nanos are required
-        int micros = chrono.millisOfSecond().get(millis) * 1000 + usec;
-        if (micros > 0) {
-            sb.append('.');
-
-            int len = sb.length();
-            sb.append(micros);
-            int lead = 6 - (sb.length() - len);
-            if (lead > 0) sb.insert(len, ZEROS, 0, lead);
-
-            for (int end = sb.length() - 1; sb.charAt(end) == '0'; end--) {
-                sb.setLength(end);
-            }
-        }
-
-        if (withZone) {
-            int offset = chrono.getZone().getOffset(millis) / 1000;
-            int absoff = Math.abs(offset);
-            int hours = absoff / 3600;
-            int mins = (absoff - hours * 3600) / 60;
-
-            sb.append(offset < 0 ? '-' : '+');
-            sb.append(NUMBERS[hours]).append(':').append(NUMBERS[mins]);
-        }
-    }
 }

data/src/java/arjdbc/util/QuotingUtils.java

@@ -52,6 +52,7 @@ public abstract class QuotingUtils {
         return quoteCharWith(context, string, value, quote, 0, 8);
     }
 
+    @SuppressWarnings("deprecation")
     public static RubyString quoteCharWith(
             final ThreadContext context,
             final RubyString string,
@@ -71,8 +72,8 @@ public abstract class QuotingUtils {
                         new byte[realSize + newOffset + newSizeDiff],
                         stringBytes.getEncoding(), false
                     );
-                    quotedBytes.setBegin(newOffset);
-                    quotedBytes.setRealSize(0);
+                    quotedBytes.begin = newOffset;
+                    quotedBytes.realSize = 0;
                 }
                 quotedBytes.append(bytes, appendFrom, i - appendFrom);
                 quotedBytes.append(quote).append(value); // e.g. "'" => "''"
@@ -87,6 +88,7 @@ public abstract class QuotingUtils {
         return context.runtime.newString(quotedBytes);
     }
 
+    @SuppressWarnings("deprecation")
     public static RubyString quoteCharAndDecorateWith(
         final ThreadContext context, final RubyString string,
         final char value, final char quote,
@@ -100,7 +102,7 @@ public abstract class QuotingUtils {
             final ByteList quoted = new ByteList(
                 new byte[realSize + 2], string.getEncoding(), false
             );
-            quoted.setRealSize(0);
+            quoted.begin = 0; quoted.realSize = 0;
             quoted.append(prefix);
             quoted.append(str.unsafeBytes(), str.getBegin(), realSize);
             quoted.append(suffix);
@@ -108,9 +110,8 @@ public abstract class QuotingUtils {
         }
         // we got a new string with a reserve of 1 byte front and back :
         final ByteList quoted = quotedString.getByteList();
-        quoted.setBegin(0);
-        quoted.unsafeBytes()[0] = prefix;
-        quoted.setRealSize(quoted.getRealSize() + 1);
+        quoted.begin = 0; // setBegin invalidates
+        quoted.bytes[0] = prefix; quoted.realSize++;
         quoted.append(suffix);
         return quotedString;
     }

data/src/java/arjdbc/util/StringHelper.java

@@ -25,9 +25,12 @@ package arjdbc.util;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.Charset;
 
 import org.jcodings.Encoding;
+import org.jcodings.specific.UTF8Encoding;
 import org.jruby.Ruby;
+import org.jruby.RubyEncoding;
 import org.jruby.RubyString;
 import org.jruby.util.ByteList;
 
@@ -58,6 +61,18 @@ public abstract class StringHelper {
         return RubyString.newString(runtime, new ByteList(bytes, false));
     }
 
+    private static final Charset ASCII_CHARSET = Charset.forName("ISO-8859-1");
+
+    public static RubyString newASCIIString(final Ruby runtime, final String str) {
+        final ByteList byteList = new ByteList(str.getBytes(ASCII_CHARSET), false);
+        return RubyString.newString(runtime, byteList);
+    }
+
+    public static RubyString newUTF8String(final Ruby runtime, final byte[] bytes) {
+        final ByteList byteList = new ByteList(bytes, false);
+        return RubyString.newString(runtime, byteList, UTF8Encoding.INSTANCE);
+    }
+
     public static RubyString newDefaultInternalString(final Ruby runtime, final byte[] bytes) {
         final ByteList byteList = new ByteList(bytes, false);
         Encoding enc = runtime.getDefaultInternalEncoding();
@@ -68,19 +83,18 @@ public abstract class StringHelper {
     public static RubyString newDefaultInternalString(final Ruby runtime, final CharSequence str) {
         Encoding enc = runtime.getDefaultInternalEncoding();
         if (enc == null) enc = runtime.getEncodingService().getJavaDefault();
-        return new RubyString(runtime, runtime.getString(), str, enc);
+        return RubyString.newString(runtime, new ByteList(RubyEncoding.encode(str, enc.getCharset()), enc));
     }
 
-    // NOTE: a 'better' RubyString.newInternalFromJavaExternal - to be back-ported in JRuby 9.2
     public static RubyString newDefaultInternalString(final Ruby runtime, final String str) {
-        Encoding enc = runtime.getDefaultInternalEncoding();
-        if (enc == null) enc = runtime.getEncodingService().getJavaDefault();
-        return RubyString.newString(runtime, str, enc);
+        return RubyString.newInternalFromJavaExternal(runtime, str);
     }
 
     public static int readBytes(final ByteList output, final InputStream input)
         throws IOException {
-        return readBytes(output, input, output.unsafeBytes().length - output.getBegin());
+        @SuppressWarnings("deprecation") // capacity :
+        final int buffSize = output.bytes.length - output.begin;
+        return readBytes(output, input, buffSize);
     }
 
     public static int readBytes(final ByteList output, final InputStream input, int buffSize)