activerecord-jdbc-adapter 1.3.17 → 1.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 134cda5c81428ddd6306cfbf8de01390845e9332
-  data.tar.gz: 5b4c2e9e1f691ab3cd0c8df0ab77a06a933bb433
+  metadata.gz: 86270ab993887f84a2f2bb4dbbb8826b95c23ca8
+  data.tar.gz: 7af7d89826ae8b430395bedbf64af8aeab0a3cfc
 SHA512:
-  metadata.gz: bb750f2f8396290b6212c017350c1b9c2f38792122a2214e1c14a2e83e22f35e6d0dab9c808f384421a64d3c11c691d94e2909e5548ccafbc523c7c066cdd7f1
-  data.tar.gz: 3cc35229994ff2f461fe35ff5e381c461d41d91ab80e51a8e89b054494f21283a9b897488cab748a1efe076abc3f86316939644a1dcfa2a22029a49c409fa800
+  metadata.gz: e2c2d95d0620b913bea2f02c5448bb709ed5e6e7033434ca367c011f0d6b6dc55d4b4862f6011fa0371fa9ae88d2396af143fe8b202da2f8ea10fe833c4dcc61
+  data.tar.gz: 87d7ffe54e5fe6e44871e85f16af7db741c1fec6cbd37b82dfb235d59cb0ad7f24af9f6074f7368bb613320f4fdfbcb017fa17f23337ba761b11f95dcfe5d112

data/.travis.yml

@@ -3,7 +3,8 @@ sudo: false
 bundler_args: --without development
 script: bundle exec rake test_$DB
 before_script:
-  - export JRUBY_OPTS="--server" # -Xcompile.invokedynamic=false
+  - export JRUBY_OPTS="--server $JRUBY_OPTS" # -Xcompile.invokedynamic=false
+  - mysql --version # to see if we're using MySQL or MariaDB
 before_install:
   - ((jruby -v | grep 1.8.7) && jruby --1.9 -S gem update --system 2.1.11) || true
 rvm:
@@ -45,10 +46,28 @@ branches:
     - /.*-stable$/
     - /^test-.*/
 matrix:
-  allow_failures:
-    - gemfile: gemfiles/rails42.gemfile
-    - env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=jdbc
-    - env: JRUBY_OPTS="--1.9 $JRUBY_OPTS" DB=jdbc PREPARED_STATEMENTS=true
+  #allow_failures:
+  #  - env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" DB=jdbc
+  #  - env: JRUBY_OPTS="--1.9 $JRUBY_OPTS" DB=jdbc PREPARED_STATEMENTS=true
+  include: # testing against MariaDB
+    - addons:
+        mariadb: '5.5'
+      rvm: jruby-1.7.18
+      gemfile: gemfiles/rails32.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql
+      jdk: openjdk7
+    - addons:
+        mariadb: '10.0'
+      rvm: jruby-1.7.18
+      gemfile: gemfiles/rails40.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=mariadb
+      jdk: openjdk7
+    - addons:
+        mariadb: '10.0'
+      rvm: jruby-1.7.18
+      gemfile: gemfiles/rails41.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=mariadb PREPARED_STATEMENTS=true
+      jdk: openjdk7
   exclude:
     # Rails 4 prefers Ruby 2.0 (or at least >= 1.9.3) :
     - rvm: jruby-1.7.18

data/History.md

