activerecord-jdbc-adapter 0.9.1 → 0.9.2

data/src/java/jdbc_adapter/JdbcMySQLSpec.java

@@ -102,9 +102,10 @@ public class JdbcMySQLSpec {
 
         newBytes.insert(0, BACKQUOTE);
         newBytes.append(bytes);
-        int i = 0;
-        while ((i = newBytes.indexOf('.')) != -1) {
+        int i = 0, j = 0;
+        while ((i = newBytes.indexOf('.', j)) != -1) {
             newBytes.replace(i, 1, QUOTED_DOT);
+            j = i+3;
         }
         newBytes.append(BACKQUOTE);
 

data/src/java/jdbc_adapter/MssqlRubyJdbcConnection.java

@@ -0,0 +1,71 @@
+/*
+ **** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2006-2009 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>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ ***** END LICENSE BLOCK *****/
+package jdbc_adapter;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
+import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.builtin.IRubyObject;
+
+/**
+ *
+ * @author nicksieger
+ */
+public class MssqlRubyJdbcConnection extends RubyJdbcConnection {
+
+    protected MssqlRubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
+        super(runtime, metaClass);
+    }
+
+    public static RubyClass createMssqlJdbcConnectionClass(Ruby runtime, RubyClass jdbcConnection) {
+        RubyClass clazz = RubyJdbcConnection.getConnectionAdapters(runtime).defineClassUnder("MssqlJdbcConnection",
+                jdbcConnection, MSSQL_JDBCCONNECTION_ALLOCATOR);
+        clazz.defineAnnotatedMethods(MssqlRubyJdbcConnection.class);
+
+        return clazz;
+    }
+    private static ObjectAllocator MSSQL_JDBCCONNECTION_ALLOCATOR = new ObjectAllocator() {
+
+        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
+            return new MssqlRubyJdbcConnection(runtime, klass);
+        }
+    };
+
+    /**
+     * 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)
+            throws SQLException {
+        if (type == Types.LONGVARCHAR) {
+            type = Types.CLOB;
+        }
+        return super.jdbcToRuby(runtime, column, type, resultSet);
+    }
+}

data/src/java/jdbc_adapter/PostgresRubyJdbcConnection.java

@@ -1,8 +1,28 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
+ **** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2006-2009 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>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ ***** END LICENSE BLOCK *****/
 package jdbc_adapter;
 
 import org.jruby.Ruby;

data/src/java/jdbc_adapter/RubyJdbcConnection.java

@@ -76,7 +76,7 @@ public class RubyJdbcConnection extends RubyObject {
     private static final String[] TABLE_TYPE = new String[]{"TABLE"};
 
     private static RubyObjectAdapter rubyApi;
-    
+
     protected RubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
         super(runtime, metaClass);
     }
@@ -103,9 +103,13 @@ public class RubyJdbcConnection extends RubyObject {
 
     @JRubyMethod(name = "begin")
     public IRubyObject begin(ThreadContext context) throws SQLException {
-        getConnection(true).setAutoCommit(false);
-
-        return context.getRuntime().getNil();
+        final Ruby runtime = context.getRuntime();
+        return (IRubyObject) withConnectionAndRetry(context, new SQLBlock() {
+          public Object call(Connection c) throws SQLException {
+            getConnection(true).setAutoCommit(false);
+            return runtime.getNil();
+          }
+        });
     }
 
     @JRubyMethod(name = {"columns", "columns_internal"}, required = 1, optional = 2)
@@ -126,7 +130,7 @@ public class RubyJdbcConnection extends RubyObject {
 
                     DatabaseMetaData metadata = c.getMetaData();
 
-                    if(args.length > 2) schemaName = args[2].toString();
+                    if(args.length > 2 && schemaName == null) schemaName = toStringOrNull(args[2]);
 
                     if (schemaName != null) schemaName = caseConvertIdentifierForJdbc(metadata, schemaName);
                     table_name = caseConvertIdentifierForJdbc(metadata, table_name);
@@ -296,7 +300,7 @@ public class RubyJdbcConnection extends RubyObject {
                 DatabaseMetaData metadata = c.getMetaData();
                 String tableName = caseConvertIdentifierForJdbc(metadata, tableNameArg);
                 String schemaName = caseConvertIdentifierForJdbc(metadata, schemaNameArg);
-                
+
                 ResultSet resultSet = null;
                 List indexes = new ArrayList();
                 try {
@@ -383,13 +387,13 @@ public class RubyJdbcConnection extends RubyObject {
     public IRubyObject native_database_types() {
         return getInstanceVariable("@native_database_types");
     }
-    
+
 
     @JRubyMethod(name = "primary_keys", required = 1)
     public IRubyObject primary_keys(ThreadContext context, IRubyObject tableName) throws SQLException {
         return context.getRuntime().newArray(primaryKeys(context, tableName.toString()));
     }
-    
+
     protected List primaryKeys(final ThreadContext context, final String tableNameArg) {
         return (List) withConnectionAndRetry(context, new SQLBlock() {
             public Object call(Connection c) throws SQLException {
@@ -419,26 +423,32 @@ public class RubyJdbcConnection extends RubyObject {
         return setConnection(getConnectionFactory().newConnection());
     }
 
+
     @JRubyMethod(name = "rollback")
     public IRubyObject rollback(ThreadContext context) throws SQLException {
-        Connection connection = getConnection(true);
+        final Ruby runtime = context.getRuntime();
+        return (IRubyObject) withConnectionAndRetry(context, new SQLBlock() {
+          public Object call(Connection c) throws SQLException {
+            Connection connection = getConnection(true);
 
-        if (!connection.getAutoCommit()) {
-            try {
-                connection.rollback();
-            } finally {
-                connection.setAutoCommit(true);
+            if (!connection.getAutoCommit()) {
+                try {
+                    connection.rollback();
+                } finally {
+                    connection.setAutoCommit(true);
+                }
             }
-        }
 
-        return context.getRuntime().getNil();
+            return runtime.getNil();
+          }
+        });
     }
 
     @JRubyMethod(name = "select?", required = 1, meta = true, frame = false)
     public static IRubyObject select_p(ThreadContext context, IRubyObject recv, IRubyObject _sql) {
         ByteList sql = rubyApi.convertToRubyString(_sql).getByteList();
 
-        return context.getRuntime().newBoolean(startsWithNoCaseCmp(sql, SELECT) || 
+        return context.getRuntime().newBoolean(startsWithNoCaseCmp(sql, SELECT) ||
                 startsWithNoCaseCmp(sql, SHOW) || startsWithNoCaseCmp(sql, CALL));
     }
 
@@ -453,7 +463,7 @@ public class RubyJdbcConnection extends RubyObject {
 
         return runtime.getNil();
     }
-    
+
     @JRubyMethod(name = "tables")
     public IRubyObject tables(ThreadContext context) {
         return tables(context, null, null, null, TABLE_TYPE);
@@ -561,7 +571,7 @@ public class RubyJdbcConnection extends RubyObject {
     public static String caseConvertIdentifierForRails(DatabaseMetaData metadata, String value)
             throws SQLException {
         if (value == null) return null;
-        
+
         return metadata.storesUpperCaseIdentifiers() ? value.toLowerCase() : value;
     }
 
@@ -570,10 +580,10 @@ public class RubyJdbcConnection extends RubyObject {
      * storage case.  Methods like DatabaseMetaData.getPrimaryKeys() needs the table name to match
      * the internal storage name.  Arbtrary queries and the like DO NOT need to do this.
      */
-    public static String caseConvertIdentifierForJdbc(DatabaseMetaData metadata, String value) 
+    public static String caseConvertIdentifierForJdbc(DatabaseMetaData metadata, String value)
             throws SQLException {
         if (value == null) return null;
-        
+
         if (metadata.storesUpperCaseIdentifiers()) {
             return value.toUpperCase();
         } else if (metadata.storesLowerCaseIdentifiers()) {
@@ -618,13 +628,12 @@ public class RubyJdbcConnection extends RubyObject {
         return arg.isNil() ? null : arg.toString();
     }
 
-    private static IRubyObject floatToRuby(Ruby runtime, ResultSet resultSet, float floatValue)
+    protected IRubyObject doubleToRuby(Ruby runtime, ResultSet resultSet, double doubleValue)
             throws SQLException, IOException {
-        if (floatValue == 0 && resultSet.wasNull()) return runtime.getNil();
-
-        return runtime.newFloat(floatValue);
+        if (doubleValue == 0 && resultSet.wasNull()) return runtime.getNil();
+        return runtime.newFloat(doubleValue);
     }
-    
+
     protected Connection getConnection() {
         return getConnection(false);
     }
@@ -642,7 +651,8 @@ public class RubyJdbcConnection extends RubyObject {
         IRubyObject connection_factory = getInstanceVariable("@connection_factory");
         JdbcConnectionFactory factory = null;
         try {
-            factory = (JdbcConnectionFactory) ((JavaObject) rubyApi.getInstanceVariable(connection_factory, "@java_object")).getValue();
+            factory = (JdbcConnectionFactory) JavaEmbedUtils.rubyToJava(
+                    connection_factory.getRuntime(), connection_factory, JdbcConnectionFactory.class);
         } catch (Exception e) {
             factory = null;
         }
@@ -713,23 +723,26 @@ public class RubyJdbcConnection extends RubyObject {
             } else {
                 return !c.isClosed();
             }
-        } catch (SQLException sx) {
+        } catch (Exception sx) {
             return true;
         }
     }
 
-    private static IRubyObject integerToRuby(Ruby runtime, ResultSet resultSet, long longValue)
+    protected IRubyObject integerToRuby(Ruby runtime, ResultSet resultSet, long longValue)
             throws SQLException, IOException {
         if (longValue == 0 && resultSet.wasNull()) return runtime.getNil();
 
         return runtime.newFixnum(longValue);
     }
 
-    private static IRubyObject jdbcToRuby(Ruby runtime, int column, int type, ResultSet resultSet)
+    protected IRubyObject jdbcToRuby(Ruby runtime, int column, int type, ResultSet resultSet)
             throws SQLException {
         try {
             switch (type) {
-            case Types.BINARY: case Types.BLOB: case Types.LONGVARBINARY: case Types.VARBINARY:
+            case Types.BINARY:
+            case Types.BLOB:
+            case Types.LONGVARBINARY:
+            case Types.VARBINARY:
             case Types.LONGVARCHAR:
                 return streamToRuby(runtime, resultSet, resultSet.getBinaryStream(column));
             case Types.CLOB:
@@ -739,7 +752,7 @@ public class RubyJdbcConnection extends RubyObject {
             case Types.INTEGER: case Types.SMALLINT: case Types.TINYINT:
                 return integerToRuby(runtime, resultSet, resultSet.getLong(column));
             case Types.REAL:
-                return floatToRuby(runtime, resultSet, resultSet.getFloat(column));
+                return doubleToRuby(runtime, resultSet, resultSet.getDouble(column));
             default:
                 return stringToRuby(runtime, resultSet, resultSet.getString(column));
             }
@@ -748,7 +761,7 @@ public class RubyJdbcConnection extends RubyObject {
         }
     }
 
-    private static void populateFromResultSet(ThreadContext context, Ruby runtime, List results,
+    protected void populateFromResultSet(ThreadContext context, Ruby runtime, List results,
             ResultSet resultSet, ColumnData[] columns) throws SQLException {
         int columnCount = columns.length;
 
@@ -763,7 +776,7 @@ public class RubyJdbcConnection extends RubyObject {
     }
 
 
-    private static IRubyObject readerToRuby(Ruby runtime, ResultSet resultSet, Reader reader)
+    protected IRubyObject readerToRuby(Ruby runtime, ResultSet resultSet, Reader reader)
             throws SQLException, IOException {
         if (reader == null && resultSet.wasNull()) return runtime.getNil();
 
@@ -850,7 +863,7 @@ public class RubyJdbcConnection extends RubyObject {
         }
     }
 
-    private static IRubyObject streamToRuby(Ruby runtime, ResultSet resultSet, InputStream is)
+    protected IRubyObject streamToRuby(Ruby runtime, ResultSet resultSet, InputStream is)
             throws SQLException, IOException {
         if (is == null && resultSet.wasNull()) return runtime.getNil();
 
@@ -868,7 +881,7 @@ public class RubyJdbcConnection extends RubyObject {
         return runtime.newString(str);
     }
 
-    private static IRubyObject stringToRuby(Ruby runtime, ResultSet resultSet, String string)
+    protected IRubyObject stringToRuby(Ruby runtime, ResultSet resultSet, String string)
             throws SQLException, IOException {
         if (string == null && resultSet.wasNull()) return runtime.getNil();
 
@@ -890,7 +903,7 @@ public class RubyJdbcConnection extends RubyObject {
 
                     String realschema = schemapat;
                     String realtablepat = tablepat;
-                    
+
                     if (realtablepat != null) realtablepat = caseConvertIdentifierForJdbc(metadata, realtablepat);
                     if (realschema != null) realschema = caseConvertIdentifierForJdbc(metadata, realschema);
 
@@ -898,7 +911,7 @@ public class RubyJdbcConnection extends RubyObject {
                     List arr = new ArrayList();
                     while (rs.next()) {
                         String name;
-                        
+
                         if (downCase) {
                             name = rs.getString(TABLE_NAME).toLowerCase();
                         } else {
@@ -917,7 +930,7 @@ public class RubyJdbcConnection extends RubyObject {
         };
     }
 
-    private static IRubyObject timestampToRuby(Ruby runtime, ResultSet resultSet, Timestamp time)
+    protected IRubyObject timestampToRuby(Ruby runtime, ResultSet resultSet, Timestamp time)
             throws SQLException, IOException {
         if (time == null && resultSet.wasNull()) return runtime.getNil();
 
@@ -959,14 +972,14 @@ public class RubyJdbcConnection extends RubyObject {
         // valid precision 1 decimal also.  Seems sketchy to me...
         if (numberAsBoolean && precision != 1 &&
             resultSet.getInt(DATA_TYPE) == java.sql.Types.DECIMAL) precision = -1;
-        
+
         String type = resultSet.getString(TYPE_NAME);
         if (precision > 0) {
             type += "(" + precision;
             if(scale > 0) type += "," + scale;
             type += ")";
         }
-        
+
         return type;
     }
 
@@ -992,7 +1005,7 @@ public class RubyJdbcConnection extends RubyObject {
                 IRubyObject column = jdbcCol.callMethod(context, "new",
                         new IRubyObject[] {
                             getInstanceVariable("@config"),
-                            RubyString.newUnicodeString(runtime, 
+                            RubyString.newUnicodeString(runtime,
                                     caseConvertIdentifierForRails(metadata, rs.getString(COLUMN_NAME))),
                             defaultValueFromResultSet(runtime, rs),
                             RubyString.newUnicodeString(runtime, typeFromResultSet(rs, isOracle)),
@@ -1031,7 +1044,7 @@ public class RubyJdbcConnection extends RubyObject {
      *
      * @param downCase should column names only be in lower case?
      */
-    protected static IRubyObject unmarshalResult(ThreadContext context, DatabaseMetaData metadata,
+    protected IRubyObject unmarshalResult(ThreadContext context, DatabaseMetaData metadata,
             ResultSet resultSet, boolean downCase) throws SQLException {
         Ruby runtime = context.getRuntime();
         List results = new ArrayList();
@@ -1099,7 +1112,7 @@ public class RubyJdbcConnection extends RubyObject {
 
         return end;
     }
-    
+
     private static byte[] CALL = new byte[]{'c', 'a', 'l', 'l'};
     private static byte[] INSERT = new byte[] {'i', 'n', 's', 'e', 'r', 't'};
     private static byte[] SELECT = new byte[] {'s', 'e', 'l', 'e', 'c', 't'};

data/test/abstract_db_create.rb

@@ -0,0 +1,45 @@
+require 'jdbc_common'
+require 'rake'
+
+module AbstractDbCreate
+  def setup
+    @prevapp = Rake.application
+    Rake.application = Rake::Application.new
+    verbose(true)
+    @prevenv = Object.const_get("RAILS_ENV") rescue nil
+    @prevroot = Object.const_get("RAILS_ENV") rescue nil
+    Object.const_set("RAILS_ENV", "unittest")
+    Object.const_set("RAILS_ROOT", ".")
+    @prevconfigs = ActiveRecord::Base.configurations
+    ActiveRecord::Base.connection.disconnect!
+    @db_name = 'test_rake_db_create'
+    require 'initializer'
+    the_db_name = @db_name
+    the_db_config = db_config
+    Rails::Configuration.class_eval do
+      define_method(:database_configuration) do
+        { "unittest" => the_db_config.merge({:database => the_db_name}).stringify_keys! }
+      end
+    end
+    load rails_databases_rake_file
+    load File.dirname(__FILE__) + '/../lib/jdbc_adapter/jdbc.rake' if jruby?
+    task :environment; task :rails_env           # dummy environment, rails_env tasks
+  end
+
+  def teardown
+    Rake::Task["db:drop"].invoke
+    Rake.application = @prevapp
+    Object.const_set("RAILS_ENV", @prevenv) if @prevenv
+    Object.const_set("RAILS_ROOT", @prevroot) if @prevroot
+    ActiveRecord::Base.configurations = @prevconfigs
+    ActiveRecord::Base.establish_connection(db_config)
+  end
+
+  def rails_databases_rake_file
+    ar_version = $LOADED_FEATURES.grep(%r{active_record/version}).first
+    ar_lib_path = $LOAD_PATH.detect {|p| p if File.exist?File.join(p, ar_version)}
+    ar_lib_path = ar_lib_path.sub(%r{activerecord/lib}, 'railties/lib') # edge rails
+    rails_lib_path = ar_lib_path.sub(/activerecord/, 'rails') # gem rails
+    "#{rails_lib_path}/tasks/databases.rake"
+  end
+end