activerecord-jdbc-adapter 1.1.1 → 1.1.2

data/History.txt

@@ -1,3 +1,42 @@
+== 1.1.2
+
+- Update version of H2 driver from 1.1.107 to 1.3.153 (Ketan
+  Padegaonkar, Jeremy Stephens)
+- Fix errors in db:test:clone_structure with PostgreSQL (Andrea Campi)
+- Fixing limit for sqlServer2000 if primary key is not named 'id'
+  (Luca Simone)
+- DB2: define jdbc_columns (fixes table_exists? bug) (Nick Kreucher)
+- ACTIVERECORD_JDBC-152 - omitting limit when dumping bytea fields
+  (Gregor Schmidt)
+- Postgres doesn't support a limit for bytea columns (Alex Tambellini)
+- JRUBY-5642: Default to schema public if no schema given for postgres
+  (Anthony Juckel)
+- Sqlite3 supports float data type so use float (Alex Tambellini)
+- GH #21: Now using sqlite3 driver from
+  http://www.xerial.org/trac/Xerial/wiki/SQLiteJDBC (thanks Ukabu)
+- GH #65: PG: Respect integer sizes (Alex Tambellini)
+- GH #59: PG: Properly escape bytea-escaped string
+- GH #53: oracle: allow configuration of schema through schema: key
+- GH #50: PG: support multiple schema in search_path (Daniel
+  Schreiber)
+- GH #25: Reload ArJdbc.column_types if number of constants changed
+- GH #47: Allow table statistics for indexes to be approximate; speeds
+  up Oracle
+- GH #67: Change primary_keys to use the same catalog/schema/table
+  separation logic as columns_internal (Marcus Brito). This change
+  allows set_table_name to specify a custom schema.
+- GH #49: mssql: quote table names like column names
+- GH #56: mssql: Fix 'select 1' behavior introduced by AR 3.0.7
+- GH #55: Make decimal columns with no precision or scale stay
+  decimals
+- GH #45: Add Arel limit support for Firebird (Systho))
+- GH #39: PG: allow negative integer default values
+- GH #19: Make a stub Mysql::Error class
+- ACTIVERECORD_JDBC-148: mssql: Ensure regex doesn't match 'from' in a
+  field name
+- GH#31: mssql: Remove extra code breaking mssql w/o limit
+- ACTIVERECORD_JDBC-156: mssql: Logic fix for detecting select_count?
+
 == 1.1.1
 
 - Arel 2.0.7 compatibility: fix bugs arising from use of Arel 2.0.7 +

data/Manifest.txt

@@ -28,6 +28,7 @@ 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/firebird.rb
 lib/arel/visitors/hsqldb.rb
 lib/arel/visitors/sql_server.rb
 lib/arjdbc/db2.rb
@@ -122,6 +123,7 @@ test/oracle_specific_test.rb
 test/pick_rails_version.rb
 test/postgres_db_create_test.rb
 test/postgres_drop_db_test.rb
+test/postgres_information_schema_leak_test.rb
 test/postgres_mixed_case_test.rb
 test/postgres_nonseq_pkey_test.rb
 test/postgres_reserved_test.rb
@@ -155,6 +157,7 @@ test/models/reserved_word.rb
 test/models/string_id.rb
 test/models/validates_uniqueness_of_string.rb
 lib/arjdbc/jdbc/jdbc.rake
+src/java/arjdbc/db2/DB2RubyJdbcConnection.java
 src/java/arjdbc/derby/DerbyModule.java
 src/java/arjdbc/h2/H2RubyJdbcConnection.java
 src/java/arjdbc/informix/InformixRubyJdbcConnection.java

data/lib/arel/visitors/firebird.rb

@@ -0,0 +1,17 @@
+require 'arel/visitors/compat'
+
+module Arel
+  module Visitors
+    class Firebird < 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?),
+         ("ROWS #{limit_for(o.limit)} " if o.limit),
+         ("TO #{o.offset} " if o.offset),
+        ].compact.join ' '
+      end
+
+    end
+  end
+end

data/lib/arel/visitors/sql_server.rb

@@ -7,8 +7,8 @@ module Arel
 
       def select_count? o
         sel = o.cores.length == 1 && o.cores.first
-        projections = sel.projections.length == 1 && sel.projections
-        Arel::Nodes::Count === projections.first
+        projections = sel && sel.projections.length == 1 && sel.projections
+        projections && Arel::Nodes::Count === projections.first
       end
 
       # Need to mimic the subquery logic in ARel 1.x for select count with limit
@@ -30,8 +30,6 @@ module Arel
           order ||= "ORDER BY #{@connection.determine_order_clause(sql)}"
           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}"
         else
           sql = super
         end

data/lib/arjdbc/db2/adapter.rb

@@ -5,6 +5,10 @@ module ArJdbc
         lambda { |cfg, column| column.extend(::ArJdbc::DB2::Column) } ]
     end
 
+    def self.jdbc_connection_class
+      ::ActiveRecord::ConnectionAdapters::DB2JdbcConnection
+    end
+
     module Column
       def type_cast(value)
         return nil if value.nil? || value =~ /^\s*null\s*$/i
