activerecord-jdbc-adapter 1.2.5 → 1.2.8

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rake/testtask'
 require 'rake/clean'
-CLEAN.include 'derby*', 'test.db.*','test/reports', 'test.sqlite3','lib/**/*.jar','manifest.mf', '*.log'
+CLEAN.include 'derby*', 'test.db.*','test/reports', 'test.sqlite3','lib/**/*.jar','manifest.mf', '*.log', 'target/*'
 
 require 'bundler/gem_helper'
 Bundler::GemHelper.install_tasks
@@ -14,46 +14,55 @@ task :default => [:jar, :test]
 task :build => :jar
 task :install => :jar
 
-ADAPTERS = %w[derby h2 hsqldb mssql mysql postgresql sqlite3].map {|a| "activerecord-jdbc#{a}-adapter" }
-DRIVERS  = %w[derby h2 hsqldb jtds mysql postgres sqlite3].map {|a| "jdbc-#{a}" }
+ADAPTERS = %w[derby h2 hsqldb mssql mysql postgresql sqlite3].map { |a| "activerecord-jdbc#{a}-adapter" }
+DRIVERS  = %w[derby h2 hsqldb jtds mysql postgres sqlite3].map { |a| "jdbc-#{a}" }
+TARGETS = ( ADAPTERS + DRIVERS )
 
 def rake(*args)
   ruby "-S", "rake", *args
 end
 
-(ADAPTERS + DRIVERS).each do |adapter|
-  namespace adapter do
-
+TARGETS.each do |target|
+  namespace target do
     task :build do
-      Dir.chdir(adapter) do
-        rake "build"
-      end
-      cp FileList["#{adapter}/pkg/#{adapter}-*.gem"], "pkg"
+      Dir.chdir(target) { rake "build" }
+      cp FileList["#{target}/pkg/#{target}-*.gem"], "pkg"
     end
-
-    # bundler handles install => build itself
     task :install do
-      Dir.chdir(adapter) do
-        rake "install"
-      end
+      Dir.chdir(target) { rake "install" }
     end
-
     task :release do
-      Dir.chdir(adapter) do
-        rake "release"
-      end
+      Dir.chdir(target) { rake "release" }
     end
   end
 end
 
-desc "Release all adapters"
-task "all:release" => ["release", *ADAPTERS.map { |f| "#{f}:release" }]
+# DRIVERS
+
+desc "Build drivers"
+task "drivers:build" => DRIVERS.map { |name| "#{name}:build" }
+
+desc "Install drivers"
+task "drivers:install" => DRIVERS.map { |name| "#{name}:install" }
+
+desc "Release drivers"
+task "drivers:release" => DRIVERS.map { |name| "#{name}:release" }
+
+# ADAPTERS
+
+desc "Build adapters"
+task "adapters:build" => [ 'build' ] + ADAPTERS.map { |name| "#{name}:build" }
+
+desc "Install adapters"
+task "adapters:install" => [ 'install' ] + ADAPTERS.map { |name| "#{name}:install" }
+
+desc "Release adapters"
+task "adapters:release" => [ 'release' ] + ADAPTERS.map { |name| "#{name}:release" }
 
-desc "Install all adapters"
-task "all:install" => ["install", *ADAPTERS.map { |f| "#{f}:install" }]
+# ALL
 
-desc "Build all adapters"
-task "all:build"   => ["build", *ADAPTERS.map { |f| "#{f}:build" }]
+task "all:build" => [ 'build' ] + TARGETS.map { |name| "#{name}:build" }
+task "all:install" => [ 'install' ] + TARGETS.map { |name| "#{name}:install" }
 
 task :filelist do
   puts FileList['pkg/**/*'].inspect

data/activerecord-jdbc-adapter.gemspec

@@ -18,7 +18,7 @@ virtually any JDBC-compliant database with your JRuby on Rails application.}
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.rdoc_options = ["--main", "README.rdoc", "-SHN", "-f", "darkfish"]
+  s.rdoc_options = ["--main", "README.md", "-SHN", "-f", "darkfish"]
   s.rubyforge_project = %q{jruby-extras}
 end
 

data/gemfiles/rails23.gemfile

@@ -6,7 +6,9 @@ gem "jruby-openssl", :platform=>:jruby
 gem "appraisal"
 gem "rake", :require=>nil
 gem "test-unit", :group=>:test
-gem "mocha", :group=>:test
-gem "activerecord", "~> 2.3.14"
-gem "rails", "~> 2.3.14"
+gem "mocha", :require=>nil, :group=>:test
+gem "simplecov", :require=>nil, :group=>:test
+gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
+gem "activerecord", "~> 2.3.16"
+gem "rails", "~> 2.3.16"
 

data/gemfiles/rails23.gemfile.lock

@@ -1,44 +1,52 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (2.3.14)
-      actionpack (= 2.3.14)
-    actionpack (2.3.14)
-      activesupport (= 2.3.14)
+    actionmailer (2.3.16)
+      actionpack (= 2.3.16)
+    actionpack (2.3.16)
+      activesupport (= 2.3.16)
       rack (~> 1.1.0)
