activerecord-jdbc-adapter 1.0.0.beta1-java → 1.0.0.beta2-java

data/lib/arjdbc/version.rb

@@ -1,6 +1,6 @@
 module ArJdbc
   module Version
-    VERSION = "1.0.0.beta1"
+    VERSION = "1.0.0.beta2"
   end
 end
 # Compatibility with older versions of ar-jdbc for other extensions out there

data/lib/jdbc_adapter/rake_tasks.rb

@@ -0,0 +1,3 @@
+warn "DEPRECATED: require 'arjdbc/rake_tasks' instead of 'jdbc_adapter/rake_tasks'."
+require 'arjdbc/jdbc/rake_tasks'
+

data/rails_generators/templates/lib/tasks/jdbc.rake

@@ -3,6 +3,6 @@
 #
 # This file allows you to use Rails' various db:* tasks with JDBC.
 if defined?(JRUBY_VERSION)
-  require 'jdbc_adapter'
-  require 'jdbc_adapter/rake_tasks'
+  require 'arjdbc'
+  require 'arjdbc/jdbc/rake_tasks'
 end

data/rakelib/package.rake

@@ -24,6 +24,8 @@ begin
     p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
     p.description = p.paragraphs_of('README.txt', 0...1).join("\n\n")
   end
+  hoe.spec.rdoc_options += ["-SHN", "-f", "darkfish"]
+
   task :gemspec do
     File.open("#{hoe.name}.gemspec", "w") {|f| f << hoe.spec.to_ruby }
   end

data/rakelib/test.rake

@@ -4,6 +4,9 @@ if defined?(JRUBY_VERSION)
   if find_executable?("psql") && `psql -c '\\l'` && $?.exitstatus == 0
     databases << :test_postgres
   end
+  if File.exist?('test/fscontext.jar')
+    databases << :test_jndi
+  end
   task :test => databases
 else
   task :test => [:test_mysql]
@@ -37,12 +40,12 @@ declare_test_task_for :postgres
 declare_test_task_for :sqlite3
 
 Rake::TestTask.new(:test_jdbc) do |t|
-  t.test_files = FileList['test/generic_jdbc_connection_test.rb', 'test/jndi_callbacks_test.rb']
+  t.test_files = FileList['test/generic_jdbc_connection_test.rb']
   t.libs << 'test' << 'drivers/mysql/lib'
 end
 
 Rake::TestTask.new(:test_jndi) do |t|
-  t.test_files = FileList['test/jndi_test.rb']
+  t.test_files = FileList['test/jndi*_test.rb']
   t.libs << 'test' << 'drivers/derby/lib'
 end
 
@@ -52,7 +55,7 @@ task :test_pgsql => [:test_postgres]
 # Ensure driver for these DBs is on your classpath
 %w(oracle db2 cachedb informix).each do |d|
   Rake::TestTask.new("test_#{d}") do |t|
-    t.test_files = FileList["test/#{d}_simple_test.rb"]
+    t.test_files = FileList["test/#{d}*_test.rb"]
     t.libs = []
     t.libs << 'lib' if defined?(JRUBY_VERSION)
     t.libs << 'test'

data/src/java/arjdbc/derby/DerbyModule.java

