activerecord-jdbc-adapter 0.9.5-java → 0.9.6-java

data/History.txt

@@ -1,3 +1,17 @@
+== 0.9.6
+
+- The Oracle release!
+- Oracle should be working much better with this release. Also updated
+  to work with Rails 3.
+- Get all unit tests running cleanly on Oracle, fixing previous
+  datetime/timezone issues.
+- ACTIVERECORD_JDBC-83: Add :sequence_start_value option to
+  create_table, following oracle_enhanced adapter
+- ACTIVERECORD_JDBC-33: Don't double-quote table names in oracle
+- ACTIVERECORD_JDBC-17: Fix Oracle primary keys so that /^NUMBER$/ => :integer
+- Fix remaining blockers ACTIVERECORD_JDBC-82, JRUBY-3675,
+  ACTIVERECORD_JDBC-22, ACTIVERECORD_JDBC-27, JRUBY-4759
+
 == 0.9.5
 
 - The MSSQL release, courtesy of Mike Williams and Lonely

data/lib/active_record/connection_adapters/jdbc_adapter.rb

@@ -56,21 +56,36 @@ module JdbcSpec
       jdbc_connection(config)
     end
   end
+
+  module QuotedPrimaryKeyExtension
+    def self.extended(base)
+      #       Rails 3 method           Rails 2 method
+      meth = [:arel_attributes_values, :attributes_with_quotes].detect do |m|
+        base.private_instance_methods.include?(m.to_s)
+      end
+      pk_hash_key = "self.class.primary_key"
+      pk_hash_value = '"?"'
+      if meth == :arel_attributes_values
+        pk_hash_key = "self.class.arel_table[#{pk_hash_key}]"
+        pk_hash_value = "Arel::SqlLiteral.new(#{pk_hash_value})"
+      end
+      if meth
+        base.module_eval %{
+          alias :#{meth}_pre_pk :#{meth}
+          def #{meth}(include_primary_key = true, *args) #:nodoc:
+            aq = #{meth}_pre_pk(include_primary_key, *args)
+            aq[#{pk_hash_key}] = #{pk_hash_value} if include_primary_key && aq[#{pk_hash_key}].nil?
+            aq
+          end
+        }
+      end
+    end
+  end
 end
 
 module ActiveRecord
   class Base
     extend JdbcSpec::ActiveRecordExtensions
-    if respond_to?(:attributes_with_quotes)
-      alias :attributes_with_quotes_pre_oracle :attributes_with_quotes
-      def attributes_with_quotes(include_primary_key = true, *args) #:nodoc:
-        aq = attributes_with_quotes_pre_oracle(include_primary_key, *args)
-        if connection.class == ConnectionAdapters::JdbcAdapter && (connection.is_a?(JdbcSpec::Oracle) || connection.is_a?(JdbcSpec::Mimer))
-          aq[self.class.primary_key] = "?" if include_primary_key && aq[self.class.primary_key].nil?
-        end
-        aq
-      end
-    end
   end
 
   module ConnectionAdapters

data/lib/jdbc_adapter/jdbc_mimer.rb

@@ -1,5 +1,9 @@
 module JdbcSpec
   module Mimer
+    def self.extended(mod)
+      ActiveRecord::Base.extend JdbcSpec::QuotedPrimaryKeyExtension
+    end
+
     def self.adapter_matcher(name, *)
       name =~ /mimer/i ? self : false
     end

data/lib/jdbc_adapter/jdbc_oracle.rb

@@ -26,8 +26,10 @@ module ::JdbcSpec
         ActiveRecord::Base.after_save :after_save_with_oracle_lob
         @lob_callback_added = true
       end
+      ActiveRecord::Base.extend JdbcSpec::QuotedPrimaryKeyExtension
       mod.class.class_eval do
-        alias_chained_method :insert, :query_dirty, :jdbc_oracle_insert
+        alias_chained_method :insert, :query_dirty, :insert
+        alias_chained_method :columns, :query_cache, :columns
       end
     end
 
@@ -40,6 +42,13 @@ module ::JdbcSpec
     end
 
     module Column
+      def primary=(val)
+        super
+        if val && @sql_type =~ /^NUMBER$/i
+          @type = :integer
+        end
+      end
+
       def type_cast(value)
         return nil if value.nil?
         case type
@@ -63,8 +72,8 @@ module ::JdbcSpec
       end
 
       def self.guess_date_or_time(value)
-        (value.hour == 0 && value.min == 0 && value.sec == 0) ?
-        new_date(value.year, value.month, value.day) : value
+        (value && value.hour == 0 && value.min == 0 && value.sec == 0) ?
+        Date.new(value.year, value.month, value.day) : value
       end
 
       private
@@ -74,7 +83,7 @@ module ::JdbcSpec
         when /char/i                           then :string
         when /float|double/i                   then :float
         when /int/i                            then :integer
-        when /num|dec|real/i                   then @scale == 0 ? :integer : :decimal
+        when /num|dec|real/i                   then extract_scale(field_type) == 0 ? :integer : :decimal
         when /date|time/i                      then :datetime
         when /clob/i                           then :text
         when /blob/i                           then :binary
@@ -115,8 +124,9 @@ module ::JdbcSpec
     def create_table(name, options = {}) #:nodoc:
       super(name, options)
       seq_name = options[:sequence_name] || "#{name}_seq"
+      start_value = options[:sequence_start_value] || 10000
       raise ActiveRecord::StatementInvalid.new("name #{seq_name} too long") if seq_name.length > table_alias_length
-      execute "CREATE SEQUENCE #{seq_name} START WITH 10000" unless options[:id] == false
+      execute "CREATE SEQUENCE #{seq_name} START WITH #{start_value}" unless options[:id] == false
     end
 
     def rename_table(name, new_name) #:nodoc:
@@ -138,10 +148,14 @@ module ::JdbcSpec
       recreate_database(name)
     end
 
-    def jdbc_oracle_insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil) #:nodoc:
-      if id_value || pk.nil? # Pre-assigned id or table without a primary key
+    def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil) #:nodoc:
+      if (id_value && !id_value.respond_to?(:to_sql)) || pk.nil?
+        # Pre-assigned id or table without a primary key
+        # Presence of #to_sql means an Arel literal bind variable
+        # that should use #execute_id_insert below
         execute sql, name