-    activerecord (2.3.14)
-      activesupport (= 2.3.14)
-    activeresource (2.3.14)
-      activesupport (= 2.3.14)
-    activesupport (2.3.14)
+    activerecord (2.3.16)
+      activesupport (= 2.3.16)
+    activeresource (2.3.16)
+      activesupport (= 2.3.16)
+    activesupport (2.3.16)
     appraisal (0.5.1)
       bundler
       rake
+    bcrypt-ruby (3.0.1-java)
     bouncy-castle-java (1.5.0146.1)
     jruby-openssl (0.7.7)
       bouncy-castle-java (>= 1.5.0146.1)
     metaclass (0.0.1)
     mocha (0.11.4)
       metaclass (~> 0.0.1)
-    rack (1.1.3)
-    rails (2.3.14)
-      actionmailer (= 2.3.14)
-      actionpack (= 2.3.14)
-      activerecord (= 2.3.14)
-      activeresource (= 2.3.14)
-      activesupport (= 2.3.14)
+    multi_json (1.5.0)
+    rack (1.1.5)
+    rails (2.3.16)
+      actionmailer (= 2.3.16)
+      actionpack (= 2.3.16)
+      activerecord (= 2.3.16)
+      activeresource (= 2.3.16)
+      activesupport (= 2.3.16)
       rake (>= 0.8.3)
     rake (0.9.2.2)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     test-unit (2.5.3)
 
 PLATFORMS
   java
 
 DEPENDENCIES
-  activerecord (~> 2.3.14)
+  activerecord (~> 2.3.16)
   appraisal
+  bcrypt-ruby (~> 3.0.0)
   jruby-openssl
   mocha
-  rails (~> 2.3.14)
+  rails (~> 2.3.16)
   rake
+  simplecov
   test-unit

data/gemfiles/rails30.gemfile

@@ -6,6 +6,8 @@ gem "jruby-openssl", :platform=>:jruby
 gem "appraisal"
 gem "rake", :require=>nil
 gem "test-unit", :group=>:test
-gem "mocha", :group=>:test
-gem "activerecord", "~> 3.0.17"
+gem "mocha", :require=>nil, :group=>:test
+gem "simplecov", :require=>nil, :group=>:test
+gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
+gem "activerecord", "~> 3.0.20"
 

data/gemfiles/rails30.gemfile.lock

@@ -1,20 +1,21 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.17)
-      activesupport (= 3.0.17)
+    activemodel (3.0.20)
+      activesupport (= 3.0.20)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.17)
-      activemodel (= 3.0.17)
-      activesupport (= 3.0.17)
+    activerecord (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.17)
+    activesupport (3.0.20)
     appraisal (0.5.1)
       bundler
       rake
     arel (2.0.10)
+    bcrypt-ruby (3.0.1-java)
     bouncy-castle-java (1.5.0146.1)
     builder (2.1.2)
     i18n (0.5.0)
@@ -23,17 +24,24 @@ GEM
     metaclass (0.0.1)
     mocha (0.11.4)
       metaclass (~> 0.0.1)
+    multi_json (1.5.0)
     rake (10.0.3)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     test-unit (2.5.3)
-    tzinfo (0.3.33)
+    tzinfo (0.3.35)
 
 PLATFORMS
   java
 
 DEPENDENCIES
-  activerecord (~> 3.0.17)
+  activerecord (~> 3.0.20)
   appraisal
+  bcrypt-ruby (~> 3.0.0)
   jruby-openssl
   mocha
   rake
+  simplecov
   test-unit

data/gemfiles/rails31.gemfile

@@ -6,6 +6,8 @@ gem "jruby-openssl", :platform=>:jruby
 gem "appraisal"
 gem "rake", :require=>nil
 gem "test-unit", :group=>:test
-gem "mocha", :group=>:test
-gem "activerecord", "~> 3.1.8"
+gem "mocha", :require=>nil, :group=>:test
+gem "simplecov", :require=>nil, :group=>:test
+gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
+gem "activerecord", "~> 3.1.10"
 

data/gemfiles/rails31.gemfile.lock

@@ -1,23 +1,24 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.1.8)
-      activesupport (= 3.1.8)
+    activemodel (3.1.10)
+      activesupport (= 3.1.10)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.8)
-      activemodel (= 3.1.8)
-      activesupport (= 3.1.8)
+    activerecord (3.1.10)
+      activemodel (= 3.1.10)
+      activesupport (= 3.1.10)
       arel (~> 2.2.3)
       tzinfo (~> 0.3.29)
-    activesupport (3.1.8)
+    activesupport (3.1.10)
       multi_json (>= 1.0, < 1.3)
     appraisal (0.5.1)
       bundler
       rake
     arel (2.2.3)
+    bcrypt-ruby (3.0.1-java)
     bouncy-castle-java (1.5.0146.1)
-    builder (3.0.0)
+    builder (3.0.4)
     i18n (0.6.1)
     jruby-openssl (0.7.7)
       bouncy-castle-java (>= 1.5.0146.1)
@@ -26,16 +27,22 @@ GEM
       metaclass (~> 0.0.1)
     multi_json (1.2.0)
     rake (10.0.3)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     test-unit (2.5.3)
-    tzinfo (0.3.33)
+    tzinfo (0.3.35)
 
 PLATFORMS
   java
 
 DEPENDENCIES
-  activerecord (~> 3.1.8)
+  activerecord (~> 3.1.10)
   appraisal
