activerecord-jdbc-adapter 1.2.9.1 → 1.3.0.beta1

data/lib/arjdbc/db2/connection_methods.rb

@@ -1,18 +1,17 @@
-class ActiveRecord::Base
-  class << self
-    def db2_connection(config)
-      config[:url] ||= begin
-        if config[:host] # Type 4 URL: jdbc:db2://server:port/database
-          config[:port] ||= 50000
-          "jdbc:db2://#{config[:host]}:#{config[:port]}/#{config[:database]}"
-        else # Type 2 URL: jdbc:db2:database
-          "jdbc:db2:#{config[:database]}"
-        end
+ArJdbc::ConnectionMethods.module_eval do
+  def db2_connection(config)
+    config[:url] ||= begin
+      if config[:host] # Type 4 URL: jdbc:db2://server:port/database
+        config[:port] ||= 50000
+        "jdbc:db2://#{config[:host]}:#{config[:port]}/#{config[:database]}"
+      else # Type 2 URL: jdbc:db2:database
+        "jdbc:db2:#{config[:database]}"
       end
-      config[:driver] ||= ::ArJdbc::DB2::DRIVER_NAME
-      config[:adapter_spec] = ::ArJdbc::DB2
-      jdbc_connection(config)
     end
-    alias_method :jdbcdb2_connection, :db2_connection
+    config[:driver] ||= ::ArJdbc::DB2::DRIVER_NAME
+    config[:adapter_spec] = ::ArJdbc::DB2
+    config[:connection_alive_sql] ||= 'SELECT 1 FROM syscat.tables FETCH FIRST 1 ROWS ONLY'
+    jdbc_connection(config)
   end
+  alias_method :jdbcdb2_connection, :db2_connection
 end

data/lib/arjdbc/derby.rb

@@ -1,3 +1,3 @@
-require 'arjdbc/jdbc'
+require 'arjdbc'
 require 'arjdbc/derby/connection_methods'
 require 'arjdbc/derby/adapter'

data/lib/arjdbc/derby/adapter.rb

@@ -15,6 +15,10 @@ module ArJdbc
     def self.column_selector
       [ /derby/i, lambda { |cfg, column| column.extend(::ArJdbc::Derby::Column) } ]
     end
+
+    def self.jdbc_connection_class
+      ::ActiveRecord::ConnectionAdapters::DerbyJdbcConnection
+    end
     
     def configure_connection
       execute("SET ISOLATION = SERIALIZABLE")
@@ -36,6 +40,7 @@ module ArJdbc
         when /^timestamp/i   then @sql_type = 'timestamp'; limit = nil
         when /^time/i        then @sql_type = 'time'; limit = nil
         when /^date/i        then @sql_type = 'date'; limit = nil
+        when /^xml/i         then @sql_type = 'xml'; limit = nil
         else
           limit = super
           # handle maximum length for a VARCHAR string :
@@ -52,6 +57,7 @@ module ArJdbc
         when /^dec/i         then # DEC is a DECIMAL alias
           extract_scale(field_type) == 0 ? :integer : :decimal
         when /^timestamp/i   then :datetime
+        when /^xml/i         then :xml
         else
           super
         end
@@ -104,6 +110,7 @@ module ArJdbc
       :time => { :name => "time" },
       :datetime => { :name => "timestamp" },
       :timestamp => { :name => "timestamp" },
+      :xml => { :name => "xml" },
       :boolean => { :name => "smallint" },
     }
     
@@ -115,7 +122,7 @@ module ArJdbc
       super(types)
       types[:primary_key] = NATIVE_DATABASE_TYPES[:primary_key]
       [ :string, :float, :decimal, :numeric, :integer, 
-        :smallint, :bigint, :real, :double ].each do |type|
+        :smallint, :bigint, :real, :double, :xml ].each do |type|
         types[type] = NATIVE_DATABASE_TYPES[type].dup
       end
       types[:boolean] = NATIVE_DATABASE_TYPES[:boolean].dup
@@ -133,6 +140,19 @@ module ArJdbc
       native_type.is_a?(Hash) ? native_type[:name] : native_type
     end
 
