activerecord-jdbc-adapter 1.3.0.beta2 → 1.3.0.rc1

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

@@ -31,7 +31,6 @@ import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
-import java.util.List;
 
 import org.jcodings.specific.UTF8Encoding;
 
@@ -50,7 +49,7 @@ import org.jruby.util.ByteList;
  * @author nicksieger
  */
 public class MSSQLRubyJdbcConnection extends RubyJdbcConnection {
-    
+
     protected MSSQLRubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
         super(runtime, metaClass);
     }
@@ -68,27 +67,27 @@ public class MSSQLRubyJdbcConnection extends RubyJdbcConnection {
             return new MSSQLRubyJdbcConnection(runtime, klass);
         }
     };
-   
+
     private static final byte[] EXEC = new byte[] { 'e', 'x', 'e', 'c' };
-    
+
     @JRubyMethod(name = "exec?", required = 1, meta = true, frame = false)
     public static IRubyObject exec_p(ThreadContext context, IRubyObject self, IRubyObject sql) {
         final ByteList sqlBytes = sql.convertToString().getByteList();
         return context.getRuntime().newBoolean( startsWithIgnoreCase(sqlBytes, EXEC) );
     }
-    
+
     @Override
-    protected RubyArray mapTables(final Ruby runtime, final DatabaseMetaData metaData, 
-            final String catalog, final String schemaPattern, final String tablePattern, 
+    protected RubyArray mapTables(final Ruby runtime, final DatabaseMetaData metaData,
+            final String catalog, final String schemaPattern, final String tablePattern,
             final ResultSet tablesSet) throws SQLException, IllegalStateException {
-        
+
         final RubyArray tables = runtime.newArray();
-        
+
         while ( tablesSet.next() ) {
             String schema = tablesSet.getString(TABLES_TABLE_SCHEM);
             if ( schema != null ) schema = schema.toLowerCase();
             // Under MS-SQL, don't return system tables/views unless explicitly asked for :
-            if ( schemaPattern == null && 
+            if ( schemaPattern == null &&
                 ( "sys".equals(schema) || "information_schema".equals(schema) ) ) {
                 continue;
             }
@@ -98,9 +97,9 @@ public class MSSQLRubyJdbcConnection extends RubyJdbcConnection {
                 // EXPLAIN is on (e.g. `SET SHOWPLAN_TEXT ON`) not returning
                 // correct result set with table info (null NAME, invalid CAT)
                 throw new IllegalStateException("got null name while matching table(s): [" +
-                    catalog + "." + schemaPattern + "." + tablePattern + "] check " + 
-                    "if this happened during EXPLAIN (SET SHOWPLAN_TEXT ON) if so please try " + 
-                    "turning it off using the system property 'arjdbc.mssql.explain_support.disabled=true' " + 
+                    catalog + "." + schemaPattern + "." + tablePattern + "] check " +
+                    "if this happened during EXPLAIN (SET SHOWPLAN_TEXT ON) if so please try " +
+                    "turning it off using the system property 'arjdbc.mssql.explain_support.disabled=true' " +
                     "or programatically by changing: `ArJdbc::MSSQL::ExplainSupport::DISABLED`");
             }
             name = caseConvertIdentifierForRails(metaData, name);
@@ -108,7 +107,7 @@ public class MSSQLRubyJdbcConnection extends RubyJdbcConnection {
         }
         return tables;
     }
-    
+
     /**
      * Microsoft SQL 2000+ support schemas
      */
@@ -116,30 +115,32 @@ public class MSSQLRubyJdbcConnection extends RubyJdbcConnection {
     protected boolean databaseSupportsSchemas() {
         return true;
     }
-    
+
     /**
      * Treat LONGVARCHAR as CLOB on MSSQL for purposes of converting a JDBC value to Ruby.
      */
     @Override
-    protected IRubyObject jdbcToRuby(Ruby runtime, int column, int type, ResultSet resultSet)
+    protected IRubyObject jdbcToRuby(
+        final ThreadContext context, final Ruby runtime,
+        final int column, int type, final ResultSet resultSet)
         throws SQLException {
         if ( type == Types.LONGVARCHAR || type == Types.LONGNVARCHAR ) type = Types.CLOB;
-        return super.jdbcToRuby(runtime, column, type, resultSet);
+        return super.jdbcToRuby(context, runtime, column, type, resultSet);
     }
 
     @Override
-    protected ColumnData[] extractColumns(final Ruby runtime, 
-        final DatabaseMetaData metaData, final ResultSet resultSet, 
+    protected ColumnData[] extractColumns(final Ruby runtime,
+        final DatabaseMetaData metaData, final ResultSet resultSet,
         final boolean downCase) throws SQLException {
         return filterRowNumFromColumns( super.extractColumns(runtime, metaData, resultSet, downCase) );
     }
-    
+
     private static final ByteList _row_num; // "_row_num"
     static {
         _row_num = new ByteList(new byte[] { '_','r','o','w','_','n','u','m' }, false);
         _row_num.setEncoding(UTF8Encoding.INSTANCE);
     }
-    
+
     /**
      * Filter out the <tt>_row_num</tt> column from results.
      */
@@ -147,7 +148,7 @@ public class MSSQLRubyJdbcConnection extends RubyJdbcConnection {
         for ( int i = 0; i < columns.length; i++ ) {
             if ( _row_num.equal( columns[i].name.getByteList() ) ) {
                 final ColumnData[] filtered = new ColumnData[columns.length - 1];
-                
+
                 if ( i > 0 ) {
                     System.arraycopy(columns, 0, filtered, 0, i);
                 }
@@ -161,5 +162,5 @@ public class MSSQLRubyJdbcConnection extends RubyJdbcConnection {
         }
         return columns;
     }
-    
+
 }

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

@@ -24,11 +24,9 @@
 
 package arjdbc.mysql;
 
-import static arjdbc.jdbc.RubyJdbcConnection.debugStackTrace;
 import static arjdbc.util.QuotingUtils.BYTES_0;
 import static arjdbc.util.QuotingUtils.BYTES_1;
-
-import java.sql.Connection;
+import static arjdbc.util.QuotingUtils.quoteCharWith;
 
 import org.jcodings.specific.UTF8Encoding;
 
@@ -41,7 +39,7 @@ import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
 
 public class MySQLModule {
-    
+
     public static RubyModule load(final RubyModule arJdbc) {
         RubyModule mysql = arJdbc.defineModuleUnder("MySQL");
         mysql.defineAnnotatedMethods(MySQLModule.class);
@@ -57,16 +55,16 @@ public class MySQLModule {
     //private final static byte[] ESCAPE = new byte[] {'\\','\\'};
 
     private static final int STRING_QUOTES_OPTIMISTIC_QUESS = 24;
-    
+
     @JRubyMethod(name = "quote_string", required = 1, frame = false)
-    public static IRubyObject quote_string(final ThreadContext context, 
+    public static IRubyObject quote_string(final ThreadContext context,
         final IRubyObject recv, final IRubyObject string) {
-        
+
         final ByteList stringBytes = ((RubyString) string).getByteList();
         final byte[] bytes = stringBytes.unsafeBytes();
         final int begin = stringBytes.getBegin();
         final int realSize = stringBytes.getRealSize();
-        
+
         ByteList quotedBytes = null; int appendFrom = begin;
         for ( int i = begin; i < begin + realSize; i++ ) {
             final byte byte2;
@@ -83,7 +81,7 @@ public class MySQLModule {
             if ( byte2 != 0 ) {
                 if ( quotedBytes == null ) {
                     quotedBytes = new ByteList(
-                        new byte[realSize + STRING_QUOTES_OPTIMISTIC_QUESS], 
+                        new byte[realSize + STRING_QUOTES_OPTIMISTIC_QUESS],
                         stringBytes.getEncoding()
                     );
                     quotedBytes.setBegin(0);
@@ -109,37 +107,40 @@ public class MySQLModule {
 
     @JRubyMethod(name = "quoted_true", required = 0, frame = false)
     public static IRubyObject quoted_true(
-            final ThreadContext context, 
+            final ThreadContext context,
             final IRubyObject self) {
         return RubyString.newString(context.getRuntime(), BYTES_1);
     }
-    
+
     @JRubyMethod(name = "quoted_false", required = 0, frame = false)
     public static IRubyObject quoted_false(
-            final ThreadContext context, 
+            final ThreadContext context,
             final IRubyObject self) {
         return RubyString.newString(context.getRuntime(), BYTES_0);
     }
-    
-    /**
-     * HACK HACK HACK See http://bugs.mysql.com/bug.php?id=36565
-     * MySQL's statement cancel timer can cause memory leaks, so cancel it
-     * if we loaded MySQL classes from the same classloader as JRuby
-     */
-    @JRubyMethod(module = true, frame = false)
-    public static IRubyObject kill_cancel_timer(final ThreadContext context, 
-        final IRubyObject self, final IRubyObject raw_connection) {
-        
-        final Connection conn = (Connection) raw_connection.dataGetStruct();
-        if (conn != null && conn.getClass().getClassLoader() == self.getRuntime().getJRubyClassLoader()) {
-            try {
-                java.lang.reflect.Field f = conn.getClass().getDeclaredField("cancelTimer");
-                f.setAccessible(true);
-                java.util.Timer timer = (java.util.Timer) f.get(null);
-                timer.cancel();
-            }
-            catch (Exception e) { debugStackTrace(context, e); }
+
+    @JRubyMethod(name = "quote_column_name", required = 1, frame = false)
+    public static IRubyObject quote_column_name(
+            final ThreadContext context,
+            final IRubyObject self,
+            final IRubyObject string) { // "`#{name.to_s.gsub('`', '``')}`"
+        RubyString origin = string.asString();
+        RubyString quoted = quoteCharWith(context, origin, '`', '`');
+        final ByteList bytes = quoted.getByteList();
+        if ( origin == quoted ) {
+            final RubyString result =
+                RubyString.newStringLight(context.getRuntime(), bytes.getRealSize() + 2, bytes.getEncoding());
+            final ByteList resultBytes = result.getByteList();
+            resultBytes.append( (byte) '`' );
+            resultBytes.append( bytes );
+            resultBytes.append( (byte) '`' );
+            return result;
+        }
+        else {
+            bytes.append( (byte) '`' );
+            bytes.prepend( (byte) '`' );
+            return quoted;
         }
-        return self.getRuntime().getNil();
     }
+
 }

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

@@ -28,20 +28,26 @@ package arjdbc.mysql;
 import arjdbc.jdbc.RubyJdbcConnection;
 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;
 import java.sql.Statement;
+import java.sql.Time;
+import java.sql.Timestamp;
 import java.sql.Types;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.TimeZone;
 
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
+import org.jruby.RubyFloat;
 import org.jruby.RubyModule;
 import org.jruby.RubyString;
+import org.jruby.exceptions.RaiseException;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
@@ -56,48 +62,95 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
         super(runtime, metaClass);
     }
 
+    private static ObjectAllocator MYSQL_JDBCCONNECTION_ALLOCATOR = new ObjectAllocator() {
+        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
+            return new MySQLRubyJdbcConnection(runtime, klass);
+        }
+    };
+
+    public static RubyClass createMySQLJdbcConnectionClass(Ruby runtime, RubyClass jdbcConnection) {
+        RubyClass clazz = getConnectionAdapters(runtime).
+            defineClassUnder("MySQLJdbcConnection", jdbcConnection, MYSQL_JDBCCONNECTION_ALLOCATOR);
+        clazz.defineAnnotatedMethods(MySQLRubyJdbcConnection.class);
+        return clazz;
+    }
+
     @Override
-    protected boolean doExecute(final Statement statement, 
-        final String query) throws SQLException {
+    protected boolean doExecute(final Statement statement, final String query)
+        throws SQLException {
         return statement.execute(query, Statement.RETURN_GENERATED_KEYS);
     }
 
     @Override
-    protected IRubyObject unmarshalKeysOrUpdateCount(final ThreadContext context, 
+    protected IRubyObject mapGeneratedKeysOrUpdateCount(final ThreadContext context,
         final Connection connection, final Statement statement) throws SQLException {
         final Ruby runtime = context.getRuntime();
-        final IRubyObject key = unmarshalIdResult(runtime, statement);
-        return key.isNil() ? runtime.newFixnum(statement.getUpdateCount()) : key;
+        final IRubyObject key = mapGeneratedKeys(runtime, connection, statement);
+        return ( key == null || key.isNil() ) ? runtime.newFixnum( statement.getUpdateCount() ) : key;
     }
 
     @Override
-    protected IRubyObject jdbcToRuby(Ruby runtime, int column, int type, ResultSet resultSet)
+    protected IRubyObject jdbcToRuby(
+        final ThreadContext context, final Ruby runtime,
+        final int column, final int type, final ResultSet resultSet)
         throws SQLException {
         if ( Types.BOOLEAN == type || Types.BIT == type ) {
             final boolean value = resultSet.getBoolean(column);
             return resultSet.wasNull() ? runtime.getNil() : runtime.newFixnum(value ? 1 : 0);
         }
-        return super.jdbcToRuby(runtime, column, type, resultSet);
+        return super.jdbcToRuby(context, runtime, column, type, resultSet);
     }
 
-    private static ObjectAllocator MYSQL_JDBCCONNECTION_ALLOCATOR = new ObjectAllocator() {
-        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
-            return new MySQLRubyJdbcConnection(runtime, klass);
+    @Override // can not use statement.setTimestamp( int, Timestamp, Calendar )
+    protected void setTimestampParameter(final ThreadContext context,
+        final Connection connection, final PreparedStatement statement,
+        final int index, IRubyObject value,
+        final IRubyObject column, final int type) throws SQLException {
+        if ( value.isNil() ) statement.setNull(index, Types.TIMESTAMP);
+        else {
+            value = getTimeInDefaultTimeZone(context, value);
+            if ( value instanceof RubyString ) { // yyyy-[m]m-[d]d hh:mm:ss[.f...]
+                final Timestamp timestamp = Timestamp.valueOf( value.toString() );
+                statement.setTimestamp( index, timestamp ); // assume local time-zone
+            }
+            else { // Time or DateTime ( ActiveSupport::TimeWithZone.to_time )
+                final double time = adjustTimeFromDefaultZone(value);
+                final RubyFloat timeValue = context.getRuntime().newFloat( time );
+                statement.setTimestamp( index, convertToTimestamp(timeValue) );
+            }
         }
-    };
-    
-    public static RubyClass createMySQLJdbcConnectionClass(Ruby runtime, RubyClass jdbcConnection) {
-        RubyClass clazz = getConnectionAdapters(runtime).
-            defineClassUnder("MySQLJdbcConnection", jdbcConnection, MYSQL_JDBCCONNECTION_ALLOCATOR);
-        clazz.defineAnnotatedMethods(MySQLRubyJdbcConnection.class);
-        return clazz;
     }
 
-    /*
-    public static RubyClass getMySQLJdbcConnectionClass(final Ruby runtime) {
-        return getConnectionAdapters(runtime).getClass("MySQLJdbcConnection");
-    } */
-    
+    @Override // can not use statement.setTime( int, Time, Calendar )
+    protected void setTimeParameter(final ThreadContext context,
+        final Connection connection, final PreparedStatement statement,
+        final int index, IRubyObject value,
+        final IRubyObject column, final int type) throws SQLException {
+        if ( value.isNil() ) statement.setNull(index, Types.TIME);
+        else {
+            value = getTimeInDefaultTimeZone(context, value);
+            if ( value instanceof RubyString ) {
+                final Time time = Time.valueOf( value.toString() );
+                statement.setTime( index, time ); // assume local time-zone
+            }
+            else { // Time or DateTime ( ActiveSupport::TimeWithZone.to_time )
+                final double timeValue = adjustTimeFromDefaultZone(value);
+                final Time time = new Time(( (long) timeValue ) * 1000); // millis
+                // java.sql.Time is expected to be only up to second precision
+                statement.setTime( index, time );
+            }
+        }
+    }
+
+    private static double adjustTimeFromDefaultZone(final IRubyObject value) {
+        // Time's to_f is : ( millis * 1000 + usec ) / 1_000_000.0
+        final double time = value.convertToFloat().getDoubleValue(); // to_f
+        // NOTE: MySQL assumes default TZ thus need to adjust to match :
+        final int offset = TimeZone.getDefault().getOffset((long) time * 1000);
+        // Time's to_f is : ( millis * 1000 + usec ) / 1_000_000.0
+        return time - ( offset / 1000.0 );
+    }
+
     @Override
     protected IRubyObject indexes(final ThreadContext context, final String tableName, final String name, final String schemaName) {
         return withConnection(context, new Callable<IRubyObject>() {
@@ -110,14 +163,14 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
                 final IRubyObject rubyTableName = RubyString.newUnicodeString(
                     runtime, caseConvertIdentifierForJdbc(metaData, tableName)
                 );
-                
+
                 StringBuilder query = new StringBuilder("SHOW KEYS FROM ");
                 if (jdbcSchemaName != null) {
                     query.append(jdbcSchemaName).append(".");
                 }
                 query.append(jdbcTableName);
                 query.append(" WHERE key_name != 'PRIMARY'");
-                
+
                 final List<IRubyObject> indexes = new ArrayList<IRubyObject>();
                 PreparedStatement statement = null;
                 ResultSet keySet = null;
@@ -125,7 +178,7 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
                 try {
                     statement = connection.prepareStatement(query.toString());
                     keySet = statement.executeQuery();
-                    
+
                     String currentKeyName = null;
 
                     while ( keySet.next() ) {
@@ -135,7 +188,7 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
                             currentKeyName = keyName;
 
                             final boolean nonUnique = keySet.getBoolean("non_unique");
-                            
+
                             IRubyObject[] args = new IRubyObject[] {
                                 rubyTableName, // table_name
                                 RubyString.newUnicodeString(runtime, keyName), // index_name
@@ -153,14 +206,14 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
                             final int length = keySet.getInt("sub_part");
                             final boolean nullLength = keySet.wasNull();
 
-                            lastIndexDef.callMethod(context, "columns").callMethod(context, 
+                            lastIndexDef.callMethod(context, "columns").callMethod(context,
                                     "<<", RubyString.newUnicodeString(runtime, columnName));
-                            lastIndexDef.callMethod(context, "lengths").callMethod(context, 
+                            lastIndexDef.callMethod(context, "lengths").callMethod(context,
                                     "<<", nullLength ? runtime.getNil() : runtime.newFixnum(length));
                         }
                     }
-                    
-                    return runtime.newArray(indexes);    
+
+                    return runtime.newArray(indexes);
                 }
                 finally {
                     close(keySet);
@@ -169,4 +222,68 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
             }
         });
     }
+
+    @Override
+    protected Connection newConnection() throws RaiseException, SQLException {
+        final Connection connection = super.newConnection();
+        killCancelTimer(connection);
+        return connection;
+    }
+
+    /**
+     * HACK HACK HACK See http://bugs.mysql.com/bug.php?id=36565
+     * MySQL's statement cancel timer can cause memory leaks, so cancel it
+     * if we loaded MySQL classes from the same class-loader as JRuby
+     *
+     * NOTE: this will likely do nothing on a recent driver esp. since MySQL's
+     * Connector/J supports JDBC 4.0 (Java 6+) which we now require at minimum
+     */
+    private void killCancelTimer(final Connection connection) {
+        if (connection.getClass().getClassLoader() == getRuntime().getJRubyClassLoader()) {
+            Field field = cancelTimerField();
+            if ( field != null ) {
+                java.util.Timer timer = null;
+                try {
+                    // connection likely: com.mysql.jdbc.JDBC4Connection
+                    // or (for 3.0) super class: com.mysql.jdbc.ConnectionImpl
+                    timer = (java.util.Timer)
+                        field.get( connection.unwrap(Connection.class) );
+                }
+                catch (SQLException e) {
+                    debugMessage( e.toString() );
+                }
+                catch (IllegalAccessException e) {
+                    debugMessage( e.toString() );
+                }
+                if ( timer != null ) timer.cancel();
+            }
+        }
+    }
+
+    private static Field cancelTimer = null;
+    private static boolean cancelTimerChecked = false;
+
+    private static Field cancelTimerField() {
+        if ( cancelTimerChecked ) return cancelTimer;
+        try {
+            Class klass = Class.forName("com.mysql.jdbc.ConnectionImpl");
+            Field field = klass.getDeclaredField("cancelTimer");
+            field.setAccessible(true);
+            synchronized(MySQLRubyJdbcConnection.class) {
+                if ( cancelTimer == null ) cancelTimer = field;
+            }
+        }
+        catch (ClassNotFoundException e) {
+            debugMessage("INFO: missing MySQL JDBC connection impl: " + e);
+        }
+        catch (NoSuchFieldException e) {
+            debugMessage("INFO: MySQL's cancel timer seems to have changed: " + e);
+        }
+        catch (SecurityException e) {
+            debugMessage( e.toString() );
+        }
+        finally { cancelTimerChecked = true; }
+        return cancelTimer;
+    }
+
 }