+  bcrypt-ruby (~> 3.0.0)
   jruby-openssl
   mocha
   rake
+  simplecov
   test-unit

data/gemfiles/rails32.gemfile

@@ -6,6 +6,8 @@ gem "jruby-openssl", :platform=>:jruby
 gem "appraisal"
 gem "rake", :require=>nil
 gem "test-unit", :group=>:test
-gem "mocha", :group=>:test
-gem "activerecord", "~> 3.2.9"
+gem "mocha", :require=>nil, :group=>:test
+gem "simplecov", :require=>nil, :group=>:test
+gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
+gem "activerecord", "~> 3.2.11"
 

data/gemfiles/rails32.gemfile.lock

@@ -1,21 +1,22 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    activerecord (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.9)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     appraisal (0.5.1)
       bundler
       rake
     arel (3.0.2)
+    bcrypt-ruby (3.0.1-java)
     bouncy-castle-java (1.5.0146.1)
     builder (3.0.4)
     i18n (0.6.1)
@@ -24,8 +25,12 @@ GEM
     metaclass (0.0.1)
     mocha (0.11.4)
       metaclass (~> 0.0.1)
-    multi_json (1.3.7)
+    multi_json (1.5.0)
     rake (10.0.3)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     test-unit (2.5.3)
     tzinfo (0.3.35)
 
@@ -33,9 +38,11 @@ PLATFORMS
   java
 
 DEPENDENCIES
-  activerecord (~> 3.2.9)
+  activerecord (~> 3.2.11)
   appraisal
+  bcrypt-ruby (~> 3.0.0)
   jruby-openssl
   mocha
   rake
+  simplecov
   test-unit

data/lib/active_record/connection_adapters/db2_adapter.rb

@@ -0,0 +1 @@
+require 'arjdbc/db2'

data/lib/arel/visitors/sql_server.rb

@@ -15,6 +15,9 @@ module Arel
       # Need to mimic the subquery logic in ARel 1.x for select count with limit
       # See arel/engines/sql/compilers/mssql_compiler.rb for details
       def visit_Arel_Nodes_SelectStatement o
+        if !o.limit && o.offset
+          raise ActiveRecord::ActiveRecordError, "You must specify :limit with :offset."
+        end
         order = "ORDER BY #{o.orders.map { |x| visit x }.join(', ')}" unless o.orders.empty?
         if o.limit
           if select_count?(o)

data/lib/arjdbc.rb

@@ -7,16 +7,14 @@ if defined?(JRUBY_VERSION)
       else
         RAILS_CONNECTION_ADAPTERS = %w(jdbc)
       end
-      if ActiveRecord::VERSION::MAJOR == 1 && ActiveRecord::VERSION::MINOR == 14
-        require 'arjdbc/jdbc'
-      end
     else
       require 'active_record'
-      require 'arjdbc/jdbc'
     end
-  rescue LoadError
+  rescue LoadError => e
     warn "activerecord-jdbc-adapter requires ActiveRecord at runtime"
+    raise e
   end
+  require 'arjdbc/jdbc'
 else
   warn "activerecord-jdbc-adapter is for use with JRuby only"
 end

data/lib/arjdbc/db2.rb

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

data/lib/arjdbc/db2/adapter.rb

@@ -1,69 +1,87 @@
+require 'arjdbc/jdbc/serialized_attributes_helper'
+
 module ArJdbc
   module DB2
+    
+    # TODO kind of standard AR configuration option for this would be nice :
+    ADD_LOB_CALLBACK = true unless const_defined?(:ADD_LOB_CALLBACK) # :nodoc
+
+    @@_lob_callback_added = nil
+    def self.lob_callback_added? # :nodoc
+      @@_lob_callback_added
+    end
+    
+    def self.lob_callback_added! # :nodoc
+      @@_lob_callback_added = true
+    end
+    
     def self.extended(base)
-      if base.zos?
-        unless @lob_callback_added
-          ActiveRecord::Base.class_eval do
-            def after_save_with_db2zos_blob
-              lobfields = self.class.columns.select { |c| c.sql_type =~ /blob|clob/i }
-              lobfields.each do |c|
-                value = self[c.name]
-                if respond_to?(:unserializable_attribute?)
-                  value = value.to_yaml if unserializable_attribute?(c.name, c)
-                else
-                  value = value.to_yaml if value.is_a?(Hash)
-                end
-                next if value.nil?
-                connection.write_large_object(c.type == :binary, c.name, self.class.table_name, self.class.primary_key, quote_value(id), value)
-              end
+      if ADD_LOB_CALLBACK && ! lob_callback_added?
+        ActiveRecord::Base.class_eval do
+          def after_save_with_db2_lob
+            lob_columns = self.class.columns.select { |c| c.sql_type =~ /blob|clob/i }
+            lob_columns.each do |column|
+              value = ::ArJdbc::SerializedAttributesHelper.dump_column_value(self, column)
+              next if value.nil? # already set NULL
+
+              connection.write_large_object(
+                column.type == :binary, column.name, 
+                self.class.table_name, 
+                self.class.primary_key, 
+                quote_value(id), value
+              )
             end
           end
-
-          ActiveRecord::Base.after_save :after_save_with_db2zos_blob
-
-          @lob_callback_added = true
+          alias after_save_with_db2zos_blob after_save_with_db2_lob # <-compat
         end
