activerecord-jdbc-adapter 1.3.12 → 1.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e7fd59bd6f8be3d2d0da36e413324eea6539846
-  data.tar.gz: ca2bb40471a4076ead3ee9476c5edbd53b63a06e
+  metadata.gz: 93ba4c816887c15797f7e73007e1a9c74bcc29f9
+  data.tar.gz: ac03282ee4b9e14b0f97fac01ce010cb0a91dcf3
 SHA512:
-  metadata.gz: e14b3b99f73a202f4b494f79ee11af3440965a706c3d6e335292d184c3ea2bbf5166e0a2ba8f59a03ceffb8a40bc98eaa54f23448f40c18c7f1b0ae58e988e65
-  data.tar.gz: 2833ecd5d304e9d99b80d8efd7e7e2be0061d3fef2db16eee749986602a8b361cbe293453c139426cf51034989c3e388b0c0fd564581178143d196cb25ee0aab
+  metadata.gz: 6ca18d9e975df305173bd10256e85eb4d213b0d11d518117d9c7b5ea50997c16c6bacf2155b162270ba01ab8a5d83b4adf92b12ea1a0e1def83f14dfafdbd3d3
+  data.tar.gz: d586f6ffc1fd69c843f5e7a6f2b0f2bb48f8b0329a090edbcb9c3101a28feac9548f3c6da95e001d92f3817bef71c33cd09f590fdfd1b0c42cfe73b354f64bdd

data/History.md