+    class TableDefinition < ActiveRecord::ConnectionAdapters::TableDefinition # :nodoc:
+      
+      def xml(*args)
+        options = args.extract_options!
+        column(args[0], 'xml', options)
+      end
+      
+    end
+
+    def table_definition(*args)
+      new_table_definition(TableDefinition, *args)
+    end
+    
     # 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?
@@ -250,13 +270,7 @@ module ArJdbc
       end
       definition
     end
-    
-    def remove_column(table_name, *column_names) # :nodoc:
-      for column_name in column_names.flatten
-        execute "ALTER TABLE #{quote_table_name(table_name)} DROP COLUMN #{quote_column_name(column_name)} RESTRICT"
-      end
-    end
-    
+
     AUTO_INC_STMT2 = "" + 
     "SELECT AUTOINCREMENTSTART, AUTOINCREMENTINC, COLUMNNAME, REFERENCEID, COLUMNDEFAULT " + 
     "FROM SYS.SYSCOLUMNS WHERE REFERENCEID = " + 
@@ -279,6 +293,12 @@ module ArJdbc
       ""
     end
     private :auto_increment_stmt
+    
+    def remove_column(table_name, *column_names) # :nodoc:
+      for column_name in column_names.flatten
+        execute "ALTER TABLE #{quote_table_name(table_name)} DROP COLUMN #{quote_column_name(column_name)} RESTRICT"
+      end
+    end
 
     # Notes about changing in Derby:
     #    http://db.apache.org/derby/docs/10.2/ref/rrefsqlj81859.html#rrefsqlj81859__rrefsqlj37860)
@@ -328,7 +348,7 @@ module ArJdbc
     end
 
     def columns(table_name, name = nil)
-      @connection.columns_internal(table_name.to_s, name, derby_schema)
+      @connection.columns_internal(table_name.to_s, nil, derby_schema)
     end
 
     def tables

data/lib/arjdbc/derby/connection_methods.rb

@@ -1,24 +1,21 @@
-module ActiveRecord
-  class Base
-    class << self
-      def derby_connection(config)
-        begin
-          require 'jdbc/derby'
-          ::Jdbc::Derby.load_driver(:require) if defined?(::Jdbc::Derby.load_driver)
-        rescue LoadError # assuming driver.jar is on the class-path
-        end
+ArJdbc::ConnectionMethods.module_eval do
+  def derby_connection(config)
+    begin
+      require 'jdbc/derby'
+      ::Jdbc::Derby.load_driver(:require) if defined?(::Jdbc::Derby.load_driver)
+    rescue LoadError # assuming driver.jar is on the class-path
+    end
 
-        config[:url] ||= "jdbc:derby:#{config[:database]};create=true"
-        config[:driver] ||= defined?(::Jdbc::Derby.driver_name) ? ::Jdbc::Derby.driver_name : 'org.apache.derby.jdbc.EmbeddedDriver'
-        config[:adapter_spec] = ::ArJdbc::Derby
-        conn = embedded_driver(config)
-        md = conn.jdbc_connection.meta_data
-        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
-      end
-      alias_method :jdbcderby_connection, :derby_connection
+    config[:url] ||= "jdbc:derby:#{config[:database]};create=true"
+    config[:driver] ||= defined?(::Jdbc::Derby.driver_name) ? ::Jdbc::Derby.driver_name : 'org.apache.derby.jdbc.EmbeddedDriver'
+    config[:adapter_spec] = ::ArJdbc::Derby
+    config[:connection_alive_sql] ||= 'SELECT 1 FROM SYS.SYSSCHEMAS FETCH FIRST 1 ROWS ONLY' # FROM clause is mandatory
+    connection = embedded_driver(config)
+    md = connection.jdbc_connection.meta_data
+    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
+    connection
   end
+  alias_method :jdbcderby_connection, :derby_connection
 end

data/lib/arjdbc/firebird.rb

@@ -1,2 +1,2 @@
-require 'arjdbc/jdbc'
+require 'arjdbc'
 require 'arjdbc/firebird/adapter'

data/lib/arjdbc/h2.rb