+        # TODO this should be changed to :after_save_with_db2_lob :
+        ActiveRecord::Base.after_save :after_save_with_db2zos_blob # <-compat
+        lob_callback_added!
       end
     end
-
+    
     def self.column_selector
-      [ /(db2|as400|zos)/i,
-        lambda { |cfg, column| column.extend(::ArJdbc::DB2::Column) } ]
+      [ /(db2|as400|zos)/i, lambda { |cfg, column| column.extend(::ArJdbc::DB2::Column) } ]
     end
 
     def self.jdbc_connection_class
       ::ActiveRecord::ConnectionAdapters::DB2JdbcConnection
     end
 
+    def self.arel2_visitors(config)
+      require 'arel/visitors/db2'
+      { 'db2'   => ::Arel::Visitors::DB2, 'as400' => ::Arel::Visitors::DB2 }
+    end
+    
+    def adapter_name
+      'DB2'
+    end
+    
     NATIVE_DATABASE_TYPES = {
-      :double    => { :name => "double" },
-      :bigint    => { :name => "bigint" }
+      :double     => { :name => "double" },
+      :bigint     => { :name => "bigint" },
+      :string     => { :name => "varchar", :limit => 255 },
+      :text       => { :name => "clob" },
+      :date       => { :name => "date" },
+      :binary     => { :name => "blob" },
+      :boolean    => { :name => "smallint" }, # no native boolean type
+      :xml        => { :name => "xml" },
+      :decimal    => { :name => "decimal" },
+      :char       => { :name => "char" },
+      :decfloat   => { :name => "decfloat" },
+      #:rowid      => { :name => "rowid" }, # supported datatype on z/OS and i/5
+      #:graphic    => { :name => "graphic", :limit => 1 },
+      #:vargraphic => { :name => "vargraphic", :limit => 1 },
+      # TODO datetime / timestamp / time mapping
     }
 
     def native_database_types
       super.merge(NATIVE_DATABASE_TYPES)
     end
 
-    def explain(query, *binds)
-      # TODO: Explain this!
-    end
-
-    def prefetch_primary_key?(table_name = nil)
-      # TRUE if the table has no identity column
-      names = table_name.upcase.split(".")
-      sql = "SELECT 1 FROM SYSCAT.COLUMNS WHERE IDENTITY = 'Y' "
-      sql += "AND TABSCHEMA = '#{names.first}' " if names.size == 2
-      sql += "AND TABNAME = '#{names.last}'"
-      select_one(sql).nil?
-    end
-
-    def next_sequence_value(sequence_name)
-      select_value("select next value for #{sequence_name} from sysibm.sysdummy1")
-    end
-
     module Column
       def type_cast(value)
-        return nil if value.nil? || value =~ /^\s*null\s*$/i
+        return nil if value.nil? || value == 'NULL' || value =~ /^\s*NULL\s*$/i
         case type
         when :string    then value
         when :integer   then defined?(value.to_i) ? value.to_i : (value ? 1 : 0)
@@ -93,6 +111,7 @@ module ArJdbc
       def self.cast_to_date_or_time(value)
         return value if value.is_a? Date
         return nil if value.blank?
+        # https://github.com/jruby/activerecord-jdbc-adapter/commit/c225126e025df2e98ba3386c67e2a5bc5e5a73e6
         return Time.now if value =~ /^CURRENT/
         guess_date_or_time((value.is_a? Time) ? value : cast_to_time(value))
       rescue
@@ -110,17 +129,30 @@ module ArJdbc
       end
 
       def self.guess_date_or_time(value)
-        (value.hour == 0 and value.min == 0 and value.sec == 0) ?
-        Date.new(value.year, value.month, value.day) : value
+        return value if value.is_a? Date
+        ( value && value.hour == 0 && value.min == 0 && value.sec == 0 ) ? 
+          Date.new(value.year, value.month, value.day) : value
       end
 
       private
       # http://publib.boulder.ibm.com/infocenter/db2luw/v9r7/topic/com.ibm.db2.luw.apdv.java.doc/doc/rjvjdata.html
       def simplified_type(field_type)
         case field_type
-        when /^decimal\(1\)$/i  then :boolean
-        when /^real/i           then :float
-        when /^timestamp/i      then :datetime
+        when /^decimal\(1\)$/i   then :boolean
+        when /smallint|boolean/i then :boolean
+        when /^real|double/i     then :float
+        when /int|serial/i       then :integer
+        when /numeric|decfloat/i then :decimal
+        when /timestamp/i        then :timestamp
+        when /datetime/i         then :datetime
+        when /time/i             then :time
+        when /date/i             then :date
+        when /clob/i             then :text
+        when /for bit data/i     then :binary
+        when /xml/i              then :xml
+        #when /vargraphic/i       then :vargraphic
+        #when /graphic/i          then :graphic
+        #when /rowid/i            then :rowid # rowid is a supported datatype on z/OS and i/5
         else
           super
         end
@@ -137,15 +169,18 @@ module ArJdbc
         value
       end
     end