@@ -1,3 +1,9 @@
+## 1.3.13 (11/21/14)
+
+- handle ("hacked") date/time/timestamp conversion from the JDBC side on 4.2
+- align SQLite's column class resolution with others in 1.3
+- avoid the Column regressions in 1.3.12 caused by backporting too much (#603)
+
 ## 1.3.12 (11/18/14)
 
 - [sqlite] support for latest JDBC 3.8

data/lib/arjdbc/db2/as400.rb

@@ -20,9 +20,6 @@ module ArJdbc
       [ /as400/i, lambda { |config, column| column.extend(Column) } ]
     end
 
-    # @private
-    Column = DB2::Column
-
     # Boolean emulation can be disabled using :
     #
     #   ArJdbc::AS400.emulate_booleans = false

data/lib/arjdbc/jdbc/adapter.rb

@@ -873,27 +873,65 @@ module ActiveRecord
 
       # @note Used by Java API to convert dates from (custom) SELECTs (might get refactored).
       # @private
-      def _string_to_date(value)
-        jdbc_column_class.string_to_date(value)
-      end
+      def _string_to_date(value); jdbc_column_class.string_to_date(value) end
 
       # @note Used by Java API to convert times from (custom) SELECTs (might get refactored).
       # @private
-      def _string_to_time(value)
-        jdbc_column_class.string_to_dummy_time(value)
-      end
+      def _string_to_time(value); jdbc_column_class.string_to_dummy_time(value) end
 
       # @note Used by Java API to convert times from (custom) SELECTs (might get refactored).
       # @private
-      def _string_to_timestamp(value)
-        jdbc_column_class.string_to_time(value)
+      def _string_to_timestamp(value); jdbc_column_class.string_to_time(value) end
+
+      if ActiveRecord::VERSION::STRING > '4.2'
+
+        # @private
+        @@_date = nil
+
+        # @private
+        def _string_to_date(value)
+          if jdbc_column_class.respond_to?(:string_to_date)
+            jdbc_column_class.string_to_date(value)
+          else
+            (@@_date ||= ActiveRecord::Type::Date.new).send(:cast_value, value)
+          end
+        end
+
+        # @private
+        @@_time = nil
+
+        # @private
+        def _string_to_time(value)
+          if jdbc_column_class.respond_to?(:string_to_dummy_time)
+            jdbc_column_class.string_to_dummy_time(value)
+          else
+            (@@_time ||= ActiveRecord::Type::Time.new).send(:cast_value, value)
+          end
+        end
+
+        # @private
+        @@_date_time = nil
+
+        # @private
+        def _string_to_timestamp(value)
+          if jdbc_column_class.respond_to?(:string_to_time)
+            jdbc_column_class.string_to_time(value)
+          else
+            (@@_date_time ||= ActiveRecord::Type::DateTime.new).send(:cast_value, value)
+          end
+        end
+
       end
 
+
       if ActiveRecord::VERSION::MAJOR < 4 # emulating Rails 3.x compatibility
         JdbcConnection.raw_date_time = true if JdbcConnection.raw_date_time? == nil
         JdbcConnection.raw_boolean = true if JdbcConnection.raw_boolean? == nil
       end
 
     end
+    module Jdbc
+      autoload :TypeCast, 'arjdbc/jdbc/type_cast'
+    end
   end
 end

data/lib/arjdbc/jdbc/column.rb

@@ -61,7 +61,7 @@ module ActiveRecord
 
       class << self
 
-        if ActiveRecord::VERSION::MAJOR > 3
+        if ActiveRecord::VERSION::MAJOR > 3 && ActiveRecord::VERSION::STRING < '4.2'
 
           # @private provides compatibility between AR 3.x/4.0 API
           def string_to_date(value); value_to_date(value) end

data/lib/arjdbc/jdbc/type_cast.rb

@@ -0,0 +1,140 @@
+module ActiveRecord::ConnectionAdapters
+  module Jdbc
+    # Type casting methods taken from AR 4.1's Column class.
+    # @private Simply to quickly "hack-in" 4.2 compatibility.
+    module TypeCast
+
+      TRUE_VALUES = [true, 1, '1', 't', 'T', 'true', 'TRUE', 'on', 'ON'].to_set
+      FALSE_VALUES = [false, 0, '0', 'f', 'F', 'false', 'FALSE', 'off', 'OFF'].to_set
+
+      #module Format
+      ISO_DATE = /\A(\d{4})-(\d\d)-(\d\d)\z/
+      ISO_DATETIME = /\A(\d{4})-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)(\.\d+)?\z/
+      #end
+
+      # Used to convert from BLOBs to Strings
+      def binary_to_string(value)
+        value
+      end
+
+      def value_to_date(value)
+        if value.is_a?(String)
+          return nil if value.empty?
+          fast_string_to_date(value) || fallback_string_to_date(value)
+        elsif value.respond_to?(:to_date)
+          value.to_date
+        else
+          value
+        end
+      end
+
+      def string_to_time(string)
+        return string unless string.is_a?(String)
+        return nil if string.empty?
+
+        fast_string_to_time(string) || fallback_string_to_time(string)
+      end
+
+      def string_to_dummy_time(string)
+        return string unless string.is_a?(String)
+        return nil if string.empty?
+
+        dummy_time_string = "2000-01-01 #{string}"
+
+        fast_string_to_time(dummy_time_string) || begin
+          time_hash = Date._parse(dummy_time_string)
+          return nil if time_hash[:hour].nil?
+          new_time(*time_hash.values_at(:year, :mon, :mday, :hour, :min, :sec, :sec_fraction))
+        end
+      end
+
+      # convert something to a boolean
+      def value_to_boolean(value)
+        if value.is_a?(String) && value.empty?
+          nil
+        else
+          TRUE_VALUES.include?(value)
+        end
+      end
+
+      # Used to convert values to integer.
+      # handle the case when an integer column is used to store boolean values
+      def value_to_integer(value)
+        case value
+        when TrueClass, FalseClass
+          value ? 1 : 0
+        else
+          value.to_i rescue nil
+        end
+      end
+
+      # convert something to a BigDecimal
+      def value_to_decimal(value)
+        # Using .class is faster than .is_a? and
+        # subclasses of BigDecimal will be handled
+        # in the else clause
+        if value.class == BigDecimal
+          value
+        elsif value.respond_to?(:to_d)
+          value.to_d
+        else
+          value.to_s.to_d
+        end
+      end
+
+      protected
+        # '0.123456' -> 123456
+        # '1.123456' -> 123456
+        def microseconds(time)
+          time[:sec_fraction] ? (time[:sec_fraction] * 1_000_000).to_i : 0
+        end
+
+        def new_date(year, mon, mday)
+          if year && year != 0
+            Date.new(year, mon, mday) rescue nil
+          end
+        end
+
+        def new_time(year, mon, mday, hour, min, sec, microsec, offset = nil)
+          # Treat 0000-00-00 00:00:00 as nil.
+          return nil if year.nil? || (year == 0 && mon == 0 && mday == 0)
+
+          if offset
+            time = Time.utc(year, mon, mday, hour, min, sec, microsec) rescue nil
+            return nil unless time
+
+            time -= offset
+            Base.default_timezone == :utc ? time : time.getlocal
+          else
+            Time.public_send(Base.default_timezone, year, mon, mday, hour, min, sec, microsec) rescue nil
+          end
+        end
+
+        def fast_string_to_date(string)
+          if string =~ ISO_DATE
+            new_date $1.to_i, $2.to_i, $3.to_i
+          end
+        end
+
+        # Doesn't handle time zones.
+        def fast_string_to_time(string)
+          if string =~ ISO_DATETIME
+            microsec = ($7.to_r * 1_000_000).to_i
+            new_time $1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i, microsec
+          end
+        end
+
+        def fallback_string_to_date(string)
+          new_date(*::Date._parse(string, false).values_at(:year, :mon, :mday))
+        end
+
+        def fallback_string_to_time(string)
+          time_hash = Date._parse(string)
+          time_hash[:sec_fraction] = microseconds(time_hash)
+
+          new_time(*time_hash.values_at(:year, :mon, :mday, :hour, :min, :sec, :sec_fraction, :offset))
+        end
+
+    end
+  end
+end

data/lib/arjdbc/mssql/adapter.rb

@@ -61,7 +61,7 @@ module ArJdbc
     end
 
     # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_column_class
-    def jdbc_column_class; Column end
+    def jdbc_column_class; ::ActiveRecord::ConnectionAdapters::MSSQLColumn end
 
     # @see ActiveRecord::ConnectionAdapters::Jdbc::ArelSupport
     def self.arel_visitor_type(config)
@@ -738,9 +738,3 @@ module ActiveRecord::ConnectionAdapters
   end
 
 end
-
-module ArJdbc
-  module MSSQL
-    Column = ::ActiveRecord::ConnectionAdapters::MSSQLColumn
-  end
-end

data/lib/arjdbc/mysql/adapter.rb

@@ -21,6 +21,10 @@ module ArJdbc
       ::ActiveRecord::ConnectionAdapters::MySQLJdbcConnection
     end
 
+    def jdbc_column_class
+      ::ActiveRecord::ConnectionAdapters::MysqlAdapter::Column
+    end
+
     # @private
     def init_connection(jdbc_connection)
       meta = jdbc_connection.meta_data
@@ -168,12 +172,12 @@ module ArJdbc
 
     # @private Only for Rails core compatibility.
     def new_column(field, default, type, null, collation, extra = "")
-      Column.new(field, default, type, null, collation, strict_mode?, extra)
+      jdbc_column_class.new(field, default, type, null, collation, strict_mode?, extra)
     end unless AR42
 
     # @private Only for Rails core compatibility.
     def new_column(field, default, cast_type, sql_type = nil, null = true, collation = "", extra = "")
-      Column.new(field, default, cast_type, sql_type, null, collation, strict_mode?, extra)
+      jdbc_column_class.new(field, default, cast_type, sql_type, null, collation, strict_mode?, extra)
     end if AR42
 
     # @private Only for Rails core compatibility.
@@ -378,9 +382,9 @@ module ArJdbc
         null = field['Null'] == "YES"
         if pass_cast_type
           cast_type = lookup_cast_type(sql_type)
-          Column.new(field['Field'], field['Default'], cast_type, sql_type, null, field['Collation'], strict, field['Extra'])
+          jdbc_column_class.new(field['Field'], field['Default'], cast_type, sql_type, null, field['Collation'], strict, field['Extra'])
         else
-          Column.new(field['Field'], field['Default'], sql_type, null, field['Collation'], strict, field['Extra'])
+          jdbc_column_class.new(field['Field'], field['Default'], sql_type, null, field['Collation'], strict, field['Extra'])
         end
       end
       columns
@@ -745,9 +749,3 @@ module ActiveRecord
 
   end
 end
-
-module ArJdbc
-  module MySQL
-    Column = ::ActiveRecord::ConnectionAdapters::MysqlAdapter::Column
-  end
-end

data/lib/arjdbc/oracle/adapter.rb

@@ -31,7 +31,7 @@ module ArJdbc
     end
 
     # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_column_class