@@ -1,3 +1,57 @@
+## 1.3.18 (09/14/15)
+
+- since arel visitor instances might get re-used we need to avoid the @instance
+- [postgres] work-around BC time parsing issue (on JRuby 1.7.x) by a patch
+- [mssql] fix broken ordering on an aggregate queries (from #646 closing #532)
+- [mssql] default to using a string limit: 4000 with newer AR
+- [mssql] setup type map for SQLServer ... backwards compat as much as possible
+- for better AR alignment on 4.2 shall do the AR type-casting of booleans/dates
+- [mssql] ... port over visitor from sqlserver-adapter (to be used on AR 4.2)
+- [mssql] allow to tune collation equality operator with *cs_equality_operator*
+- [mssql] setup BINARY/TEXT types as binary_basic/text_basic (needed on 4.2)
+- [mssql] setup a NATIVE_DATABASE_TYPES constant (for SQLServer > 2K) (#508)
+- [jdbc] prefer BIT(1) as a better match for :boolean type than TINYINT
+- [mssql] get_table_name bug with unusual queries has been fixed (#583)
+- [mssql] make sure we set @primary on column instances even on AR 4.2
+- [mssql] issue when using joins with distinct (#590) ... fixed with #608
+- [firebird] tune arel visitor (limit/offset handling) to work on AR 4.2
+- [firebird] avoid prefetch_primary_key? depending on column.primary due AR 4.2
+- [firebird] introduce type map on AR 4.2 (not sure about :timestamp handling
+- [firebird] boolean parameter with prepared-statements should be set as CHAR
+- [firebird] standalone column and adapter classes +
+  standalone custom (native) JdbcConnection class for firebird due CHAR handling
+- [firebird] handle schema-prefixed table names in default_sequence_name
+- [oracle] support for handling NUMBER(1) type as boolean just like on AR < 4.2
+- [oracle] generic optimized NUMBER type extraction (with scale == 0 as integer)
+- [oracle] support XMLTYPE as a custom type on AR 4.2
+- [oracle] add disable_referential_integrity helper (for the duration of a block)
+- base (adapter: jdbc) foreign_keys support for all (for AR 4.2 compatibility)
+- [oracle] AR 4.2 type map support (ported over from oracle-enhanced adapter)
+- [oracle] avoid error logging optional DROP SEQUENCE on drop_table
+- [oracle] default config[:database] (when not provided) to **XE**
+- [oracle] improved index + primary_key (detection) support not just for AR 4.2
+- [oracle] update default_sequence_name to strip prefix + add trigger name
+- [oracle] set statement_escape_processing: true by default on AR 4.x (#479)
+- handle serialized attributes the AR 4.2 way (serialized_attributes deprecated)
+- [db2] custom type map for AR 4.2 based on IBM_DB gem
+- [db2] support XML as type on AR 4.2
+- type-casting on our native side should now handle AR 4.2 right!
+- jdbc connection should not attempt to type-cast date/time on AR 4.2
+- [db2] arel visitor + handle basic type mapping the AR 4.2 way
+- no longer warn on 4.2 + but still warn with (unsupported) adapters
+- restore Ruby 1.8 (syntax) compatibility - was broken for MySQL/Derby
+- use standard AREL with H2/HSQLDB as H2/HSQLDB support standard LIMIT and OFFSET
+- [h2] working AR 4.2 support
+- [hsqldb] working AR 4.2 support
+- [rake] support adapter: mariadb as if it were mysql (on AR 4.x)
+- [postgres] changes to avoid double cast for AR42 (with prepared statements)
+- [postgres] use standard JDBC bind arguments marker "?" instead of "$n"
+- [postgres] allow reading "infinity" and "BC timestamps on 4.2
+- type cast bind arguments in RubyJdbcConnection (prepared statements)
+- [derby] ActiveRecord 4.2 reports xml columns as XML(2147483647)
+- [derby] working AR 4.2 support
+- support cast_type on the JdbcConnection side for improved AR 4.2 compatibility
+
 ## 1.3.17 (06/30/15)
 
 - [mysql] bulk compatibility with AR 4.2 - all _sql helper accept an options (hash)

data/lib/arel/visitors/compat.rb

@@ -22,8 +22,36 @@ module Arel
 
       private
 
-      def limit_for(limit_or_node)
-        limit_or_node.respond_to?(:expr) ? limit_or_node.expr.to_i : limit_or_node
+      if ArJdbc::AR42
+        if Arel::VERSION < '6.0.2'
+          def limit_for(limit_or_node)
+            if limit_or_node.respond_to?(:expr)
+              expr = limit_or_node.expr
+              # NOTE(uwe): Different behavior for Arel 6.0.0 and 6.0.2
+              expr.respond_to?(:value) ? expr.value.to_i : expr.to_i
+            else
+              limit_or_node
+            end
+          end
+        else
+          def limit_for(limit_or_node)
+            limit_or_node.respond_to?(:expr) ? limit_or_node.expr.to_i : limit_or_node
+          end
+        end
+      else
+        def limit_for(limit_or_node)
+          limit_or_node.respond_to?(:expr) ? limit_or_node.expr.to_i : limit_or_node
+        end
+      end
+      module_function :limit_for
+
+      def node_value(node)
+        return nil unless node
+        case expr = node.expr
+          when NilClass then nil
+          when Numeric then expr
+          when Arel::Nodes::Unary then expr.expr
+        end
       end
 
     end

data/lib/arel/visitors/db2.rb

@@ -1,48 +1,137 @@
+# NOTE: file contains code adapted from **ruby-ibmdb**'s adapter, license follows
+=begin
+Copyright (c) 2006 - 2015 IBM Corporation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=end
+
 require 'arel/visitors/compat'
 
 module Arel
   module Visitors
     class DB2 < Arel::Visitors::ToSql
 
-      def visit_Arel_Nodes_SelectStatement o, a = nil
-        sql = o.cores.map { |x| do_visit_select_core x, a }.join
-        sql << " ORDER BY #{o.orders.map { |x| do_visit x, a }.join(', ')}" unless o.orders.empty?
-        add_limit_offset(sql, o)
+      if ArJdbc::AR42
+        def visit_Arel_Nodes_SelectStatement(o, a = nil)
+          a = o.cores.inject(a) { |c, x| visit_Arel_Nodes_SelectCore(x, c) }
+
+          unless o.orders.empty?
+            a << ' ORDER BY '
+            last = o.orders.length - 1
+            o.orders.each_with_index do |x, i|
+              visit(x, a);  a << ', ' unless last == i
+            end
+          end
+
+          if limit = o.limit
+            if limit = limit.value
+              limit = limit.to_i
+            end
+          end
+          if offset = o.offset
+            if offset = offset.value
+              offset = offset.to_i
+            end
+          end
+
+          if limit || offset
+            add_limit_offset(a, o, limit, offset)
+          else
+            a
+          end
+        end
+
+        def visit_Arel_Nodes_Limit o, collector
+          # visit o.expr, collector
+        end
+
+        def visit_Arel_Nodes_Offset o, collector
+          # visit o.expr, collector
+        end
+
+      else
+        def visit_Arel_Nodes_SelectStatement o, a = nil
+          sql = o.cores.map { |x| do_visit_select_core x, a }.join
+          sql << " ORDER BY #{o.orders.map { |x| do_visit x, a }.join(', ')}" unless o.orders.empty?
+
+          if limit = o.limit
+            if limit = limit.value
+              limit = limit.to_i
+            end
+          end
+          if offset = o.offset
+            if offset = offset.value
+              offset = offset.to_i
+            end
+          end
+
+          if limit || offset
+            add_limit_offset(sql, o, limit, offset)
+          else
+            sql
+          end
+        end
       end
 
-      def visit_Arel_Nodes_InsertStatement o, a = nil
-        sql = "INSERT INTO "
-        sql << visit(o.relation, a)
-
-        values = o.values
-
-        if o.columns.any?
-          cols = o.columns.map { |x| quote_column_name x.name }
-          sql << ' (' << cols.join(', ') << ') '
-        # should depend the other way around but who cares it's AR
-        elsif o.values.eql? ArJdbc::DB2::VALUES_DEFAULT
-          cols = o.relation.engine.columns.map { |c| c.name }
-          sql << ' (' << cols.join(', ') << ')'
-          sql << ' VALUES '
-          sql << ' (' << cols.map { 'DEFAULT' }.join(', ') << ')'
-          values = nil
+      if ArJdbc::AR42
+        def visit_Arel_Nodes_InsertStatement o, a = nil
+          a << "INSERT INTO "
+          visit(o.relation, a)
+
+          values = o.values
+
+          if o.columns.any?
+            cols = o.columns.map { |x| quote_column_name x.name }
+            a << ' (' << cols.join(', ') << ') '
+          elsif o.values.eql? ArJdbc::DB2::VALUES_DEFAULT
+            cols = o.relation.engine.columns.map { |c| c.name }
+            a << ' (' << cols.join(', ') << ')'
+            a << ' VALUES '
+            a << ' (' << cols.map { 'DEFAULT' }.join(', ') << ')'
+            values = false
+          end
+          visit(values, a) if values
+          a
         end
+      elsif Arel::VERSION >= '4.0' # AR 4.0 ... AREL 5.0 since AR >= 4.1
+        def visit_Arel_Nodes_InsertStatement o, a = nil
+          sql = "INSERT INTO "
+          sql << visit(o.relation, a)
 
-        sql << visit(values, a) if values
+          values = o.values
 
-        sql
-      end if Arel::VERSION >= '4.0' # AR 4.0 ... AREL 5.0 since AR >= 4.1
+          if o.columns.any?
+            cols = o.columns.map { |x| quote_column_name x.name }
+            sql << ' (' << cols.join(', ') << ') '
+          # should depend the other way around but who cares it's AR
+          elsif o.values.eql? ArJdbc::DB2::VALUES_DEFAULT
+            cols = o.relation.engine.columns.map { |c| c.name }
+            sql << ' (' << cols.join(', ') << ')'
+            sql << ' VALUES '
+            sql << ' (' << cols.map { 'DEFAULT' }.join(', ') << ')'
+            values = nil
+          end
 
-      private
+          sql << visit(values, a) if values
 
-      def add_limit_offset(sql, o)
-        if o.offset && o.offset.value && o.limit && o.limit.value
-          @connection.replace_limit_offset_with_ordering! sql, o.limit.value, o.offset.value, o.orders
-        else
-          @connection.replace_limit_offset! sql, limit_for(o.limit), o.offset && o.offset.value
+          sql
         end
       end
 
+      private
+
+      def add_limit_offset(sql, o, limit, offset)
+        @connection.replace_limit_offset! sql, limit, offset, o.orders
+      end
+
     end
   end
 end
+
+Arel::Collectors::Bind.class_eval do
+  attr_reader :parts
+end if defined? Arel::Collectors::Bind

data/lib/arel/visitors/derby.rb

@@ -4,21 +4,55 @@ module Arel
   module Visitors
     class Derby < Arel::Visitors::ToSql
 
-      def visit_Arel_Nodes_SelectStatement o, a = nil
-        sql = o.cores.map { |x| do_visit(x, a) }.join
-        sql << " ORDER BY #{o.orders.map { |x| visit x }.join(', ')}" unless o.orders.empty?
-        sql << " #{do_visit o.offset, a}" if o.offset
-        sql << " #{do_visit o.limit, a}" if o.limit
-        sql << " #{do_visit o.lock, a}" if o.lock
-        sql
+      # @private
+      STR_1 = ' '
+
+      if ArJdbc::AR42
+        def visit_Arel_Nodes_SelectStatement(o, a = nil)
+          a = o.cores.inject(a) { |c, x| visit_Arel_Nodes_SelectCore(x, c) }
+          unless o.orders.empty?
+            a << ' ORDER BY '
+            last = o.orders.length - 1
+            o.orders.each_with_index do |x, i|
+              visit(x, a);  a << ', ' unless last == i
+            end
+          end
+          if o.offset
+            a << STR_1; visit(o.offset, a)
+          end
+          if o.limit
+            a << STR_1; visit(o.limit, a)
+          end
+          if o.lock
+            a << STR_1; visit(o.lock, a)
+          end
+          a
+        end
+      else
+        def visit_Arel_Nodes_SelectStatement(o, a = nil)
+          sql = o.cores.map { |x| do_visit(x, a) }.join
+          sql << " ORDER BY #{o.orders.map { |x| do_visit x, a }.join(', ')}" unless o.orders.empty?
+          sql << " #{do_visit o.offset, a}" if o.offset
+          sql << " #{do_visit o.limit, a}" if o.limit
+          sql << " #{do_visit o.lock, a}" if o.lock
+          sql
+        end
       end
 
-      def visit_Arel_Nodes_Limit o, a = nil
-        "FETCH FIRST #{limit_for(o)} ROWS ONLY"
+      def visit_Arel_Nodes_Limit(o, a = nil)
+        limit = "FETCH FIRST #{limit_for(o)} ROWS ONLY"
+        a << limit if a
+        limit
       end
 
-      def visit_Arel_Nodes_Offset o, a = nil
-        "OFFSET #{do_visit o.value, a} ROWS"
+      def visit_Arel_Nodes_Offset(o, a = nil)
+        if a
+          a << 'OFFSET '
+          do_visit(o.value, a)
+          a << ' ROWS'
+        else
+          "OFFSET #{do_visit o.value, a} ROWS"
+        end
       end
 
       # This generates SELECT...FOR UPDATE, but it will only work if the
@@ -31,27 +65,48 @@ module Arel
       # @private
       VALUES_DEFAULT = 'VALUES ( DEFAULT )' # NOTE: marker set by ArJdbc::Derby
 
-      def visit_Arel_Nodes_InsertStatement o, a = nil
-        sql = "INSERT INTO "
-        sql << visit(o.relation, a)
-
-        values = o.values
-
-        if o.columns.any?
-          cols = o.columns.map { |x| quote_column_name x.name }
-          sql << ' (' << cols.join(', ') << ') '
-        elsif o.values.eql? VALUES_DEFAULT
-          cols = o.relation.engine.columns.map { |c| c.name }
-          sql << ' (' << cols.join(', ') << ')'
-          sql << ' VALUES '
-          sql << ' (' << cols.map { 'DEFAULT' }.join(', ') << ')'
-          values = false
+      if ArJdbc::AR42
+        def visit_Arel_Nodes_InsertStatement o, a = nil
+          a << "INSERT INTO "
+          visit(o.relation, a)
+
+          values = o.values
+
+          if o.columns.any?
+            cols = o.columns.map { |x| quote_column_name x.name }
+            a << ' (' << cols.join(', ') << ') '
+          elsif o.values.eql? VALUES_DEFAULT
+            cols = o.relation.engine.columns.map { |c| c.name }
+            a << ' (' << cols.join(', ') << ')'
+            a << ' VALUES '
+            a << ' (' << cols.map { 'DEFAULT' }.join(', ') << ')'
+            values = false
+          end
+          visit(values, a) if values
+          a
         end
+      elsif Arel::VERSION >= '4.0' # AR 4.0 ... AREL 5.0 since AR >= 4.1
+        def visit_Arel_Nodes_InsertStatement o, a = nil
+          sql = 'INSERT INTO '
+          sql << visit(o.relation, a)
+
+          values = o.values
 
-        sql << visit(values, a) if values
-        sql
-      end if Arel::VERSION >= '4.0' # AR 4.0 ... AREL 5.0 since AR >= 4.1
+          if o.columns.any?
+            cols = o.columns.map { |x| quote_column_name x.name }
+            sql << ' (' << cols.join(', ') << ') '
+          elsif o.values.eql? VALUES_DEFAULT
+            cols = o.relation.engine.columns.map { |c| c.name }
+            sql << ' (' << cols.join(', ') << ')'
+            sql << ' VALUES '
+            sql << ' (' << cols.map { 'DEFAULT' }.join(', ') << ')'
+            values = false
+          end
 
+          sql << visit(values, a) if values
+          sql
+        end
+      end
     end
   end
 end