+    
+    def prefetch_primary_key?(table_name = nil)
+      # TRUE if the table has no identity column
+      names = table_name.upcase.split(".")
+      sql = "SELECT 1 FROM SYSCAT.COLUMNS WHERE IDENTITY = 'Y' "
+      sql += "AND TABSCHEMA = '#{names.first}' " if names.size == 2
+      sql += "AND TABNAME = '#{names.last}'"
+      select_one(sql).nil?
+    end
 
-    def _execute(sql, name = nil)
-      if ActiveRecord::ConnectionAdapters::JdbcConnection::select?(sql)
-        @connection.execute_query(sql)
-      elsif ActiveRecord::ConnectionAdapters::JdbcConnection::insert?(sql)
-        (@connection.execute_insert(sql) or last_insert_id(sql)).to_i
-      else
-        @connection.execute_update(sql)
-      end
+    def next_sequence_value(sequence_name)
+      select_value("SELECT NEXT VALUE FOR #{sequence_name} FROM sysibm.sysdummy1")
     end
 
     # holy moly batman! all this to tell AS400 "yes i am sure"
@@ -155,108 +190,93 @@ module ArJdbc
         @connection.execute_update "call qsys.qcmdexc('ADDRPYLE SEQNBR(9876) MSGID(CPA32B2) RPY(''I'')',0000000045.00000)"
       rescue Exception => e
         raise "Could not call CHGJOB INQMSGRPY(*SYSRPYL) and ADDRPYLE SEQNBR(9876) MSGID(CPA32B2) RPY('I').\n" +
-          "Do you have authority to do this?\n\n" + e.to_s
+              "Do you have authority to do this?\n\n" + e.to_s
       end
 
-      r = execute sql
+      result = execute sql
 
       begin
         @connection.execute_update "call qsys.qcmdexc('QSYS/CHGJOB INQMSGRPY(*DFT)',0000000027.00000)"
         @connection.execute_update "call qsys.qcmdexc('RMVRPYLE SEQNBR(9876)',0000000021.00000)"
       rescue Exception => e
         raise "Could not call CHGJOB INQMSGRPY(*DFT) and RMVRPYLE SEQNBR(9876).\n" +
-          "Do you have authority to do this?\n\n" + e.to_s
+              "Do you have authority to do this?\n\n" + e.to_s
       end
-      r
+      result
     end
 
+    def _execute(sql, name = nil)
+      if self.class.select?(sql)
+        @connection.execute_query(sql)
+      elsif self.class.insert?(sql)
+        (@connection.execute_insert(sql) or last_insert_id(sql)).to_i
+      else
+        @connection.execute_update(sql)
+      end
+    end
+    
     def last_insert_id(sql)
       table_name = sql.split(/\s/)[2]