-    def jdbc_column_class; Column end
+    def jdbc_column_class; ::ActiveRecord::ConnectionAdapters::OracleColumn end
 
     # @private
     @@update_lob_values = true
@@ -683,9 +683,3 @@ module ActiveRecord::ConnectionAdapters
   end
 
 end
-
-module ArJdbc
-  module Oracle
-    Column = ::ActiveRecord::ConnectionAdapters::OracleColumn
-  end
-end

data/lib/arjdbc/postgresql/adapter.rb

@@ -21,6 +21,9 @@ module ArJdbc
       ::ActiveRecord::ConnectionAdapters::PostgreSQLJdbcConnection
     end
 
+    # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_column_class
+    def jdbc_column_class; ::ActiveRecord::ConnectionAdapters::PostgreSQLColumn end
+
     # @private
     def init_connection(jdbc_connection)
       meta = jdbc_connection.meta_data
@@ -159,12 +162,12 @@ module ArJdbc
       when Array
         case column.sql_type
         when 'point'
-          Column.point_to_string(value)
+          jdbc_column_class.point_to_string(value)
         when 'json'
-          Column.json_to_string(value)
+          jdbc_column_class.json_to_string(value)
         else
           return super(value, column) unless column.array?
-          Column.array_to_string(value, column, self)
+          jdbc_column_class.array_to_string(value, column, self)
         end
       when NilClass
         if column.array? && array_member
@@ -177,17 +180,17 @@ module ArJdbc
       when Hash
         case column.sql_type
         when 'hstore'
-          Column.hstore_to_string(value)
+          jdbc_column_class.hstore_to_string(value)
         when 'json'
-          Column.json_to_string(value)
+          jdbc_column_class.json_to_string(value)
         else super(value, column)
         end
       when IPAddr
         return super unless column.sql_type == 'inet' || column.sql_type == 'cidr'
-        Column.cidr_to_string(value)
+        jdbc_column_class.cidr_to_string(value)
       when Range
         return super(value, column) unless /range$/ =~ column.sql_type
-        Column.range_to_string(value)
+        jdbc_column_class.range_to_string(value)
       else
         super(value, column)
       end
@@ -826,30 +829,30 @@ module ArJdbc
         sql_type && sql_type[0, 3] == 'bit' ? quote_bit(value) : super
       when Array
         if AR4_COMPAT && column.array? # will be always falsy in AR < 4.0
-          "'#{Column.array_to_string(value, column, self).gsub(/'/, "''")}'"
+          "'#{jdbc_column_class.array_to_string(value, column, self).gsub(/'/, "''")}'"
         elsif column.type == :json # only in AR-4.0
-          super(Column.json_to_string(value), column)
+          super(jdbc_column_class.json_to_string(value), column)
         elsif column.type == :point # only in AR-4.0
-          super(Column.point_to_string(value), column)
+          super(jdbc_column_class.point_to_string(value), column)
         else super
         end
       when Hash
         if column.type == :hstore # only in AR-4.0
-          super(Column.hstore_to_string(value), column)
+          super(jdbc_column_class.hstore_to_string(value), column)
         elsif column.type == :json # only in AR-4.0
-          super(Column.json_to_string(value), column)
+          super(jdbc_column_class.json_to_string(value), column)
         else super
         end
       when Range
         sql_type = column.respond_to?(:sql_type) && column.sql_type
         if sql_type && sql_type[-5, 5] == 'range' && AR4_COMPAT
-          escaped = quote_string(Column.range_to_string(value))
+          escaped = quote_string(jdbc_column_class.range_to_string(value))
           "'#{escaped}'::#{sql_type}"
         else super
         end
       when IPAddr
         if column.type == :inet || column.type == :cidr # only in AR-4.0
-          super(Column.cidr_to_string(value), column)
+          super(jdbc_column_class.cidr_to_string(value), column)
         else super
         end
       else
@@ -1079,6 +1082,7 @@ module ArJdbc
 
     # Returns the list of all column definitions for a table.
     def columns(table_name, name = nil)
+      column = jdbc_column_class
       pass_cast_type = respond_to?(:lookup_cast_type)
       column_definitions(table_name).map do |row|
         # name, type, default, notnull, oid, fmod
