activerecord-jdbc-adapter 1.3.8 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdd070e64ed269bffd40cf0a8664f09964f771d5
-  data.tar.gz: 1e14ca7c497d7bddb3bbdca2bcfa4da04acfebcf
+  metadata.gz: fb8275489a147bf60f8705498a80efe51ec395cc
+  data.tar.gz: 757b6d0d663b6d94499d42bb4aa27873456b1034
 SHA512:
-  metadata.gz: 19d45b4f7f4edcace3341a1641b24ee7e3e98bb8e2f7a4853cfa9cc6877eeffbbc5e56f86e2f98e37c9df6af3a85a0afa02a346f381498a87e71d36ddffa3eae
-  data.tar.gz: 349a9d32b318d73fc0f549a81c2dc5d38367629e1694597e47efae4aeea2ff6ca70e1f07cb750d453955781378f021149a2ae46994b111667db66d39a3a5f87c
+  metadata.gz: 309e8913e85548dc626989380c8b6d0f3cd5cd66e98912b30d160995cb69e1b984a2671004c7ca26b8e5c5b2e4b0ab003e451958fa6656f25643a03aca296e09
+  data.tar.gz: 67e41e8ef986c2d4bc113f8d85a5ed5e2ef947e353ca6dd75fa607ebb1cbbc09a0d502afafc017a29e9927bd248dd5d05c6b44ccbd8cadfe72f1ddfa3618ff63

data/Appraisals

@@ -12,17 +12,17 @@ appraise "rails31" do
 end
 
 appraise "rails32" do
-  gem "activerecord", "~> 3.2.18", :require => false
+  gem "activerecord", "~> 3.2.19", :require => false
 end
 
 appraise "rails40" do
   # NOTE: make sure you're using --1.9 with AR-4.0
-  gem "activerecord", "~> 4.0.6", :require => false
+  gem "activerecord", "~> 4.0.8", :require => false
 end
 
 appraise "rails41" do
   # NOTE: make sure you're using --1.9 with AR-4.0
-  gem "activerecord", "~> 4.1.2", :require => false
+  gem "activerecord", "~> 4.1.4", :require => false
 end
 
 appraise "rails42" do

data/History.md

@@ -1,3 +1,10 @@
+## 1.3.9 (07/07/14)
+
+- [postgres] improve Range's type cast - fixing minor quoting failure on AR 4.x
+- [postgres] range type's :exclude_start is actually += 1 (align with AR 4.1)
+- [postgres] correctly quote numeric values with string/text column types
+- [postgres] backport CVE-2014-3483 and protect against CVE-2014-3482 (from AR)
+
 ## 1.3.8 (06/27/14)
 
 - [mysql] updated so that we can run with non-official driver (+ against MariaDB)

data/Rakefile