-      result = select(ActiveRecord::Base.send(:sanitize_sql, %[select IDENTITY_VAL_LOCAL() as last_insert_id from #{table_name}], nil))
+      result = select(ActiveRecord::Base.send(:sanitize_sql, %[SELECT IDENTITY_VAL_LOCAL() AS last_insert_id FROM #{table_name}], nil))
       result.last['last_insert_id']
     end
-
-    def modify_types(tp)
-      tp[:primary_key] = 'int not null generated by default as identity (start with 1) primary key'
-      tp[:string][:limit] = 255
-      tp[:integer][:limit] = nil
-      tp[:boolean] = {:name => "decimal(1)"}
-      tp
-    end
-
-    def type_to_sql(type, limit = nil, precision = nil, scale = nil)
-      limit = nil if type.to_sym == :integer
-      super(type, limit, precision, scale)
-    end
-
-    def adapter_name
-      'DB2'
-    end
-
-    def self.arel2_visitors(config)
-      require 'arel/visitors/db2'
-      {}.tap {|v| %w(db2 as400).each {|a| v[a] = ::Arel::Visitors::DB2 } }
-    end
-
-    def add_limit_offset!(sql, options)
-      replace_limit_offset!(sql, options[:limit], options[:offset])
-    end
-
-
+    
     def create_table(name, options = {}) #:nodoc:
       if zos?
-        table_definition = ActiveRecord::ConnectionAdapters::TableDefinition.new(self)
-
-        table_definition.primary_key(options[:primary_key] || ActiveRecord::Base.get_primary_key(name)) unless options[:id] == false
-
-        yield table_definition
-
-        # Clobs in DB2 Host have to be created after the Table with an auxiliary Table.
-        # First: Save them for later in Array "clobs"
-        clobs =table_definition.columns.select { |x| x.type == "text" }
-
-        # Second: and delete them from the original Colums-Array
-        table_definition.columns.delete_if { |x| x.type=="text" }
+        zos_create_table(name, options)
+      else
+        super(name, options)
+      end
+    end
+    
+    def zos_create_table(name, options = {}) #:nodoc:
+      table_definition = ActiveRecord::ConnectionAdapters::TableDefinition.new(self)
+      table_definition.primary_key(options[:primary_key] || ActiveRecord::Base.get_primary_key(name)) unless options[:id] == false
 
-        if options[:force] && table_exists?(name)
-          super.drop_table(name, options)
-        end
+      yield table_definition
 
-        create_sql = "CREATE#{' TEMPORARY' if options[:temporary]} TABLE "
-        create_sql << "#{quote_table_name(name)} ("
-        create_sql << table_definition.to_sql
-        create_sql << ") #{options[:options]}"
-        create_sql << " IN #{@config[:database]}.#{@config[:tablespace]}" if @config[:database] && @config[:tablespace]
+      # Clobs in DB2 Host have to be created after the Table with an auxiliary Table.
+      # First: Save them for later in Array "clobs"
+      clobs = table_definition.columns.select { |x| x.type.to_s == "text" }
+      # Second: and delete them from the original Colums-Array
+      table_definition.columns.delete_if { |x| x.type.to_s == "text" }
 
-        execute create_sql
+      drop_table(name, options) if options[:force] && table_exists?(name)
 
-        clobs.each do |clob_column|
-          execute "ALTER TABLE #{name+" ADD COLUMN "+clob_column.name.to_s+" clob"}"
-          execute "CREATE AUXILIARY TABLE #{name+"_"+clob_column.name.to_s+"_CD_"} IN #{@config[:database]}.#{@config[:lob_tablespaces][name.split(".")[1]]} STORES #{name} COLUMN "+clob_column.name.to_s
-          execute "CREATE UNIQUE INDEX #{name+"_"+clob_column.name.to_s+"_CD_"} ON #{name+"_"+clob_column.name.to_s+"_CD_"};"
-        end
+      create_sql = "CREATE#{' TEMPORARY' if options[:temporary]} TABLE "
+      create_sql << "#{quote_table_name(name)} ("
+      create_sql << table_definition.to_sql
+      create_sql << ") #{options[:options]}"
+      if @config[:database] && @config[:tablespace]
+        in_db_table_space = " IN #{@config[:database]}.#{@config[:tablespace]}"
       else
-        super(name, options)
+        in_db_table_space = ''
       end
-    end
-
-    def replace_limit_offset!(sql, limit, offset)
-      if limit
-        limit = limit.to_i
-        if !offset
-          if limit == 1
-            sql << " FETCH FIRST ROW ONLY"
-          else
-            sql << " FETCH FIRST #{limit} ROWS ONLY"
-          end
+      create_sql << in_db_table_space
+
+      execute create_sql
+
+      # Table definition is complete only when a unique index is created on the primary_key column for DB2 V8 on zOS
+      # create index on id column if options[:id] is nil or id ==true
+      # else check if options[:primary_key]is not nil then create an unique index on that column
+      # TODO someone on Z/OS should test this out - also not needed for V9 ?
+      #primary_column = options[:id] == true ? 'id' : options[:primary_key]
+      #add_index(name, (primary_column || 'id').to_s, :unique => true)
+
+      clobs.each do |clob_column|
+        column_name = clob_column.name.to_s
+        execute "ALTER TABLE #{name + ' ADD COLUMN ' + column_name + ' clob'}"
+        clob_table_name = name + '_' + column_name + '_CD_'
+        if @config[:database] && @config[:lob_tablespaces]
+          in_lob_table_space = " IN #{@config[:database]}.#{@config[:lob_tablespaces][name.split(".")[1]]}"
         else
-          offset = offset.to_i
-          sql.sub!(/SELECT/i, 'SELECT B.* FROM (SELECT A.*, row_number() over () AS internal$rownum FROM (SELECT')
-          sql << ") A ) B WHERE B.internal$rownum > #{offset} AND B.internal$rownum <= #{limit + offset}"
+          in_lob_table_space = ''
         end
+        execute "CREATE AUXILIARY TABLE #{clob_table_name} #{in_lob_table_space} STORES #{name} COLUMN #{column_name}"
+        execute "CREATE UNIQUE INDEX #{clob_table_name} ON #{clob_table_name};"
       end
-      sql
     end
+    private :zos_create_table
 
     def pk_and_sequence_for(table)
       # In JDBC/DB2 side, only upcase names of table and column are handled.
@@ -268,74 +288,147 @@ module ArJdbc
       keys
     end
 
-    def quote_column_name(column_name)
-      column_name.to_s
-    end
-
+    # Properly quotes the various data types.
+    # +value+ contains the data, +column+ is optional and contains info on the field
     def quote(value, column = nil) # :nodoc:
-      if column && column.respond_to?(:primary) && column.primary && column.klass != String
-        return value.to_i.to_s
-      end
-      if column && (column.type == :decimal || column.type == :integer) && value
-        return value.to_s
+      return value.quoted_id if value.respond_to?(:quoted_id)
+      
+      if column
+        if column.respond_to?(:primary) && column.primary && column.klass != String
+          return value.to_i.to_s
+        end
+        if value && (column.type.to_sym == :decimal || column.type.to_sym == :integer)
+          return value.to_s
+        end
       end
+      
+      column_type = column && column.type.to_sym
+      
       case value
-      when String
-        if column && column.type == :binary
-          "BLOB('#{quote_string(value)}')"
+      when nil then "NULL"
+      when Numeric # IBM_DB doesn't accept quotes on numeric types
+        # if the column type is text or string, return the quote value
+        if column_type == :text || column_type == :string
+          "'#{value}'"
         else
-          if zos? && column.type == :text
-            "'if_you_see_this_value_the_after_save_hook_in_db2_zos_adapter_went_wrong'"
+          value.to_s
+        end
+      when String, ActiveSupport::Multibyte::Chars
+        if column_type == :binary && !(column.sql_type =~ /for bit data/i)
+          if ArJdbc::DB2.lob_callback_added?
+            "NULL" # '@@@IBMBINARY@@@'"
+          else
+            "BLOB('#{quote_string(value)}')"
+          end
+        elsif column && column.sql_type =~ /clob/ # :text
+          if ArJdbc::DB2.lob_callback_added?
+            "NULL" # "'@@@IBMTEXT@@@'"
           else
             "'#{quote_string(value)}'"
           end
+        elsif column_type == :xml
+          "#{value}" # "'<ibm>@@@IBMXML@@@</ibm>'"
+        else
+          "'#{quote_string(value)}'"
         end
+      when Symbol then "'#{quote_string(value.to_s)}'"
       else super
       end
     end
 
-    def quote_string(string)
-      string.gsub(/'/, "''") # ' (for ruby-mode)
+    def quote_column_name(column_name)
+      column_name.to_s
     end
-
-    def quoted_true
-      '1'
+    
+    def modify_types(types)
+      super(types)
+      types[:primary_key] = 'int not null generated by default as identity (start with 1) primary key'
+      types[:string][:limit] = 255
+      types[:integer][:limit] = nil
+      types[:boolean] = {:name => "decimal(1)"}
+      types
     end
 
-    def quoted_false
-      '0'
+    def type_to_sql(type, limit = nil, precision = nil, scale = nil)
+      limit = nil if type.to_sym == :integer
+      super(type, limit, precision, scale)
     end
 
+    def add_limit_offset!(sql, options)
+      replace_limit_offset!(sql, options[:limit], options[:offset])
+    end
+    
+    def add_column_options!(sql, options) # :nodoc:
+      # handle case of defaults for CLOB columns, 
+      # which might get incorrect if we write LOBs in the after_save callback
+      if options_include_default?(options)
+        column = options[:column]
+        if column && column.type == :text
+          sql << " DEFAULT #{quote(options.delete(:default))}"
+        end
+        if column && column.type == :binary
+          # quoting required for the default value of a column :
+          value = options.delete(:default)
+          # DB2 z/OS only allows NULL or "" (empty) string as DEFAULT value 
+          # for a BLOB column. non-empty string and non-NULL, return error!
+          if value.nil?
+            sql_value = "NULL"
+          else
+            sql_value = zos? ? "#{value}" : "BLOB('#{quote_string(value)}'"
+          end
+          sql << " DEFAULT #{sql_value}"
+        end
+      end
+      super
+    end
+    
+    def replace_limit_offset!(sql, limit, offset)
+      if limit
+        limit = limit.to_i
+        if !offset
+          if limit == 1
+            sql << " FETCH FIRST ROW ONLY"
+          else
+            sql << " FETCH FIRST #{limit} ROWS ONLY"
+          end
+        else
+          offset = offset.to_i
+          sql.sub!(/SELECT/i, 'SELECT B.* FROM (SELECT A.*, row_number() over () AS internal$rownum FROM (SELECT')
+          sql << ") A ) B WHERE B.internal$rownum > #{offset} AND B.internal$rownum <= #{limit + offset}"
+        end
+      end
+      sql
+    end
+    
     def reorg_table(table_name)
       unless as400?
         @connection.execute_update "call sysproc.admin_cmd ('REORG TABLE #{table_name}')"
       end
     end
+    private :reorg_table
 
     def runstats_for_table(tablename, priority=10)
       @connection.execute_update "call sysproc.admin_cmd('RUNSTATS ON TABLE #{tablename} WITH DISTRIBUTION AND DETAILED INDEXES ALL UTIL_IMPACT_PRIORITY #{priority}')"
     end
 
     def recreate_database(name, options = {})
-      tables.each {|table| drop_table("#{db2_schema}.#{table}")}
+      tables.each { |table| drop_table("#{db2_schema}.#{table}") }
     end
 
     def add_index(table_name, column_name, options = {})
-      if (!zos? || (table_name.to_s ==  ActiveRecord::Migrator.schema_migrations_table_name.to_s))
+      if ! zos? || ( table_name.to_s == ActiveRecord::Migrator.schema_migrations_table_name.to_s )
         column_name = column_name.to_s if column_name.is_a?(Symbol)
         super
       else
-        statement ="CREATE"
-        statement << " UNIQUE " if options[:unique]
-        statement << " INDEX "+"#{ActiveRecord::Base.table_name_prefix}#{options[:name]} "
-
+        statement = 'CREATE'
+        statement << ' UNIQUE ' if options[:unique]
+        statement << " INDEX #{ActiveRecord::Base.table_name_prefix}#{options[:name]} "
         statement << " ON #{table_name}(#{column_name})"
-
+        
         execute statement
       end
     end
 
-
     def remove_index(table_name, options = { })
       execute "DROP INDEX #{quote_column_name(index_name(table_name, options))}"
     end
@@ -392,12 +485,13 @@ module ArJdbc
         change_column_null(table_name, column_name, options[:null])
       end
     end
-
+    
     # http://publib.boulder.ibm.com/infocenter/db2luw/v9r7/topic/com.ibm.db2.luw.admin.dbobj.doc/doc/t0020132.html
-    def remove_column(table_name, column_name) #:nodoc:
-      sql = "ALTER TABLE #{table_name} DROP COLUMN #{column_name}"
-
-      as400? ? execute_and_auto_confirm(sql) : execute(sql)
+    def remove_column(table_name, *column_names) #:nodoc:
+      for column_name in column_names.flatten
+        sql = "ALTER TABLE #{table_name} DROP COLUMN #{column_name}"
+        as400? ? execute_and_auto_confirm(sql) : execute(sql)
+      end
       reorg_table(table_name)
     end
 
@@ -406,35 +500,34 @@ module ArJdbc
       execute "RENAME TABLE #{name} TO #{new_name}"
       reorg_table(new_name)
     end
-
+    
     def tables
       @connection.tables(nil, db2_schema, nil, ["TABLE"])
     end
 
-    # only record precision and scale for types that can set
-    # them via CREATE TABLE:
+    # only record precision and scale for types that can set them via CREATE TABLE:
     # http://publib.boulder.ibm.com/infocenter/db2luw/v9r7/topic/com.ibm.db2.luw.sql.ref.doc/doc/r0000927.html
     HAVE_LIMIT = %w(FLOAT DECFLOAT CHAR VARCHAR CLOB BLOB NCHAR NCLOB DBCLOB GRAPHIC VARGRAPHIC) #TIMESTAMP
     HAVE_PRECISION = %w(DECIMAL NUMERIC)
     HAVE_SCALE = %w(DECIMAL NUMERIC)
 
     def columns(table_name, name = nil)
-      cols = @connection.columns(table_name, name, db2_schema)
+      columns = @connection.columns(table_name.to_s, name, db2_schema)
 
       if zos?
         # Remove the mighty db2_generated_rowid_for_lobs from the list of columns
-        cols = cols.reject { |col| "db2_generated_rowid_for_lobs" == col.name }
+        columns = columns.reject { |col| "db2_generated_rowid_for_lobs" == col.name }
       end
       # scrub out sizing info when CREATE TABLE doesn't support it
       # but JDBC reports it (doh!)
-      for col in cols
-        base_sql_type = col.sql_type.sub(/\(.*/, "").upcase
-        col.limit = nil unless HAVE_LIMIT.include?(base_sql_type)
-        col.precision = nil unless HAVE_PRECISION.include?(base_sql_type)
-        #col.scale = nil unless HAVE_SCALE.include?(base_sql_type)
+      for column in columns
+        base_sql_type = column.sql_type.sub(/\(.*/, "").upcase
+        column.limit = nil unless HAVE_LIMIT.include?(base_sql_type)
+        column.precision = nil unless HAVE_PRECISION.include?(base_sql_type)
+        #column.scale = nil unless HAVE_SCALE.include?(base_sql_type)
       end
 
-      cols
+      columns
     end
 
     def jdbc_columns(table_name, name = nil)
@@ -462,9 +555,9 @@ module ArJdbc
     end
 
     def structure_dump #:nodoc:
-      definition=""
       schema_name = db2_schema.upcase if db2_schema.present?
-      rs = @connection.connection.meta_data.getTables(nil,schema_name,nil,["TABLE"].to_java(:string))
+      rs = @connection.connection.meta_data.getTables(nil, schema_name, nil, ["TABLE"].to_java(:string))
+      definition = ''
       while rs.next
         tname = rs.getString(3)
         definition << "CREATE TABLE #{tname} (\n"
@@ -527,34 +620,47 @@ module ArJdbc
       end
       definition
     end
-
+    
+    DRIVER_NAME = 'com.ibm.db2.jcc.DB2Driver'.freeze
+    
     def zos?
-      @config[:url] =~ /^jdbc:db2j:net:/ && @config[:driver] == "com.ibm.db2.jcc.DB2Driver"
+      return @zos unless @zos.nil?
+      @zos = 
+        if url = @config[:url]
+          !!( url =~ /^jdbc:db2j:net:/ && @config[:driver] == DRIVER_NAME )
+        else
+          nil
+        end
     end
-
-    private
+    
     def as400?
-      @config[:url] =~ /^jdbc:as400:/
+      return @as400 unless @as400.nil?
+      @as400 = 
+        if url = @config[:url]
+          !!( url =~ /^jdbc:as400:/ )
+        else
+          nil
+        end
     end
 
+    private
+    
     def db2_schema
-      if @config[:schema].blank?
-        if as400?
-          # AS400 implementation takes schema from library name (last part of url)
-          schema = @config[:url].split('/').last.strip
-          (schema[-1..-1] == ";") ? schema.chop : schema
-        elsif @config[:username].present?
-          # LUW implementation uses schema name of username by default
-          @config[:username]
+      return @db2_schema unless @db2_schema.nil?
+      @db2_schema = 
+        if @config[:schema].present?
+          @config[:schema]
         elsif @config[:jndi].present?
-          # let jndi worry about schema
-          nil
+          nil # let JNDI worry about schema
+        elsif as400?
+          # AS400 implementation takes schema from library name (last part of URL)
+          # jdbc:as400://localhost/schema;naming=system;libraries=lib1,lib2
+          @config[:url].split('/').last.split(';').first.strip
         else
-          ENV['USER']
+          # LUW implementation uses schema name of username by default
+          @config[:username].presence || ENV['USER']
         end
-      else
-        @config[:schema]
-      end
     end
+    
   end
 end