ActiveRecord-JDBC 0.2.4 → 0.3

data/History.txt

@@ -1,3 +1,9 @@
+== 0.3
+
+* Release coincides with JRuby 1.0.0RC1 release
+* Improvements for Derby, Postgres, and Oracle, all of which are running 
+  > 95% of AR tests
+
 == 0.2.4
 
 * Release coincides with JRuby 0.9.9 release

data/Rakefile

@@ -84,7 +84,7 @@ begin
   Rake::Task['manifest'].invoke # Always regen manifest, so Hoe has up-to-date list of files
 
   require 'hoe'
-  Hoe.new("ActiveRecord-JDBC", "0.2.4") do |p|
+  Hoe.new("ActiveRecord-JDBC", "0.3") do |p|
     p.rubyforge_name = "jruby-extras"
     p.url = "http://jruby-extras.rubyforge.org/ActiveRecord-JDBC"
     p.author = "Nick Sieger, Ola Bini and JRuby contributors"

data/lib/active_record/connection_adapters/jdbc_adapter.rb

@@ -88,6 +88,7 @@ module ActiveRecord
                           lambda {|r| r['precision'] == '38'},
                           lambda {|r| r['data_type'] == '2'}],
         :float       => [ lambda {|r| [Jdbc::Types::FLOAT,Jdbc::Types::DOUBLE, Jdbc::Types::REAL].include?(r['data_type'].to_i)},
+                          lambda {|r| r['data_type'].to_i == Jdbc::Types::REAL}, #Prefer REAL to DOUBLE for Postgresql
                           lambda {|r| r['type_name'] =~ /^float/i},
                           lambda {|r| r['type_name'] =~ /^double$/i},
                           lambda {|r| r['type_name'] =~ /^real$/i},
@@ -110,6 +111,7 @@ module ActiveRecord
                           lambda {|r| r['type_name'] =~ /^binary$/i}, ],
         :boolean     => [ lambda {|r| [Jdbc::Types::TINYINT].include?(r['data_type'].to_i)},
                           lambda {|r| r['type_name'] =~ /^bool/i},
+                          lambda {|r| r['data_type'] == '-7'},
                           lambda {|r| r['type_name'] =~ /^tinyint$/i},
                           lambda {|r| r['type_name'] =~ /^decimal$/i}],
       }
@@ -262,6 +264,8 @@ module ActiveRecord
         else
           raise
         end
+      ensure
+        metadata.close rescue nil
       end
 
       private
@@ -397,6 +401,13 @@ module ActiveRecord
       end
 
       def execute(sql, name = nil)
+        _execute(sql,name)
+      end
+
+      # we need to do it this way, to allow Rails stupid tests to always work
+      # even if we define a new execute method. Instead of mixing in a new
+      # execute, an _execute should be mixed in.
+      def _execute(sql, name = nil)
         log_no_bench(sql, name) do
           case sql.strip
           when /^(select|show)/i:
@@ -408,7 +419,7 @@ module ActiveRecord
           end
         end
       end
-
+      
       def update(sql, name = nil) #:nodoc:
         execute(sql, name)
       end

data/lib/jdbc_adapter/jdbc_derby.rb

@@ -34,6 +34,11 @@ module JdbcSpec
         (value.hour == 0 and value.min == 0 and value.sec == 0) ?
         Date.new(value.year, value.month, value.day) : value
       end
+
+      def simplified_type(field_type)
+        return :boolean if field_type =~ /smallint/i 
+        super
+      end
     end
 
     include JdbcSpec::MissingFunctionalityHelper
@@ -41,6 +46,7 @@ module JdbcSpec
     def modify_types(tp)
       tp[:primary_key] = "int generated by default as identity NOT NULL PRIMARY KEY"
       tp[:integer][:limit] = nil
+      tp[:boolean] = {:name => "smallint"}
       tp
     end
 
@@ -79,12 +85,21 @@ module JdbcSpec
       end
     end
     
-    def execute(sql, name = nil)
+    def _execute(sql, name = nil)
       log_no_bench(sql, name) do
-        if sql =~ /^select/i
-          @limit ||= -1
+        case sql.strip
+        when /^(select|show)/i:
           @offset ||= 0
-          @connection.execute_query(sql)[@offset..(@offset+@limit)]
+          if !@limit || @limit == -1
+            range = @offset..-1
+            max = 0
+          else
+            range = @offset...(@offset+@limit)
+            max = @offset+@limit+1
+          end
+          @connection.execute_query(sql,max)[range] || []
+        when /^insert/i:
+          @connection.execute_insert(sql)
         else
           @connection.execute_update(sql)
         end
@@ -139,8 +154,17 @@ module JdbcSpec
       end
     end
 
+    # There seems to be more than one thing wrong with 
+    # changing defaults for VARCHAR columns right now... DERBY-2371
+    # among others
     def change_column_default(table_name, column_name, default) #:nodoc:
-      execute "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} SET DEFAULT #{quote(default)}"
+      begin
+        execute "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} DEFAULT #{quote(default)}"
+      rescue
+        alter_table(table_name) do |definition|
+          definition[column_name].default = default
+        end
+      end        
     end
 
     # Support for renaming columns:
@@ -149,9 +173,13 @@ module JdbcSpec
     # This feature is expect to arrive in version 10.3.0.0:
     # http://wiki.apache.org/db-derby/DerbyTenThreeRelease)
     #
-    #def rename_column(table_name, column_name, new_column_name) #:nodoc:
-    #  execute "ALTER TABLE #{table_name} ALTER RENAME COLUMN #{column_name} TO #{new_column_name}"
-    #end
+    def rename_column(table_name, column_name, new_column_name) #:nodoc:
+      begin
+        execute "ALTER TABLE #{table_name} ALTER RENAME COLUMN #{column_name} TO #{new_column_name}"
+      rescue
+        alter_table(table_name, :rename => {column_name => new_column_name})
+      end
+    end
     
     def primary_keys(table_name)
       @connection.primary_keys table_name.to_s.upcase
@@ -195,10 +223,18 @@ module JdbcSpec
       end
     end
 
+    def quote_string(s)
+      s.gsub(/'/, "''") # ' (for ruby-mode)
+    end
+    
 # For DDL it appears you can quote "" column names, but in queries (like insert it errors out?)
-#    def quote_column_name(name) #:nodoc:
-#        %Q{"#{name}"}
-#    end
+    def quote_column_name(name) #:nodoc:
+      if /^references$/i =~ name
+        %Q{"#{name.upcase}"}
+      else
+        name
+      end
+    end
     
     def quoted_true
       '1'

data/lib/jdbc_adapter/jdbc_firebird.rb

@@ -42,7 +42,7 @@ module JdbcSpec
       execute "UPDATE RDB$GENERATORS SET RDB$GENERATOR_NAME='#{new_name}_seq' WHERE RDB$GENERATOR_NAME='#{name}_seq'" rescue nil
     end  
 
-    def drop_table(name) #:nodoc:
+    def drop_table(name, options = {}) #:nodoc:
       super(name)
       execute "DROP GENERATOR #{name}_seq" rescue nil
     end

data/lib/jdbc_adapter/jdbc_mimer.rb

@@ -22,7 +22,7 @@ module JdbcSpec
       execute "CREATE SEQUENCE #{name}_seq" unless options[:id] == false
     end
 
-    def drop_table(name) #:nodoc:
+    def drop_table(name, options = {}) #:nodoc:
       super(name) rescue nil
       execute "DROP SEQUENCE #{name}_seq" rescue nil
     end
@@ -91,9 +91,13 @@ module JdbcSpec
     end
     
     def select_all(sql, name = nil)
-      @limit ||= -1
       @offset ||= 0
-      select(sql, name)[@offset..(@offset+@limit)]
+      if !@limit || @limit == -1
+        range = @offset..-1
+      else
+        range = @offset...(@offset+@limit)
+      end
+      select(sql, name)[range]
     ensure
       @limit = @offset = nil
     end
@@ -105,12 +109,16 @@ module JdbcSpec
       @limit = @offset = nil
     end
 
-    def execute(sql, name = nil)
+    def _execute(sql, name = nil)
       log_no_bench(sql, name) do
         if sql =~ /^select/i
-          @limit ||= -1
           @offset ||= 0
-          @connection.execute_query(sql)[@offset..(@offset+@limit)]
+          if !@limit || @limit == -1
+            range = @offset..-1
+          else
+            range = @offset...(@offset+@limit)
+          end
+          @connection.execute_query(sql)[range]
         else
           @connection.execute_update(sql)
         end

data/lib/jdbc_adapter/jdbc_oracle.rb

@@ -58,7 +58,7 @@ module JdbcSpec
       execute "RENAME #{name}_seq TO #{new_name}_seq" rescue nil
     end  
 
-    def drop_table(name) #:nodoc:
+    def drop_table(name, options = {}) #:nodoc:
       super(name)
       execute "DROP SEQUENCE #{name}_seq" rescue nil
     end
@@ -69,21 +69,23 @@ module JdbcSpec
       elsif id_value # Pre-assigned id
         log(sql, name) { @connection.execute_insert sql,pk }
       else # Assume the sql contains a bind-variable for the id
-        id_value = select_one("select #{sequence_name}.nextval id from dual")['id']
+        id_value = select_one("select #{sequence_name}.nextval id from dual")['id'].to_i
         log(sql, name) { 
-          execute_prepared_insert(sql,id_value)
+          @connection.execute_id_insert(sql,id_value)
         }
       end
       id_value
     end
-    
-    def execute_prepared_insert(sql, id)
-      @stmts ||= {}
-      @stmts[sql] ||= @connection.ps(sql)
-      stmt = @stmts[sql]
-      stmt.setLong(1,id)
-      stmt.executeUpdate
-      id
+
+    def _execute(sql, name = nil)
+      log_no_bench(sql, name) do
+        case sql.strip
+        when /^(select|show)/i:
+          @connection.execute_query(sql)
+        else
+          @connection.execute_update(sql)
+        end
+      end
     end
     
     def modify_types(tp)

data/lib/jdbc_adapter/jdbc_postgre.rb

@@ -1,19 +1,11 @@
 module JdbcSpec
   module PostgreSQL
     module Column
-      def type_cast(value)
-        return nil if value.nil? || value =~ /^\s*null\s*$/i
-        case type
-        when :string    then value
-        when :integer   then defined?(value.to_i) ? value.to_i : (value ? 1 : 0)
-        when :primary_key then defined?(value.to_i) ? value.to_i : (value ? 1 : 0) 
-        when :float     then value.to_f
-        when :datetime  then cast_to_date_or_time(value)
-        when :timestamp then cast_to_time(value)
-        when :time      then cast_to_time(value)
-        else value
-        end
+      def simplified_type(field_type)
+        return :integer if field_type =~ /^serial/i 
+        super
       end
+
       def cast_to_date_or_time(value)
         return value if value.is_a? Date
         return nil if value.blank?
@@ -31,6 +23,7 @@ module JdbcSpec
         (value.hour == 0 and value.min == 0 and value.sec == 0) ?
         Date.new(value.year, value.month, value.day) : value
       end
+
       def default_value(value)
         # Boolean types
         return "t" if value =~ /true/i
@@ -38,7 +31,7 @@ module JdbcSpec
         
         # Char/String/Bytea type values
         return $1 if value =~ /^'(.*)'::(bpchar|text|character varying|bytea)$/
-          
+        
         # Numeric values
         return value if value =~ /^-?[0-9]+(\.[0-9]*)?/
         
@@ -50,7 +43,7 @@ module JdbcSpec
         return nil
       end
     end
-    
+
     def modify_types(tp)
       tp[:primary_key] = "serial primary key"
       tp[:string][:limit] = 255
@@ -119,6 +112,17 @@ module JdbcSpec
       Integer(select_value("SELECT currval('#{sequence_name}')"))
     end
 
+    def _execute(sql, name = nil)
+      log_no_bench(sql, name) do
+        case sql.strip
+        when /^(select|show)/i:
+          @connection.execute_query(sql)
+        else
+          @connection.execute_update(sql)
+        end
+      end
+    end
+    
     def quote(value, column = nil)
       if value.kind_of?(String) && column && column.type == :binary
         "'#{escape_bytea(value)}'"
@@ -169,5 +173,17 @@ module JdbcSpec
     def remove_index(table_name, options) #:nodoc:
       execute "DROP INDEX #{index_name(table_name, options)}"
     end
+
+    def type_to_sql(type, limit = nil, precision = nil, scale = nil) #:nodoc:
+      return super unless type.to_s == 'integer'
+      
+      if limit.nil? || limit == 4
+        'integer'
+      elsif limit < 4
+        'smallint'
+      else
+        'bigint'
+      end
+    end
   end  
 end

data/test/activerecord/connection_adapters/type_conversion_test.rb

@@ -1,30 +1,30 @@
-require 'java'
-require 'models/data_types'
-require 'db/derby'
-require 'test/unit'
-
-JInteger = java.lang.Integer
-
-class TypeConversionTest < Test::Unit::TestCase
-
-  def setup
-    DbTypeMigration.up  
-    DbType.create(
-      :sample_timestamp => Time.at(1169964202),
-      :sample_decimal => JInteger::MAX_VALUE + 1)
-  end
-  
-  def teardown
-    DbTypeMigration.down
-  end
-  
-  def test_timestamp
-    types = DbType.find(:first)
-    assert_equal 'Sun Jan 28 06:03:22 UTC 2007', types.sample_timestamp.getutc.to_s
-  end
-  
-  def test_decimal
-    types = DbType.find(:first)
-    assert_equal((JInteger::MAX_VALUE + 1), types.sample_decimal)
-  end
-end
+require 'java'
+require 'models/data_types'
+require 'db/derby'
+require 'test/unit'
+
+JInteger = java.lang.Integer
+
+class TypeConversionTest < Test::Unit::TestCase
+  TEST_TIME = Time.at(1169964202)
+  def setup
+    DbTypeMigration.up  
+    DbType.create(
+      :sample_timestamp => TEST_TIME,
+      :sample_decimal => JInteger::MAX_VALUE + 1)
+  end
+  
+  def teardown
+    DbTypeMigration.down
+  end
+  
+  def test_timestamp
+    types = DbType.find(:first)
+    assert_equal TEST_TIME, types.sample_timestamp.getutc
+  end
+  
+  def test_decimal
+    types = DbType.find(:first)
+    assert_equal((JInteger::MAX_VALUE + 1), types.sample_decimal)
+  end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: ActiveRecord-JDBC
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
-date: 2007-04-24 00:00:00 -05:00
+  version: "0.3"
+date: 2007-05-07 00:00:00 -05:00
 summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.
 require_paths: 
 - lib