@@ -1095,9 +1099,9 @@ module ArJdbc
         end
         if pass_cast_type
           cast_type = lookup_cast_type(type)
-          Column.new(name, default, cast_type, type, ! notnull, fmod, self)
+          column.new(name, default, cast_type, type, ! notnull, fmod, self)
         else
-          Column.new(name, default, oid, type, ! notnull, fmod, self)
+          column.new(name, default, oid, type, ! notnull, fmod, self)
         end
       end
     end
@@ -1483,11 +1487,6 @@ module ActiveRecord::ConnectionAdapters
       ::ArJdbc::PostgreSQL.jdbc_connection_class
     end
 
-    # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_column_class
-    def jdbc_column_class
-      ::ActiveRecord::ConnectionAdapters::PostgreSQLColumn
-    end
-
     if ::ActiveRecord::VERSION::MAJOR < 4 # Rails 3.x compatibility
       PostgreSQLJdbcConnection.raw_array_type = true if PostgreSQLJdbcConnection.raw_array_type? == nil
       PostgreSQLJdbcConnection.raw_hstore_type = true if PostgreSQLJdbcConnection.raw_hstore_type? == nil
@@ -1495,9 +1494,3 @@ module ActiveRecord::ConnectionAdapters
 
   end
 end
-
-module ArJdbc
-  module PostgreSQL
-    Column = ::ActiveRecord::ConnectionAdapters::PostgreSQLColumn
-  end
-end

data/lib/arjdbc/postgresql/column.rb

@@ -28,6 +28,7 @@ module ArJdbc
             include ActiveRecord::ConnectionAdapters::PostgreSQL::ArrayParser
           end if AR4_COMPAT
 
+          include ActiveRecord::ConnectionAdapters::Jdbc::TypeCast if AR42_COMPAT
           include Cast
 
         end

data/lib/arjdbc/sqlite3/adapter.rb

@@ -12,6 +12,8 @@ module ArJdbc
       ::ActiveRecord::ConnectionAdapters::SQLite3JdbcConnection
     end
 
+    def jdbc_column_class; ::ActiveRecord::ConnectionAdapters::SQLite3Column end
+
     # @see ActiveRecord::ConnectionAdapters::JdbcColumn#column_types
     def self.column_selector
       [ /sqlite/i, lambda { |config, column| column.extend(Column) } ]
@@ -348,15 +350,15 @@ module ArJdbc
 
     # @override
     def columns(table_name, name = nil)
-      klass = ::ActiveRecord::ConnectionAdapters::SQLite3Column
+      column = jdbc_column_class
       pass_cast_type = respond_to?(:lookup_cast_type)
       table_structure(table_name).map do |field|
         sql_type = field['type']
         if pass_cast_type
           cast_type = lookup_cast_type(sql_type)
-          klass.new(field['name'], field['dflt_value'], cast_type, sql_type, field['notnull'] == 0)
+          column.new(field['name'], field['dflt_value'], cast_type, sql_type, field['notnull'] == 0)
         else
-          klass.new(field['name'], field['dflt_value'], sql_type, field['notnull'] == 0)
+          column.new(field['name'], field['dflt_value'], sql_type, field['notnull'] == 0)
         end
       end
     end
@@ -592,10 +594,6 @@ module ActiveRecord::ConnectionAdapters
       ::ArJdbc::SQLite3.jdbc_connection_class
     end
 
-    def jdbc_column_class
-      ::ActiveRecord::ConnectionAdapters::SQLite3Column
-    end
-
     # @private
     Version = ArJdbc::SQLite3::Version
 

data/lib/arjdbc/version.rb

@@ -1,5 +1,5 @@
 module ArJdbc
-  VERSION = "1.3.12"
+  VERSION = "1.3.13"
   # @deprecated
   module Version
     # @private 1.2.x compatibility

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.12
+  version: 1.3.13
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -120,6 +120,7 @@ files:
 - lib/arjdbc/jdbc/railtie.rb
 - lib/arjdbc/jdbc/rake_tasks.rb
 - lib/arjdbc/jdbc/serialized_attributes_helper.rb
+- lib/arjdbc/jdbc/type_cast.rb
 - lib/arjdbc/jdbc/type_converter.rb
 - lib/arjdbc/mimer.rb
 - lib/arjdbc/mimer/adapter.rb