activerecord-jdbc-adapter 0.8.2 → 0.9

data/History.txt

@@ -1,3 +1,24 @@
+== 0.9
+
+- Now updated to support ActiveRecord 2.2. JNDI-based connections will
+  automatically connect/disconnect for every AR connection pool
+  checkout/checkin. For best results, set your pool: parameter >= the
+  actual maximum size of the JNDI connection pool. (We'll look at how
+  to eliminate the need to configure AR's pool in the future.)
+- NEW! Informix support courtesy of Javier Fernandez-Ivern.
+- Backport another Oracle CLOB issue, thanks Edson C�sar.
+- Rubyforge #22018: chomp final trailing semicolon for oracle
+- JRUBY-2848: Fix NPE error in set_native_database_types
+- Rework oracle lob saving callback to be Rails 2.1 friendly (assist
+  from court3nay)
+- JRUBY-2715: Add create/drop database methods to Postgres (Peter Williams)
+- JRUBY-3183: Fix structure dump for Postgres (Ryan Bell)
+- JRUBY-3184: recreate_database for test database working for PG (Ryan Bell)
+- JRUBY-3186: disable referential integrity for PG (Ryan Bell)
+- Authoritative repository now hosted at
+  git://github.com/nicksieger/activerecord-jdbc-adapter.git; rubyforge
+  svn trunk cleaned out.
+
 == 0.8.2
 
 - Added an optional config key called :dialect. Using :dialect allows you to
@@ -145,4 +166,4 @@
 
 == 0.0.1
 
-- Initial, very alpha release
+- Initial, very alpha release

data/Manifest.txt

@@ -7,6 +7,7 @@ lib/active_record/connection_adapters/cachedb_adapter.rb
 lib/active_record/connection_adapters/derby_adapter.rb
 lib/active_record/connection_adapters/h2_adapter.rb
 lib/active_record/connection_adapters/hsqldb_adapter.rb
+lib/active_record/connection_adapters/informix_adapter.rb
 lib/active_record/connection_adapters/jdbc_adapter.rb
 lib/active_record/connection_adapters/jdbc_adapter_spec.rb
 lib/active_record/connection_adapters/jndi_adapter.rb
@@ -19,6 +20,7 @@ lib/jdbc_adapter/jdbc_db2.rb
 lib/jdbc_adapter/jdbc_derby.rb
 lib/jdbc_adapter/jdbc_firebird.rb
 lib/jdbc_adapter/jdbc_hsqldb.rb
+lib/jdbc_adapter/jdbc_informix.rb
 lib/jdbc_adapter/jdbc_mimer.rb
 lib/jdbc_adapter/jdbc_mssql.rb
 lib/jdbc_adapter/jdbc_mysql.rb
@@ -40,6 +42,7 @@ test/db/db2.rb
 test/db/derby.rb
 test/db/h2.rb
 test/db/hsqldb.rb
+test/db/informix.rb
 test/db/jdbc.rb
 test/db/jndi_config.rb
 test/db/logger.rb
@@ -55,9 +58,11 @@ test/generic_jdbc_connection_test.rb
 test/h2_simple_test.rb
 test/has_many_through.rb
 test/hsqldb_simple_test.rb
+test/informix_simple_test.rb
 test/jdbc_adapter/jdbc_db2_test.rb
 test/jdbc_adapter/jdbc_sybase_test.rb
 test/jdbc_common.rb
+test/jndi_callbacks_test.rb
 test/jndi_test.rb
 test/manualTestDatabase.rb
 test/minirunit/testConnect.rb

data/README.txt

@@ -1,6 +1,6 @@
-ActiveRecord-JDBC is a database adapter for Rails' ActiveRecord component that can be used with JRuby[http://www.jruby.org/].  It allows use of virtually any JDBC-compliant database with your JRuby on Rails application.
-
-ActiveRecord-JDBC is a sub-project of jruby-extras at RubyForge.
+activerecord-jdbc-adapter is a database adapter for Rails' ActiveRecord
+component that can be used with JRuby[http://www.jruby.org/]. It allows use of
+virtually any JDBC-compliant database with your JRuby on Rails application.
 
 == Databases
 
@@ -27,16 +27,21 @@ What's there, and what is not there:
 * HSQLDB - Complete
 * H2 - Complete
 * SQLite3 - work in progress
+* Informix - Fairly complete support, all tests pass and migrations appear to work.  Comments welcome.
 
-Other databases will require testing and likely a custom configuration module. Please join the jruby-extras mailing-list[http://rubyforge.org/mail/?group_id=2014] to help us discover support for more databases.
+Other databases will require testing and likely a custom configuration module.
+Please join the jruby-extras
+mailing-list[http://rubyforge.org/mail/?group_id=2014] to help us discover
+support for more databases.
 
 == Using ActiveRecord JDBC
 
 === Inside Rails
 
-To use ActiveRecord-JDBC with JRuby on Rails:
+To use activerecord-jdbc-adapter with JRuby on Rails:
 
-1. Choose the adapter you wish to gem install.  The following pre-packaged adapters are available:
+1. Choose the adapter you wish to gem install. The following pre-packaged
+   adapters are available:
 
   * base jdbc (<tt>activerecord-jdbc-adapter</tt>). Supports all available databases via JDBC, but requires you to download and manually install the database vendor's JDBC driver .jar file.
   * mysql (<tt>activerecord-jdbcmysql-adapter</tt>)
@@ -45,7 +50,12 @@ To use ActiveRecord-JDBC with JRuby on Rails:
   * hsqldb (<tt>activerecord-jdbchsqldb-adapter</tt>)
   * h2 (<tt>activerecord-jdbch2-adapter</tt>)
 
-2. If you're using Rails 2.0, you may skip to the next step. For Rails prior to version 2.0, you'll need to add one-time setup to your config/environment.rb file in your Rails application. Add the following lines just before the <code>Rails::Initializer</code>. (If you're using ActiveRecord-JDBC under the old gem name used in versions 0.5 and earlier, replace 'activerecord-jdbc-adapter' with 'ActiveRecord-JDBC' below.)
+2. If you're using Rails 2.0, you may skip to the next step. For Rails prior to
+   version 2.0, you'll need to add one-time setup to your config/environment.rb
+   file in your Rails application. Add the following lines just before the
+   <code>Rails::Initializer</code>. (If you're using activerecord-jdbc-adapter
+   under the old gem name used in versions 0.5 and earlier (ActiveRecord-JDBC),
+   replace 'activerecord-jdbc-adapter' with 'ActiveRecord-JDBC' below.)
 
     if RUBY_PLATFORM =~ /java/
       require 'rubygems'
@@ -53,8 +63,11 @@ To use ActiveRecord-JDBC with JRuby on Rails:
       require 'jdbc_adapter'
     end
 
-3. Configure your database.yml to use the <code>jdbc</code> adapter.
-For mysql, postgres, derby, oracle, hsqldb and h2 you can simply configure the database in the normal Rails style. If you use one of the convenience 'activerecord-jdbcXXX-adapter' adapters, be sure and put a 'jdbc' prefix in front of the databas adapter name as below.
+3. Configure your database.yml to use the <code>jdbc</code> adapter. For mysql,
+   postgres, derby, oracle, hsqldb, h2, and informix you can simply configure
+   the database in the normal Rails style. If you use one of the convenience
+   'activerecord-jdbcXXX-adapter' adapters, be sure and put a 'jdbc' prefix in
+   front of the databas adapter name as below.
 
     development:
       adapter: jdbcmysql
@@ -63,7 +76,8 @@ For mysql, postgres, derby, oracle, hsqldb and h2 you can simply configure the d
       hostname: localhost
       database: weblog_development
 
-For other databases, you'll need to know the database driver class and URL.  Example:
+For other databases, you'll need to know the database driver class and URL.
+Example:
 
     development:
       adapter: jdbc
@@ -78,11 +92,13 @@ For other databases, you'll need to know the database driver class and URL.  Exa
 
     jruby -S gem install activerecord-jdbc-adapter
 
-   If you wish to use the adapter for a specific database, you can install it directly and a driver gem will be installed as well:
+   If you wish to use the adapter for a specific database, you can install it
+   directly and a driver gem will be installed as well:
 
     jruby -S gem install activerecord-jdbcderby-adapter
 
-2. If using ActiveRecord 2.0 (Rails 2.0) or greater, you can skip to the next step. Otherwise, ensure the following code gets executed in your script:
+2. If using ActiveRecord 2.0 (Rails 2.0) or greater, you can skip to the next
+   step. Otherwise, ensure the following code gets executed in your script:
 
     require 'rubygems'
     gem 'activerecord-jdbc-adapter'
@@ -104,16 +120,29 @@ For other databases, you'll need to know the database driver class and URL.  Exa
       :url => 'jdbc:derby:test_ar;create=true'
     )
 
+== Getting the source
+
+The source for activerecord-jdbc-adapter is available using git.
+
+  git clone git://github.com/nicksieger/activerecord-jdbc-adapter.git
+
 == Running AR-JDBC's Tests
 
-Drivers for 4 open-source databases are included.  Provided you have MySQL installed, you can simply type <tt>jruby -S rake</tt> to run the tests.  A database named <tt>weblog_development</tt> is needed beforehand with a connection user of "blog" and password empty.
+Drivers for 4 open-source databases are included. Provided you have MySQL
+installed, you can simply type <tt>jruby -S rake</tt> to run the tests. A
+database named <tt>weblog_development</tt> is needed beforehand with a
+connection user of "blog" and password empty.
 
 == Authors
 
-This project was written by Nick Sieger <nick@nicksieger.com> and Ola Bini <ola@ologix.com> with lots of help from the JRuby community.
+This project was written by Nick Sieger <nick@nicksieger.com> and Ola Bini
+<olabini@gmail.com> with lots of help from the JRuby community.
 
 == License
 
-ActiveRecord-JDBC is released under a BSD license.  See the LICENSE file included with the distribution for details.
+activerecord-jdbc-adapter is released under a BSD license. See the LICENSE file
+included with the distribution for details.
 
-Open-source driver gems for ActiveRecord JDBC are licensed under the same license the database's drivers are licensed.  See each driver gem's LICENSE.txt file for details.
+Open-source driver gems for activerecord-jdbc-adapter are licensed under the
+same license the database's drivers are licensed. See each driver gem's
+LICENSE.txt file for details.

data/Rakefile

@@ -53,7 +53,7 @@ FileList['drivers/*'].each do |d|
 end
 
 Rake::TestTask.new(:test_jdbc) do |t|
-  t.test_files = FileList['test/generic_jdbc_connection_test.rb']
+  t.test_files = FileList['test/generic_jdbc_connection_test.rb', 'test/jndi_callbacks_test.rb']
   t.libs << 'test' << 'drivers/mysql/lib'
 end
 
@@ -89,6 +89,12 @@ Rake::TestTask.new(:test_mssql) do | t |
   t.libs << 'test'
 end
 
+# Ensure that the Informix driver is on your classpath before launching rake
+Rake::TestTask.new(:test_informix) do |t|
+  t.test_files = FileList[ 'test/informix_simple_test.rb' ]
+  t.libs << 'test'
+end
+
 # Tests for JDBC adapters that don't require a database.
 Rake::TestTask.new(:test_jdbc_adapters) do | t |
   t.test_files = FileList[ 'test/jdbc_adapter/jdbc_sybase_test.rb' ]
@@ -170,4 +176,4 @@ end
 end
 
 require 'rake/clean'
-CLEAN.include 'derby*', 'test.db.*','test/reports', 'test.sqlite3','lib/**/*.jar','manifest.mf'
+CLEAN.include 'derby*', 'test.db.*','test/reports', 'test.sqlite3','lib/**/*.jar','manifest.mf', '*.log'

data/lib/active_record/connection_adapters/informix_adapter.rb

@@ -0,0 +1 @@
+require 'active_record/connection_adapters/jdbc_adapter'

data/lib/active_record/connection_adapters/jdbc_adapter.rb

@@ -124,6 +124,7 @@ module ActiveRecord
                           lambda {|r| r['type_name'] =~ /^varchar$/i},
                           lambda {|r| r['type_name'] =~ /varying/i}],
         :text        => [ lambda {|r| [Jdbc::Types::LONGVARCHAR, Jdbc::Types::CLOB].include?(r['data_type'].to_i)},
+                          lambda {|r| r['type_name'] =~ /^text$/i},     # For Informix
                           lambda {|r| r['type_name'] =~ /^(text|clob)$/i},
                           lambda {|r| r['type_name'] =~ /^character large object$/i},
                           lambda {|r| r['sql_data_type'] == 2005}],
@@ -156,6 +157,7 @@ module ActiveRecord
                           lambda {|r| r['type_name'] =~ /^integer/i}],  #Num of milliseconds for SQLite3 JDBC Driver
         :time        => [ lambda {|r| Jdbc::Types::TIME == r['data_type'].to_i},
                           lambda {|r| r['type_name'] =~ /^time$/i},
+                          lambda {|r| r['type_name'] =~ /^datetime/i},  # For Informix
                           lambda {|r| r['type_name'] =~ /^date/i},
                           lambda {|r| r['type_name'] =~ /^integer/i}],  #Num of milliseconds for SQLite3 JDBC Driver
         :date        => [ lambda {|r| Jdbc::Types::DATE == r['data_type'].to_i},
@@ -372,6 +374,10 @@ module ActiveRecord
         end
       end
 
+      def jndi_connection?
+        @jndi_connection
+      end
+
       private
       def configure_jndi
         jndi = @config[:jndi].to_s
@@ -383,6 +389,7 @@ module ActiveRecord
         unless @config[:driver]
           @config[:driver] = connection.meta_data.connection.java_class.name
         end
+        @jndi_connection = true
       end
 
       def configure_jdbc
@@ -407,32 +414,68 @@ module ActiveRecord
           jdbc_driver.connection(url, user, pass)
         end
       end
-
     end
 
-    module ShadowCoreMethods
-      def alias_chained_method(meth, feature, target)
-        if instance_methods.include?("#{meth}_without_#{feature}")
-          alias_method "#{meth}_without_#{feature}".to_sym, target
-        else
-          alias_method meth, target
+    class JdbcAdapter < AbstractAdapter
+      module ShadowCoreMethods
+        def alias_chained_method(meth, feature, target)
+          if instance_methods.include?("#{meth}_without_#{feature}")
+            alias_method "#{meth}_without_#{feature}".to_sym, target
+          else
+            alias_method meth, target
+          end
         end
       end
-    end
 
-    module CompatibilityMethods
-      def self.needed?(base)
-        !base.instance_methods.include?("quote_table_name")
+      module CompatibilityMethods
+        def self.needed?(base)
+          !base.instance_methods.include?("quote_table_name")
+        end
+
+        def quote_table_name(name)
+          quote_column_name(name)
+        end
+      end
+
+      module ConnectionPoolCallbacks
+        def self.included(base)
+          base.checkin :on_checkin
+          base.checkout :on_checkout
+        end
+
+        def self.needed?
+          ActiveRecord::Base.respond_to?(:connection_pool)
+        end
+
+        def on_checkin
+          # default implementation does nothing
+        end
+
+        def on_checkout
+          # default implementation does nothing
+        end
       end
 
-      def quote_table_name(name)
-        quote_column_name(name)
+      module JndiConnectionPoolCallbacks
+        def self.prepare(adapter, conn)
+          if ActiveRecord::Base.respond_to?(:connection_pool) && conn.jndi_connection?
+            adapter.extend self
+            conn.disconnect! # disconnect initial connection in JdbcConnection#initialize
+          end
+        end
+
+        def on_checkin
+          disconnect!
+        end
+
+        def on_checkout
+          reconnect!
+        end
       end
-    end
 
-    class JdbcAdapter < AbstractAdapter
       extend ShadowCoreMethods
       include CompatibilityMethods if CompatibilityMethods.needed?(self)
+      include ConnectionPoolCallbacks if ConnectionPoolCallbacks.needed?
 
       attr_reader :config
 
@@ -452,6 +495,7 @@ module ActiveRecord
           end
         end
         connection.adapter = self
+        JndiConnectionPoolCallbacks.prepare(self, connection)
       end
 
       def modify_types(tp)

data/lib/active_record/connection_adapters/jdbc_adapter_spec.rb

@@ -11,3 +11,4 @@ require 'jdbc_adapter/jdbc_mssql'
 require 'jdbc_adapter/jdbc_cachedb'
 require 'jdbc_adapter/jdbc_sqlite3'
 require 'jdbc_adapter/jdbc_sybase'
+require 'jdbc_adapter/jdbc_informix'

data/lib/jdbc_adapter/jdbc.rake

@@ -64,17 +64,30 @@ namespace :db do
   namespace :test do
     redefine_task :clone_structure => [ "db:structure:dump", "db:test:purge" ] do
       abcs = ActiveRecord::Base.configurations
+      abcs['test']['pg_params'] = '?allowEncodingChanges=true' if abcs['test']['adapter'] =~ /postgresql/i
       ActiveRecord::Base.establish_connection(abcs["test"])
       ActiveRecord::Base.connection.execute('SET foreign_key_checks = 0') if abcs["test"]["adapter"] =~ /mysql/i
       IO.readlines("db/#{RAILS_ENV}_structure.sql").join.split(";\n\n").each do |ddl|
-        ActiveRecord::Base.connection.execute(ddl)
+        ActiveRecord::Base.connection.execute(ddl.chomp(';'))
       end
     end
 
     redefine_task :purge => :environment do
       abcs = ActiveRecord::Base.configurations
-      ActiveRecord::Base.establish_connection(abcs["test"])
-      db = ActiveRecord::Base.connection.database_name
+      config = abcs['test'].dup
+      if config['adapter'] =~ /postgresql/i
+        if config['url']
+          db = config['url'][/\/([^\/]*)$/, 1]
+          config['url'][/\/([^\/]*)$/, 1] if db_name
+        else
+          db = config['database']
+          config['database'] = 'postgres'
+        end
+        ActiveRecord::Base.establish_connection(config)
+      else
+        ActiveRecord::Base.establish_connection(config)
+        db = ActiveRecord::Base.connection.database_name
+      end
       ActiveRecord::Base.connection.recreate_database(db)
     end
   end

data/lib/jdbc_adapter/jdbc_hsqldb.rb

@@ -5,23 +5,26 @@ module ::JdbcSpec
       config[:driver] ||= "org.hsqldb.jdbcDriver"
       embedded_driver(config)
     end
-      
+
     def h2_connection(config)
       config[:url] ||= "jdbc:h2:#{config[:database]}"
       config[:driver] ||= "org.h2.Driver"
       embedded_driver(config)
     end
   end
-  
+
   module HSQLDB
     def self.column_selector
       [/hsqldb|\.h2\./i, lambda {|cfg,col| col.extend(::JdbcSpec::HSQLDB::Column)}]
     end
 
     def self.adapter_selector
-      [/hsqldb|\.h2\./i, lambda {|cfg,adapt| adapt.extend(::JdbcSpec::HSQLDB)}]
+      [/hsqldb|\.h2\./i, lambda do |cfg,adapt|
+         adapt.extend(::JdbcSpec::HSQLDB)
+         def adapt.h2_adapter; true; end if cfg[:driver] =~ /\.h2\./
+       end]
     end
-    
+
     module Column
       def type_cast(value)
         return nil if value.nil? || value =~ /^\s*null\s*$/i
@@ -93,10 +96,12 @@ module ::JdbcSpec
 
     def quote(value, column = nil) # :nodoc:
       return value.quoted_id if value.respond_to?(:quoted_id)
-      
+
       case value
       when String
-        if column && column.type == :binary
+        if respond_to?(:h2_adapter) && value.empty?
+          "NULL"
+        elsif column && column.type == :binary
           "'#{quote_string(value).unpack("C*").collect {|v| v.to_s(16)}.join}'"
         else
           "'#{quote_string(value)}'"

data/lib/jdbc_adapter/jdbc_informix.rb

@@ -0,0 +1,148 @@
+module ::ActiveRecord
+  class Base
+    after_save :write_lobs
+
+  private
+    def write_lobs
+      if connection.is_a?(JdbcSpec::Informix)
+        self.class.columns.each do |c|
+          if [:text, :binary].include? c.type
+            value = self[c.name]
+            value = value.to_yaml if unserializable_attribute?(c.name, c)
+
+            unless value.nil? || (value == '')
+              connection.write_large_object(c.type == :binary,
+                                            c.name,
+                                            self.class.table_name,
+                                            self.class.primary_key,
+                                            quote_value(id),
+                                            value)
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+module ::JdbcSpec
+  module ActiveRecordExtensions
+    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'
+      jdbc_connection(config)
+    end
+  end
+
+  module Informix
+    def self.extended(base)
+      @@db_major_version = base.select_one("SELECT dbinfo('version', 'major') version FROM systables WHERE tabid = 1")['version'].to_i
+    end
+
+    def self.column_selector
+      [ /informix/i,
+        lambda { |cfg, column| column.extend(::JdbcSpec::Informix::Column) } ]
+    end
+
+    def self.adapter_selector
+      [ /informix/i,
+        lambda { |cfg, adapter| adapter.extend(::JdbcSpec::Informix) } ]
+    end
+
+    module Column
+    private
+      # TODO: Test all Informix column types.
+      def simplified_type(field_type)
+        if field_type =~ /serial/i
+          :primary_key
+        else
+          super
+        end
+      end
+    end
+
+    def modify_types(tp)
+      tp[:primary_key] = "SERIAL PRIMARY KEY"
+      tp[:string]      = { :name => "VARCHAR", :limit => 255 }
+      tp[:integer]     = { :name => "INTEGER" }
+      tp[:float]       = { :name => "FLOAT" }
+      tp[:decimal]     = { :name => "DECIMAL" }
+      tp[:datetime]    = { :name => "DATETIME YEAR TO FRACTION(5)" }
+      tp[:timestamp]   = { :name => "DATETIME YEAR TO FRACTION(5)" }
+      tp[:time]        = { :name => "DATETIME HOUR TO FRACTION(5)" }
+      tp[:date]        = { :name => "DATE" }
+      tp[:binary]      = { :name => "BYTE" }
+      tp[:boolean]     = { :name => "BOOLEAN" }
+      tp
+    end
+
+    def prefetch_primary_key?(table_name = nil)
+      true
+    end
+
+    def supports_migrations?
+      true
+    end
+
+    def default_sequence_name(table, column)
+      "#{table}_seq"
+    end
+
+    def add_limit_offset!(sql, options)
+      if options[:limit]
+        limit = "FIRST #{options[:limit]}"
+        # SKIP available only in IDS >= 10
+        offset = (@@db_major_version >= 10 && options[:offset]?
+                  "SKIP #{options[:offset]}" : "")
+        sql.sub!(/^select /i, "SELECT #{offset} #{limit} ")
+      end
+      sql
+    end
+
+    def next_sequence_value(sequence_name)
+      select_one("SELECT #{sequence_name}.nextval id FROM systables WHERE tabid=1")['id']
+    end
+
+    # TODO: Add some smart quoting for newlines in string and text fields.
+    def quote_string(string)
+      string.gsub(/\'/, "''")
+    end
+
+    def quote(value, column = nil)
+      if column && [:binary, :text].include?(column.type)
+        # LOBs are updated separately by an after_save trigger.
+        "NULL"
+      elsif column && column.type == :date
+        "'#{value.mon}/#{value.day}/#{value.year}'"
+      else
+        super
+      end
+    end
+
+    def create_table(name, options = {})
+      super(name, options)
+      execute("CREATE SEQUENCE #{name}_seq")
+    end
+ 
+    def rename_table(name, new_name)
+      execute("RENAME TABLE #{name} TO #{new_name}")
+      execute("RENAME SEQUENCE #{name}_seq TO #{new_name}_seq")
+    end
+ 
+    def drop_table(name)
+      super(name)
+      execute("DROP SEQUENCE #{name}_seq")
+    end
+
+    def remove_index(table_name, options = {})
+      @connection.execute_update("DROP INDEX #{index_name(table_name, options)}")
+    end
+
+  private
+    def select(sql, name = nil)
+      # Informix does not like "= NULL", "!= NULL", or "<> NULL".
+      execute(sql.gsub(/(!=|<>)\s*null/i, "IS NOT NULL").gsub(/=\s*null/i, "IS NULL"), name)
+    end
+  end # module Informix
+end # module ::JdbcSpec

data/lib/jdbc_adapter/jdbc_oracle.rb

@@ -1,8 +1,5 @@
 module ::ActiveRecord
   class Base
-    # After setting large objects to empty, write data back with a helper method
-    alias after_save_without_oracle_lob after_save
-    
     def after_save_with_oracle_lob() #:nodoc:
       if connection.is_a?(JdbcSpec::Oracle)
         self.class.columns.select { |c| c.sql_type =~ /LOB\(|LOB$/i }.each { |c|
@@ -13,10 +10,7 @@ module ::ActiveRecord
           connection.write_large_object(c.type == :binary, c.name, self.class.table_name, self.class.primary_key, quote_value(id), value)
         }
       end
-      after_save_without_oracle_lob
     end
-    
-    alias after_save after_save_with_oracle_lob
   end
 end
 
@@ -29,8 +23,13 @@ module ::JdbcSpec
       jdbc_connection(config)
     end
   end
-  
+
   module Oracle
+    def self.extended(mod)
+      ActiveRecord::Base.after_save :after_save_with_oracle_lob unless @lob_callback_added
+      @lob_callback_added = true
+    end
+
     def self.column_selector
       [/oracle/i, lambda {|cfg,col| col.extend(::JdbcSpec::Oracle::Column)}]
     end
@@ -54,17 +53,31 @@ module ::JdbcSpec
       def type_cast(value)
         return nil if value.nil?
         case type
-        when :string   then value
-        when :integer  then defined?(value.to_i) ? value.to_i : (value ? 1 : 0)
+        when :string      then value
+        when :integer     then defined?(value.to_i) ? value.to_i : (value ? 1 : 0)
         when :primary_key then defined?(value.to_i) ? value.to_i : (value ? 1 : 0) 
-        when :float    then value.to_f
-        when :datetime then JdbcSpec::Oracle::Column.cast_to_date_or_time(value)
-        when :time     then JdbcSpec::Oracle::Column.cast_to_time(value)
-        when :decimal   then self.class.value_to_decimal(value)
-        when :boolean   then self.class.value_to_boolean(value)
+        when :float       then value.to_f
+        when :datetime    then JdbcSpec::Oracle::Column.cast_to_date_or_time(value)
+        when :time        then JdbcSpec::Oracle::Column.cast_to_time(value)
+        when :decimal     then self.class.value_to_decimal(value)
+        when :boolean     then self.class.value_to_boolean(value)
         else value
         end
       end
+      
+      def type_cast_code(var_name)
+        case type
+        when :string      then nil
+        when :integer     then "(#{var_name}.to_i rescue #{var_name} ? 1 : 0)"
+        when :primary_key then "(#{var_name}.to_i rescue #{var_name} ? 1 : 0)"
+        when :float       then "#{var_name}.to_f"
+        when :datetime    then "JdbcSpec::Oracle::Column.cast_to_date_or_time(#{var_name})"
+        when :time        then "JdbcSpec::Oracle::Column.cast_to_time(#{var_name})"
+        when :decimal     then "#{self.class.name}.value_to_decimal(#{var_name})"
+        when :boolean     then "#{self.class.name}.value_to_boolean(#{var_name})"
+        else nil
+        end
+      end      
 
       private
       def simplified_type(field_type)
@@ -188,12 +201,20 @@ module ::JdbcSpec
       execute "ALTER TABLE #{table_name} MODIFY #{column_name} DEFAULT #{quote(default)}"
     end
 
+    def add_column_options!(sql, options) #:nodoc:
+      # handle case  of defaults for CLOB columns, which would otherwise get "quoted" incorrectly
+      if options_include_default?(options) && (column = options[:column]) && column.type == :text
+        sql << " DEFAULT #{quote(options.delete(:default))}" 
+      end
+      super
+    end
+
     def change_column(table_name, column_name, type, options = {}) #:nodoc:
       change_column_sql = "ALTER TABLE #{table_name} MODIFY #{column_name} #{type_to_sql(type, options[:limit])}"
       add_column_options!(change_column_sql, options)
       execute(change_column_sql)
     end
-
+    
     def rename_column(table_name, column_name, new_column_name) #:nodoc:
       execute "ALTER TABLE #{table_name} RENAME COLUMN #{column_name} to #{new_column_name}"
     end
@@ -328,6 +349,14 @@ module ::JdbcSpec
       end
     end
     
+    def quoted_true #:nodoc:
+      '1'
+    end
+    
+    def quoted_false #:nodoc:
+      '0'
+    end
+    
     private
     def select(sql, name=nil)
       records = execute(sql,name)

data/lib/jdbc_adapter/jdbc_postgre.rb

@@ -7,6 +7,7 @@ module ::JdbcSpec
       config[:host] ||= "localhost"
       config[:port] ||= 5432
       config[:url] ||= "jdbc:postgresql://#{config[:host]}:#{config[:port]}/#{config[:database]}"
+      config[:url] << config[:pg_params] if config[:pg_params]
       config[:driver] ||= "org.postgresql.Driver"
       jdbc_connection(config)
     end
@@ -20,7 +21,7 @@ module ::JdbcSpec
     def self.adapter_selector
       [/postgre/i, lambda {|cfg,adapt| adapt.extend(::JdbcSpec::PostgreSQL)}]
     end
-    
+
     module Column
       def type_cast(value)
         case type
@@ -30,7 +31,7 @@ module ::JdbcSpec
       end
 
       def simplified_type(field_type)
-        return :integer if field_type =~ /^serial/i 
+        return :integer if field_type =~ /^serial/i
         return :string if field_type =~ /\[\]$/i || field_type =~ /^interval/i
         return :string if field_type =~ /^(?:point|lseg|box|"?path"?|polygon|circle)/i
         return :datetime if field_type =~ /^timestamp/i
@@ -39,7 +40,7 @@ module ::JdbcSpec
         return :boolean if field_type =~ /^bool/i
         super
       end
-      
+
       def cast_to_boolean(value)
         if value == true || value == false
           value
@@ -70,16 +71,16 @@ module ::JdbcSpec
         # Boolean types
         return "t" if value =~ /true/i
         return "f" if value =~ /false/i
-        
+
         # Char/String/Bytea type values
         return $1 if value =~ /^'(.*)'::(bpchar|text|character varying|bytea)$/
-        
+
         # Numeric values
         return value if value =~ /^-?[0-9]+(\.[0-9]*)?/
-        
+
         # Fixed dates / timestamp
         return $1 if value =~ /^'(.+)'::(date|timestamp)/
-        
+
         # Anything else is blank, some user type, or some function
         # and we can't know the value of that, so return nil.
         return nil
@@ -93,7 +94,7 @@ module ::JdbcSpec
       tp[:boolean][:limit] = nil
       tp
     end
-    
+
     def default_sequence_name(table_name, pk = nil)
       default_pk, default_seq = pk_and_sequence_for(table_name)
       default_seq || "#{table_name}_#{pk || default_pk || 'id'}_seq"
@@ -216,34 +217,41 @@ module ::JdbcSpec
       Integer(select_value("SELECT currval('#{sequence_name}')"))
     end
 
-    # the point here is really just to empty the database, not recreate it
-    # so we delete all tables
     def recreate_database(name)
-      tables.each{|t| drop_table(t)}
+      drop_database(name)
+      create_database(name)
     end
-    
-    def structure_dump
-      abcs = ActiveRecord::Base.configurations
 
-      database = nil
-      if abcs[RAILS_ENV]["url"] =~ /\/([^\/]*)$/
-        database = $1
-      else
-        raise "Could not figure out what database this url is for #{abcs[RAILS_ENV]["url"]}"
+    def create_database(name, options = {})
+      execute "CREATE DATABASE \"#{name}\" ENCODING='#{options[:encoding] || 'utf8'}'"
+    end
+
+    def drop_database(name)
+      execute "DROP DATABASE \"#{name}\""
+    end
+
+    def structure_dump
+      database = @config[:database]
+      if database.nil?
+        if @config[:url] =~ /\/([^\/]*)$/
+          database = $1
+        else
+          raise "Could not figure out what database this url is for #{@config["url"]}"
+        end
       end
-    
-      ENV['PGHOST']     = abcs[RAILS_ENV]["host"] if abcs[RAILS_ENV]["host"]
-      ENV['PGPORT']     = abcs[RAILS_ENV]["port"].to_s if abcs[RAILS_ENV]["port"]
-      ENV['PGPASSWORD'] = abcs[RAILS_ENV]["password"].to_s if abcs[RAILS_ENV]["password"]
-      search_path = abcs[RAILS_ENV]["schema_search_path"]
+
+      ENV['PGHOST']     = @config[:host] if @config[:host]
+      ENV['PGPORT']     = @config[:port].to_s if @config[:port]
+      ENV['PGPASSWORD'] = @config[:password].to_s if @config[:password]
+      search_path = @config[:schema_search_path]
       search_path = "--schema=#{search_path}" if search_path
 
       @connection.connection.close
       begin
         file = "db/#{RAILS_ENV}_structure.sql"
-        `pg_dump -i -U "#{abcs[RAILS_ENV]["username"]}" -s -x -O -f #{file} #{search_path} #{database}`
+        `pg_dump -i -U "#{@config[:username]}" -s -x -O -f #{file} #{search_path} #{database}`
         raise "Error dumping database" if $?.exitstatus == 1
-        
+
         # need to patch away any references to SQL_ASCII as it breaks the JDBC driver
         lines = File.readlines(file)
         File.open(file, "w") do |io|
@@ -254,9 +262,9 @@ module ::JdbcSpec
         end
       ensure
         reconnect!
-      end  
+      end
     end
-    
+
     def _execute(sql, name = nil)
         case sql.strip
         when /\A\(?\s*(select|show)/i:
@@ -265,7 +273,7 @@ module ::JdbcSpec
           @connection.execute_update(sql)
         end
     end
-    
+
     # SELECT DISTINCT clause for a given set of columns and a given ORDER BY clause.
     #
     # PostgreSQL requires the ORDER BY columns in the select list for distinct queries, and
@@ -288,22 +296,22 @@ module ::JdbcSpec
     end
 
     # ORDER BY clause for the passed order option.
-    # 
+    #
     # PostgreSQL does not allow arbitrary ordering when using DISTINCT ON, so we work around this
     # by wrapping the sql as a sub-select and ordering in that query.
     def add_order_by_for_association_limiting!(sql, options)
       return sql if options[:order].blank?
-      
+
       order = options[:order].split(',').collect { |s| s.strip }.reject(&:blank?)
       order.map! { |s| 'DESC' if s =~ /\bdesc$/i }
       order = order.zip((0...order.size).to_a).map { |s,i| "id_list.alias_#{i} #{s}" }.join(', ')
-      
+
       sql.replace "SELECT * FROM (#{sql}) AS id_list ORDER BY #{order}"
     end
 
     def quote(value, column = nil)
       return value.quoted_id if value.respond_to?(:quoted_id)
-      
+
       if value.kind_of?(String) && column && column.type == :binary
         "'#{escape_bytea(value)}'"
       elsif column && column.type == :primary_key
@@ -320,7 +328,7 @@ module ::JdbcSpec
         result
       end
     end
-    
+
     def quote_column_name(name)
       %("#{name}")
     end
@@ -329,10 +337,17 @@ module ::JdbcSpec
       value.strftime("%Y-%m-%d %H:%M:%S")
     end
 
+    def disable_referential_integrity(&block) #:nodoc:
+      execute(tables.collect { |name| "ALTER TABLE #{quote_table_name(name)} DISABLE TRIGGER ALL" }.join(";"))
+      yield
+    ensure
+      execute(tables.collect { |name| "ALTER TABLE #{quote_table_name(name)} ENABLE TRIGGER ALL" }.join(";"))
+    end
+
     def rename_table(name, new_name)
       execute "ALTER TABLE #{name} RENAME TO #{new_name}"
     end
-    
+
     def add_column(table_name, column_name, type, options = {})
       execute("ALTER TABLE #{table_name} ADD #{column_name} #{type_to_sql(type, options[:limit])}")
       change_column_default(table_name, column_name, options[:default]) unless options[:default].nil?
@@ -355,23 +370,23 @@ module ::JdbcSpec
         commit_db_transaction
       end
       change_column_default(table_name, column_name, options[:default]) unless options[:default].nil?
-    end      
-    
+    end
+
     def change_column_default(table_name, column_name, default) #:nodoc:
       execute "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} SET DEFAULT '#{default}'"
     end
-      
+
     def rename_column(table_name, column_name, new_column_name) #:nodoc:
       execute "ALTER TABLE #{table_name} RENAME COLUMN #{column_name} TO #{new_column_name}"
     end
-    
+
     def remove_index(table_name, options) #:nodoc:
       execute "DROP INDEX #{index_name(table_name, options)}"
     end
 
     def type_to_sql(type, limit = nil, precision = nil, scale = nil) #:nodoc:
       return super unless type.to_s == 'integer'
-      
+
       if limit.nil? || limit == 4
         'integer'
       elsif limit < 4
@@ -384,5 +399,5 @@ module ::JdbcSpec
     def tables
       @connection.tables(database_name, nil, nil, ["TABLE"])
     end
-  end  
+  end
 end

data/lib/jdbc_adapter/version.rb

@@ -1,5 +1,5 @@
 module JdbcAdapter
   module Version
-    VERSION = "0.8.2"
+    VERSION = "0.9"
   end
-end
+end

data/src/java/jdbc_adapter/JdbcAdapterInternalService.java

@@ -235,7 +235,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
         Throwable toWrap = null;
         boolean autoCommit = false;
         while (i < tries) {
-            Connection c = getConnection(recv);
+            Connection c = getConnection(recv, true);
             try {
                 autoCommit = c.getAutoCommit();
                 return block.call(c);
@@ -370,7 +370,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
     @JRubyMethod(name = "set_native_database_types")
     public static IRubyObject set_native_database_types(IRubyObject recv) throws SQLException, IOException {
         Ruby runtime = recv.getRuntime();
-        IRubyObject types = unmarshal_result_downcase(recv, getConnection(recv).getMetaData().getTypeInfo());
+        IRubyObject types = unmarshal_result_downcase(recv, getConnection(recv, true).getMetaData().getTypeInfo());
         IRubyObject typeConverter = ((RubyModule) (runtime.getModule("ActiveRecord").getConstant("ConnectionAdapters"))).getConstant("JdbcTypeConverter");
         IRubyObject value = rubyApi.callMethod(rubyApi.callMethod(typeConverter, "new", types), "choose_best_types");
         rubyApi.setInstanceVariable(recv, "@native_types", value);
@@ -379,9 +379,9 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
 
     @JRubyMethod(name = "database_name")
     public static IRubyObject database_name(IRubyObject recv) throws SQLException {
-        String name = getConnection(recv).getCatalog();
+        String name = getConnection(recv, true).getCatalog();
         if(null == name) {
-            name = getConnection(recv).getMetaData().getUserName();
+            name = getConnection(recv, true).getMetaData().getUserName();
             if(null == name) {
                 name = "db1";
             }
@@ -391,13 +391,13 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
 
     @JRubyMethod(name = "begin")
     public static IRubyObject begin(IRubyObject recv) throws SQLException {
-        getConnection(recv).setAutoCommit(false);
+        getConnection(recv, true).setAutoCommit(false);
         return recv.getRuntime().getNil();
     }
 
     @JRubyMethod(name = "commit")
     public static IRubyObject commit(IRubyObject recv) throws SQLException {
-        Connection c = getConnection(recv);
+        Connection c = getConnection(recv, true);
         if (!c.getAutoCommit()) {
             try {
                 c.commit();
@@ -410,7 +410,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
 
     @JRubyMethod(name = "rollback")
     public static IRubyObject rollback(IRubyObject recv) throws SQLException {
-        Connection c = getConnection(recv);
+        Connection c = getConnection(recv, true);
         if (!c.getAutoCommit()) {
             try {
                 c.rollback();
@@ -1057,7 +1057,15 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
     }
 
     private static Connection getConnection(IRubyObject recv) {
+        return getConnection(recv, false);
+    }
+
+    private static Connection getConnection(IRubyObject recv, boolean error) {
         Connection conn = (Connection) recv.dataGetStruct();
+        if(error && conn == null) {
+            RubyClass err = recv.getRuntime().getModule("ActiveRecord").getClass("ConnectionNotEstablished");
+            throw new RaiseException(recv.getRuntime(), err, "no connection available", false);
+        }
         return conn;
     }
 

data/test/db/h2.rb

@@ -4,6 +4,9 @@ config = {
 }
 
 ActiveRecord::Base.establish_connection(config)
+logger = Logger.new 'h2-testdb.log'
+logger.level = Logger::DEBUG
+ActiveRecord::Base.logger = logger
 
 at_exit {
   # Clean up hsqldb when done

data/test/db/informix.rb

@@ -0,0 +1,11 @@
+config = {
+  :username   => 'blog',
+  :password   => 'blog',
+  :adapter    => 'informix',
+  :servername => 'ol_weblog',
+  :database   => 'weblog_development',
+  :host       => 'localhost',
+  :port       => '9088'
+}
+
+ActiveRecord::Base.establish_connection(config)

data/test/informix_simple_test.rb

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+#
+# To run this script, run the following:
+#
+#   CREATE DATABASE weblog_development;
+#
+# TODO: Finish the explanation.
+
+require 'jdbc_common'
+require 'db/informix'
+
+class InformixSimpleTest < Test::Unit::TestCase
+  include SimpleTestMethods
+
+  # Informix does not like "= NULL".
+  def test_equals_null
+    Entry.create!(:title => "Foo")
+    entry = Entry.find(:first, :conditions => ["content = NULL"])
+    assert_equal "Foo", entry.title
+  end
+
+  # Informix does not like "!= NULL" or "<> NULL".
+  def test_not_equals_null
+    Entry.create!(:title => "Foo", :content => "Bar")
+    entry = Entry.find_by_title("Foo", :conditions => ["content != NULL"])
+    assert_equal "Foo", entry.title
+    entry = Entry.find_by_title("Foo", :conditions => ["content <> NULL"])
+    assert_equal "Foo", entry.title
+  end
+end
+
+class InformixMultibyteTest < Test::Unit::TestCase
+  include MultibyteTestMethods
+
+  # Overriding the included test since we can't create text fields via a
+  # simple insert in Informix.
+  def test_select_multibyte_string
+    Entry.create!(:title => 'テスト', :content => '本文')
+    entry = Entry.find(:first)
+    assert_equal "テスト", entry.title
+    assert_equal "本文", entry.content
+    assert_equal entry, Entry.find_by_title("テスト")
+  end
+end
+
+class InformixHasManyThroughTest < Test::Unit::TestCase
+  include HasManyThroughMethods
+end

data/test/jdbc_common.rb

@@ -1,7 +1,9 @@
 require 'rubygems'
-# Specify version of activerecord here if desired
-# gem 'activerecord', '=2.1'
+# Specify version of activerecord with ENV['AR_VERSION'] if desired
+gem 'activerecord', ENV['AR_VERSION'] if ENV['AR_VERSION']
 require 'jdbc_adapter'
+puts "Using activerecord version #{ActiveRecord::VERSION::STRING}"
+puts "Specify version with AR_VERSION=={version} or RUBYLIB={path}"
 require 'models/auto_id'
 require 'models/entry'
 require 'models/add_not_null_column_to_table'

data/test/jndi_callbacks_test.rb

@@ -0,0 +1,38 @@
+require 'jdbc_common'
+
+begin
+  require 'mocha'
+
+class JndiConnectionPoolCallbacksTest < Test::Unit::TestCase
+  def setup
+    @connection = mock "JdbcConnection"
+    @connection.stubs(:jndi_connection?).returns(true)
+    @connection.stubs(:adapter=)
+    @logger = mock "logger"
+    @config = { :jndi => "jdbc/some_pool", :adapter => "mysql" }
+    Entry.connection_pool.disconnect!
+    assert !Entry.connection_pool.connected?
+    class << Entry.connection_pool; public :instance_variable_set; end
+  end
+
+  def teardown
+    @connection.stubs(:disconnect!)
+    Entry.connection_pool.disconnect!
+  end
+
+  def test_should_call_hooks_on_checkout_and_checkin
+    @connection.expects(:disconnect!)
+    @adapter = ActiveRecord::ConnectionAdapters::JdbcAdapter.new @connection, @logger, @config
+    Entry.connection_pool.instance_variable_set "@connections", [@adapter]
+
+    @connection.expects(:reconnect!)
+    Entry.connection_pool.checkout
+
+    @connection.expects(:disconnect!)
+    Entry.connection_pool.checkin @adapter
+  end
+end
+
+rescue LoadError
+  warn "mocha not found, disabling mocha-based tests"
+end if ActiveRecord::Base.respond_to?(:connection_pool)

data/test/simple.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 ActiveRecord::Schema.verbose = false
 
 module MigrationSetup
@@ -138,6 +139,7 @@ module SimpleTestMethods
   def test_disconnect
     assert_equal 1, Entry.count
     ActiveRecord::Base.clear_active_connections!
+    ActiveRecord::Base.connection_pool.disconnect! if ActiveRecord::Base.respond_to?(:connection_pool)
     assert !ActiveRecord::Base.connected?
     assert_equal 1, Entry.count
     assert ActiveRecord::Base.connected?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
+  version: "0.9"
 platform: ruby
 authors: 
 - Nick Sieger, Ola Bini and JRuby contributors
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-17 00:00:00 -07:00
+date: 2008-11-26 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
-description: ActiveRecord-JDBC is a database adapter for Rails' ActiveRecord component that can be used with JRuby[http://www.jruby.org/].  It allows use of virtually any JDBC-compliant database with your JRuby on Rails application.
+description: activerecord-jdbc-adapter is a database adapter for Rails' ActiveRecord component that can be used with JRuby[http://www.jruby.org/]. It allows use of virtually any JDBC-compliant database with your JRuby on Rails application.
 email: nick@nicksieger.com, ola.bini@gmail.com
 executables: []
 
@@ -34,6 +34,7 @@ files:
 - lib/active_record/connection_adapters/derby_adapter.rb
 - lib/active_record/connection_adapters/h2_adapter.rb
 - lib/active_record/connection_adapters/hsqldb_adapter.rb
+- lib/active_record/connection_adapters/informix_adapter.rb
 - lib/active_record/connection_adapters/jdbc_adapter.rb
 - lib/active_record/connection_adapters/jdbc_adapter_spec.rb
 - lib/active_record/connection_adapters/jndi_adapter.rb
@@ -46,6 +47,7 @@ files:
 - lib/jdbc_adapter/jdbc_derby.rb
 - lib/jdbc_adapter/jdbc_firebird.rb
 - lib/jdbc_adapter/jdbc_hsqldb.rb
+- lib/jdbc_adapter/jdbc_informix.rb
 - lib/jdbc_adapter/jdbc_mimer.rb
 - lib/jdbc_adapter/jdbc_mssql.rb
 - lib/jdbc_adapter/jdbc_mysql.rb
@@ -67,6 +69,7 @@ files:
 - test/db/derby.rb
 - test/db/h2.rb
 - test/db/hsqldb.rb
+- test/db/informix.rb
 - test/db/jdbc.rb
 - test/db/jndi_config.rb
 - test/db/logger.rb
@@ -82,9 +85,11 @@ files:
 - test/h2_simple_test.rb
 - test/has_many_through.rb
 - test/hsqldb_simple_test.rb
+- test/informix_simple_test.rb
 - test/jdbc_adapter/jdbc_db2_test.rb
 - test/jdbc_adapter/jdbc_sybase_test.rb
 - test/jdbc_common.rb
+- test/jndi_callbacks_test.rb
 - test/jndi_test.rb
 - test/manualTestDatabase.rb
 - test/minirunit/testConnect.rb
@@ -136,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jruby-extras
-rubygems_version: 1.0.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.