@@ -111,6 +111,10 @@ public class DerbyModule {
         if (args.length > 1) {
             IRubyObject col = args[1];
             String type = rubyApi.callMethod(col, "type").toString();
+            // intercept and change value, maybe, if the column type is :text or :string
+            if (type.equals("text") || type.equals("string")) {
+            	value = make_ruby_string_for_text_column(context, recv, runtime, value);
+            }
             if (value instanceof RubyString) {
                 if (type.equals("string")) {
                     return quote_string_with_surround(runtime, "'", (RubyString)value, "'");
@@ -135,7 +139,32 @@ public class DerbyModule {
         return super_quote(context, recv, runtime, value, runtime.getNil());
     }
 
-    private final static ByteList NULL = new ByteList("NULL".getBytes());
+    /* 
+     * Derby is not permissive like MySql. Try and send an Integer to a CLOB or VARCHAR column and Derby will vomit.
+     * This method turns non stringy things into strings.
+     */
+    private static IRubyObject make_ruby_string_for_text_column(ThreadContext context, IRubyObject recv, Ruby runtime, IRubyObject value) {
+    	RubyModule multibyteChars = (RubyModule) 
+        ((RubyModule) ((RubyModule) runtime.getModule("ActiveSupport")).getConstant("Multibyte")).getConstantAt("Chars");
+		if (value instanceof RubyString || rubyApi.isKindOf(value, multibyteChars) || value.isNil()) {
+			return value;
+		}
+		if (value instanceof RubyBoolean) {
+            return value.isTrue() ? runtime.newString("1") : runtime.newString("0");
+		} else if (value instanceof RubyFloat || value instanceof RubyFixnum || value instanceof RubyBignum) {
+			return RubyString.objAsString(context, value);
+		} else if ( value instanceof RubyBigDecimal) {
+			return rubyApi.callMethod(value, "to_s", runtime.newString("F"));
+		} else {
+			if (rubyApi.callMethod(value, "acts_like?", runtime.newString("date")).isTrue() || rubyApi.callMethod(value, "acts_like?", runtime.newString("time")).isTrue()) {
+	            return (RubyString)rubyApi.callMethod(recv, "quoted_date", value); 
+	        } else {
+	            return (RubyString)rubyApi.callMethod(value, "to_yaml");
+	        }
+		}
+	}
+
+	private final static ByteList NULL = new ByteList("NULL".getBytes());
 
     private static IRubyObject super_quote(ThreadContext context, IRubyObject recv, Ruby runtime, IRubyObject value, IRubyObject col) {
         if (value.respondsTo("quoted_id")) {

data/src/java/arjdbc/informix/InformixRubyJdbcConnection.java

@@ -0,0 +1,74 @@
+/*
+ **** BEGIN LICENSE BLOCK *****
+ * 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>
+ *
+ * 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 arjdbc.informix;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+
+import arjdbc.jdbc.RubyJdbcConnection;
+
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
+import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.builtin.IRubyObject;
+
+/**
+ *
+ * @author nicksieger
+ */
+public class InformixRubyJdbcConnection extends RubyJdbcConnection {
+    protected InformixRubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
+        super(runtime, metaClass);
+    }
+
+    public static RubyClass createInformixJdbcConnectionClass(Ruby runtime, RubyClass jdbcConnection) {
+        RubyClass clazz = RubyJdbcConnection.getConnectionAdapters(runtime).defineClassUnder("InformixJdbcConnection",
+                jdbcConnection, INFORMIX_JDBCCONNECTION_ALLOCATOR);
+        clazz.defineAnnotatedMethods(InformixRubyJdbcConnection.class);
+
+        return clazz;
+    }
+
+    private static ObjectAllocator INFORMIX_JDBCCONNECTION_ALLOCATOR = new ObjectAllocator() {
+        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
+            return new InformixRubyJdbcConnection(runtime, klass);
+        }
+    };
+
+    /**
+     * Treat LONGVARCHAR as CLOB on Informix 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/arjdbc/jdbc/AdapterJavaService.java

@@ -28,11 +28,13 @@ package arjdbc.jdbc;
 
 import java.io.IOException;
 
-import arjdbc.postgresql.PostgresqlRubyJdbcConnection;
+import arjdbc.derby.DerbyModule;
+import arjdbc.informix.InformixRubyJdbcConnection;
 import arjdbc.mssql.MssqlRubyJdbcConnection;
-import arjdbc.sqlite3.Sqlite3RubyJdbcConnection;
 import arjdbc.mysql.MySQLModule;
-import arjdbc.derby.DerbyModule;
+import arjdbc.oracle.OracleRubyJdbcConnection;
+import arjdbc.postgresql.PostgresqlRubyJdbcConnection;
+import arjdbc.sqlite3.Sqlite3RubyJdbcConnection;
 
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
@@ -48,6 +50,8 @@ public class AdapterJavaService implements BasicLibraryService {
         RubyClass jdbcConnection = RubyJdbcConnection.createJdbcConnectionClass(runtime);
         PostgresqlRubyJdbcConnection.createPostgresqlJdbcConnectionClass(runtime, jdbcConnection);
         MssqlRubyJdbcConnection.createMssqlJdbcConnectionClass(runtime, jdbcConnection);
+        InformixRubyJdbcConnection.createInformixJdbcConnectionClass(runtime, jdbcConnection);
+        OracleRubyJdbcConnection.createOracleJdbcConnectionClass(runtime, jdbcConnection);
         Sqlite3RubyJdbcConnection.createSqlite3JdbcConnectionClass(runtime, jdbcConnection);
         RubyModule arJdbc = runtime.getOrCreateModule("ArJdbc");
 

data/src/java/arjdbc/jdbc/RubyJdbcConnection.java

@@ -123,21 +123,32 @@ public class RubyJdbcConnection extends RubyObject {
                     String table_name = rubyApi.convertToRubyString(args[0]).getUnicodeValue();
                     String schemaName = null;
 
-                    int index = table_name.indexOf(".");
-                    if(index != -1) {
-                        schemaName = table_name.substring(0, index);
-                        table_name = table_name.substring(index + 1);
+                    final String[] name_parts = table_name.split( "\\." );
+                    if ( name_parts.length > 3 ) {
+                        throw new SQLException("Table name '" + table_name + "' should not contain more than 2 '.'");
                     }
 
                     DatabaseMetaData metadata = c.getMetaData();
+                    String clzName = metadata.getClass().getName().toLowerCase();
+                    boolean isDB2 = clzName.indexOf("db2") != -1 || clzName.indexOf("as400") != -1;
+
+                    String catalog = c.getCatalog();
+                    if( name_parts.length == 2 ) {
+                        schemaName = name_parts[0];
+                        table_name = name_parts[1];
+                    }
+                    else if ( name_parts.length == 3 ) {
+                        catalog = name_parts[0];
+                        schemaName = name_parts[1];
+                        table_name = name_parts[2];
+                    }
 
                     if(args.length > 2 && schemaName == null) schemaName = toStringOrNull(args[2]);
 
                     if (schemaName != null) schemaName = caseConvertIdentifierForJdbc(metadata, schemaName);
                     table_name = caseConvertIdentifierForJdbc(metadata, table_name);
 
-                    String catalog = c.getCatalog();
-                    if (schemaName != null) { catalog = schemaName; }
+                    if (schemaName != null && !isDB2 && !databaseSupportsSchemas()) { catalog = schemaName; }
 
                     String[] tableTypes = new String[]{"TABLE","VIEW","SYNONYM"};
                     RubyArray matchingTables = (RubyArray) tableLookupBlock(context.getRuntime(),
@@ -645,10 +656,11 @@ public class RubyJdbcConnection extends RubyObject {
     public static String caseConvertIdentifierForJdbc(DatabaseMetaData metadata, String value)
             throws SQLException {
         if (value == null) return null;
+        boolean isPostgres = metadata.getDatabaseProductName().equals("PostgreSQL");
 
         if (metadata.storesUpperCaseIdentifiers()) {
             return value.toUpperCase();
-        } else if (metadata.storesLowerCaseIdentifiers()) {
+        } else if (metadata.storesLowerCaseIdentifiers() && ! isPostgres) {
             return value.toLowerCase();
         }
 
@@ -839,8 +851,9 @@ public class RubyJdbcConnection extends RubyObject {
             RubyHash row = RubyHash.newHash(runtime);
 
             for (int i = 0; i < columnCount; i++) {
-                row.op_aset(context, columns[i].name, jdbcToRuby(runtime, i + 1, columns[i].type, resultSet));
+                row.op_aset(context, columns[i].name, jdbcToRuby(runtime, columns[i].index, columns[i].type, resultSet));
             }
+
             results.add(row);
         }
     }
@@ -970,10 +983,12 @@ public class RubyJdbcConnection extends RubyObject {
                     DatabaseMetaData metadata = c.getMetaData();
                     String clzName = metadata.getClass().getName().toLowerCase();
                     boolean isOracle = clzName.indexOf("oracle") != -1 || clzName.indexOf("oci") != -1;
+                    boolean isDerby = clzName.indexOf("derby") != 1;
 
                     String realschema = schemapat;
                     String realtablepat = tablepat;
 
+                    if (isDerby && realschema != null && realschema.equals("")) realschema = null;  // Derby doesn't like empty-string schema name
                     if (realtablepat != null) realtablepat = caseConvertIdentifierForJdbc(metadata, realtablepat);
                     if (realschema != null) realschema = caseConvertIdentifierForJdbc(metadata, realschema);
 
@@ -1015,15 +1030,15 @@ public class RubyJdbcConnection extends RubyObject {
         return RubyString.newUnicodeString(runtime, str);
     }
 
-    private static final int COLUMN_NAME = 4;
-    private static final int DATA_TYPE = 5;
-    private static final int TYPE_NAME = 6;
-    private static final int COLUMN_SIZE = 7;
-    private static final int DECIMAL_DIGITS = 9;
-    private static final int COLUMN_DEF = 13;
-    private static final int IS_NULLABLE = 18;
+    protected static final int COLUMN_NAME = 4;
+    protected static final int DATA_TYPE = 5;
+    protected static final int TYPE_NAME = 6;
+    protected static final int COLUMN_SIZE = 7;
+    protected static final int DECIMAL_DIGITS = 9;
+    protected static final int COLUMN_DEF = 13;
+    protected static final int IS_NULLABLE = 18;
 
-    private int intFromResultSet(ResultSet resultSet, int column) throws SQLException {
+    protected int intFromResultSet(ResultSet resultSet, int column) throws SQLException {
         int precision = resultSet.getInt(column);
 
         return precision == 0 && resultSet.wasNull() ? -1 : precision;
@@ -1032,20 +1047,11 @@ public class RubyJdbcConnection extends RubyObject {
     /**
      * Create a string which represents a sql type usable by Rails from the resultSet column
      * metadata object.
-     *
-     * @param numberAsBoolean the database uses decimal as a boolean data type
-     * because it does not support optional SQL92 type or mandatory SQL99
-     * booleans.
      */
-    private String typeFromResultSet(ResultSet resultSet, boolean numberAsBoolean) throws SQLException {
+    protected String typeFromResultSet(ResultSet resultSet) throws SQLException {
         int precision = intFromResultSet(resultSet, COLUMN_SIZE);
         int scale = intFromResultSet(resultSet, DECIMAL_DIGITS);
 
-        // Assume db's which use decimal for boolean will not also specify a
-        // 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;
@@ -1070,7 +1076,6 @@ public class RubyJdbcConnection extends RubyObject {
             List columns = new ArrayList();
             List pkeyNames = new ArrayList();
             String clzName = metadata.getClass().getName().toLowerCase();
-            boolean isOracle = clzName.indexOf("oracle") != -1 || clzName.indexOf("oci") != -1;
 
             RubyHash types = (RubyHash) native_database_types();
             IRubyObject jdbcCol = getJdbcColumnClass(context);
@@ -1087,7 +1092,7 @@ public class RubyJdbcConnection extends RubyObject {
                             RubyString.newUnicodeString(runtime,
                                     caseConvertIdentifierForRails(metadata, colName)),
                             defaultValueFromResultSet(runtime, rs),
-                            RubyString.newUnicodeString(runtime, typeFromResultSet(rs, isOracle)),
+                            RubyString.newUnicodeString(runtime, typeFromResultSet(rs)),
                             runtime.newBoolean(!rs.getString(IS_NULLABLE).trim().equals("NO"))
                         });
                 columns.add(column);
@@ -1192,6 +1197,14 @@ public class RubyJdbcConnection extends RubyObject {
         return Java.java_to_ruby(this, JavaObject.wrap(getRuntime(), c), Block.NULL_BLOCK);
     }
 
+    /**
+     * Some databases support schemas and others do not.
+     * For ones which do this method should return true, aiding in decisions regarding schema vs database determination.
+     */
+    protected boolean databaseSupportsSchemas() {
+        return false;
+    }
+
     private static int whitespace(int start, ByteList bl) {
         int end = bl.begin + bl.realSize;
 
@@ -1222,11 +1235,13 @@ public class RubyJdbcConnection extends RubyObject {
 
     public static class ColumnData {
         public IRubyObject name;
+        public int index;
         public int type;
 
-        public ColumnData(IRubyObject name, int type) {
+        public ColumnData(IRubyObject name, int type, int idx) {
             this.name = name;
             this.type = type;
+            this.index = idx;
         }
 
         public static ColumnData[] setup(Ruby runtime, DatabaseMetaData databaseMetadata,
@@ -1242,7 +1257,7 @@ public class RubyJdbcConnection extends RubyObject {
                     name = RubyJdbcConnection.caseConvertIdentifierForRails(databaseMetadata, metadata.getColumnLabel(i));
                 }
 
-                columns[i - 1] = new ColumnData(RubyString.newUnicodeString(runtime, name), metadata.getColumnType(i));
+                columns[i - 1] = new ColumnData(RubyString.newUnicodeString(runtime, name), metadata.getColumnType(i), i);
             }
 
             return columns;

data/src/java/arjdbc/mssql/MssqlRubyJdbcConnection.java

@@ -28,12 +28,16 @@ package arjdbc.mssql;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
+import java.util.List;
 
 import arjdbc.jdbc.RubyJdbcConnection;
+import static arjdbc.jdbc.RubyJdbcConnection.ColumnData;
 
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
+import org.jruby.RubyString;
 import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
 /**
@@ -42,8 +46,11 @@ import org.jruby.runtime.builtin.IRubyObject;
  */
 public class MssqlRubyJdbcConnection extends RubyJdbcConnection {
 
+    private RubyString _row_num;
+
     protected MssqlRubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
         super(runtime, metaClass);
+        _row_num = runtime.newString("_row_num");
     }
 
     public static RubyClass createMssqlJdbcConnectionClass(Ruby runtime, RubyClass jdbcConnection) {
@@ -53,22 +60,68 @@ public class MssqlRubyJdbcConnection extends RubyJdbcConnection {
 
         return clazz;
     }
-    private static ObjectAllocator MSSQL_JDBCCONNECTION_ALLOCATOR = new ObjectAllocator() {
 
+    private static ObjectAllocator MSSQL_JDBCCONNECTION_ALLOCATOR = new ObjectAllocator() {
         public IRubyObject allocate(Ruby runtime, RubyClass klass) {
             return new MssqlRubyJdbcConnection(runtime, klass);
         }
     };
 
+    protected static IRubyObject booleanToRuby(Ruby runtime, ResultSet resultSet, boolean booleanValue)
+            throws SQLException {
+        if (booleanValue == false && resultSet.wasNull()) return runtime.getNil();
+        return runtime.newBoolean(booleanValue);
+    }
+
     /**
      * Treat LONGVARCHAR as CLOB on Mssql for purposes of converting a JDBC value to Ruby.
+     * Treat BOOLEAN/BIT as Boolean, rather than the default behaviour of conversion to string
      */
     @Override
     protected IRubyObject jdbcToRuby(Ruby runtime, int column, int type, ResultSet resultSet)
             throws SQLException {
+        if ( Types.BOOLEAN == type || Types.BIT == type ) {
+          return booleanToRuby(runtime, resultSet, resultSet.getBoolean(column));
+        }
         if (type == Types.LONGVARCHAR) {
             type = Types.CLOB;
         }
         return super.jdbcToRuby(runtime, column, type, resultSet);
     }
+
+    /**
+     * Microsoft SQL 2000+ support schemas
+     */
+    @Override
+    protected boolean databaseSupportsSchemas() {
+        return true;
+    }
+
+    @Override
+    protected void populateFromResultSet(ThreadContext context, Ruby runtime, List results,
+                                         ResultSet resultSet, ColumnData[] columns) throws SQLException {
+        super.populateFromResultSet(context, runtime, results, resultSet, filterRowNumFromColumns(columns));
+    }
+
+    /**
+     * Filter out the <tt>_row_num</tt> column from results.
+     */
+    private ColumnData[] filterRowNumFromColumns(ColumnData[] columns) {
+        for (int i = 0; i < columns.length; i++) {
+            if (columns[i].name.equals(_row_num)) {
+                ColumnData[] filtered = new ColumnData[columns.length - 1];
+                if (i > 0) {
+                    System.arraycopy(columns, 0, filtered, 0, i);
+                }
+
+                if (i + 1 < columns.length) {
+                    System.arraycopy(columns, i + 1, filtered, i, columns.length - (i + 1));
+                }
+
+                return filtered;
+            }
+        }
+
+        return columns;
+    }
 }