@@ -1,3 +1,3 @@
-require 'arjdbc/jdbc'
-require 'arjdbc/h2/connection_methods'
+require 'arjdbc'
 require 'arjdbc/h2/adapter'
+require 'arjdbc/h2/connection_methods'

data/lib/arjdbc/h2/adapter.rb

@@ -152,7 +152,7 @@ module ArJdbc
     end
 
     def columns(table_name, name = nil)
-      @connection.columns_internal(table_name.to_s, name, h2_schema)
+      @connection.columns_internal(table_name.to_s, nil, h2_schema)
     end
 
     def change_column(table_name, column_name, type, options = {}) #:nodoc:

data/lib/arjdbc/h2/connection_methods.rb

@@ -1,19 +1,15 @@
-module ActiveRecord
-  class Base
-    class << self
-      def h2_connection(config)
-        begin
-          require 'jdbc/h2'
-          ::Jdbc::H2.load_driver(:require) if defined?(::Jdbc::H2.load_driver)
-        rescue LoadError # assuming driver.jar is on the class-path
-        end
-
-        config[:url] ||= "jdbc:h2:#{config[:database]}"
-        config[:driver] ||= defined?(::Jdbc::H2.driver_name) ? ::Jdbc::H2.driver_name : 'org.h2.Driver'
-        config[:adapter_spec] = ::ArJdbc::H2
-        embedded_driver(config)
-      end
-      alias_method :jdbch2_connection, :h2_connection
+ArJdbc::ConnectionMethods.module_eval do
+  def h2_connection(config)
+    begin
+      require 'jdbc/h2'
+      ::Jdbc::H2.load_driver(:require) if defined?(::Jdbc::H2.load_driver)
+    rescue LoadError # assuming driver.jar is on the class-path
     end
+    
+    config[:url] ||= "jdbc:h2:#{config[:database]}"
+    config[:driver] ||= defined?(::Jdbc::H2.driver_name) ? ::Jdbc::H2.driver_name : 'org.h2.Driver'
+    config[:adapter_spec] = ::ArJdbc::H2
+    embedded_driver(config)
   end
+  alias_method :jdbch2_connection, :h2_connection
 end

data/lib/arjdbc/hsqldb.rb

@@ -1,3 +1,3 @@
-require 'arjdbc/jdbc'
+require 'arjdbc'
 require 'arjdbc/hsqldb/adapter'
 require 'arjdbc/hsqldb/connection_methods'

data/lib/arjdbc/hsqldb/connection_methods.rb

@@ -1,19 +1,16 @@
-module ActiveRecord
-  class Base
-    class << self
-      def hsqldb_connection(config)
-        begin
-          require 'jdbc/hsqldb'
-          ::Jdbc::HSQLDB.load_driver(:require) if defined?(::Jdbc::HSQLDB.load_driver)
-        rescue LoadError # assuming driver.jar is on the class-path
-        end
-
-        config[:url] ||= "jdbc:hsqldb:#{config[:database]}"
-        config[:driver] ||= defined?(::Jdbc::HSQLDB.driver_name) ? ::Jdbc::HSQLDB.driver_name : 'org.hsqldb.jdbcDriver'
-        config[:adapter_spec] = ::ArJdbc::HSQLDB
-        embedded_driver(config)
-      end
-      alias_method :jdbchsqldb_connection, :hsqldb_connection
+ArJdbc::ConnectionMethods.module_eval do
+  def hsqldb_connection(config)
+    begin
+      require 'jdbc/hsqldb'
+      ::Jdbc::HSQLDB.load_driver(:require) if defined?(::Jdbc::HSQLDB.load_driver)
+    rescue LoadError # assuming driver.jar is on the class-path
     end
+    
+    config[:url] ||= "jdbc:hsqldb:#{config[:database]}"
+    config[:driver] ||= defined?(::Jdbc::HSQLDB.driver_name) ? ::Jdbc::HSQLDB.driver_name : 'org.hsqldb.jdbcDriver'
+    config[:adapter_spec] = ::ArJdbc::HSQLDB
+    config[:connection_alive_sql] ||= 'CALL PI()' # does not like 'SELECT 1'
+    embedded_driver(config)
   end
+  alias_method :jdbchsqldb_connection, :hsqldb_connection
 end

data/lib/arjdbc/informix.rb

@@ -1,3 +1,3 @@
-require 'arjdbc/jdbc'
+require 'arjdbc'
 require 'arjdbc/informix/connection_methods'
 require 'arjdbc/informix/adapter'

data/lib/arjdbc/informix/connection_methods.rb

@@ -1,11 +1,9 @@
-class ActiveRecord::Base
-  class << self
-    def informix_connection(config)
-      config[:port] ||= 9088
-      config[:url] ||= "jdbc:informix-sqli://#{config[:host]}:#{config[:port]}/#{config[:database]}:INFORMIXSERVER=#{config[:servername]}"
-      config[:driver] = 'com.informix.jdbc.IfxDriver'
-      config[:adapter_spec] = ::ArJdbc::Informix
-      jdbc_connection(config)
-    end
+ArJdbc::ConnectionMethods.module_eval do
+  def informix_connection(config)
+    config[:port] ||= 9088
+    config[:url] ||= "jdbc:informix-sqli://#{config[:host]}:#{config[:port]}/#{config[:database]}:INFORMIXSERVER=#{config[:servername]}"
+    config[:driver] = 'com.informix.jdbc.IfxDriver'
+    config[:adapter_spec] = ::ArJdbc::Informix
+    jdbc_connection(config)
   end
-end
+end

data/lib/arjdbc/jdbc.rb

@@ -1,2 +1,2 @@
 require 'arjdbc/jdbc/adapter'
-require 'arjdbc/jdbc/discover'
+module ArJdbc; self.discover_extensions; end

data/lib/arjdbc/jdbc/adapter.rb

@@ -1,11 +1,10 @@
 require 'active_record/version'
 require 'active_record/connection_adapters/abstract_adapter'
+
 require 'arjdbc/version'
+require 'arjdbc/jdbc/java'
 require 'arjdbc/jdbc/base_ext'
 require 'arjdbc/jdbc/connection_methods'
-require 'arjdbc/jdbc/compatibility'
-require 'arjdbc/jdbc/core_ext'
-require 'arjdbc/jdbc/java'
 require 'arjdbc/jdbc/driver'
 require 'arjdbc/jdbc/column'
 require 'arjdbc/jdbc/connection'
@@ -17,9 +16,8 @@ module ActiveRecord
   module ConnectionAdapters
     class JdbcAdapter < AbstractAdapter
       extend ShadowCoreMethods
-      include CompatibilityMethods if CompatibilityMethods.needed?(self)
       include JdbcConnectionPoolCallbacks if JdbcConnectionPoolCallbacks.needed?
-
+      
       attr_reader :config
 
       def initialize(connection, logger, config)
@@ -222,11 +220,6 @@ module ActiveRecord
         alias_chained_method :select_all, :query_cache, :jdbc_select_all
         alias_chained_method :update, :query_dirty, :jdbc_update
         alias_chained_method :insert, :query_dirty, :jdbc_insert
-
-        # Do we need this? Not in AR 3.
-        def select_one(sql, name = nil)
-          select(sql, name).first
-        end
         
       end
 
@@ -238,30 +231,57 @@ module ActiveRecord
       # Executes +sql+ statement in the context of this connection using
       # +binds+ as the bind substitutes.  +name+ is logged along with
       # the executed +sql+ statement.
-      def exec_query(sql, name = 'SQL', binds = [])
-        execute(sql, name, binds)
+      def exec_query(sql, name = 'SQL', binds = []) # :nodoc:
+        log(sql, name || 'SQL') { @connection.execute_query(to_sql(sql, binds)) }
       end
 
       # Executes insert +sql+ statement in the context of this connection using
       # +binds+ as the bind substitutes. +name+ is the logged along with
       # the executed +sql+ statement.
-      def exec_insert(sql, name, binds)
-        exec_query(sql, name, binds)
+      def exec_insert(sql, name, binds, pk = nil, sequence_name = nil) # :nodoc:
+        log(sql, name || 'SQL') { @connection.execute_insert(to_sql(sql, binds)) }
       end
 
       # Executes delete +sql+ statement in the context of this connection using
       # +binds+ as the bind substitutes. +name+ is the logged along with
       # the executed +sql+ statement.
