activerecord-jdbc-adapter 1.2.1 → 1.2.2

data/.travis.yml

@@ -1,5 +1,8 @@
 rvm:
   - jruby
+env:
+  - JRUBY_OPTS=
+  - JRUBY_OPTS=--1.9
 branches:
   only:
     - master

data/Gemfile.lock

@@ -1,35 +1,33 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.1.0)
-      activesupport (= 3.1.0)
-      bcrypt-ruby (~> 3.0.0)
+    activemodel (3.2.1)
+      activesupport (= 3.2.1)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-      arel (~> 2.2.1)
+    activerecord (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+      arel (~> 3.0.0)
       tzinfo (~> 0.3.29)
-    activesupport (3.1.0)
+    activesupport (3.2.1)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (2.2.1)
-    bcrypt-ruby (3.0.0-java)
+    arel (3.0.0)
     bouncy-castle-java (1.5.0146.1)
     builder (3.0.0)
     columnize (0.3.1)
     i18n (0.6.0)
-    jruby-openssl (0.7.4)
-      bouncy-castle-java
+    jruby-openssl (0.7.5)
+      bouncy-castle-java (>= 1.5.0146.1)
     mocha (0.9.8)
       rake
-    multi_json (1.0.3)
+    multi_json (1.0.4)
     rake (0.9.2.2)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4-java)
-    tzinfo (0.3.29)
+    tzinfo (0.3.31)
 
 PLATFORMS
   java

data/History.txt

@@ -1,3 +1,22 @@
+== 1.2.2 (01/27/12)
+
+- Thanks George Murphy and Dwayne Litzenberger for their significant
+  work this release!
+- AR 3.2.x compatibility via #156 (thanks George Murphy)
+- #152: Bunch of derby and mssql fixes (thanks Dwayne Litzenberger)
+- #137: Fix configure_arel2_visitors for vanilla JDBC adapters
+- #136: query cache fix
+- #138: error message improvement for #table_structure (threez)
+- #130, #139: sqlite3 should log inserts (Uwe Kubosch)
+- #141 column queries logging (George Murphy)
+- #142 MySQL fixes for AR 3-1-stable tests (George Murphy)
+- #147, #149 Improve speed of PG metadata queries (George Murphy)
+- #148 PostgreSQL fixes for AR 3-1-stable tests (George Murphy)
+- #128, #129 Fix for invalid :limit on date columns in schema.rb (Lenny Marks)
+- #144 Stop using ParseDate (not 1.9 friendly) (Bill Koch)
+- #146 Upgrade PG drivers (David Kellum)
+- #150 avoid 'TypeError: can't dup Fixnum' for performance (Bruce Adams)
+
 == 1.2.1 (11/23/11)
 
 - #117: Skip ? substitution when no bind parameters are given

data/README.rdoc

@@ -182,6 +182,8 @@ the ActiveRecord sources.
 
   jruby -S rake rails:test DRIVER=mysql RAILS=/path/activerecord_source_dir
 