@@ -319,6 +323,10 @@ module ArJdbc
       cols
     end
 
+    def jdbc_columns(table_name, name = nil)
+      columns(table_name, name)
+    end
+
     def indexes(table_name, name = nil)
       @connection.indexes(table_name, name, db2_schema)
     end

data/lib/arjdbc/derby/adapter.rb

@@ -37,9 +37,13 @@ module ::ArJdbc
 
     module Column
       def simplified_type(field_type)
-        return :boolean if field_type =~ /smallint/i
-        return :float if field_type =~ /real/i
-        super
+        case field_type
+        when /smallint/i  then :boolean
+        when /real/i      then :float
+        when /decimal/i   then :decimal
+        else
+          super
+        end
       end
 
       # Post process default value from JDBC into a Rails-friendly format (columns{-internal})

data/lib/arjdbc/firebird/adapter.rb

@@ -23,6 +23,11 @@ module ::ArJdbc
       'Firebird'
     end
 
+    def arel2_visitors
+      require 'arel/visitors/firebird'
+      {'firebird' => ::Arel::Visitors::Firebird, 'firebirdsql' => ::Arel::Visitors::Firebird}
+    end
+
     def modify_types(tp)
       tp[:primary_key] = 'INTEGER NOT NULL PRIMARY KEY'
       tp[:string][:limit] = 252

data/lib/arjdbc/hsqldb/adapter.rb

@@ -8,14 +8,12 @@ module ::ArJdbc
       private
       def simplified_type(field_type)
         case field_type
-        when /longvarchar/i
-          :text
-        when /tinyint/i
-          :boolean
-        when /real/i
-          :float
+        when /longvarchar/i then :text
+        when /tinyint/i  then :boolean
+        when /real/i     then :float
+        when /decimal/i  then :decimal
         else
-          super(field_type)
+          super
         end
       end
 

data/lib/arjdbc/jdbc/adapter.rb

@@ -75,7 +75,7 @@ module ActiveRecord
               config[:username] ||= conn.getMetaData.getUserName
             end
           rescue
-            conn.close
+            conn.close if conn
           end
         end
         nil

data/lib/arjdbc/jdbc/column.rb

@@ -17,13 +17,22 @@ module ActiveRecord
       end
 
       def self.column_types
-        @column_types ||= ::ArJdbc.constants.map{|c|
-          ::ArJdbc.const_get c }.select{ |c|
-          c.respond_to? :column_selector }.map{|c|
-          c.column_selector }.inject({}) { |h,val|
+        # GH #25: reset the column types if the # of constants changed
+        # since last call
+        if ::ArJdbc.constants.size != driver_constants.size
+          @driver_constants = nil
+          @column_types = nil
+        end
+        @column_types ||= driver_constants.select {|c|
+          c.respond_to? :column_selector }.map {|c|
+          c.column_selector }.inject({}) {|h,val|
           h[val[0]] = val[1]; h }
       end
 
+      def self.driver_constants
+        @driver_constants ||= ::ArJdbc.constants.map {|c| ::ArJdbc.const_get c }
+      end
+
       protected
       def call_discovered_column_callbacks(config)
         dialect = config[:dialect] || config[:driver]

data/lib/arjdbc/jdbc/connection.rb

@@ -5,7 +5,7 @@ module ActiveRecord
         attr_reader :config
 
         def config=(config)
-          @config = config.symbolize_keys!
+          @config = config.symbolize_keys
         end
 
         def configure_connection
@@ -62,9 +62,7 @@ module ActiveRecord
           user   = config[:username].to_s
           pass   = config[:password].to_s
           url    = configure_url
-
-          jdbc_driver = JdbcDriver.new(driver)
-          jdbc_driver.load
+          jdbc_driver = (config[:driver_instance] ||= JdbcDriver.new(driver))
           @connection_factory = JdbcConnectionFactory.impl do
             jdbc_driver.connection(url, user, pass)
           end
@@ -90,13 +88,17 @@ module ActiveRecord
       rescue ::ActiveRecord::ActiveRecordError
         raise
       rescue Exception => e
-        raise "The driver encountered an unknown error: #{e}"
+        raise ::ActiveRecord::JDBCError.new("The driver encountered an unknown error: #{e}").tap do |err|
+          err.errno = 0
+          err.sql_exception = e
+        end
       end
 
       def adapter=(adapter)
         @adapter = adapter
         @native_database_types = dup_native_types
         @adapter.modify_types(@native_database_types)
+        @adapter.config.replace(config)
       end
 
       # Duplicate all native types into new hash structure so it can be modified

data/lib/arjdbc/jdbc/discover.rb

@@ -1,7 +1,7 @@
 module ArJdbc
   def self.discover_extensions
-    if defined?(::Gem)
-      files = Gem.find_files('arjdbc/discover')
+    if defined?(::Gem) && ::Gem.respond_to?(:find_files)
+      files = ::Gem.find_files('arjdbc/discover')
     else
       files = $LOAD_PATH.map do |p|
         discover = File.join(p, 'arjdbc','discover.rb')

data/lib/arjdbc/jdbc/driver.rb

@@ -3,6 +3,7 @@ module ActiveRecord
     class JdbcDriver
       def initialize(name)
         @name = name
+        @driver = driver_class.new
       end
 
       def driver_class
@@ -12,32 +13,22 @@ module ActiveRecord
             unless Jdbc.const_defined?(driver_class_const)
               driver_class_name = @name
               Jdbc.module_eval do
-                include_class(driver_class_name) { driver_class_const }
+                java_import(driver_class_name) { driver_class_const }
               end
             end
           end
           driver_class = Jdbc.const_get(driver_class_const)
-          raise "You specify a driver for your JDBC connection" unless driver_class
+          raise "You must specify a driver for your JDBC connection" unless driver_class
           driver_class
         end
       end
 
-      def load
-        Jdbc::DriverManager.registerDriver(create)
-      end
-
       def connection(url, user, pass)
-        Jdbc::DriverManager.getConnection(url, user, pass)
-      rescue
         # bypass DriverManager to get around problem with dynamically loaded jdbc drivers
         props = java.util.Properties.new
         props.setProperty("user", user)
         props.setProperty("password", pass)
-        create.connect(url, props)
-      end
-
-      def create
-        driver_class.new
+        @driver.connect(url, props)
       end
     end
   end

data/lib/arjdbc/jdbc/jdbc.rake

@@ -54,8 +54,12 @@ namespace :db do
     if config['adapter'] =~ /postgresql/i
       config = config.dup
       if config['url']
-        db = config['url'][/\/([^\/]*)$/, 1]
-        config['url'][/\/([^\/]*)$/, 1] = 'postgres' if db
+        url = config['url'].dup
+        db = url[/\/([^\/]*)$/, 1]
+        if db
+          url[/\/([^\/]*)$/, 1] = 'postgres'
+          config['url'] = url
+        end
       else
         db = config['database']
         config['database'] = 'postgres'

data/lib/arjdbc/mssql/adapter.rb

@@ -217,7 +217,7 @@ module ::ArJdbc
     end
 
     def quote_table_name(name)
-      name
+      quote_column_name(name)
     end
 
     def quote_column_name(name)

data/lib/arjdbc/mssql/limit_helpers.rb

@@ -5,7 +5,7 @@ module ::ArJdbc
       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
+        elsif sql =~ /\bfrom\s+([^\(\s,]+)\s*/i
           $1
         else
           nil
@@ -31,14 +31,15 @@ module ::ArJdbc
               rest = rest_of_query[/FROM/i=~ rest_of_query.. -1]
               #need the table name for avoiding amiguity
               table_name = LimitHelpers.get_table_name(sql)
+              primary_key = order[/(\w*id\w*)/i]
               #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 BY #{order}, #{table_name}.#{primary_key}" if order.index("#{table_name}.#{primary_key}").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} "
+                new_sql = "#{select} TOP #{limit} #{rest_of_query} WHERE #{table_name}.#{primary_key} NOT IN (#{select} TOP #{offset} #{table_name}.#{primary_key} #{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} "
+                new_sql = "#{select} TOP #{limit} #{rest_of_query} AND #{table_name}.#{primary_key} NOT IN (#{select} TOP #{offset} #{table_name}.#{primary_key} #{rest} #{new_order}) #{order} "
               end
 
               sql.replace(new_sql)
@@ -67,10 +68,15 @@ module ::ArJdbc
             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]
+            rest_of_query.strip!
+            if rest_of_query.first == "1"
+              rest_of_query[0] = "*"
             end
-            new_sql = "#{select} t.* FROM (SELECT ROW_NUMBER() OVER(#{order}) AS _row_num, #{from_table + '.' if from_table}#{rest_of_query}"
+            if rest_of_query.first == "*"
+              from_table = LimitHelpers.get_table_name(rest_of_query)
+              rest_of_query = from_table + '.' + rest_of_query
+            end
+            new_sql = "#{select} t.* FROM (SELECT ROW_NUMBER() OVER(#{order}) AS _row_num, #{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

data/lib/arjdbc/mysql/adapter.rb

@@ -39,9 +39,13 @@ module ::ArJdbc
       end
 
       def simplified_type(field_type)
-        return :boolean if field_type =~ /tinyint\(1\)|bit/i
-        return :string  if field_type =~ /enum/i
-        super
+        case field_type
+        when /tinyint\(1\)|bit/i then :boolean
+        when /enum/i             then :string
+        when /decimal/i          then :decimal
+        else
+          super
+        end
       end
 
       def extract_limit(sql_type)
@@ -410,6 +414,11 @@ module ActiveRecord::ConnectionAdapters
 end
 
 module Mysql                    # :nodoc:
+  remove_const(:Error) if const_defined?(:Error)
+
+  class Error < ::ActiveRecord::JDBCError
+  end
+
   def self.client_version
     50400                       # faked out for AR tests
   end

data/lib/arjdbc/oracle/adapter.rb

@@ -23,9 +23,9 @@ module ::ArJdbc
       end
       require 'arjdbc/jdbc/quoted_primary_key'
       ActiveRecord::Base.extend ArJdbc::QuotedPrimaryKeyExtension
-      mod.class.class_eval do
-        alias_chained_method :insert, :query_dirty, :insert
-        alias_chained_method :columns, :query_cache, :columns
+      (class << mod; self; end).class_eval do
+        alias_chained_method :insert, :query_dirty, :ora_insert
+        alias_chained_method :columns, :query_cache, :ora_columns
       end
     end
 
@@ -68,6 +68,7 @@ module ::ArJdbc
       end
 
       def self.guess_date_or_time(value)
+        return value if Date === value
         (value && value.hour == 0 && value.min == 0 && value.sec == 0) ?
         Date.new(value.year, value.month, value.day) : value
       end
@@ -128,7 +129,7 @@ module ::ArJdbc
 
     def create_table(name, options = {}) #:nodoc:
       super(name, options)
-      seq_name = options[:sequence_name] || "#{name}_seq"
+      seq_name = options[:sequence_name] || default_sequence_name(name)
       start_value = options[:sequence_start_value] || 10000
       raise ActiveRecord::StatementInvalid.new("name #{seq_name} too long") if seq_name.length > table_alias_length
       execute "CREATE SEQUENCE #{seq_name} START WITH #{start_value}" unless options[:id] == false
@@ -140,8 +141,8 @@ module ::ArJdbc
     end
 
     def drop_table(name, options = {}) #:nodoc:
-      super(name)
-      seq_name = options[:sequence_name] || "#{name}_seq"
+      super(name) rescue nil
+      seq_name = options[:sequence_name] || default_sequence_name(name)
       execute "DROP SEQUENCE #{seq_name}" rescue nil
     end
 
@@ -162,7 +163,7 @@ module ::ArJdbc
       defined?(::Arel::SqlLiteral) && ::Arel::SqlLiteral === value
     end
 
-    def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil) #:nodoc:
+    def ora_insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil) #:nodoc:
       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
@@ -333,7 +334,7 @@ module ::ArJdbc
       @connection.tables(nil, oracle_schema)
     end
 
-    def columns(table_name, name=nil)
+    def ora_columns(table_name, name=nil)
       @connection.columns_internal(table_name, name, oracle_schema)
     end
 
@@ -394,10 +395,15 @@ module ::ArJdbc
     end
 
     private
-    # In Oracle, schemas are created under your username:
+    # In Oracle, schemas are usually created under your username:
     # http://www.oracle.com/technology/obe/2day_dba/schema/schema.htm
+    # But allow separate configuration as "schema:" anyway (GH #53)
     def oracle_schema
-      @config[:username].to_s if @config[:username]
+      if @config[:schema]
+        @config[:schema].to_s
+      elsif @config[:username]
+        @config[:username].to_s
+      end
     end
 
     def select(sql, name=nil)

data/lib/arjdbc/postgresql/adapter.rb

@@ -5,8 +5,9 @@ end
 module ::ArJdbc
   module PostgreSQL
     def self.extended(mod)
-      mod.class.class_eval do
-        alias_chained_method :insert, :query_dirty, :insert
+      (class << mod; self; end).class_eval do
+        alias_chained_method :insert, :query_dirty, :pg_insert
+        alias_chained_method :columns, :query_cache, :pg_columns
       end
     end
 
@@ -28,9 +29,13 @@ module ::ArJdbc
 
       def extract_limit(sql_type)
         case sql_type
-        when /^bigint/i;    8
+        when /^int2/i;      2
         when /^smallint/i;  2
-        when /^(bool|text|date|time)/i; nil # ACTIVERECORD_JDBC-135,139
+        when /^int4/i;      nil
+        when /^integer/i;   nil
+        when /^int8/i;      8
+        when /^bigint/i;    8
+        when /^(bool|text|date|time|bytea)/i; nil # ACTIVERECORD_JDBC-135,139
         else super
         end
       end
@@ -43,6 +48,7 @@ module ::ArJdbc
         return :float if field_type =~ /^(?:real|double precision)$/i
         return :binary if field_type =~ /^bytea/i
         return :boolean if field_type =~ /^bool/i
+        return :decimal if field_type == 'numeric(131089)'
         super
       end
 
@@ -65,7 +71,7 @@ module ::ArJdbc
         return $1 if value =~ /^'(.*)'::(bpchar|text|character varying|bytea)$/
 
         # Numeric values
-        return value if value =~ /^-?[0-9]+(\.[0-9]*)?/
+        return value.delete("()") if value =~ /^\(?-?[0-9]+(\.[0-9]*)?\)?/
 
         # Fixed dates / timestamp
         return $1 if value =~ /^'(.+)'::(date|timestamp)/
@@ -239,7 +245,7 @@ module ::ArJdbc
       nil
     end
 
-    def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
+    def pg_insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
       # Extract the table from the insert sql. Yuck.
       table = sql.split(" ", 4)[2].gsub('"', '')
 
@@ -273,14 +279,27 @@ module ::ArJdbc
       id_value
     end
 
-    def columns(table_name, name=nil)
+    def pg_columns(table_name, name=nil)
       schema_name = @config[:schema_search_path]
       if table_name =~ /\./
         parts = table_name.split(/\./)
         table_name = parts.pop
         schema_name = parts.join(".")
       end
-      @connection.columns_internal(table_name, name, schema_name)
+      schema_list = if schema_name.nil?
+          []
+        else
+          schema_name.split(/\s*,\s*/)
+        end
+      while schema_list.size > 1
+        s = schema_list.shift
+        begin
+          return @connection.columns_internal(table_name, name, s)
+        rescue ActiveRecord::JDBCError=>ignored_for_next_schema
+        end
+      end
+      s = schema_list.shift
+      return @connection.columns_internal(table_name, name, s)
     end
 
     # From postgresql_adapter.rb
@@ -418,7 +437,7 @@ module ::ArJdbc
       return super unless column
 
       if value.kind_of?(String) && column.type == :binary
-        "'#{escape_bytea(value)}'"
+        "E'#{escape_bytea(value)}'"
       elsif value.kind_of?(String) && column.sql_type == 'xml'
         "xml '#{quote_string(value)}'"
       elsif value.kind_of?(Numeric) && column.sql_type == 'money'
@@ -557,9 +576,9 @@ module ::ArJdbc
     def translate_exception(exception, message)
       case exception.message
       when /duplicate key value violates unique constraint/
-        RecordNotUnique.new(message, exception)
+        ::ActiveRecord::RecordNotUnique.new(message, exception)
       when /violates foreign key constraint/
-        InvalidForeignKey.new(message, exception)
+        ::ActiveRecord::InvalidForeignKey.new(message, exception)
       else
         super
       end

data/lib/arjdbc/sqlite3/adapter.rb

@@ -108,7 +108,7 @@ module ::ArJdbc
       tp[:primary_key] = "integer primary key autoincrement not null"
       tp[:string] = { :name => "varchar", :limit => 255 }
       tp[:text] = { :name => "text" }
-      tp[:float] = { :name => "decimal" }
+      tp[:float] = { :name => "float" }
       tp[:decimal] = { :name => "decimal" }
       tp[:datetime] = { :name => "datetime" }
       tp[:timestamp] = { :name => "datetime" }

data/lib/arjdbc/version.rb

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

data/rakelib/package.rake

@@ -12,6 +12,7 @@ require File.dirname(__FILE__) + "/../lib/arjdbc/version"
 begin
   require 'hoe'
   Hoe.plugin :gemcutter
+  Hoe.plugin :rubyforge
   hoe = Hoe.spec("activerecord-jdbc-adapter") do |p|
     p.version = ArJdbc::Version::VERSION
     p.spec_extras[:files] = MANIFEST

data/src/java/arjdbc/db2/DB2RubyJdbcConnection.java

@@ -0,0 +1,62 @@
+/*
+ **** 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.db2;
+
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
+import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.builtin.IRubyObject;
+
+import arjdbc.jdbc.RubyJdbcConnection;
+
+/**
+ *
+ * @author mikestone
+ */
+public class DB2RubyJdbcConnection extends RubyJdbcConnection {
+    protected DB2RubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
+        super(runtime, metaClass);
+    }
+
+    @Override
+    protected boolean databaseSupportsSchemas() {
+        return true;
+    }
+
+    public static RubyClass createDB2JdbcConnectionClass(Ruby runtime, RubyClass jdbcConnection) {
+        RubyClass clazz = RubyJdbcConnection.getConnectionAdapters(runtime).defineClassUnder("DB2JdbcConnection",
+                jdbcConnection, DB2_JDBCCONNECTION_ALLOCATOR);
+        clazz.defineAnnotatedMethods(DB2RubyJdbcConnection.class);
+
+        return clazz;
+    }
+
+    private static ObjectAllocator DB2_JDBCCONNECTION_ALLOCATOR = new ObjectAllocator() {
+        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
+            return new DB2RubyJdbcConnection(runtime, klass);
+        }
+    };
+}

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

@@ -28,6 +28,7 @@ package arjdbc.jdbc;
 
 import java.io.IOException;
 
+import arjdbc.db2.DB2RubyJdbcConnection;
 import arjdbc.derby.DerbyModule;
 import arjdbc.h2.H2RubyJdbcConnection;
 import arjdbc.informix.InformixRubyJdbcConnection;