-      def exec_delete(sql, name, binds)
-        exec_query(sql, name, binds)
+      def exec_delete(sql, name, binds) # :nodoc:
+        log(sql, name || 'SQL') { @connection.execute_delete(to_sql(sql, binds)) }
       end
 
       # Executes update +sql+ statement in the context of this connection using
       # +binds+ as the bind substitutes. +name+ is the logged along with
       # the executed +sql+ statement.
-      def exec_update(sql, name, binds)
+      def exec_update(sql, name, binds) # :nodoc:
+        log(sql, name || 'SQL') { @connection.execute_update(to_sql(sql, binds)) }
+      end
+      
+      # Similar to {#exec_query} except it returns "raw" results in an array
+      # where each rows is a hash with keys as columns (just like Rails used to 
+      # do up until 3.0) instead of wrapping them in a {#ActiveRecord::Result}.
+      def exec_query_raw(sql, name = 'SQL', binds = [], &block) # :nodoc:
+        log(sql, name || 'SQL') do
+          @connection.execute_query_raw(to_sql(sql, binds), &block)
+        end
+      end
+      
+      def select_rows(sql, name = nil)
+        exec_query_raw(sql, name).map!(&:values)
+      end
+      
+      if ActiveRecord::VERSION::MAJOR > 3 # expects AR::Result e.g. from select_all
+        
+      def select(sql, name = nil, binds = [])
         exec_query(sql, name, binds)
       end
+        
+      else
+        
+      def select(sql, name = nil, binds = []) # NOTE: only (sql, name) on AR < 3.1
+        exec_query_raw(sql, name, binds)
+      end
+      
+      end
       
       if ActiveRecord::VERSION::MAJOR < 3 # 2.3.x
         
@@ -273,7 +293,7 @@ module ActiveRecord
         if name == :skip_logging
           _execute(sql, name)
         else
-          log(sql, name) { _execute(sql, name ||= "SQL") }
+          log(sql, name ||= 'SQL') { _execute(sql, name) }
         end
       end
 
@@ -305,20 +325,6 @@ module ActiveRecord
         @connection.execute(sql)
       end
       private :_execute
-      
-      # Returns an array of record hashes with the column names as keys and
-      # column values as values.
-      # @note on AR-3.2 expects "only" 2 arguments `select(sql, name = nil)`
-      #  we accept 3 arguments as well `select(sql, name = nil, binds = [])`
-      def select(*args)
-        execute(*args)
-      end
-      
-      def select_rows(sql, name = nil)
-        rows = []
-        select(sql, name).each {|row| rows << row.values }
-        rows
-      end
 
       # NOTE: we have an extra binds argument at the end due 2.3 support (due {#jdbc_insert}).
       def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil, binds = []) # :nodoc:
@@ -331,7 +337,7 @@ module ActiveRecord
       end
 
       def table_exists?(name)
-        jdbc_columns(name) rescue nil
+        @connection.table_exists?(name) # schema_name = nil
       end
 
       def indexes(table_name, name = nil, schema_name = nil)
@@ -350,13 +356,23 @@ module ActiveRecord
         @connection.rollback
       end
 
+      def begin_isolated_db_transaction(isolation)
+        @connection.begin(isolation)
+      end
+      
+      # Does this adapter support setting the isolation level for a transaction?
+      # @note We allow to ask for a specified transaction isolation level ...
+      def supports_transaction_isolation?(level = nil)
+        @connection.supports_transaction_isolation?(level)
+      end 
+      
       def write_large_object(*args)
         @connection.write_large_object(*args)
       end
 
       def pk_and_sequence_for(table)
         key = primary_key(table)
-        [key, nil] if key
+        [ key, nil ] if key
       end
 
       def primary_key(table)
@@ -367,44 +383,88 @@ module ActiveRecord
         @connection.primary_keys(table)
       end
 