-      else # Assume the sql contains a bind-variable for the id
+      else
+        # Assume the sql contains a bind-variable for the id
         # Extract the table from the insert sql. Yuck.
         table = sql.split(" ", 4)[2].gsub('"', '')
         sequence_name ||= default_sequence_name(table)
@@ -313,6 +327,12 @@ module ::JdbcSpec
     #
     # see: abstract/quoting.rb
 
+    # See ACTIVERECORD_JDBC-33 for details -- better to not quote
+    # table names, esp. if they have schemas.
+    def quote_table_name(name) #:nodoc:
+      name.to_s
+    end
+
     # Camelcase column names need to be quoted.
     # Nonquoted identifiers can contain only alphanumeric characters from your
     # database character set and the underscore (_), dollar sign ($), and pound sign (#).
@@ -335,7 +355,7 @@ module ::JdbcSpec
           %Q{empty_#{ column.sql_type.downcase rescue 'blob' }()}
         end
       else
-        if column.respond_to?(:primary) && column.primary
+        if column.respond_to?(:primary) && column.primary && column.klass != String
           return value.to_i.to_s
         end
         quoted = super
@@ -347,7 +367,7 @@ module ::JdbcSpec
     end
 
     def quoted_date(value)
-      %Q{TIMESTAMP'#{value.strftime("%Y-%m-%d %H:%M:%S")}'}
+      %Q{TIMESTAMP'#{super}'}
     end
 
     def quoted_true #:nodoc:

data/lib/jdbc_adapter/version.rb

@@ -1,5 +1,5 @@
 module JdbcAdapter
   module Version
-    VERSION = "0.9.5"
+    VERSION = "0.9.6"
   end
 end

data/src/java/jdbc_adapter/RubyJdbcConnection.java

@@ -1,6 +1,6 @@
 /*
  **** BEGIN LICENSE BLOCK *****
- * Copyright (c) 2006-2009 Nick Sieger <nick@nicksieger.com>
+ * 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>
  *
@@ -117,7 +117,7 @@ public class RubyJdbcConnection extends RubyObject {
             throws SQLException, IOException {
         return (IRubyObject) withConnectionAndRetry(context, new SQLBlock() {
             public Object call(Connection c) throws SQLException {
-                ResultSet results = null;
+                ResultSet results = null, pkeys = null;
                 try {
                     String table_name = rubyApi.convertToRubyString(args[0]).getUnicodeValue();
                     String schemaName = null;
@@ -143,9 +143,11 @@ public class RubyJdbcConnection extends RubyObject {
                     }
 
                     results = metadata.getColumns(c.getCatalog(),schemaName,table_name,null);
-                    return unmarshal_columns(context, metadata, results);
+                    pkeys = metadata.getPrimaryKeys(c.getCatalog(),schemaName,table_name);
+                    return unmarshal_columns(context, metadata, results, pkeys);
                 } finally {
                     close(results);
+                    close(pkeys);
                 }
             }
         });
@@ -991,22 +993,28 @@ public class RubyJdbcConnection extends RubyObject {
     }
 
     private IRubyObject unmarshal_columns(ThreadContext context, DatabaseMetaData metadata,
-            ResultSet rs) throws SQLException {
+                                          ResultSet rs, ResultSet pkeys) throws SQLException {
         try {
             Ruby runtime = context.getRuntime();
             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 = getConnectionAdapters(runtime).getConstant("JdbcColumn");
 
-            while(rs.next()) {
+            while (pkeys.next()) {
+                pkeyNames.add(pkeys.getString(COLUMN_NAME));
+            }
+
+            while (rs.next()) {
+                String colName = rs.getString(COLUMN_NAME);
                 IRubyObject column = jdbcCol.callMethod(context, "new",
                         new IRubyObject[] {
                             getInstanceVariable("@config"),
                             RubyString.newUnicodeString(runtime,
-                                    caseConvertIdentifierForRails(metadata, rs.getString(COLUMN_NAME))),
+                                    caseConvertIdentifierForRails(metadata, colName)),
                             defaultValueFromResultSet(runtime, rs),
                             RubyString.newUnicodeString(runtime, typeFromResultSet(rs, isOracle)),
                             runtime.newBoolean(!rs.getString(IS_NULLABLE).trim().equals("NO"))
@@ -1014,12 +1022,15 @@ public class RubyJdbcConnection extends RubyObject {
                 columns.add(column);
 
                 IRubyObject tp = (IRubyObject)types.fastARef(column.callMethod(context,"type"));
-                if(tp != null && !tp.isNil() && tp.callMethod(context, "[]", runtime.newSymbol("limit")).isNil()) {
+                if (tp != null && !tp.isNil() && tp.callMethod(context, "[]", runtime.newSymbol("limit")).isNil()) {
                     column.callMethod(context, "limit=", runtime.getNil());
                     if(!column.callMethod(context, "type").equals(runtime.newSymbol("decimal"))) {
                         column.callMethod(context, "precision=", runtime.getNil());
                     }
                 }
+                if (pkeyNames.contains(colName)) {
+                    column.callMethod(context, "primary=", runtime.getTrue());
+                }
             }
             return runtime.newArray(columns);
         } finally {

data/test/oracle_simple_test.rb

@@ -6,24 +6,49 @@ class OracleSimpleTest < Test::Unit::TestCase
 end
 
 class OracleSpecificTest < Test::Unit::TestCase
-  include MultibyteTestMethods
+  include MultibyteTestMethods  # so we can get @java_con
 
   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)"
+    @java_con.createStatement.execute "CREATE TABLE DEFAULT_NUMBER (VALUE NUMBER, DATUM DATE)"
+    @java_con.createStatement.execute "INSERT INTO DEFAULT_NUMBER (VALUE, DATUM) VALUES (0.076, TIMESTAMP'2009-11-05 00:00:00')"
+    @java_con.createStatement.execute "CREATE SYNONYM POSTS FOR ENTRIES"
+    @klass = Class.new(ActiveRecord::Base)
+    @klass.set_table_name "DEFAULT_NUMBER"
   end
 
   def teardown
     @java_con.createStatement.execute "DROP TABLE DEFAULT_NUMBER"
+    @java_con.createStatement.execute "DROP SYNONYM POSTS"
     super
   end
 
-
   def test_default_number_precision
-    klass = Class.new(ActiveRecord::Base)
-    klass.set_table_name "DEFAULT_NUMBER"
-    obj = klass.find(:first)
+    obj = @klass.find(:first)
     assert_equal 0.076, obj.value
   end
+
+  # JRUBY-3675, ACTIVERECORD_JDBC-22
+  def test_load_date
+    obj = @klass.find(:first)
+    assert_not_nil obj.datum, "no date"
+  end
+
+  def test_load_null_date
+    @java_con.createStatement.execute "UPDATE DEFAULT_NUMBER SET DATUM = NULL"
+    obj = @klass.find(:first)
+    assert obj.datum.nil?
+  end
+
+  def test_model_access_by_synonym
+    @klass.set_table_name "POSTS"
+    entry_columns = Entry.columns_hash
+    @klass.columns.each do |c|
+      ec = entry_columns[c.name]
+      assert ec
+      assert_equal ec.sql_type, c.sql_type
+      assert_equal ec.type, c.type
+    end
+  end
+
 end if defined?(JRUBY_VERSION)

data/test/simple.rb

@@ -105,6 +105,20 @@ module SimpleTestMethods
   end
 
   if Time.respond_to?(:zone)
+    def test_save_time_with_utc
+      current_zone = Time.zone
+      default_zone = ActiveRecord::Base.default_timezone
+      ActiveRecord::Base.default_timezone = Time.zone = :utc
+      now = Time.now
+      my_time = Time.local now.year, now.month, now.day, now.hour, now.min, now.sec
+      m = DbType.create! :sample_datetime => my_time
+      m.reload
+      assert_equal my_time, m.sample_datetime
+    rescue
+      Time.zone = current_zone
+      ActiveRecord::Base.default_timezone = default_zone
+    end
+
     def test_save_time
       t = Time.now
       #precision will only be expected to the second.
@@ -156,7 +170,12 @@ module SimpleTestMethods
     e.sample_date = date
     e.save!
     e = DbType.find(:first)
-    assert_equal date, e.sample_date
+    if DbType.columns_hash["sample_date"].type == :datetime
+      # Oracle doesn't distinguish btw date/datetime
+      assert_equal date, e.sample_date.to_date
+    else
+      assert_equal date, e.sample_date
+    end
   end
 
   def test_boolean

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 9
-    - 5
-  version: 0.9.5
+    - 6
+  version: 0.9.6
 platform: java
 authors: 
   - Nick Sieger, Ola Bini and JRuby contributors
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-22 00:00:00 -05:00
+date: 2010-05-05 00:00:00 -05:00
 default_executable: 
 dependencies: []