activerecord-jdbc-adapter 1.0.2-java → 1.0.3-java

data/History.txt

@@ -1,3 +1,12 @@
+== 1.0.3 (11/29/10)
+
+- ACTIVERECORD_JDBC-143: Implement table_exists? fixing association
+  table names with schema prefixes
+- Cleanup of column code for hsqldb (Denis Odorcic)
+- Rails 3.0.3 support - add Arel 2 visitors for all adapters
+- Fix MySQL date types to not have limits (Chris Lowder)
+- ACTIVERECORD_JDBC-141: Better schema support in H2
+
 == 1.0.2
 
 - ACTIVERECORD_JDBC-134: Fix conflicting adapter/column superclasses

data/Manifest.txt

@@ -25,6 +25,10 @@ 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/db2.rb
+lib/arel/visitors/derby.rb
+lib/arel/visitors/hsqldb.rb
+lib/arel/visitors/mssql.rb
 lib/arjdbc/db2.rb
 lib/arjdbc/derby.rb
 lib/arjdbc/discover.rb
@@ -71,6 +75,7 @@ lib/arjdbc/jdbc/type_converter.rb
 lib/arjdbc/mimer/adapter.rb
 lib/arjdbc/mssql/adapter.rb
 lib/arjdbc/mssql/connection_methods.rb
+lib/arjdbc/mssql/limit_helpers.rb
 lib/arjdbc/mssql/tsql_helper.rb
 lib/arjdbc/mysql/adapter.rb
 lib/arjdbc/mysql/connection_methods.rb
@@ -150,6 +155,7 @@ test/models/string_id.rb
 test/models/validates_uniqueness_of_string.rb
 lib/arjdbc/jdbc/jdbc.rake
 src/java/arjdbc/derby/DerbyModule.java
+src/java/arjdbc/h2/H2RubyJdbcConnection.java
 src/java/arjdbc/informix/InformixRubyJdbcConnection.java
 src/java/arjdbc/jdbc/AdapterJavaService.java
 src/java/arjdbc/jdbc/JdbcConnectionFactory.java

data/lib/arel/visitors/db2.rb

@@ -0,0 +1,15 @@
+module Arel
+  module Visitors
+    class DB2 < Arel::Visitors::ToSql
+      def visit_Arel_Nodes_SelectStatement o
+        add_limit_offset([o.cores.map { |x| visit_Arel_Nodes_SelectCore x }.join,
+         ("ORDER BY #{o.orders.map { |x| visit x }.join(', ')}" unless o.orders.empty?),
+        ].compact.join(' '), o)
+      end
+
+      def add_limit_offset(sql, o)
+        @connection.replace_limit_offset! sql, o.limit, o.offset
+      end
+    end
+  end
+end

data/lib/arel/visitors/derby.rb

@@ -0,0 +1,19 @@
+module Arel
+  module Visitors
+    class Derby < Arel::Visitors::ToSql
+      def visit_Arel_Nodes_SelectStatement o
+        [
+         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),
+         (visit(o.offset) if o.offset),
+         (visit(o.lock) if o.lock),
+        ].compact.join ' '
+      end
+
+      def visit_Arel_Nodes_Offset o
+        "OFFSET #{visit o.value} ROWS"
+      end
+    end
+  end
+end

data/lib/arel/visitors/hsqldb.rb

@@ -0,0 +1,24 @@
+module Arel
+  module Visitors
+    class HSQLDB < Arel::Visitors::ToSql
+      def visit_Arel_Nodes_SelectStatement o
+        [
+          limit_offset(o.cores.map { |x| visit_Arel_Nodes_SelectCore x }.join, o),
+          ("ORDER BY #{o.orders.map { |x| visit x }.join(', ')}" unless o.orders.empty?),
+        ].compact.join ' '
+      end
+
+      def limit_offset sql, o
+        offset = o.offset || 0
+        bef = sql[7..-1]
+        if limit = o.limit
+          "SELECT LIMIT #{offset} #{limit} #{bef}"
+        elsif offset > 0
+          "SELECT LIMIT #{offset} 0 #{bef}"
+        else
+          sql
+        end
+      end
+    end
+  end
+end

data/lib/arel/visitors/mssql.rb

