activerecord-jdbc-adapter 0.8 → 0.8.1

data/lib/jdbc_adapter/version.rb

@@ -1,5 +1,5 @@
 module JdbcAdapter
   module Version
-    VERSION = "0.8"
+    VERSION = "0.8.1"
   end
 end

data/src/java/jdbc_adapter/JdbcAdapterInternalService.java

@@ -1,7 +1,7 @@
 /***** BEGIN LICENSE BLOCK *****
- * Copyright (c) 2006-2007 Nick Sieger <nick@nicksieger.com>
+ * Copyright (c) 2006-2008 Nick Sieger <nick@nicksieger.com>
  * Copyright (c) 2006-2007 Ola Bini <ola.bini@gmail.com>
- * 
+ *
  * 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
@@ -9,10 +9,10 @@
  * 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
@@ -233,34 +233,38 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
         int tries = 1;
         int i = 0;
         Throwable toWrap = null;
+        boolean autoCommit = false;
         while (i < tries) {
             Connection c = getConnection(recv);
             try {
+                autoCommit = c.getAutoCommit();
                 return block.call(c);
             } catch (Exception e) {
                 toWrap = e;
                 while (toWrap.getCause() != null && toWrap.getCause() != toWrap) {
                     toWrap = toWrap.getCause();
                 }
-                if (i == 0) {
-                    tries = (int) rubyApi.convertToRubyInteger(config_value(recv, "retry_count")).getLongValue();
-                    if (tries <= 0) {
-                        tries = 1;
-                    }
-                }
                 i++;
-                if (isConnectionBroken(recv, c)) {
-                    reconnect(recv);
-                } else {
-                    throw wrap(recv, toWrap);
+                if (autoCommit) {
+                    if (i == 1) {
+                        tries = (int) rubyApi.convertToRubyInteger(config_value(recv, "retry_count")).getLongValue();
+                        if (tries <= 0) {
+                            tries = 1;
+                        }
+                    }
+                    if (isConnectionBroken(recv, c)) {
+                        reconnect(recv);
+                    } else {
+                        throw wrap(recv, toWrap);
+                    }
                 }
             }
         }
         throw wrap(recv, toWrap);
     }
 
-    private static SQLBlock tableLookupBlock(final Ruby runtime, 
-            final String catalog, final String schemapat, 
+    private static SQLBlock tableLookupBlock(final Ruby runtime,
+            final String catalog, final String schemapat,
             final String tablepat, final String[] types) {
         return new SQLBlock() {
             public IRubyObject call(Connection c) throws SQLException {
@@ -271,6 +275,16 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
                     boolean isOracle = clzName.indexOf("oracle") != -1 || clzName.indexOf("oci") != -1;
 
                     String realschema = schemapat;
+                    String realtablepat = tablepat;
+
+                    if(metadata.storesUpperCaseIdentifiers()) {
+                        if (realschema != null) realschema = realschema.toUpperCase();
+                        if (realtablepat != null) realtablepat = realtablepat.toUpperCase();
+                    } else if(metadata.storesLowerCaseIdentifiers()) {
+                        if (null != realschema) realschema = realschema.toLowerCase();
+                        if (realtablepat != null) realtablepat = realtablepat.toLowerCase();
+                    }
+
                     if (realschema == null && isOracle) {
                         ResultSet schemas = metadata.getSchemas();
                         String username = metadata.getUserName();
@@ -282,7 +296,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
                         }
                         schemas.close();
                     }
-                    rs = metadata.getTables(catalog, realschema, tablepat, types);
+                    rs = metadata.getTables(catalog, realschema, realtablepat, types);
                     List arr = new ArrayList();
                     while (rs.next()) {
                         String name = rs.getString(3).toLowerCase();
@@ -351,7 +365,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
     @JRubyMethod(name = "native_database_types")
     public static IRubyObject native_database_types(IRubyObject recv) {
         return rubyApi.getInstanceVariable(recv, "@tps");
-    }    
+    }
 
     @JRubyMethod(name = "set_native_database_types")
     public static IRubyObject set_native_database_types(IRubyObject recv) throws SQLException, IOException {
@@ -383,22 +397,28 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
 
     @JRubyMethod(name = "commit")
     public static IRubyObject commit(IRubyObject recv) throws SQLException {
-        try {
-            getConnection(recv).commit();
-            return recv.getRuntime().getNil();
-        } finally {
-            getConnection(recv).setAutoCommit(true);
+        Connection c = getConnection(recv);
+        if (!c.getAutoCommit()) {
+            try {
+                c.commit();
+            } finally {
+                c.setAutoCommit(true);
+            }
         }
+        return recv.getRuntime().getNil();
     }
 
     @JRubyMethod(name = "rollback")
     public static IRubyObject rollback(IRubyObject recv) throws SQLException {
-        try {
-            getConnection(recv).rollback();
-            return recv.getRuntime().getNil();
-        } finally {
-            getConnection(recv).setAutoCommit(true);
+        Connection c = getConnection(recv);
+        if (!c.getAutoCommit()) {
+            try {
+                c.rollback();
+            } finally {
+                c.setAutoCommit(true);
+            }
         }
+        return recv.getRuntime().getNil();
     }
 
     @JRubyMethod(name = {"columns", "columns_internal"}, required = 1, optional = 2)
@@ -410,9 +430,10 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
                     String table_name = rubyApi.convertToRubyString(args[0]).getUnicodeValue();
                     String schemaName = null;
 
-                    if(table_name.indexOf(".") != -1) {
-                        schemaName = table_name.substring(table_name.indexOf(".")+1);
-                        table_name = table_name.substring(0, table_name.indexOf(".")+1);
+                    int index = table_name.indexOf(".");
+                    if(index != -1) {
+                        schemaName = table_name.substring(0, index);
+                        table_name = table_name.substring(index + 1);
                     }
 
                     DatabaseMetaData metadata = c.getMetaData();
@@ -425,8 +446,10 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
                     }
 
                     if(metadata.storesUpperCaseIdentifiers()) {
+                        if (null != schemaName) schemaName = schemaName.toUpperCase();
                         table_name = table_name.toUpperCase();
                     } else if(metadata.storesLowerCaseIdentifiers()) {
+                        if (null != schemaName) schemaName = schemaName.toLowerCase();
                         table_name = table_name.toLowerCase();
                     }
 
@@ -442,7 +465,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
                         schemas.close();
                     }
 
-                    RubyArray matchingTables = (RubyArray) tableLookupBlock(recv.getRuntime(), 
+                    RubyArray matchingTables = (RubyArray) tableLookupBlock(recv.getRuntime(),
                                                                             c.getCatalog(), schemaName, table_name, new String[]{"TABLE","VIEW"}).call(c);
                     if (matchingTables.isEmpty()) {
                         throw new SQLException("Table " + table_name + " does not exist");
@@ -486,6 +509,9 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
                     if(scal != null) {
                         scale = Integer.parseInt(scal);
                     }
+                    else if(isOracle && rs.getInt(5) == java.sql.Types.DECIMAL) { // NUMBER type in Oracle
+                        prec = null;
+                    }
                 }
                 String type = rs.getString(6);
                 if(prec != null && precision > 0) {
@@ -611,7 +637,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
         } else {
             maxrows = 0;
         }
-        
+
         return withConnectionAndRetry(recv, new SQLBlock() {
             public IRubyObject call(Connection c) throws SQLException {
                 Statement stmt = null;
@@ -682,7 +708,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
                 rs.close();
             } catch(Exception e) {}
         }
- 
+
         return runtime.newArray(results);
     }
 
@@ -771,7 +797,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
                 rs.close();
             } catch(Exception e) {}
         }
- 
+
         return runtime.newArray(results);
     }
 
@@ -856,7 +882,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
 
     private static int getTypeValueFor(Ruby runtime, IRubyObject type) throws SQLException {
         if(!(type instanceof RubySymbol)) {
-            type = rubyApi.callMethod(type, "type");
+            type = rubyApi.callMethod(type, "class");
         }
         if(type == runtime.newSymbol("string")) {
             return Types.VARCHAR;
@@ -884,7 +910,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
             return -1;
         }
     }
-    
+
     private final static DateFormat FORMAT = new SimpleDateFormat("%y-%M-%d %H:%m:%s");
 
     private static void setValue(PreparedStatement ps, int index, Ruby runtime, ThreadContext context,
@@ -1012,7 +1038,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
                     ps = c.prepareStatement(sql);
                     if (args[0].isTrue()) { // binary
                         ByteList outp = rubyApi.convertToRubyString(args[5]).getByteList();
-                        ps.setBinaryStream(1, new ByteArrayInputStream(outp.bytes, 
+                        ps.setBinaryStream(1, new ByteArrayInputStream(outp.bytes,
                                 outp.begin, outp.realSize), outp.realSize);
                     } else { // clob
                         String ss = rubyApi.convertToRubyString(args[5]).getUnicodeValue();
@@ -1048,7 +1074,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
             jo = (JavaObject) rubyApi.getInstanceVariable(inp, "@java_object");
         }
         return (ResultSet) jo.getValue();
-    }   
+    }
 
     private static boolean isConnectionBroken(IRubyObject recv, Connection c) {
         try {
@@ -1061,7 +1087,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
                 } finally {
                     try { s.close(); } catch (SQLException ignored) {}
                 }
-                return true;
+                return false;
             } else {
                 return !c.isClosed();
             }

data/src/java/jdbc_adapter/JdbcMySQLSpec.java

@@ -66,7 +66,7 @@ public class JdbcMySQLSpec {
             default: continue;
             }
             if(i > startOfExtend)
-              blNew.append(bl, startOfExtend, i-startOfExtend);
+              blNew.append(bl, startOfExtend-bl.begin, i-startOfExtend);
             blNew.append(rep, 0, 2);
             startOfExtend = i+1;
         }
@@ -75,7 +75,7 @@ public class JdbcMySQLSpec {
           return string;
         }
         if (bl.begin + bl.realSize > startOfExtend)
-          blNew.append(bl, startOfExtend, bl.begin + bl.realSize - startOfExtend);
+          blNew.append(bl, startOfExtend-bl.begin, bl.begin + bl.realSize - startOfExtend);
 
         return recv.getRuntime().newStringShared(blNew);
     }

data/test/cachedb_simple_test.rb

@@ -0,0 +1,6 @@
+require 'jdbc_common'
+require 'db/cachedb'
+
+class CacheDBSimpleTest < Test::Unit::TestCase
+  include SimpleTestMethods
+end

data/test/db/cachedb.rb

@@ -0,0 +1,9 @@
+config = { 
+  :username => '_SYSTEM',
+  :password => 'SYS',
+  :adapter  => 'cachedb',
+  :host     => ENV[ "CACHE_HOST" ] || 'localhost',
+  :database => ENV[ "CACHE_NAMESPACE" ] || 'weblog_development'
+}
+
+ActiveRecord::Base.establish_connection( config )

data/test/db/mssql.rb

@@ -0,0 +1,9 @@
+config = { 
+  :username => 'blog',
+  :password => '',
+  :adapter  => 'jdbc',
+  :url => "jdbc:jtds:sqlserver://localhost:1433/weblog_development",
+  :driver => 'net.sourceforge.jtds.jdbc.Driver'
+}
+
+ActiveRecord::Base.establish_connection( config )

data/test/db/oracle.rb

@@ -1,9 +1,29 @@
 config = {
   :username => 'blog',
-  :password => '',
+  :password => 'blog',
   :adapter  => 'oracle',
   :host => ENV["ORACLE_HOST"] || 'localhost',
-  :database => ENV["ORACLE_SID"] || 'weblog_development'
+  :database => ENV["ORACLE_SID"] || 'XE' # XE is the default SID for oracle xe
 }
 
 ActiveRecord::Base.establish_connection(config)
+
+# Here are some notes of things I had to do to get running on Oracle
+# XE.
+#
+#   create tablespace weblog_development
+#     datafile '/usr/lib/oracle/xe/oradata/XE/weblog_development.dbf';
+#   create user blog identified by blog
+#     default tablespace weblog_development;
+#   grant all privileges to blog;
+#
+# You might need to up the number of processes and restart the
+# listener. (In my case, I had to reboot.) See
+# http://it.newinstance.it/2007/06/01/ora-12519-tnsno-appropriate-service-handler-found/
+#
+#   alter system set PROCESSES=150 scope=SPFILE;
+#
+# These might be helpful too (numbers are rather arbitrary...)
+#
+#   alter system set TRANSACTIONS=126 scope=SPFILE;
+#   alter system set SESSIONS=115 scope=SPFILE;

data/test/db/sqlite3.rb

@@ -0,0 +1,11 @@
+config = {
+  :adapter => 'sqlite3',
+  :database => 'test.sqlite3'
+}
+
+ActiveRecord::Base.establish_connection(config)
+
+at_exit {
+  # Clean up hsqldb when done
+  Dir['test.sqlite3*'].each {|f| File.delete(f)}
+}

data/test/db2_simple_test.rb

@@ -4,3 +4,7 @@ require 'db/db2'
 class DB2SimpleTest < Test::Unit::TestCase
   include SimpleTestMethods
 end
+
+class DB2HasManyThroughTest < Test::Unit::TestCase
+  include HasManyThroughMethods
+end

data/test/jdbc_common.rb

@@ -1,5 +1,7 @@
-require 'jdbc_adapter'
 require 'rubygems'
+# Specify version of activerecord here if desired
+# gem 'activerecord', '=2.1'
+require 'jdbc_adapter'
 require 'models/auto_id'
 require 'models/entry'
 require 'models/add_not_null_column_to_table'

data/test/manualTestDatabase.rb

@@ -172,11 +172,7 @@ end
   pelle.female = false
   pelle.save
 
-
-
-
-
-  prods = Product.find_all
+  prods = Product.find :all
   order = Order.new(:name => "Dalai Lama", :address => "Great Road 32", :email => "abc@dot.com", :pay_type => "cash")
   order.line_items << LineItem.new(:product => prods[0], :quantity => 3, :total_price => (prods[0].price * 3))
   order.line_items << LineItem.new(:product => prods[2], :quantity => 1, :total_price => (prods[2].price))

data/test/models/entry.rb

@@ -7,7 +7,7 @@ class CreateEntries < ActiveRecord::Migration
       t.column :title, :string, :limit => 100
       t.column :updated_on, :datetime
       t.column :content, :text
-      t.column :rating, :decimal, :precision => 10
+      t.column :rating, :decimal, :precision => 10, :scale => 2
     end
   end
 

data/test/mssql_simple_test.rb

@@ -0,0 +1,6 @@
+require 'jdbc_common'
+require 'db/mssql'
+
+class MsSQLSimpleTest < Test::Unit::TestCase
+  include SimpleTestMethods
+end

data/test/mysql_simple_test.rb

@@ -10,6 +10,15 @@ require 'db/mysql'
 
 class MysqlSimpleTest < Test::Unit::TestCase
   include SimpleTestMethods
+
+  def test_string_quoting_oddity
+    s = "0123456789a'a"
+    assert_equal "'0123456789a\\'a'", ActiveRecord::Base.connection.quote(s)
+
+    s2 = s[10,3]
+    assert_equal "a'a", s2
+    assert_equal "'a\\'a'", ActiveRecord::Base.connection.quote(s2)
+  end
 end
 
 class MysqlHasManyThroughTest < Test::Unit::TestCase

data/test/oracle_simple_test.rb

@@ -4,3 +4,26 @@ require 'db/oracle'
 class OracleSimpleTest < Test::Unit::TestCase
   include SimpleTestMethods
 end
+
+class OracleSpecificTest < Test::Unit::TestCase
+  include MultibyteTestMethods
+
+  def setup
+    super
+    @java_con.createStatement.execute "CREATE TABLE DEFAULT_NUMBER (VALUE NUMBER)"
+    @java_con.createStatement.execute "INSERT INTO DEFAULT_NUMBER (VALUE) VALUES (0.076)"
+  end
+
+  def teardown
+    @java_con.createStatement.execute "DROP TABLE DEFAULT_NUMBER"
+    super
+  end
+
+
+  def test_default_number_precision
+    klass = Class.new(ActiveRecord::Base)
+    klass.set_table_name "DEFAULT_NUMBER"
+    obj = klass.find(:first)
+    assert_equal 0.076, obj.value
+  end
+end