activerecord-jdbc-adapter 1.3.0.rc1 → 1.3.0

data/src/java/arjdbc/jdbc/SQLBlock.java

@@ -1,5 +1,5 @@
-/*
- **** BEGIN LICENSE BLOCK *****
+/***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2012-2013 Karol Bucek <self@kares.org>
  * Copyright (c) 2006-2010 Nick Sieger <nick@nicksieger.com>
  * Copyright (c) 2006-2007 Ola Bini <ola.bini@gmail.com>
  * Copyright (c) 2008-2009 Thomas E Enebo <enebo@acm.org>
@@ -33,12 +33,12 @@ import java.sql.Statement;
 
 /**
  * @deprecated implement a {@link Callable} directly instead.
- * 
+ *
  * @author nicksieger
  */
 @Deprecated
 public abstract class SQLBlock implements Callable {
-    
+
     /**
      * @see Callable#call(Connection)
      */

data/src/java/arjdbc/mssql/MSSQLRubyJdbcConnection.java

@@ -1,5 +1,5 @@
-/*
- **** BEGIN LICENSE BLOCK *****
+/***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2012-2013 Karol Bucek <self@kares.org>
  * Copyright (c) 2006-2010 Nick Sieger <nick@nicksieger.com>
  * Copyright (c) 2006-2007 Ola Bini <ola.bini@gmail.com>
  * Copyright (c) 2008-2009 Thomas E Enebo <enebo@acm.org>
@@ -25,8 +25,7 @@
  ***** END LICENSE BLOCK *****/
 package arjdbc.mssql;
 
-import arjdbc.jdbc.RubyJdbcConnection;
-
+import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -48,7 +47,7 @@ import org.jruby.util.ByteList;
  *
  * @author nicksieger
  */
-public class MSSQLRubyJdbcConnection extends RubyJdbcConnection {
+public class MSSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection {
 
     protected MSSQLRubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
         super(runtime, metaClass);
@@ -130,9 +129,9 @@ public class MSSQLRubyJdbcConnection extends RubyJdbcConnection {
 
     @Override
     protected ColumnData[] extractColumns(final Ruby runtime,
-        final DatabaseMetaData metaData, final ResultSet resultSet,
+        final Connection connection, final ResultSet resultSet,
         final boolean downCase) throws SQLException {
-        return filterRowNumFromColumns( super.extractColumns(runtime, metaData, resultSet, downCase) );
+        return filterRowNumFromColumns( super.extractColumns(runtime, connection, resultSet, downCase) );
     }
 
     private static final ByteList _row_num; // "_row_num"

data/src/java/arjdbc/mysql/MySQLModule.java

@@ -1,4 +1,5 @@
 /***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2012-2013 Karol Bucek <self@kares.org>
  * Copyright (c) 2006-2010 Nick Sieger <nick@nicksieger.com>
  * Copyright (c) 2006-2007 Ola Bini <ola.bini@gmail.com>
  *

data/src/java/arjdbc/mysql/MySQLRubyJdbcConnection.java

@@ -1,5 +1,5 @@
-/*
- **** BEGIN LICENSE BLOCK *****
+/***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2012-2013 Karol Bucek <self@kares.org>
  * Copyright (c) 2006-2010 Nick Sieger <nick@nicksieger.com>
  * Copyright (c) 2006-2007 Ola Bini <ola.bini@gmail.com>
  * Copyright (c) 2008-2009 Thomas E Enebo <enebo@acm.org>
@@ -30,7 +30,6 @@ import arjdbc.jdbc.Callable;
 
 import java.lang.reflect.Field;
 import java.sql.Connection;
-import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.ResultSet;
@@ -157,11 +156,10 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
             public IRubyObject call(final Connection connection) throws SQLException {
                 final Ruby runtime = context.getRuntime();
                 final RubyModule indexDefinition = getIndexDefinition(runtime);
-                final DatabaseMetaData metaData = connection.getMetaData();
-                final String jdbcTableName = caseConvertIdentifierForJdbc(metaData, tableName);
-                final String jdbcSchemaName = caseConvertIdentifierForJdbc(metaData, schemaName);
+                final String jdbcTableName = caseConvertIdentifierForJdbc(connection, tableName);
+                final String jdbcSchemaName = caseConvertIdentifierForJdbc(connection, schemaName);
                 final IRubyObject rubyTableName = RubyString.newUnicodeString(
-                    runtime, caseConvertIdentifierForJdbc(metaData, tableName)
+                    runtime, caseConvertIdentifierForJdbc(connection, tableName)
                 );
 
                 StringBuilder query = new StringBuilder("SHOW KEYS FROM ");
@@ -182,7 +180,7 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
                     String currentKeyName = null;
 
                     while ( keySet.next() ) {
-                        final String keyName = caseConvertIdentifierForRails(metaData, keySet.getString("key_name"));
+                        final String keyName = caseConvertIdentifierForRails(connection, keySet.getString("key_name"));
 
                         if ( ! keyName.equals(currentKeyName) ) {
                             currentKeyName = keyName;
@@ -202,7 +200,7 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
 
                         IRubyObject lastIndexDef = indexes.isEmpty() ? null : indexes.get(indexes.size() - 1);
                         if (lastIndexDef != null) {
-                            final String columnName = caseConvertIdentifierForRails(metaData, keySet.getString("column_name"));
+                            final String columnName = caseConvertIdentifierForRails(connection, keySet.getString("column_name"));
                             final int length = keySet.getInt("sub_part");
                             final boolean nullLength = keySet.wasNull();
 
@@ -223,6 +221,13 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
         });
     }
 
+    @Override
+    protected String caseConvertIdentifierForRails(final Connection connection, final String value)
+        throws SQLException {
+        if ( value == null ) return null;
+        return value; // MySQL does not storesUpperCaseIdentifiers() :
+    }
+
     @Override
     protected Connection newConnection() throws RaiseException, SQLException {
         final Connection connection = super.newConnection();

data/src/java/arjdbc/oracle/OracleRubyJdbcConnection.java

@@ -1,5 +1,5 @@
-/*
- **** BEGIN LICENSE BLOCK *****
+/***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2012-2013 Karol Bucek <self@kares.org>
  * Copyright (c) 2006-2010 Nick Sieger <nick@nicksieger.com>
  * Copyright (c) 2006-2007 Ola Bini <ola.bini@gmail.com>
  * Copyright (c) 2008-2009 Thomas E Enebo <enebo@acm.org>
@@ -27,9 +27,9 @@ package arjdbc.oracle;
 
 import arjdbc.jdbc.Callable;
 import arjdbc.jdbc.RubyJdbcConnection;
+
 import java.io.IOException;
 import java.io.Reader;
-
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -205,4 +205,20 @@ public class OracleRubyJdbcConnection extends RubyJdbcConnection {
         return runtime.newArray(tables);
     }
 
+    // storesMixedCaseIdentifiers() return false;
+    // storesLowerCaseIdentifiers() return false;
+    // storesUpperCaseIdentifiers() return true;
+
+    @Override
+    protected String caseConvertIdentifierForRails(final Connection connection, final String value)
+        throws SQLException {
+        return value == null ? null : value.toLowerCase();
+    }
+
+    @Override
+    protected String caseConvertIdentifierForJdbc(final Connection connection, final String value)
+        throws SQLException {
+        return value == null ? null : value.toUpperCase();
+    }
+
 }

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

@@ -1,5 +1,5 @@
-/*
- **** BEGIN LICENSE BLOCK *****
+/***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2012-2013 Karol Bucek <self@kares.org>
  * Copyright (c) 2006-2010 Nick Sieger <nick@nicksieger.com>
  * Copyright (c) 2006-2007 Ola Bini <ola.bini@gmail.com>
  * Copyright (c) 2008-2009 Thomas E Enebo <enebo@acm.org>
@@ -29,13 +29,13 @@ import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.sql.Array;
 import java.sql.Connection;
-import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Timestamp;
 import java.sql.Types;
+import java.util.List;
 import java.util.UUID;
 
 import org.jruby.Ruby;
@@ -52,6 +52,7 @@ import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
 
+import org.postgresql.PGConnection;
 import org.postgresql.PGStatement;
 import org.postgresql.util.PGInterval;
 import org.postgresql.util.PGobject;
@@ -99,18 +100,37 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
         return null; // not supported
     }
 
+    // storesMixedCaseIdentifiers() return false;
+    // storesLowerCaseIdentifiers() return true;
+    // storesUpperCaseIdentifiers() return false;
+
     @Override
-    protected String caseConvertIdentifierForJdbc(final DatabaseMetaData metaData, final String value)
+    protected String caseConvertIdentifierForRails(final Connection connection, final String value)
         throws SQLException {
-        if ( value != null ) {
-            if ( metaData.storesUpperCaseIdentifiers() ) {
-                return value.toUpperCase();
-            }
-            // for PostgreSQL we do not care about storesLowerCaseIdentifiers()
-        }
         return value;
     }
 
+    @Override
+    protected String caseConvertIdentifierForJdbc(final Connection connection, final String value)
+        throws SQLException {
+        return value;
+    }
+
+    @Override
+    protected void setStatementParameters(final ThreadContext context,
+        final Connection connection, final PreparedStatement statement,
+        final List<?> binds) throws SQLException {
+
+        ((PGConnection) connection).addDataType("daterange", DateRangeType.class);
+        ((PGConnection) connection).addDataType("tsrange",   TsRangeType.class);
+        ((PGConnection) connection).addDataType("tstzrange", TstzRangeType.class);
+        ((PGConnection) connection).addDataType("int4range", Int4RangeType.class);
+        ((PGConnection) connection).addDataType("int8range", Int8RangeType.class);
+        ((PGConnection) connection).addDataType("numrange",  NumRangeType.class);
+
+        super.setStatementParameters(context, connection, statement, binds);
+    }
+
     @Override // due statement.setNull(index, Types.BLOB) not working :
     // org.postgresql.util.PSQLException: ERROR: column "sample_binary" is of type bytea but expression is of type oid
     protected void setBlobParameter(final ThreadContext context,
@@ -175,6 +195,199 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
         super.setTimestampParameter(context, connection, statement, index, value, column, type);
     }
 
+    private static final ByteList INTERVAL =
+        new ByteList( new byte[] { 'i','n','t','e','r','v','a','l' }, false );
+
+    @Override
+    protected void setStringParameter(final ThreadContext context,
+        final Connection connection, final PreparedStatement statement,
+        final int index, final IRubyObject value,
+        final IRubyObject column, final int type) throws SQLException {
+        if ( value.isNil() ) statement.setNull(index, Types.VARCHAR);
+        else {
+            if ( column != null && ! column.isNil() ) {
+                final RubyString sqlType = column.callMethod(context, "sql_type").asString();
+
+                if ( sqlType.getByteList().startsWith( INTERVAL ) ) {
+                    statement.setObject( index, new PGInterval( value.asString().toString() ) );
+                    return;
+                }
+            }
+            statement.setString( index, value.asString().toString() );
+        }
+    }
+
+    @Override
+    protected void setObjectParameter(final ThreadContext context,
+        final Connection connection, final PreparedStatement statement,
+        final int index, Object value,
+        final IRubyObject column, final int type) throws SQLException {
+
+        final String columnType = column.callMethod(context, "type").asJavaString();
+
+        if ( columnType == (Object) "uuid" ) {
+            setUUIDParameter(statement, index, value);
+            return;
+        }
+
+        if ( columnType == (Object) "json" ) {
+            setJsonParameter(context, statement, index, value, column);
+            return;
+        }
+
+        if ( columnType == (Object) "tsvector" ) {
+            setTsVectorParameter(statement, index, value);
+            return;
+        }
+
+        if ( columnType == (Object) "cidr" || columnType == (Object) "inet"
+                || columnType == (Object) "macaddr" ) {
+            setAddressParameter(context, statement, index, value, column, columnType);
+            return;
+        }
+
+        if ( columnType != null && columnType.endsWith("range") ) {
+            setRangeParameter(context, statement, index, value, column, columnType);
+            return;
+        }
+
+        super.setObjectParameter(context, connection, statement, index, value, column, type);
+    }
+
+    private void setUUIDParameter(
+        final PreparedStatement statement, final int index,
+        Object value) throws SQLException {
+
+        if ( value instanceof IRubyObject ) {
+            final IRubyObject rubyValue = (IRubyObject) value;
+            if ( rubyValue.isNil() ) {
+                statement.setNull(index, Types.OTHER); return;
+            }
+        }
+        else if ( value == null ) {
+            statement.setNull(index, Types.OTHER); return;
+        }
+
+        final Object uuid = UUID.fromString( value.toString() );
+        statement.setObject(index, uuid);
+    }
+
+    private void setJsonParameter(final ThreadContext context,
+        final PreparedStatement statement, final int index,
+        Object value, final IRubyObject column) throws SQLException {
+
+        if ( value instanceof IRubyObject ) {
+            final IRubyObject rubyValue = (IRubyObject) value;
+            if ( rubyValue.isNil() ) {
+                statement.setNull(index, Types.OTHER); return;
+            }
+            value = column.getMetaClass().callMethod(context, "json_to_string", rubyValue);
+        }
+        else if ( value == null ) {
+            statement.setNull(index, Types.OTHER); return;
+        }
+
+        final PGobject pgJson = new PGobject();
+        pgJson.setType("json");
+        pgJson.setValue(value.toString());
+        statement.setObject(index, pgJson);
+    }
+
+    private void setTsVectorParameter(
+        final PreparedStatement statement, final int index,
+        Object value) throws SQLException {
+
+        if ( value instanceof IRubyObject ) {
+            final IRubyObject rubyValue = (IRubyObject) value;
+            if ( rubyValue.isNil() ) {
+                statement.setNull(index, Types.OTHER); return;
+            }
+        }
+        else if ( value == null ) {
+            statement.setNull(index, Types.OTHER); return;
+        }
+
+        final PGobject pgTsVector = new PGobject();
+        pgTsVector.setType("tsvector");
+        pgTsVector.setValue(value.toString());
+        statement.setObject(index, pgTsVector);
+    }
+
+    private void setAddressParameter(final ThreadContext context,
+        final PreparedStatement statement, final int index,
+        Object value, final IRubyObject column,
+        final String columnType) throws SQLException {
+
+        if ( value instanceof IRubyObject ) {
+            final IRubyObject rubyValue = (IRubyObject) value;
+            if ( rubyValue.isNil() ) {
+                statement.setNull(index, Types.OTHER); return;
+            }
+            value = column.getMetaClass().callMethod(context, "cidr_to_string", rubyValue);
+        }
+        else if ( value == null ) {
+            statement.setNull(index, Types.OTHER); return;
+        }
+
+        final PGobject pgAddress = new PGobject();
+        pgAddress.setType(columnType);
+        pgAddress.setValue(value.toString());
+        statement.setObject(index, pgAddress);
+    }
+
+    private void setRangeParameter(final ThreadContext context,
+        final PreparedStatement statement, final int index,
+        final Object value, final IRubyObject column,
+        final String columnType) throws SQLException {
+
+        final String rangeValue;
+
+        if ( value instanceof IRubyObject ) {
+            final IRubyObject rubyValue = (IRubyObject) value;
+            if ( rubyValue.isNil() ) {
+                statement.setNull(index, Types.OTHER); return;
+            }
+            rangeValue = column.getMetaClass().callMethod(context, "range_to_string", rubyValue).toString();
+        }
+        else {
+            if ( value == null ) {
+                statement.setNull(index, Types.OTHER); return;
+            }
+            rangeValue = value.toString();
+        }
+
+        final Object pgRange;
+        if ( columnType == (Object) "daterange" ) {
+            pgRange = new DateRangeType(rangeValue);
+        }
+        else if ( columnType == (Object) "tsrange" ) {
+            pgRange = new TsRangeType(rangeValue);
+        }
+        else if ( columnType == (Object) "tstzrange" ) {
+            pgRange = new TstzRangeType(rangeValue);
+        }
+        else if ( columnType == (Object) "int4range" ) {
+            pgRange = new Int4RangeType(rangeValue);
+        }
+        else if ( columnType == (Object) "int8range" ) {
+            pgRange = new Int8RangeType(rangeValue);
+        }
+        else { // if ( columnType == (Object) "numrange" )
+            pgRange = new NumRangeType(rangeValue);
+        }
+        statement.setObject(index, pgRange);
+    }
+
+    @Override
+    protected String resolveArrayBaseTypeName(final ThreadContext context,
+        final Object value, final IRubyObject column, final int type) {
+        String sqlType = column.callMethod(context, "sql_type").toString();
+        if ( sqlType.startsWith("character varying") ) return "text";
+        final int index = sqlType.indexOf('('); // e.g. "character varying(255)"
+        if ( index > 0 ) sqlType = sqlType.substring(0, index);
+        return sqlType;
+    }
+
     @Override
     protected int jdbcTypeFor(final ThreadContext context, final Ruby runtime,
         final IRubyObject column, final Object value) throws SQLException {
@@ -222,7 +435,7 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
         }
 
         final RubyString strValue = timestampToRubyString(runtime, value.toString());
-        if ( rawDateTime ) return strValue;
+        if ( rawDateTime != null && rawDateTime.booleanValue() ) return strValue;
 
         final IRubyObject adapter = callMethod(context, "adapter"); // self.adapter
         if ( adapter.isNil() ) return strValue; // NOTE: we warn on init_connection
@@ -341,4 +554,85 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
         return value;
     }
 
+    // NOTE: without these custom registered Postgre (driver) types
+    // ... we can not set range parameters in prepared statements !
+
+    public static class DateRangeType extends PGobject {
+
+        public DateRangeType() {
+            setType("daterange");
+        }
+
+        public DateRangeType(final String value) throws SQLException {
+            this();
+            setValue(value);
+        }
+
+    }
+
+    public static class TsRangeType extends PGobject {
+
+        public TsRangeType() {
+            setType("tsrange");
+        }
+
+        public TsRangeType(final String value) throws SQLException {
+            this();
+            setValue(value);
+        }
+
+    }
+
+    public static class TstzRangeType extends PGobject {
+
+        public TstzRangeType() {
+            setType("tstzrange");
+        }
+
+        public TstzRangeType(final String value) throws SQLException {
+            this();
+            setValue(value);
+        }
+
+    }
+
+    public static class Int4RangeType extends PGobject {
+
+        public Int4RangeType() {
+            setType("int4range");
+        }
+
+        public Int4RangeType(final String value) throws SQLException {
+            this();
+            setValue(value);
+        }
+
+    }
+
+    public static class Int8RangeType extends PGobject {
+
+        public Int8RangeType() {
+            setType("int8range");
+        }
+
+        public Int8RangeType(final String value) throws SQLException {
+            this();
+            setValue(value);
+        }
+
+    }
+
+    public static class NumRangeType extends PGobject {
+
+        public NumRangeType() {
+            setType("numrange");
+        }
+
+        public NumRangeType(final String value) throws SQLException {
+            this();
+            setValue(value);
+        }
+
+    }
+
 }