@@ -0,0 +1,44 @@
+module Arel
+  module Visitors
+    class SQLServer < Arel::Visitors::ToSql
+      include ArJdbc::MsSQL::LimitHelpers::SqlServerReplaceLimitOffset
+
+      def select_count? o
+        sel = o.cores.length == 1 && o.cores.first
+        projections = sel.projections.length == 1 && sel.projections
+        Arel::Nodes::Count === projections.first
+      end
+
+      # Need to mimic the subquery logic in ARel 1.x for select count with limit
+      # See arel/engines/sql/compilers/mssql_compiler.rb for details
+      def visit_Arel_Nodes_SelectStatement o
+        order = "ORDER BY #{o.orders.map { |x| visit x }.join(', ')}" unless o.orders.empty?
+        if o.limit
+          if select_count?(o)
+            subquery = true
+            sql = o.cores.map do |x|
+              x = x.dup
+              x.projections = [Arel::Nodes::SqlLiteral.new("*")]
+              visit_Arel_Nodes_SelectCore x
+            end.join
+          else
+            sql = o.cores.map { |x| visit_Arel_Nodes_SelectCore x }.join
+          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)
+          sql = "SELECT COUNT(*) AS count_id FROM (#{sql}) AS subquery" if subquery
+        elsif order
+          sql << " #{order}"
+        else
+          sql = super
+        end
+        sql
+      end
+    end
+
+    class SQLServer2000 < SQLServer
+      include ArJdbc::MsSQL::LimitHelpers::SqlServer2000ReplaceLimitOffset
+    end
+  end
+end

data/lib/arjdbc/db2/adapter.rb

@@ -143,8 +143,16 @@ module ArJdbc
       'DB2'
     end
 
+    def arel2_visitors
+      require 'arel/visitors/db2'
+      {'db2' => ::Arel::Visitors::DB2, 'as400' => ::Arel::Visitors::DB2}
+    end
+
     def add_limit_offset!(sql, options)
-      limit, offset = options[:limit], options[:offset]
+      replace_limit_offset!(sql, options[:limit], options[:offset])
+    end
+
+    def replace_limit_offset!(sql, limit, offset)
       if limit && !offset
         if limit == 1
           sql << " FETCH FIRST ROW ONLY"
@@ -153,9 +161,9 @@ module ArJdbc
         end
       elsif limit && offset
         sql.gsub!(/SELECT/i, 'SELECT B.* FROM (SELECT A.*, row_number() over () AS internal$rownum FROM (SELECT')
-        sql << ") A ) B WHERE B.internal$rownum > #{offset} AND B.internal$rown
-um <= #{sanitize_limit(limit) + offset}"
+        sql << ") A ) B WHERE B.internal$rownum > #{offset} AND B.internal$rownum <= #{sanitize_limit(limit) + offset}"
       end
+      sql
     end
 
     def pk_and_sequence_for(table)

data/lib/arjdbc/derby/adapter.rb

@@ -55,6 +55,11 @@ module ::ArJdbc
       'Derby'
     end
 
+    def arel2_visitors
+      require 'arel/visitors/derby'
+      {'derby' => ::Arel::Visitors::Derby, 'jdbcderby' => ::Arel::Visitors::Derby}
+    end
+
     include ArJdbc::MissingFunctionalityHelper
 
     def index_name_length
@@ -87,7 +92,6 @@ module ::ArJdbc
     # Override default -- fix case where ActiveRecord passes :default => nil, :null => true
     def add_column_options!(sql, options)
       options.delete(:default) if options.has_key?(:default) && options[:default].nil?
-      options.delete(:null) if options.has_key?(:null) && (options[:null].nil? || options[:null] == true)
       sql << " DEFAULT #{quote(options.delete(:default))}" if options.has_key?(:default)
       super
     end
@@ -158,16 +162,9 @@ module ::ArJdbc
 
 
     def add_column(table_name, column_name, type, options = {})
-      if option_not_null = (options[:null] == false)
-        options.delete(:null)
-      end
       add_column_sql = "ALTER TABLE #{quote_table_name(table_name)} ADD #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
       add_column_options!(add_column_sql, options)
       execute(add_column_sql)
-      if option_not_null
-        alter_column_sql = "ALTER TABLE #{quote_table_name(table_name)} ALTER #{quote_column_name(column_name)} NOT NULL"
-        execute(alter_column_sql)
-      end
     end
 
     def execute(sql, name = nil)

data/lib/arjdbc/derby/connection_methods.rb

@@ -6,7 +6,7 @@ module ActiveRecord
         config[:driver] ||= "org.apache.derby.jdbc.EmbeddedDriver"
         conn = embedded_driver(config)
         md = conn.jdbc_connection.meta_data
-        if md.database_major_version < 10 || md.database_minor_version < 5
+        if md.database_major_version < 10 || (md.database_major_version == 10 && md.database_minor_version < 5)
           raise ::ActiveRecord::ConnectionFailed, "Derby adapter requires Derby 10.5 or later"
         end
         conn

data/lib/arjdbc/h2/adapter.rb

@@ -4,10 +4,18 @@ module ArJdbc
   module H2
     include HSQLDB
 
+    def self.jdbc_connection_class
+      ::ActiveRecord::ConnectionAdapters::H2JdbcConnection
+    end
+
     def adapter_name #:nodoc:
       'H2'
     end
 
+    def arel2_visitors
+      super.merge 'h2' => ::Arel::Visitors::HSQLDB, 'jdbch2' => ::Arel::Visitors::HSQLDB
+    end
+
     def h2_adapter
       true
     end

data/lib/arjdbc/hsqldb/adapter.rb

@@ -40,6 +40,11 @@ module ::ArJdbc
       'Hsqldb'
     end
 
+    def arel2_visitors
+      require 'arel/visitors/hsqldb'
+      {'hsqldb' => ::Arel::Visitors::HSQLDB, 'jdbchsqldb' => ::Arel::Visitors::HSQLDB}
+    end
+
     def modify_types(tp)
       tp[:primary_key] = "INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 0) PRIMARY KEY"
       tp[:integer][:limit] = nil
@@ -99,15 +104,9 @@ module ::ArJdbc
     end
 
     def add_column(table_name, column_name, type, options = {})
-      if option_not_null = options[:null] == false
-        option_not_null = options.delete(:null)
-      end
       add_column_sql = "ALTER TABLE #{quote_table_name(table_name)} ADD #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
       add_column_options!(add_column_sql, options)
       execute(add_column_sql)
-      if option_not_null
-        alter_column_sql = "ALTER TABLE #{quote_table_name(table_name)} ALTER #{quote_column_name(column_name)} NOT NULL"
-      end
     end
 
     def change_column(table_name, column_name, type, options = {}) #:nodoc:

data/lib/arjdbc/jdbc/adapter.rb

@@ -32,7 +32,7 @@ module ActiveRecord
         end
         super(connection, logger)
         extend spec if spec
-        configure_arel2_visitors
+        configure_arel2_visitors(config)
         connection.adapter = self
         JndiConnectionPoolCallbacks.prepare(self, connection)
       end
@@ -93,12 +93,17 @@ module ActiveRecord
         {}
       end
 
-      def configure_arel2_visitors
+      def configure_arel2_visitors(config)
         if defined?(::Arel::Visitors::VISITORS)
           visitors = ::Arel::Visitors::VISITORS
+          visitor = nil
           arel2_visitors.each do |k,v|
+            visitor = v
             visitors[k] = v unless visitors.has_key?(k)
           end
+          if visitor && config[:dialect] && config[:adapter] =~ /^(jdbc|jndi)$/
+            visitors[config[:adapter]] = visitor
+          end
         end
       end
 
@@ -220,7 +225,6 @@ module ActiveRecord
         id_value || id
       end
 
-
       def jdbc_columns(table_name, name = nil)
         @connection.columns(table_name.to_s)
       end
@@ -230,6 +234,10 @@ module ActiveRecord
         @connection.tables
       end
 
+      def table_exists?(name)
+        jdbc_columns(name) rescue nil
+      end
+
       def indexes(table_name, name = nil, schema_name = nil)
         @connection.indexes(table_name, name, schema_name)
       end
@@ -266,6 +274,12 @@ module ActiveRecord
       def select(*args)
         execute(*args)
       end
+
+      def translate_exception(e, message)
+        puts e.backtrace if $DEBUG || ENV['DEBUG']
+        super
+      end
+      protected :translate_exception
     end
   end
 end

data/lib/arjdbc/mssql/adapter.rb

@@ -1,8 +1,10 @@
 require 'arjdbc/mssql/tsql_helper'
+require 'arjdbc/mssql/limit_helpers'
 
 module ::ArJdbc
   module MsSQL
     include TSqlMethods
+    include LimitHelpers
 
     def self.extended(mod)
       unless @lob_callback_added
@@ -32,15 +34,21 @@ module ::ArJdbc
       ::ActiveRecord::ConnectionAdapters::MssqlJdbcConnection
     end
 
+    def arel2_visitors
+      require 'arel/visitors/mssql'
+      visitor_class = sqlserver_version == "2000" ? ::Arel::Visitors::SQLServer2000 : ::Arel::Visitors::SQLServer
+      { 'mssql' => visitor_class, 'jdbcmssql' => visitor_class}
+    end
+
     def sqlserver_version
       @sqlserver_version ||= select_value("select @@version")[/Microsoft SQL Server\s+(\d{4})/, 1]
     end
 
     def add_version_specific_add_limit_offset
       if sqlserver_version == "2000"
-        extend SqlServer2000LimitOffset
+        extend LimitHelpers::SqlServer2000AddLimitOffset
       else
-        extend SqlServerLimitOffset
+        extend LimitHelpers::SqlServerAddLimitOffset
       end
     end
 
@@ -228,64 +236,6 @@ module ::ArJdbc
       'MsSQL'
     end
 
-    module SqlServer2000LimitOffset
-      def add_limit_offset!(sql, options)
-        limit = options[:limit]
-        if limit
-          offset = (options[:offset] || 0).to_i
-          start_row = offset + 1
-          end_row = offset + limit.to_i
-          order = (options[:order] || determine_order_clause(sql))
-          sql.sub!(/ ORDER BY.*$/i, '')
-          find_select = /\b(SELECT(?:\s+DISTINCT)?)\b(.*)/im
-          whole, select, rest_of_query = find_select.match(sql).to_a
-          if (start_row == 1) && (end_row ==1)
-            new_sql = "#{select} TOP 1 #{rest_of_query}"
-            sql.replace(new_sql)
-          else
-            #UGLY
-            #KLUDGY?
-            #removing out stuff before the FROM...
-            rest = rest_of_query[/FROM/i=~ rest_of_query.. -1]
-            #need the table name for avoiding amiguity
-            table_name = get_table_name(sql)
-            #I am not sure this will cover all bases.  but all the tests pass
-            new_order = "#{order}, #{table_name}.id" if order.index("#{table_name}.id").nil?
-            new_order ||= order
-
-            if (rest_of_query.match(/WHERE/).nil?)
-              new_sql = "#{select} TOP #{limit} #{rest_of_query} WHERE #{table_name}.id NOT IN (#{select} TOP #{offset} #{table_name}.id #{rest} ORDER BY #{new_order}) ORDER BY #{order} "
-            else
-              new_sql = "#{select} TOP #{limit} #{rest_of_query} AND #{table_name}.id NOT IN (#{select} TOP #{offset} #{table_name}.id #{rest} ORDER BY #{new_order}) ORDER BY #{order} "
-            end
-
-            sql.replace(new_sql)
-          end
-        end
-      end
-    end
-
-    module SqlServerLimitOffset
-      def add_limit_offset!(sql, options)
-        limit = options[:limit]
-        if limit
-          offset = (options[:offset] || 0).to_i
-          start_row = offset + 1
-          end_row = offset + limit.to_i
-          order = (options[:order] || determine_order_clause(sql))
-          sql.sub!(/ ORDER BY.*$/i, '')
-          find_select = /\b(SELECT(?:\s+DISTINCT)?)\b(.*)/im
-          whole, select, rest_of_query = find_select.match(sql).to_a
-          if rest_of_query.strip!.first == '*'
-            from_table = /.*FROM\s*\b(\w*)\b/i.match(rest_of_query).to_a[1]
-          end
-          new_sql = "#{select} t.* FROM (SELECT ROW_NUMBER() OVER(ORDER BY #{order}) AS _row_num, #{from_table + '.' if from_table}#{rest_of_query}"
-          new_sql << ") AS t WHERE t._row_num BETWEEN #{start_row.to_s} AND #{end_row.to_s}"
-          sql.replace(new_sql)
-        end
-      end
-    end
-
     def change_order_direction(order)
       order.split(",").collect do |fragment|
         case fragment
@@ -442,8 +392,6 @@ module ::ArJdbc
       sql
     end
 
-    private
-
     # 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
@@ -460,16 +408,6 @@ module ::ArJdbc
       raise ActiveRecord::ActiveRecordError, "IDENTITY_INSERT could not be turned #{enable ? 'ON' : 'OFF'} for table #{table_name}"
     end
 
-    def get_table_name(sql)
-      if sql =~ /^\s*insert\s+into\s+([^\(\s,]+)\s*|^\s*update\s+([^\(\s,]+)\s*/i
-        $1
-      elsif sql =~ /from\s+([^\(\s,]+)\s*/i
-        $1
-      else
-        nil
-      end
-    end
-
     def identity_column(table_name)
       columns(table_name).each do |col|
         return col.name if col.identity
@@ -527,7 +465,7 @@ module ::ArJdbc
     end
 
     def clear_cached_table(name)
-      (@table_columns ||= {}).delete(name)
+      (@table_columns ||= {}).delete(name.to_s)
     end
   end
 end

data/lib/arjdbc/mssql/limit_helpers.rb

@@ -0,0 +1,92 @@
+module ::ArJdbc
+  module MsSQL
+    module LimitHelpers
+      module_function
+      def get_table_name(sql)
+        if sql =~ /^\s*insert\s+into\s+([^\(\s,]+)\s*|^\s*update\s+([^\(\s,]+)\s*/i
+          $1
+        elsif sql =~ /from\s+([^\(\s,]+)\s*/i
+          $1
+        else
+          nil
+        end
+      end
+
+      module SqlServer2000ReplaceLimitOffset
+        module_function
+        def replace_limit_offset!(sql, limit, offset, order)
+          if limit
+            offset ||= 0
+            start_row = offset + 1
+            end_row = offset + limit.to_i
+            find_select = /\b(SELECT(?:\s+DISTINCT)?)\b(.*)/im
+            whole, select, rest_of_query = find_select.match(sql).to_a
+            if (start_row == 1) && (end_row ==1)
+              new_sql = "#{select} TOP 1 #{rest_of_query}"
+              sql.replace(new_sql)
+            else
+              #UGLY
+              #KLUDGY?
+              #removing out stuff before the FROM...
+              rest = rest_of_query[/FROM/i=~ rest_of_query.. -1]
+              #need the table name for avoiding amiguity
+              table_name = LimitHelpers.get_table_name(sql)
+              #I am not sure this will cover all bases.  but all the tests pass
+              new_order = "ORDER BY #{order}, #{table_name}.id" if order.index("#{table_name}.id").nil?
+              new_order ||= order
+
+              if (rest_of_query.match(/WHERE/).nil?)
+                new_sql = "#{select} TOP #{limit} #{rest_of_query} WHERE #{table_name}.id NOT IN (#{select} TOP #{offset} #{table_name}.id #{rest} #{new_order}) #{order} "
+              else
+                new_sql = "#{select} TOP #{limit} #{rest_of_query} AND #{table_name}.id NOT IN (#{select} TOP #{offset} #{table_name}.id #{rest} #{new_order}) #{order} "
+              end
+
+              sql.replace(new_sql)
+            end
+          end
+          sql
+        end
+      end
+
+      module SqlServer2000AddLimitOffset
+        def add_limit_offset!(sql, options)
+          if options[:limit]
+            order = "ORDER BY #{options[:order] || determine_order_clause(sql)}"
+            sql.sub!(/ ORDER BY.*$/i, '')
+            SqlServerReplaceLimitOffset.replace_limit_offset!(sql, options[:limit], options[:offset], order)
+          end
+        end
+      end
+
+      module SqlServerReplaceLimitOffset
+        module_function
+        def replace_limit_offset!(sql, limit, offset, order)
+          if limit
+            offset ||= 0
+            start_row = offset + 1
+            end_row = offset + limit.to_i
+            find_select = /\b(SELECT(?:\s+DISTINCT)?)\b(.*)/im
+            whole, select, rest_of_query = find_select.match(sql).to_a
+            if rest_of_query.strip!.first == '*'
+              from_table = /.*FROM\s*\b(\w*)\b/i.match(rest_of_query).to_a[1]
+            end
+            new_sql = "#{select} t.* FROM (SELECT ROW_NUMBER() OVER(#{order}) AS _row_num, #{from_table + '.' if from_table}#{rest_of_query}"
+            new_sql << ") AS t WHERE t._row_num BETWEEN #{start_row.to_s} AND #{end_row.to_s}"
+            sql.replace(new_sql)
+          end
+          sql
+        end
+      end
+
+      module SqlServerAddLimitOffset
+        def add_limit_offset!(sql, options)
+          if options[:limit]
+            order = "ORDER BY #{options[:order] || determine_order_clause(sql)}"
+            sql.sub!(/ ORDER BY.*$/i, '')
+            SqlServerReplaceLimitOffset.replace_limit_offset!(sql, options[:limit], options[:offset], order)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/arjdbc/mysql/adapter.rb

@@ -58,7 +58,7 @@ module ::ArJdbc
         when /^mediumint/i; 3
         when /^smallint/i;  2
         when /^tinyint/i;   1
-        when /^(datetime|timestamp)/
+        when /^(datetime|date|timestamp)/
           nil
         else
           super

data/lib/arjdbc/oracle/adapter.rb

@@ -109,6 +109,15 @@ module ::ArJdbc
       'Oracle'
     end
 
+    def arel2_visitors
+      { 'oracle' => Arel::Visitors::Oracle }
+    end
+
+    # TODO: use this instead of the QuotedPrimaryKey logic and execute_id_insert?
+    # def prefetch_primary_key?(table_name = nil)
+    #   columns(table_name).detect {|c| c.primary } if table_name
+    # end
+
     def table_alias_length
       30
     end
@@ -144,8 +153,17 @@ module ::ArJdbc
       recreate_database(name)
     end
 
+    def next_sequence_value(sequence_name)
+      # avoid #select or #select_one so that the sequence values aren't cached
+      execute("select #{sequence_name}.nextval id from dual").first['id'].to_i
+    end
+
+    def sql_literal?(value)
+      defined?(::Arel::SqlLiteral) && ::Arel::SqlLiteral === value
+    end
+
     def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil) #:nodoc:
-      if (id_value && !id_value.respond_to?(:to_sql)) || pk.nil?
+      if (id_value && !sql_literal?(id_value)) || pk.nil?
         # Pre-assigned id or table without a primary key
         # Presence of #to_sql means an Arel literal bind variable
         # that should use #execute_id_insert below
@@ -155,7 +173,7 @@ module ::ArJdbc
         # Extract the table from the insert sql. Yuck.
         table = sql.split(" ", 4)[2].gsub('"', '')
         sequence_name ||= default_sequence_name(table)
-        id_value = select_one("select #{sequence_name}.nextval id from dual")['id'].to_i
+        id_value = next_sequence_value(sequence_name)
         log(sql, name) do
           @connection.execute_id_insert(sql,id_value)
         end
@@ -344,6 +362,9 @@ module ::ArJdbc
     end
 
     def quote(value, column = nil) #:nodoc:
+      # Arel 2 passes SqlLiterals through
+      return value if sql_literal?(value)
+
       if column && [:text, :binary].include?(column.type)
         if /(.*?)\([0-9]+\)/ =~ column.sql_type
           %Q{empty_#{ $1.downcase }()}

data/lib/arjdbc/postgresql/adapter.rb

@@ -90,6 +90,10 @@ module ::ArJdbc
       'PostgreSQL'
     end
 
+    def arel2_visitors
+      {'jdbcpostgresql' => ::Arel::Visitors::PostgreSQL}
+    end
+
     def postgresql_version
       @postgresql_version ||=
         begin

data/lib/arjdbc/version.rb

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

data/src/java/arjdbc/h2/H2RubyJdbcConnection.java

@@ -0,0 +1,70 @@
+/*
+ **** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2006-2010 Nick Sieger <nick@nicksieger.com>
+ * Copyright (c) 2006-2007 Ola Bini <ola.bini@gmail.com>
+ * Copyright (c) 2008-2009 Thomas E Enebo <enebo@acm.org>
+ *
+ * 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 LICENSE BLOCK *****/
+
+package arjdbc.h2;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+
+import arjdbc.jdbc.RubyJdbcConnection;
+
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
+import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.builtin.IRubyObject;
+
+/**
+ *
+ * @author nicksieger
+ */
+public class H2RubyJdbcConnection extends RubyJdbcConnection {
+    protected H2RubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
+        super(runtime, metaClass);
+    }
+
+    public static RubyClass createH2JdbcConnectionClass(Ruby runtime, RubyClass jdbcConnection) {
+        RubyClass clazz = RubyJdbcConnection.getConnectionAdapters(runtime).defineClassUnder("H2JdbcConnection",
+                jdbcConnection, H2_JDBCCONNECTION_ALLOCATOR);
+        clazz.defineAnnotatedMethods(H2RubyJdbcConnection.class);
+
+        return clazz;
+    }
+
+    private static ObjectAllocator H2_JDBCCONNECTION_ALLOCATOR = new ObjectAllocator() {
+        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
+            return new H2RubyJdbcConnection(runtime, klass);
+        }
+    };
+
+    /**
+     * H2 supports schemas.
+     */
+    @Override
+    protected boolean databaseSupportsSchemas() {
+        return true;
+    }
+}

data/src/java/arjdbc/jdbc/AdapterJavaService.java

@@ -29,6 +29,7 @@ package arjdbc.jdbc;
 import java.io.IOException;
 
 import arjdbc.derby.DerbyModule;
+import arjdbc.h2.H2RubyJdbcConnection;
 import arjdbc.informix.InformixRubyJdbcConnection;
 import arjdbc.mssql.MssqlRubyJdbcConnection;
 import arjdbc.mysql.MySQLModule;
@@ -53,6 +54,7 @@ public class AdapterJavaService implements BasicLibraryService {
         InformixRubyJdbcConnection.createInformixJdbcConnectionClass(runtime, jdbcConnection);
         OracleRubyJdbcConnection.createOracleJdbcConnectionClass(runtime, jdbcConnection);
         Sqlite3RubyJdbcConnection.createSqlite3JdbcConnectionClass(runtime, jdbcConnection);
+        H2RubyJdbcConnection.createH2JdbcConnectionClass(runtime, jdbcConnection);
         RubyModule arJdbc = runtime.getOrCreateModule("ArJdbc");
 
         rubyApi = JavaEmbedUtils.newObjectAdapter();

data/test/h2_simple_test.rb

@@ -4,3 +4,38 @@ require 'db/h2'
 class H2SimpleTest < Test::Unit::TestCase
   include SimpleTestMethods
 end
+
+class H2SchemaTest < Test::Unit::TestCase
+  def setup
+    @connection = ActiveRecord::Base.connection
+    @connection.execute("create schema s1");
+    @connection.execute("set schema s1");
+    CreateEntries.up
+    @connection.execute("create schema s2");
+    @connection.execute("set schema s2");
+    CreateUsers.up
+    @connection.execute("set schema public");
+    Entry.set_table_name 's1.entries'
+    User.set_table_name 's2.users'
+    user = User.create! :login => "something"
+    Entry.create! :title => "title", :content => "content", :rating => 123.45, :user => user
+  end
+
+  def teardown
+    @connection.execute("set schema s1");
+    CreateEntries.down
+    @connection.execute("set schema s2");
+    CreateUsers.down
+    @connection.execute("drop schema s1");
+    @connection.execute("drop schema s2");
+    @connection.execute("set schema public");
+    Entry.reset_table_name
+    Entry.reset_column_information
+    User.reset_table_name
+    User.reset_column_information
+  end
+
+  def test_find_in_other_schema
+    assert !Entry.all(:include => :user).empty?
+  end
+end

data/test/jdbc_common.rb

@@ -20,6 +20,6 @@ require 'helper'
 require 'test/unit'
 
 # Comment/uncomment to enable logging to be loaded for any of the database adapters
-# require 'db/logger'
+require 'db/logger' if $DEBUG || ENV['DEBUG']
 
 

data/test/mysql_db_create_test.rb

@@ -8,9 +8,9 @@ class MysqlDbCreateTest < Test::Unit::TestCase
     MYSQL_CONFIG
   end
 
-  if find_executable?("mysql")
-    def test_rake_db_create
-      Rake::Task["db:create"].invoke
+  def test_rake_db_create
+    Rake::Task["db:create"].invoke
+    if find_executable?("mysql")
       output = nil
       IO.popen("mysql -u #{MYSQL_CONFIG[:username]} --password=#{MYSQL_CONFIG[:password]}", "r+") do |mysql|
         mysql << "show databases where `Database` = '#{@db_name}';"
@@ -18,13 +18,10 @@ class MysqlDbCreateTest < Test::Unit::TestCase
         assert mysql.read =~ /#{@db_name}/m
       end
     end
+  end
 
-    def test_rake_db_test_purge
-      Rake::Task["db:create"].invoke
-      Rake::Task["db:test:purge"].invoke
-    end
-  else
-    def test_skipped
-    end
+  def test_rake_db_test_purge
+    Rake::Task["db:create"].invoke
+    Rake::Task["db:test:purge"].invoke
   end
 end

data/test/mysql_info_test.rb

@@ -12,6 +12,7 @@ class DBSetup < ActiveRecord::Migration
 
     create_table :cars, :primary_key => 'legacy_id' do |t|
       t.string :name
+      t.date :production_started_on
     end
 
     create_table :cats, :id => false do |t|
@@ -80,6 +81,13 @@ class MysqlInfoTest < Test::Unit::TestCase
     dump = strio.string
     dump.grep(/datetime/).each {|line| assert line !~ /limit/ }
   end
+  
+  def test_schema_dump_should_not_have_limits_on_date
+    strio = StringIO.new
+    ActiveRecord::SchemaDumper::dump(@connection, strio)
+    dump = strio.string
+    dump.grep(/date/).each {|line| assert line !~ /limit/ }
+  end
 
   def test_should_include_limit
     text_column = @connection.columns('memos').find { |c| c.name == 'text' }

data/test/mysql_simple_test.rb

@@ -29,6 +29,19 @@ class MysqlSimpleTest < Test::Unit::TestCase
   def test_update_all_with_limit
     assert_nothing_raised { Entry.update_all({:title => "test"}, {}, {:limit => 1}) }
   end
+
+  def test_find_in_other_schema_with_include
+    old_entries_table_name = Entry.table_name
+    old_users_table_name   = User.table_name
+    begin
+      User.set_table_name 'weblog_development.users'
+      Entry.set_table_name 'weblog_development.entries'
+      assert !Entry.all(:include => :user).empty?
+    ensure
+      Entry.set_table_name old_entries_table_name
+      User.set_table_name old_users_table_name
+    end
+  end
 end
 
 class MysqlHasManyThroughTest < Test::Unit::TestCase

data/test/oracle_simple_test.rb

@@ -7,4 +7,12 @@ class OracleSimpleTest < Test::Unit::TestCase
   def test_default_id_type_is_integer
     assert Integer === Entry.first.id
   end
+
+  def test_sequences_are_not_cached
+    ActiveRecord::Base.transaction do
+      e1 = Entry.create :title => "hello1"
+      e2 = Entry.create :title => "hello2"
+      assert e1.id != e2.id
+    end
+  end
 end

data/test/simple.rb

@@ -348,6 +348,36 @@ module SimpleTestMethods
     AddNotNullColumnToTable.down
   end
 
+  def test_add_null_column_with_default
+    Entry.connection.add_column :entries, :color, :string, :null => false, :default => "blue"
+    created_columns = Entry.connection.columns('entries')
+
+    color = created_columns.detect { |c| c.name == 'color' }
+    assert !color.null
+  end
+
+  def test_add_null_column_with_no_default
+    # You must specify a default value with most databases
+    if ActiveRecord::Base.connection.adapter_name =~ /mysql/i
+      Entry.connection.add_column :entries, :color, :string, :null => false
+      created_columns = Entry.connection.columns('entries')
+
+      color = created_columns.detect { |c| c.name == 'color' }
+      assert !color.null
+    end
+  end
+
+  def test_add_null_column_with_nil_default
+    # You must specify a default value with most databases
+    if ActiveRecord::Base.connection.adapter_name =~ /mysql/i
+      Entry.connection.add_column :entries, :color, :string, :null => false, :default => nil
+      created_columns = Entry.connection.columns('entries')
+
+      color = created_columns.detect { |c| c.name == 'color' }
+      assert !color.null
+    end
+  end
+
   def test_validates_uniqueness_of_strings_case_sensitive
     name_lower = ValidatesUniquenessOfString.new(:cs_string => "name", :ci_string => '1')
     name_lower.save!

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 1
     - 0
-    - 2
-  version: 1.0.2
+    - 3
+  version: 1.0.3
 platform: java
 authors: 
   - Nick Sieger, Ola Bini and JRuby contributors
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-20 00:00:00 -05:00
+date: 2010-11-29 00:00:00 -06:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -89,6 +89,10 @@ 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/db2.rb
+  - lib/arel/visitors/derby.rb
+  - lib/arel/visitors/hsqldb.rb
+  - lib/arel/visitors/mssql.rb
   - lib/arjdbc/db2.rb
   - lib/arjdbc/derby.rb
   - lib/arjdbc/discover.rb
@@ -135,6 +139,7 @@ files:
   - lib/arjdbc/mimer/adapter.rb
   - lib/arjdbc/mssql/adapter.rb
   - lib/arjdbc/mssql/connection_methods.rb
+  - lib/arjdbc/mssql/limit_helpers.rb
   - lib/arjdbc/mssql/tsql_helper.rb
   - lib/arjdbc/mysql/adapter.rb
   - lib/arjdbc/mysql/connection_methods.rb
@@ -214,6 +219,7 @@ files:
   - test/models/validates_uniqueness_of_string.rb
   - lib/arjdbc/jdbc/jdbc.rake
   - src/java/arjdbc/derby/DerbyModule.java
+  - src/java/arjdbc/h2/H2RubyJdbcConnection.java
   - src/java/arjdbc/informix/InformixRubyJdbcConnection.java
   - src/java/arjdbc/jdbc/AdapterJavaService.java
   - src/java/arjdbc/jdbc/JdbcConnectionFactory.java