-      if ActiveRecord::VERSION::MAJOR >= 3
-        
-      # Converts an arel AST to SQL
-      def to_sql(arel, binds = [])
-        if arel.respond_to?(:ast)
-          visitor.accept(arel.ast) do
-            quote(*binds.shift.reverse)
-          end
-        else # for backwards compatibility :
+      if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 0
+      
+        #attr_reader :visitor unless method_defined?(:visitor) # not in 3.0
+
+        # Converts an AREL AST to SQL.
+        def to_sql(arel, binds = [])
+          # NOTE: can not handle `visitor.accept(arel.ast)` right thus
+          # convert AREL to a SQL string and simply substitute binds :
           sql = arel.respond_to?(:to_sql) ? arel.send(:to_sql) : arel
           return sql if binds.blank?
           sql.gsub('?') { quote(*binds.shift.reverse) }
         end
-      end
+        
+      elsif ActiveRecord::VERSION::MAJOR >= 3 # AR >= 3.1 or 4.0
+      
+        # Converts an AREL AST to SQL.
+        def to_sql(arel, binds = [])
+          if arel.respond_to?(:ast)
+            visitor.accept(arel.ast) { quote(*binds.shift.reverse) }
+          else # for backwards compatibility :
+            sql = arel.respond_to?(:to_sql) ? arel.send(:to_sql) : arel
+            return sql if binds.blank?
+            sql.gsub('?') { quote(*binds.shift.reverse) }
+          end
+        end
       
       else # AR-2.3 no #to_sql method
         
-      # Substitutes SQL bind (?) parameters
-      def to_sql(sql, binds = [])
-        sql = sql.send(:to_sql) if sql.respond_to?(:to_sql)
-        return sql if binds.blank?
-        copy = binds.dup
-        sql.gsub('?') { quote(*copy.shift.reverse) }
-      end
+        # Substitutes SQL bind parameters.
+        def to_sql(sql, binds = [])
+          sql = sql.send(:to_sql) if sql.respond_to?(:to_sql)
+          return sql if binds.blank?
+          copy = binds.dup
+          sql.gsub('?') { quote(*copy.shift.reverse) }
+        end
         
       end
       
       protected
  
       def translate_exception(e, message)
-        puts e.backtrace if $DEBUG || ENV['DEBUG']
-        super
+        # we shall not translate native "Java" exceptions as they might
+        # swallow an ArJdbc / driver bug into a AR::StatementInvalid ...
+        return e if e.is_a?(NativeException) # JRuby 1.6
+        return e if e.is_a?(Java::JavaLang::Throwable)
+        super # NOTE: wraps AR::JDBCError into AR::StatementInvalid, desired ?!
       end
 
       def last_inserted_id(result)
         result
       end
       
+      # Helper to handle 3.x/4.0 uniformly override #table_definition as :
+      # 
+      #   def table_definition(*args)
+      #     new_table_definition(TableDefinition, *args)
+      #   end
+      #
+      def new_table_definition(table_definition, *args)
+        table_definition.new(self) # args ignored only used for 4.0
+      end
+      private :new_table_definition
+      
+      # if adapter overrides #table_definition it works on 3.x as well as 4.0
+      if ActiveRecord::VERSION::MAJOR > 3
+        
+      # aliasing #create_table_definition as #table_definition :
+      alias table_definition create_table_definition
+
+      # TableDefinition.new native_database_types, name, temporary, options
+      def create_table_definition(name, temporary, options)
+        table_definition(name, temporary, options)
+      end
+      
+      # arguments expected: (name, temporary, options)
+      def new_table_definition(table_definition, *args)
+        table_definition.new native_database_types, *args
+      end
+      private :new_table_definition
+      
+      end
+    
       private
       
       # #deprecated no longer used
@@ -436,7 +496,19 @@ module ActiveRecord
       def self.update?(sql)
         ! select?(sql) && ! insert?(sql)
       end
+      
+      unless defined? AbstractAdapter.type_cast_config_to_integer
+        
+        def self.type_cast_config_to_integer(config)
+          config =~ /\A\d+\z/ ? config.to_i : config
+        end
 
+        def self.type_cast_config_to_boolean(config)
+          config == "false" ? false : config
+        end
+        
+      end
+      
     end
   end
 end