+== Travis Build Status {<img src="https://secure.travis-ci.org/jruby/activerecord-jdbc-adapter.png"/>}[http://travis-ci.org/#!/jruby/activerecord-jdbc-adapter]
+
 == Authors
 
 This project was written by Nick Sieger <nick@nicksieger.com> and Ola Bini

data/Rakefile

@@ -6,6 +6,8 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 require 'bundler/setup'
 
+require File.expand_path('../test/helper', __FILE__)
+
 task :default => [:jar, :test]
 
 #ugh, bundler doesn't use tasks, so gotta hook up to both tasks.
@@ -56,4 +58,3 @@ task "all:build"   => ["build", *ADAPTERS.map { |f| "#{f}:build" }]
 task :filelist do
   puts FileList['pkg/**/*'].inspect
 end
-

data/lib/arel/visitors/derby.rb

@@ -5,10 +5,10 @@ module Arel
     class Derby < Arel::Visitors::ToSql
       def visit_Arel_Nodes_SelectStatement o
         [
-         o.cores.map { |x| visit_Arel_Nodes_SelectCore x }.join,
+         o.cores.map { |x| visit(x) }.join,
          ("ORDER BY #{o.orders.map { |x| visit x }.join(', ')}" unless o.orders.empty?),
-         (visit_Arel_Nodes_Limit(o.limit) if o.limit),
          (visit(o.offset) if o.offset),
+         (visit(o.limit) if o.limit),
          (visit(o.lock) if o.lock),
         ].compact.join ' '
       end
@@ -20,6 +20,13 @@ module Arel
       def visit_Arel_Nodes_Offset o
         "OFFSET #{visit o.value} ROWS"
       end
+
+      # This generates SELECT...FOR UPDATE, but it will only work if the
+      # current transaction isolation level is set to SERIALIZABLE.  Otherwise,
+      # locks aren't held for the entire transaction.
+      def visit_Arel_Nodes_Lock o
+        visit o.expr
+      end
     end
   end
 end

data/lib/arel/visitors/sql_server.rb

@@ -4,6 +4,7 @@ module Arel
   module Visitors
     class SQLServer < Arel::Visitors::ToSql
       include ArJdbc::MsSQL::LimitHelpers::SqlServerReplaceLimitOffset
+      include ArJdbc::MsSQL::LockHelpers::SqlServerAddLock
 
       def select_count? o
         sel = o.cores.length == 1 && o.cores.first
@@ -33,6 +34,7 @@ module Arel
         else
           sql = super
         end
+        add_lock!(sql, :lock => o.lock && true)
         sql
       end
     end

data/lib/arjdbc/db2/adapter.rb

@@ -69,7 +69,9 @@ module ArJdbc
       def self.cast_to_time(value)
         return value if value.is_a? Time
         # AS400 returns a 2 digit year, LUW returns a 4 digit year, so comp = true to help out AS400
-        time_array = ParseDate.parsedate(value, true)
+        time = DateTime.parse(value).to_time rescue nil
+        return nil unless time
+        time_array = [time.year, time.month, time.day, time.hour, time.min, time.sec]
         time_array[0] ||= 2000; time_array[1] ||= 1; time_array[2] ||= 1;
         Time.send(ActiveRecord::Base.default_timezone, *time_array) rescue nil
       end

data/lib/arjdbc/derby/adapter.rb

@@ -27,19 +27,25 @@ module ::ArJdbc
       end
     end
 
-    def self.extended(*args)
+    def self.extended(adapter)
       monkey_rails
+      adapter.configure_connection
     end
 
     def self.included(*args)
       monkey_rails
     end
 
+    def configure_connection
+      execute("SET ISOLATION = SERIALIZABLE")   # This must be done or SELECT...FOR UPDATE won't work how we expect
+    end
+
     module Column
       def simplified_type(field_type)
         case field_type
         when /smallint/i  then :boolean
         when /real/i      then :float
+        when /^timestamp/i then :datetime
         else
           super
         end
@@ -73,10 +79,10 @@ module ::ArJdbc
     # In Derby, the following cannot specify a limit:
     # - integer
     # - boolean (smallint)
-    # - timestamp
+    # - datetime (timestamp)
     # - date
     def type_to_sql(type, limit = nil, precision = nil, scale = nil) #:nodoc:
-      return super unless [:integer, :boolean, :timestamp, :date].include? type
+      return super unless [:integer, :boolean, :timestamp, :datetime, :date].include? type
 
       native = native_database_types[type.to_s.downcase.to_sym]
       native.is_a?(Hash) ? native[:name] : native
@@ -87,6 +93,7 @@ module ::ArJdbc
       tp[:string][:limit] = 256
       tp[:integer][:limit] = nil
       tp[:boolean] = {:name => "smallint"}
+      tp[:datetime] = {:name => "timestamp", :limit => nil}
       tp[:timestamp][:limit] = nil
       tp[:date][:limit] = nil
       tp

data/lib/arjdbc/jdbc/adapter.rb

@@ -12,6 +12,7 @@ require 'arjdbc/jdbc/column'
 require 'arjdbc/jdbc/connection'
 require 'arjdbc/jdbc/callbacks'
 require 'arjdbc/jdbc/extension'
+require 'arjdbc/jdbc/base_ext'
 require 'bigdecimal'
 
 module ActiveRecord
@@ -111,7 +112,7 @@ module ActiveRecord
         if defined?(::Arel::Visitors::VISITORS)
           visitors = ::Arel::Visitors::VISITORS
           visitor = nil
-          adapter_spec = config[:adapter_spec] || self
+          adapter_spec = config[:adapter_spec] || self.class
           adapter_spec.arel2_visitors(config).each do |k,v|
             visitor = v
             visitors[k] = v
@@ -119,6 +120,7 @@ module ActiveRecord
           if visitor && config[:adapter] =~ /^(jdbc|jndi)$/
             visitors[config[:adapter]] = visitor
           end
+          @visitor = visitors[config[:adapter]].new(self)
         end
       end
 
@@ -196,7 +198,8 @@ module ActiveRecord
         if binds.empty?
           sql
         else
-          sql.gsub('?') { quote(*binds.shift.reverse) }
+          copy = binds.dup
+          sql.gsub('?') { quote(*copy.shift.reverse) }
         end
       end
 

data/lib/arjdbc/jdbc/base_ext.rb

@@ -0,0 +1,15 @@
+module ActiveRecord
+  class Base  # reopen
+    class <<self
+      # Allow adapters to provide their own reset_column_information methods
+      #
+      # NOTE: This only affects the current thread's connection.
+      def reset_column_information_with_arjdbc_base_ext
+        # Invoke the adapter-specific reset_column_information method
+        connection.reset_column_information if connection.respond_to?(:reset_column_information)
+        reset_column_information_without_arjdbc_base_ext
+      end
+      alias_method_chain :reset_column_information, :arjdbc_base_ext unless instance_methods.include?("reset_column_information_without_arjdbc_base_ext")
+    end
+  end
+end

data/lib/arjdbc/jdbc/connection.rb

@@ -107,7 +107,11 @@ module ActiveRecord
         types = {}
         @native_types.each_pair do |k, v|
           types[k] = v.inject({}) do |memo, kv|
-            memo[kv.first] = begin kv.last.dup rescue kv.last end
+            memo[kv.first] = if kv.last.is_a? Numeric
+                               kv.last
+                             else
+                               begin kv.last.dup rescue kv.last end
+                             end
             memo
           end
         end

data/lib/arjdbc/jdbc/missing_functionality_helper.rb

@@ -33,6 +33,7 @@ module ArJdbc
 
           @definition.column(column_name, column.type,
             :limit => column.limit, :default => column.default,
+            :precision => column.precision, :scale => column.scale,
             :null => column.null)
         end
         @definition.primary_key(primary_key(from)) if primary_key(from)

data/lib/arjdbc/mssql/adapter.rb

@@ -1,5 +1,7 @@
 require 'arjdbc/mssql/tsql_helper'
 require 'arjdbc/mssql/limit_helpers'
+require 'arjdbc/mssql/lock_helpers'
+require 'strscan'
 
 module ::ArJdbc
   module MsSQL
@@ -12,7 +14,13 @@ module ::ArJdbc
           def after_save_with_mssql_lob
             self.class.columns.select { |c| c.sql_type =~ /image/i }.each do |c|
               value = self[c.name]
-              value = value.to_yaml if unserializable_attribute?(c.name, c)
+              if coder = self.class.serialized_attributes[c.name]
+                if coder.respond_to?(:dump)
+                  value = coder.dump(value)
+                else
+                  value = value.to_yaml
+                end
+              end
               next if value.nil?  || (value == '')
 
               connection.write_large_object(c.type == :binary, c.name, self.class.table_name, self.class.primary_key, quote_value(id), value)
@@ -84,22 +92,26 @@ module ::ArJdbc
     end
 
     module Column
+      include LockHelpers::SqlServerAddLock
+
       attr_accessor :identity, :is_special
 
       def simplified_type(field_type)
         case field_type
-        when /int|bigint|smallint|tinyint/i                        then :integer
-        when /numeric/i                                            then (@scale.nil? || @scale == 0) ? :integer : :decimal
-        when /float|double|decimal|money|real|smallmoney/i         then :decimal
-        when /datetime|smalldatetime/i                             then :datetime
-        when /timestamp/i                                          then :timestamp
-        when /time/i                                               then :time
-        when /date/i                                               then :date
-        when /text|ntext|xml/i                                     then :text
-        when /binary|image|varbinary/i                             then :binary
-        when /char|nchar|nvarchar|string|varchar/i                 then (@limit == 1073741823 ? (@limit = nil; :text) : :string)
-        when /bit/i                                                then :boolean
-        when /uniqueidentifier/i                                   then :string
+        when /int|bigint|smallint|tinyint/i           then :integer
+        when /numeric/i                               then (@scale.nil? || @scale == 0) ? :integer : :decimal
+        when /float|double|money|real|smallmoney/i    then :decimal
+        when /datetime|smalldatetime/i                then :datetime
+        when /timestamp/i                             then :timestamp
+        when /time/i                                  then :time
+        when /date/i                                  then :date
+        when /text|ntext|xml/i                        then :text
+        when /binary|image|varbinary/i                then :binary
+        when /char|nchar|nvarchar|string|varchar/i    then (@limit == 1073741823 ? (@limit = nil; :text) : :string)
+        when /bit/i                                   then :boolean
+        when /uniqueidentifier/i                      then :string
+        else
+          super
         end
       end
 
@@ -109,7 +121,7 @@ module ::ArJdbc
       end
 
       def type_cast(value)
-        return nil if value.nil? || value == "(null)" || value == "(NULL)"
+        return nil if value.nil?
         case type
         when :integer then value.delete('()').to_i rescue unquote(value).to_i rescue value ? 1 : 0
         when :primary_key then value == true || value == false ? value == true ? 1 : 0 : value.to_i
@@ -143,15 +155,7 @@ module ::ArJdbc
 
       def cast_to_time(value)
         return value if value.is_a?(Time)
-        time_array = ParseDate.parsedate(value)
-        return nil if !time_array.any?
-        time_array[0] ||= 2000
-        time_array[1] ||= 1
-        time_array[2] ||= 1
-        return Time.send(ActiveRecord::Base.default_timezone, *time_array) rescue nil
-
-        # Try DateTime instead - the date may be outside the time period support by Time.
-        DateTime.new(*time_array[0..5]) rescue nil
+        DateTime.parse(value).to_time rescue nil
       end
 
       def cast_to_date(value)
@@ -389,11 +393,6 @@ module ::ArJdbc
       end
     end
 
-    #SELECT .. FOR UPDATE is not supported on Microsoft SQL Server
-    def add_lock!(sql, options)
-      sql
-    end
-
     # Turns IDENTITY_INSERT ON for table during execution of the block
     # N.B. This sets the state of IDENTITY_INSERT to OFF after the
     # block has been executed without regard to its previous state
@@ -469,6 +468,10 @@ module ::ArJdbc
     def clear_cached_table(name)
       (@table_columns ||= {}).delete(name.to_s)
     end
+
+    def reset_column_information
+      @table_columns = nil
+    end
   end
 end
 

data/lib/arjdbc/mssql/lock_helpers.rb

@@ -0,0 +1,72 @@
+module ::ArJdbc
+  module MsSQL
+    module LockHelpers
+      module SqlServerAddLock
+        # Microsoft SQL Server uses its own syntax for SELECT .. FOR UPDATE:
+        # SELECT .. FROM table1 WITH(ROWLOCK,UPDLOCK), table2 WITH(ROWLOCK,UPDLOCK) WHERE ..
+        #
+        # This does in-place modification of the passed-in string.
+        def add_lock!(sql, options)
+          if options[:lock] and sql =~ /\A\s*SELECT/mi
+            # Check for and extract the :limit/:offset sub-query
+            if sql =~ /\A(\s*SELECT t\.\* FROM \()(.*)(\) AS t WHERE t._row_num BETWEEN \d+ AND \d+\s*)\Z/m
+              prefix, subselect, suffix = [$1, $2, $3]
+              add_lock!(subselect, options)
+              return sql.replace(prefix + subselect + suffix)
+            end
+            unless sql =~ /\A(\s*SELECT\s.*?)(\sFROM\s)(.*?)(\sWHERE\s.*|)\Z/mi
+              # If you get this error, this driver probably needs to be fixed.
+              raise NotImplementedError, "Don't know how to add_lock! to SQL statement: #{sql.inspect}"
+            end
+            select_clause, from_word, from_tables, where_clause = [$1, $2, $3, $4]
+            with_clause = options[:lock].is_a?(String) ? " #{options[:lock]} " : " WITH(ROWLOCK,UPDLOCK) "
+
+            # Split the FROM clause into its constituent tables, and add the with clause after each one.
+            new_from_tables = []
+            s = StringScanner.new(from_tables)
+            until s.eos?
+              prev_pos = s.pos
+              if s.scan_until(/,|(INNER\s+JOIN|CROSS\s+JOIN|(LEFT|RIGHT|FULL)(\s+OUTER)?\s+JOIN)\s+/mi)
+                join_operand = s.pre_match[prev_pos..-1]
+                join_operator = s.matched
+              else
+                join_operand = s.rest
+                join_operator = ""
+                s.terminate
+              end
+
+              # At this point, we have something like:
+              #   join_operand == "appointments "
+              #   join_operator == "INNER JOIN "
+              # or:
+              #   join_operand == "appointment_details AS d1 ON appointments.[id] = d1.[appointment_id]"
+              #   join_operator == ""
+              if join_operand =~ /\A(.*)(\s+ON\s+.*)\Z/mi
+                table_spec, on_clause = [$1, $2]
+              else
+                table_spec = join_operand
+                on_clause = ""
+              end
+
+              # Add the "WITH(ROWLOCK,UPDLOCK)" option to the table specification
+              table_spec << with_clause unless table_spec =~ /\A\(\s*SELECT\s+/mi  # HACK - this parser isn't so great
+              join_operand = table_spec + on_clause
+
+              # So now we have something like:
+              #   join_operand == "appointments  WITH(ROWLOCK,UPDLOCK) "
+              #   join_operator == "INNER JOIN "
+              # or:
+              #   join_operand == "appointment_details AS d1 WITH(ROWLOCK,UPDLOCK)  ON appointments.[id] = d1.[appointment_id]"
+              #   join_operator == ""
+
+              new_from_tables << join_operand
+              new_from_tables << join_operator
+            end
+            sql.replace([select_clause, from_word, new_from_tables, where_clause].flatten.join)
+          end
+          sql
+        end
+      end
+    end
+  end
+end