@@ -57,6 +58,7 @@ public class AdapterJavaService implements BasicLibraryService {
         Sqlite3RubyJdbcConnection.createSqlite3JdbcConnectionClass(runtime, jdbcConnection);
         H2RubyJdbcConnection.createH2JdbcConnectionClass(runtime, jdbcConnection);
         MySQLRubyJdbcConnection.createMySQLJdbcConnectionClass(runtime, jdbcConnection);
+        DB2RubyJdbcConnection.createDB2JdbcConnectionClass(runtime, jdbcConnection);
         RubyModule arJdbc = runtime.getOrCreateModule("ArJdbc");
         rubyApi = JavaEmbedUtils.newObjectAdapter();
         MySQLModule.load(arJdbc);

data/src/java/arjdbc/jdbc/RubyJdbcConnection.java

@@ -1,6 +1,6 @@
 /*
  **** BEGIN LICENSE BLOCK *****
- * Copyright (c) 2006-2010 Nick Sieger <nick@nicksieger.com>
+ * Copyright (c) 2006-2011 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>
  *
@@ -122,45 +122,20 @@ public class RubyJdbcConnection extends RubyObject {
             public Object call(Connection c) throws SQLException {
                 ResultSet results = null, pkeys = null;
                 try {
-                    String table_name = rubyApi.convertToRubyString(args[0]).getUnicodeValue();
-                    String schemaName = null;
-
-                    final String[] name_parts = table_name.split( "\\." );
-                    if ( name_parts.length > 3 ) {
-                        throw new SQLException("Table name '" + table_name + "' should not contain more than 2 '.'");
-                    }
-
-                    DatabaseMetaData metadata = c.getMetaData();
-                    String clzName = metadata.getClass().getName().toLowerCase();
-                    boolean isDB2 = clzName.indexOf("db2") != -1 || clzName.indexOf("as400") != -1;
-
-                    String catalog = c.getCatalog();
-                    if( name_parts.length == 2 ) {
-                        schemaName = name_parts[0];
-                        table_name = name_parts[1];
-                    }
-                    else if ( name_parts.length == 3 ) {
-                        catalog = name_parts[0];
-                        schemaName = name_parts[1];
-                        table_name = name_parts[2];
-                    }
-
-                    if(args.length > 2 && schemaName == null) schemaName = toStringOrNull(args[2]);
-
-                    if (schemaName != null) schemaName = caseConvertIdentifierForJdbc(metadata, schemaName);
-                    table_name = caseConvertIdentifierForJdbc(metadata, table_name);
-
-                    if (schemaName != null && !isDB2 && !databaseSupportsSchemas()) { catalog = schemaName; }
+                    String defaultSchema = args.length > 2 ? toStringOrNull(args[2]) : null;
+                    String tableName = rubyApi.convertToRubyString(args[0]).getUnicodeValue();
+                    TableNameComponents components = extractTableNameComponents(c, defaultSchema, tableName);
 
                     String[] tableTypes = new String[]{"TABLE","VIEW","SYNONYM"};
                     RubyArray matchingTables = (RubyArray) tableLookupBlock(context.getRuntime(),
-                            catalog, schemaName, table_name, tableTypes, false).call(c);
+                            components.catalog, components.schema, components.table, tableTypes, false).call(c);
                     if (matchingTables.isEmpty()) {
-                        throw new SQLException("Table " + table_name + " does not exist");
+                        throw new SQLException("Table " + tableName + " does not exist");
                     }
 
-                    results = metadata.getColumns(catalog,schemaName,table_name,null);
-                    pkeys = metadata.getPrimaryKeys(catalog,schemaName,table_name);
+                    DatabaseMetaData metadata = c.getMetaData();
+                    results = metadata.getColumns(components.catalog, components.schema, components.table, null);
+                    pkeys = metadata.getPrimaryKeys(components.catalog, components.schema, components.table);
                     return unmarshal_columns(context, metadata, results, pkeys);
                 } finally {
                     close(results);
@@ -387,7 +362,7 @@ public class RubyJdbcConnection extends RubyObject {
                 ResultSet resultSet = null;
                 List indexes = new ArrayList();
                 try {
-                    resultSet = metadata.getIndexInfo(null, schemaName, tableName, false, false);
+                    resultSet = metadata.getIndexInfo(null, schemaName, tableName, false, true);
                     List primaryKeys = primaryKeys(context, tableName);
                     String currentIndex = null;
                     RubyModule indexDefinitionClass = getConnectionAdapters(runtime).getClass("IndexDefinition");
@@ -486,7 +461,8 @@ public class RubyJdbcConnection extends RubyObject {
                 ResultSet resultSet = null;
                 List keyNames = new ArrayList();
                 try {
-                    resultSet = metadata.getPrimaryKeys(null, null, tableName);
+                    TableNameComponents components = extractTableNameComponents(c, null, tableName);
+                    resultSet = metadata.getPrimaryKeys(components.catalog, components.schema, components.table);
 
                     while (resultSet.next()) {
                         keyNames.add(RubyString.newUnicodeString(runtime,
@@ -1272,6 +1248,41 @@ public class RubyJdbcConnection extends RubyObject {
         return true;
     }
 
+    private TableNameComponents extractTableNameComponents(Connection connection, String defaultSchema, String tableName) throws SQLException {
+        String schemaName = null;
+
+        final String[] name_parts = tableName.split("\\.");
+        if (name_parts.length > 3) {
+            throw new SQLException("Table name '" + tableName + "' should not contain more than 2 '.'");
+        }
+
+        DatabaseMetaData metadata = connection.getMetaData();
+        String clzName = metadata.getClass().getName().toLowerCase();
+        boolean isPostgres = clzName.contains("postgresql");
+
+        String catalog = connection.getCatalog();
+        if (name_parts.length == 2) {
+            schemaName = name_parts[0];
+            tableName = name_parts[1];
+        } else if (name_parts.length == 3) {
+            catalog = name_parts[0];
+            schemaName = name_parts[1];
+            tableName = name_parts[2];
+        }
+
+        if (schemaName == null && defaultSchema != null) schemaName = defaultSchema;
+
+        // The postgres JDBC driver will default to searching every schema if no
+        // schema search path is given.  Default to the public schema instead.
+        if (schemaName == null && isPostgres) schemaName = "public";
+        if (schemaName != null) schemaName = caseConvertIdentifierForJdbc(metadata, schemaName);
+        tableName = caseConvertIdentifierForJdbc(metadata, tableName);
+
+        if (schemaName != null && !databaseSupportsSchemas()) { catalog = schemaName; }
+
+        return new TableNameComponents(catalog, schemaName, tableName);
+    }
+
     public static class ColumnData {
         public IRubyObject name;
         public int index;
@@ -1302,4 +1313,16 @@ public class RubyJdbcConnection extends RubyObject {
             return columns;
         }
     }
+
+    private static class TableNameComponents {
+        private String catalog;
+        private String schema;
+        private String table;
+
+        private TableNameComponents(String catalog, String schema, String table) {
+            this.catalog = catalog;
+            this.schema = schema;
+            this.table = table;
+        }
+    }
 }

data/test/models/add_not_null_column_to_table.rb

@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'active_record'
-
 class AddNotNullColumnToTable < ActiveRecord::Migration
   def self.up
     add_column :entries, :color, :string, :null => false, :default => "blue"

data/test/models/auto_id.rb

@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'active_record'
-
 class CreateAutoIds < ActiveRecord::Migration
   def self.up
     create_table "auto_ids", :force => true do |t|

data/test/models/data_types.rb

@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'active_record'
-
 class DbTypeMigration < ActiveRecord::Migration
   def self.up
     create_table "db_types", :force => true do |t|
@@ -10,11 +7,16 @@ class DbTypeMigration < ActiveRecord::Migration
       t.column :sample_time, :time
       t.column :sample_decimal, :decimal, :precision => 15, :scale => 0
       t.column :sample_small_decimal, :decimal, :precision => 3, :scale => 2
+      t.column :sample_default_decimal, :decimal
       t.column :sample_float, :float
       t.column :sample_binary, :binary
       t.column :sample_boolean, :boolean
       t.column :sample_string, :string, :default => ''
       t.column :sample_integer, :integer, :limit => 5
+      t.column :sample_integer_with_limit_2, :integer, :limit => 2
+      t.column :sample_integer_with_limit_8, :integer, :limit => 8
+      t.column :sample_integer_no_limit, :integer
+      t.column :sample_integer_negative_default, :integer, :default => -1
       t.column :sample_text, :text
     end
   end

data/test/models/entry.rb

@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'active_record'
-
 class CreateEntries < ActiveRecord::Migration
   def self.up
     create_table "entries", :force => true do |t|

data/test/models/mixed_case.rb

@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'active_record'
-
 module Migration
   class MixedCase < ActiveRecord::Migration
 

data/test/models/reserved_word.rb

@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'active_record'
-
 class CreateReservedWords < ActiveRecord::Migration
   def self.up
     create_table "reserved_words", :force => true do |t|

data/test/models/string_id.rb

@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'active_record'
-
 class CreateStringIds < ActiveRecord::Migration
   def self.up
     create_table "string_ids", :force => true, :id => false do |t|

data/test/mysql_info_test.rb

@@ -81,7 +81,7 @@ 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)

data/test/postgres_db_create_test.rb

@@ -11,7 +11,7 @@ class PostgresDbCreateTest < Test::Unit::TestCase
   if find_executable?("psql")
     def test_rake_db_create
       Rake::Task["db:create"].invoke
-      output = `psql -c '\\l'`
+      output = `psql -d template1 -c '\\l'`
       assert output =~ /#{@db_name}/m
     end
 

data/test/postgres_information_schema_leak_test.rb

@@ -0,0 +1,29 @@
+require 'jdbc_common'
+require 'db/postgres'
+
+class CreateISLSchema < ActiveRecord::Migration
+  def self.up
+    execute "CREATE TABLE domains (id int, name varchar(16))"
+  end
+
+  def self.down
+    execute "DROP TABLE domains"
+  end
+end
+
+class Domain < ActiveRecord::Base
+end
+
+class PostgresInformationSchemaLeakTest < Test::Unit::TestCase
+  def setup
+    CreateISLSchema.up
+  end
+
+  def teardown
+    CreateISLSchema.down
+  end
+
+  def test_columns
+    assert_equal(%w{id name}, Domain.column_names)
+  end
+end  

data/test/postgres_schema_search_path_test.rb

@@ -16,7 +16,7 @@ class CreateSchema < ActiveRecord::Migration
 end
 
 class Person < ActiveRecord::Base
-  establish_connection POSTGRES_CONFIG.merge(:schema_search_path => 'test')
+  establish_connection POSTGRES_CONFIG.merge(:schema_search_path => 'test,public')
 end
 
 class PostgresSchemaSearchPathTest < Test::Unit::TestCase
@@ -41,4 +41,8 @@ class PostgresSchemaSearchPathTest < Test::Unit::TestCase
       Person.find_by_wrongname("Alex")
     end
   end
+  def test_column_information
+    assert Person.columns.map{|col| col.name}.include?("name")
+    assert !Person.columns.map{|col| col.name}.include?("wrongname")
+  end
 end

data/test/postgres_simple_test.rb

@@ -56,10 +56,35 @@ class PostgresSchemaDumperTest < Test::Unit::TestCase
     lines.each {|line| assert line !~ /limit/ }
   end
 
+
+  def test_schema_dump_should_not_have_limits_on_binaries
+    lines = @dump.grep(/binary/)
+    assert !lines.empty?, 'no binary type definitions found'
+    lines.each {|line| assert line !~ /limit/, 'binary definition contains limit' }
+  end
+
   # http://kenai.com/jira/browse/ACTIVERECORD_JDBC-139
   def test_schema_dump_should_not_have_limits_on_text_or_date
     lines = @dump.grep(/date|text/)
     assert !lines.empty?
     lines.each {|line| assert line !~ /limit/ }
   end
+
+  def test_schema_dump_integer_with_no_limit_should_have_no_limit
+    lines = @dump.grep(/sample_integer_no_limit/)
+    assert !lines.empty?
+    lines.each {|line| assert line !~ /:limit/ }
+  end
+
+  def test_schema_dump_integer_with_limit_2_should_have_limit_2
+    lines = @dump.grep(/sample_integer_with_limit_2/)
+    assert !lines.empty?
+    lines.each {|line| assert line =~ /limit => 2/ }
+  end
+
+  def test_schema_dump_integer_with_limit_8_should_have_limit_8
+    lines = @dump.grep(/sample_integer_with_limit_8/)
+    assert !lines.empty?
+    lines.each {|line| assert line =~ /limit => 8/ }
+  end
 end

data/test/simple.rb

@@ -256,6 +256,17 @@ module SimpleTestMethods
     assert_equal binary_string, e.sample_binary
   end
 
+  def test_default_decimal_should_keep_fractional_part
+    expected = 7.3
+    actual = DbType.create(:sample_default_decimal => expected).sample_default_decimal
+    assert_equal expected, actual
+  end
+
+  def test_negative_default_value
+    assert_equal -1, DbType.columns_hash['sample_integer_negative_default'].default
+    assert_equal -1, DbType.new.sample_integer_negative_default
+  end
+
   def test_indexes
     # Only test indexes if we have implemented it for the particular adapter
     if @connection.respond_to?(:indexes)
@@ -461,14 +472,14 @@ module MultibyteTestMethods
     def setup
       super
       config = ActiveRecord::Base.connection.config
-      jdbc_driver = ActiveRecord::ConnectionAdapters::JdbcDriver.new(config[:driver])
-      jdbc_driver.load
-      @java_con = jdbc_driver.connection(config[:url], config[:username], config[:password])
+      @jdbc_driver = ActiveRecord::ConnectionAdapters::JdbcDriver.new(config[:driver])
+      @java_con = @jdbc_driver.connection(config[:url], config[:username], config[:password])
       @java_con.setAutoCommit(true)
     end
 
     def teardown
       @java_con.close
+      @jdbc_driver = nil
       super
     end
 

metadata

@@ -2,7 +2,7 @@
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
   - Nick Sieger, Ola Bini and JRuby contributors
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-14 00:00:00 -06:00
+date: 2011-06-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            version: 2.6.2
+            version: 2.9.4
     type: :development
     version_requirements: *id002
 description: |-
@@ -80,6 +80,7 @@ files:
   - lib/arel/visitors/compat.rb
   - lib/arel/visitors/db2.rb
   - lib/arel/visitors/derby.rb
+  - lib/arel/visitors/firebird.rb
   - lib/arel/visitors/hsqldb.rb
   - lib/arel/visitors/sql_server.rb
   - lib/arjdbc/db2.rb
@@ -174,6 +175,7 @@ files:
   - test/pick_rails_version.rb
   - test/postgres_db_create_test.rb
   - test/postgres_drop_db_test.rb
+  - test/postgres_information_schema_leak_test.rb
   - test/postgres_mixed_case_test.rb
   - test/postgres_nonseq_pkey_test.rb
   - test/postgres_reserved_test.rb
@@ -207,6 +209,7 @@ files:
   - test/models/string_id.rb
   - test/models/validates_uniqueness_of_string.rb
   - lib/arjdbc/jdbc/jdbc.rake
+  - src/java/arjdbc/db2/DB2RubyJdbcConnection.java
   - src/java/arjdbc/derby/DerbyModule.java
   - src/java/arjdbc/h2/H2RubyJdbcConnection.java
   - src/java/arjdbc/informix/InformixRubyJdbcConnection.java
@@ -228,6 +231,7 @@ files:
   - rails_generators/jdbc_generator.rb
   - rails_generators/templates/config/initializers/jdbc.rb
   - rails_generators/templates/lib/tasks/jdbc.rake
+  - .gemtest
 has_rdoc: true
 homepage: http://jruby-extras.rubyforge.org/activerecord-jdbc-adapter
 licenses: []
@@ -256,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jruby-extras
-rubygems_version: 1.4.2
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.