@@ -20,21 +20,19 @@ ADAPTERS = %w[derby h2 hsqldb mssql mysql postgresql sqlite3].map { |a| "activer
 DRIVERS  = %w[derby h2 hsqldb jtds mysql postgres sqlite3].map { |a| "jdbc-#{a}" }
 TARGETS = ( ADAPTERS + DRIVERS )
 
-def rake(*args)
-  ruby "-S", "rake", *args
-end
+rake = lambda { |task| ruby "-S", "rake", task }
 
 TARGETS.each do |target|
   namespace target do
     task :build do
-      Dir.chdir(target) { rake "build" }
+      Dir.chdir(target) { rake.call "build" }
       cp FileList["#{target}/pkg/#{target}-*.gem"], "pkg"
     end
     task :install do
-      Dir.chdir(target) { rake "install" }
+      Dir.chdir(target) { rake.call "install" }
     end
     task :release do
-      Dir.chdir(target) { rake "release" }
+      Dir.chdir(target) { rake.call "release" }
     end
   end
 end
@@ -43,37 +41,44 @@ end
 
 desc "Build drivers"
 task "build:drivers" => DRIVERS.map { |name| "#{name}:build" }
-task "drivers:build" => DRIVERS.map { |name| "#{name}:build" }
+task "drivers:build" => 'build:drivers'
 
 desc "Install drivers"
 task "install:drivers" => DRIVERS.map { |name| "#{name}:install" }
-task "drivers:install" => DRIVERS.map { |name| "#{name}:install" }
+task "drivers:install" => 'install:drivers'
 
-desc "Release drivers"
-task "release:drivers" => DRIVERS.map { |name| "#{name}:release" }
-task "drivers:release" => DRIVERS.map { |name| "#{name}:release" }
+# desc "Release drivers"
+# task "release:drivers" => DRIVERS.map { |name| "#{name}:release" }
+# task "drivers:release" => DRIVERS.map { |name| "#{name}:release" }
 
 # ADAPTERS
 
 desc "Build adapters"
 task "build:adapters" => [ 'build' ] + ADAPTERS.map { |name| "#{name}:build" }
-task "adapters:build" => [ 'build' ] + ADAPTERS.map { |name| "#{name}:build" }
+task "adapters:build" => 'build:adapters'
 
 desc "Install adapters"
 task "install:adapters" => [ 'install' ] + ADAPTERS.map { |name| "#{name}:install" }
-task "adapters:install" => [ 'install' ] + ADAPTERS.map { |name| "#{name}:install" }
+task "adapters:install" => 'install:adapters'
 
 desc "Release adapters"
 task "release:adapters" => [ 'release' ] + ADAPTERS.map { |name| "#{name}:release" }
-task "adapters:release" => [ 'release' ] + ADAPTERS.map { |name| "#{name}:release" }
+task "adapters:release" => 'release:adapters'
+
+task 'release:do' => 'build:adapters' do
+  gemspec = Bundler.load_gemspec('activerecord-jdbc-adapter.gemspec')
+  version = gemspec.version; version_tag = "v#{version}"
+
+  sh("git diff --no-patch --exit-code") { |ok| fail "git working dir is not clean" unless ok }
+  sh("git diff-index --quiet --cached HEAD") { |ok| fail "git index is not clean" unless ok }
+
+  sh "git tag -a -m \"AR-JDBC #{version}\" #{version_tag}"
+  sh "for gem in `ls pkg/*-#{version}.gem`; do gem push $gem; done"
+end
 
 # ALL
 
 task "build:all" => [ 'build' ] + TARGETS.map { |name| "#{name}:build" }
-task "all:build" => [ 'build' ] + TARGETS.map { |name| "#{name}:build" }
+task "all:build" => 'build:all'
 task "install:all" => [ 'install' ] + TARGETS.map { |name| "#{name}:install" }
-task "all:install" => [ 'install' ] + TARGETS.map { |name| "#{name}:install" }
-
-task :filelist do
-  puts FileList['pkg/**/*'].inspect
-end
+task "all:install" => 'install:all'

data/lib/arjdbc/postgresql/adapter.rb

@@ -818,8 +818,9 @@ module ArJdbc
         end
       when Numeric
         if column.respond_to?(:sql_type) && column.sql_type == 'money'
-          # not truly string input, so doesn't require (or allow) escape syntax :
-          ( column.type == :string || column.type == :text ) ? "'#{value}'" : super
+          "'#{value}'"
+        elsif column.type == :string || column.type == :text
+          "'#{value}'"
         else super
         end
       when String
@@ -849,9 +850,11 @@ module ArJdbc
         else super
         end
       when Range
-        if column.type.to_s[-5..-1] == 'range' # :'xxxrange' only in AR-4.0
+        sql_type = column.respond_to?(:sql_type) && column.sql_type
+        if sql_type && sql_type[-5, 5] == 'range' && AR4_COMPAT
           column_class = ::ActiveRecord::ConnectionAdapters::PostgreSQLColumn
-          "'#{column_class.range_to_string(value)}'::#{column.sql_type}"
+          escaped = quote_string(column_class.range_to_string(value))
+          "'#{escaped}'::#{sql_type}"
         else super
         end
       when IPAddr
@@ -885,8 +888,8 @@ module ArJdbc
       #  "0101" will be treated as binary string
       #  "0100" will be treated as binary string
       # ... but is kept due Rails compatibility
-      when /^[01]*$/      then "B'#{value}'" # Bit-string notation
-      when /^[0-9A-F]*$/i then "X'#{value}'" # Hexadecimal notation
+      when /\A[01]*\Z/ then "B'#{value}'" # Bit-string notation
+      when /\A[0-9A-F]*\Z/i then "X'#{value}'" # Hexadecimal notation
       end
     end
 
@@ -1272,9 +1275,9 @@ module ActiveRecord::ConnectionAdapters
       else # NOTE: AR <= 3.2 : (name, default, sql_type = nil, null = true)
         null, sql_type, oid_type = !! sql_type, oid_type, nil
       end
-      if sql_type =~ /\[\]$/ && ArJdbc::PostgreSQL::AR4_COMPAT
+      if sql_type.to_s[-2, 2] == '[]' && ArJdbc::PostgreSQL::AR4_COMPAT
         @array = true if respond_to?(:array)
-        super(name, default, sql_type[0..sql_type.length - 3], null)
+        super(name, default, sql_type[0..-3], null)
       else
         @array = false if respond_to?(:array)
         super(name, default, sql_type, null)

data/lib/arjdbc/postgresql/column.rb

@@ -147,41 +147,47 @@ module ArJdbc
         when :tsvector then value
         when :datetime, :timestamp then self.class.string_to_time value
         else
-          case sql_type
-          when 'money'
+          if ( sql_type = self.sql_type.to_s ) == 'money'
             self.class.string_to_money(value)
-          when /^point/
+          elsif sql_type[0, 5] == 'point'
             value.is_a?(String) ? self.class.string_to_point(value) : value
-          when /^(bit|varbit)/
+          elsif sql_type[0, 3] == 'bit' || sql_type[0, 6] == 'varbit'
             value.is_a?(String) ? self.class.string_to_bit(value) : value
-          when /(.*?)range$/
+          elsif sql_type[-5, 5] == 'range'
             return if value.nil? || value == 'empty'
             return value if value.is_a?(::Range)
 
             extracted = extract_bounds(value)
 
-            case $1 # subtype
+            case sql_type[0...-5] # range sub-type
             when 'date' # :date
               from = self.class.value_to_date(extracted[:from])
-              from -= 1.day if extracted[:exclude_start]
+              from += 1.day if extracted[:exclude_start]
               to = self.class.value_to_date(extracted[:to])
             when 'num' # :decimal
-              from = BigDecimal.new(extracted[:from].to_s)
+              from = ::BigDecimal.new(extracted[:from].to_s)
               # FIXME: add exclude start for ::Range, same for timestamp ranges
-              to = BigDecimal.new(extracted[:to].to_s)
+              to = ::BigDecimal.new(extracted[:to].to_s)
             when 'ts', 'tstz' # :time
               from = self.class.string_to_time(extracted[:from])
               to = self.class.string_to_time(extracted[:to])
             when 'int4', 'int8' # :integer
-              from = to_integer(extracted[:from]) rescue value ? 1 : 0
-              from -= 1 if extracted[:exclude_start]
-              to = to_integer(extracted[:to]) rescue value ? 1 : 0
+              from = extracted[:from]
+              unless (from.respond_to?(:infinite?) && from.infinite?)
+                from = from.respond_to?(:to_i) ? from.to_i : ( value ? 1 : 0 )
+              end
+              from += 1 if extracted[:exclude_start]
+              to = extracted[:to]
+              unless (to.respond_to?(:infinite?) && to.infinite?)
+                to = to.respond_to?(:to_i) ? to.to_i : ( value ? 1 : 0 )
+              end
             else
               return value
             end
 
             ::Range.new(from, to, extracted[:exclude_end])
-          else super(value)
+          else
+             super(value)
           end
         end
       end if AR4_COMPAT
@@ -321,10 +327,6 @@ module ArJdbc
         ::Float::INFINITY * (options[:negative] ? -1 : 1)
       end if AR4_COMPAT
 
-      def to_integer(value)
-        (value.respond_to?(:infinite?) && value.infinite?) ? value : value.to_i
-      end if AR4_COMPAT
-
       # @note Based on *active_record/connection_adapters/postgresql/cast.rb* (4.0).
       module Cast
 

data/lib/arjdbc/postgresql/explain_support.rb

@@ -1,5 +1,6 @@
 module ArJdbc
   module PostgreSQL
+    # @private
     module ExplainSupport
       def supports_explain?
         true
@@ -10,8 +11,8 @@ module ArJdbc
         result = exec_query(sql, "EXPLAIN", binds)
         ExplainPrettyPrinter.new.pp result # we can assume AR >= 3.1
       end
-
-      class ExplainPrettyPrinter # :nodoc:
+      # @private
+      class ExplainPrettyPrinter
         # Pretty prints the result of a EXPLAIN in a way that resembles the output of the
         # PostgreSQL shell:
         #

data/lib/arjdbc/postgresql/oid_types.rb

@@ -3,6 +3,7 @@ require 'thread'
 
 module ArJdbc
   module PostgreSQL
+    # @private
     module OIDTypes
 
       OID = ActiveRecord::ConnectionAdapters::PostgreSQL::OID

data/lib/arjdbc/version.rb

@@ -1,8 +1,8 @@
 module ArJdbc
-  VERSION = "1.3.8"
+  VERSION = "1.3.9"
   # @deprecated
   module Version
     # @private 1.2.x compatibility
     VERSION = ArJdbc::VERSION
   end
-end
+end

data/src/java/arjdbc/mysql/MySQLRubyJdbcConnection.java

@@ -215,7 +215,7 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
                         }
                     }
 
-                    return runtime.newArray(indexes);
+                    return indexes;
                 }
                 finally {
                     close(keySet);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord