activerecord-jdbc-adapter 1.1.0 → 1.1.1

data/History.txt

@@ -1,3 +1,11 @@
+== 1.1.1
+
+- Arel 2.0.7 compatibility: fix bugs arising from use of Arel 2.0.7 +
+  ArJdbc 1.1.0.
+  - Gracefully handle changes to limit in Arel's AST
+  - Avoid conflict with Arel 2.0.7's mssql visitor
+- Upgrade to PostgreSQL 9.0.801 JDBC drivers (David Kellum)
+
 == 1.1.0 (12/09/10)
 
 - Don't narrow platform to '-java' only: revert back to 0.9.2 where

data/Manifest.txt

@@ -25,10 +25,11 @@ lib/arel/engines/sql/compilers/h2_compiler.rb
 lib/arel/engines/sql/compilers/hsqldb_compiler.rb
 lib/arel/engines/sql/compilers/jdbc_compiler.rb
 lib/arel/engines/sql/compilers/mssql_compiler.rb
+lib/arel/visitors/compat.rb
 lib/arel/visitors/db2.rb
 lib/arel/visitors/derby.rb
 lib/arel/visitors/hsqldb.rb
-lib/arel/visitors/mssql.rb
+lib/arel/visitors/sql_server.rb
 lib/arjdbc/db2.rb
 lib/arjdbc/derby.rb
 lib/arjdbc/discover.rb

data/lib/activerecord-jdbc-adapter.rb

@@ -1,6 +1,8 @@
 require 'arjdbc'
-begin
-  require 'arjdbc/jdbc/railtie'
-rescue LoadError
-  # Assume we don't have railties in this version of AR
+if ActiveRecord::VERSION::MAJOR >= 3
+  begin
+    require 'arjdbc/jdbc/railtie'
+  rescue LoadError
+    # Assume we don't have railties in this version of AR
+  end
 end

data/lib/arel/visitors/compat.rb

@@ -0,0 +1,13 @@
+module Arel
+  module Visitors
+    module ArJdbcCompat
+      def limit_for(limit_or_node)
+        limit_or_node.respond_to?(:expr) ? limit_or_node.expr.to_i : limit_or_node
+      end
+    end
+
+    class ToSql
+      include ArJdbcCompat
+    end
+  end
+end

data/lib/arel/visitors/db2.rb

@@ -1,3 +1,5 @@
+require 'arel/visitors/compat'
+
 module Arel
   module Visitors
     class DB2 < Arel::Visitors::ToSql
@@ -8,7 +10,7 @@ module Arel
       end
 
       def add_limit_offset(sql, o)
-        @connection.replace_limit_offset! sql, o.limit, o.offset && o.offset.value
+        @connection.replace_limit_offset! sql, limit_for(o.limit), o.offset && o.offset.value
       end
     end
   end

data/lib/arel/visitors/derby.rb

@@ -1,3 +1,5 @@
+require 'arel/visitors/compat'
+
 module Arel
   module Visitors
     class Derby < Arel::Visitors::ToSql
@@ -5,7 +7,7 @@ module Arel
         [
          o.cores.map { |x| visit_Arel_Nodes_SelectCore x }.join,
          ("ORDER BY #{o.orders.map { |x| visit x }.join(', ')}" unless o.orders.empty?),
-         ("FETCH FIRST #{o.limit} ROWS ONLY" if o.limit),
+         ("FETCH FIRST #{limit_for(o.limit)} ROWS ONLY" if o.limit),
          (visit(o.offset) if o.offset),
          (visit(o.lock) if o.lock),
         ].compact.join ' '

data/lib/arel/visitors/hsqldb.rb

@@ -1,3 +1,5 @@
+require 'arel/visitors/compat'
+
 module Arel
   module Visitors
     class HSQLDB < Arel::Visitors::ToSql
@@ -12,7 +14,7 @@ module Arel
         offset = o.offset || 0
         bef = sql[7..-1]
         if limit = o.limit
-          "SELECT LIMIT #{offset} #{limit} #{bef}"
+          "SELECT LIMIT #{offset} #{limit_for(limit)} #{bef}"
         elsif offset > 0
           "SELECT LIMIT #{offset} 0 #{bef}"
         else

data/lib/arel/visitors/{mssql.rb → sql_server.rb}

@@ -1,3 +1,5 @@
+require 'arel/visitors/compat'
+
 module Arel
   module Visitors
     class SQLServer < Arel::Visitors::ToSql
@@ -26,7 +28,7 @@ module Arel
           end
 
           order ||= "ORDER BY #{@connection.determine_order_clause(sql)}"
-          replace_limit_offset!(sql, o.limit.to_i, o.offset && o.offset.value.to_i, order)
+          replace_limit_offset!(sql, limit_for(o.limit).to_i, o.offset && o.offset.value.to_i, order)
           sql = "SELECT COUNT(*) AS count_id FROM (#{sql}) AS subquery" if subquery
         elsif order
           sql << " #{order}"

data/lib/arjdbc/jdbc/adapter.rb

@@ -99,7 +99,7 @@ module ActiveRecord
           visitor = nil
           arel2_visitors.each do |k,v|
             visitor = v
-            visitors[k] = v unless visitors.has_key?(k)
+            visitors[k] = v
           end
           if visitor && config[:adapter] =~ /^(jdbc|jndi)$/
             visitors[config[:adapter]] = visitor

data/lib/arjdbc/mssql/adapter.rb

@@ -35,9 +35,9 @@ module ::ArJdbc
     end
 
     def arel2_visitors
-      require 'arel/visitors/mssql'
+      require 'arel/visitors/sql_server'
       visitor_class = sqlserver_version == "2000" ? ::Arel::Visitors::SQLServer2000 : ::Arel::Visitors::SQLServer
-      { 'mssql' => visitor_class, 'jdbcmssql' => visitor_class}
+      { 'mssql' => visitor_class, 'sqlserver' => visitor_class, 'jdbcmssql' => visitor_class}
     end
 
     def sqlserver_version

data/lib/arjdbc/postgresql/adapter.rb

@@ -554,6 +554,17 @@ module ::ArJdbc
     end
 
     private
+    def translate_exception(exception, message)
+      case exception.message
+      when /duplicate key value violates unique constraint/
+        RecordNotUnique.new(message, exception)
+      when /violates foreign key constraint/
+        InvalidForeignKey.new(message, exception)
+      else
+        super
+      end
+    end
+
     def extract_pg_identifier_from_name(name)
       match_data = name[0,1] == '"' ? name.match(/\"([^\"]+)\"/) : name.match(/([^\.]+)/)
 

data/lib/arjdbc/version.rb

@@ -1,6 +1,6 @@
 module ArJdbc
   module Version
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end
 # Compatibility with older versions of ar-jdbc for other extensions out there

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-    - 1
-    - 1
-    - 0
-  version: 1.1.0
+  prerelease: 
+  version: 1.1.1
 platform: ruby
 authors: 
   - Nick Sieger, Ola Bini and JRuby contributors
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-09 00:00:00 -06:00
+date: 2011-01-14 00:00:00 -06:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -25,10 +21,6 @@ dependencies:
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 2
-              - 0
-              - 4
             version: 2.0.4
     type: :development
     version_requirements: *id001
@@ -40,10 +32,6 @@ dependencies:
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 2
-              - 6
-              - 2
             version: 2.6.2
     type: :development
     version_requirements: *id002
@@ -89,10 +77,11 @@ files:
   - lib/arel/engines/sql/compilers/hsqldb_compiler.rb
   - lib/arel/engines/sql/compilers/jdbc_compiler.rb
   - lib/arel/engines/sql/compilers/mssql_compiler.rb
+  - lib/arel/visitors/compat.rb
   - lib/arel/visitors/db2.rb
   - lib/arel/visitors/derby.rb
   - lib/arel/visitors/hsqldb.rb
-  - lib/arel/visitors/mssql.rb
+  - lib/arel/visitors/sql_server.rb
   - lib/arjdbc/db2.rb
   - lib/arjdbc/derby.rb
   - lib/arjdbc/discover.rb
@@ -257,21 +246,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 requirements: []
 
 rubyforge_project: jruby-extras
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.