ibm_db 2.5.9-x86-mingw32 → 2.5.10-x86-mingw32

data/lib/active_record/connection_adapters/ibm_db_adapter.rb

@@ -44,10 +44,15 @@ module ActiveRecord
               # (except for a CLOB field where '' can be a value)
               if self[col.name].nil? || 
                  self[col.name] == {} || 
+                 self[col.name] == [] ||
                 (self[col.name] == '' && col.type != :text)
                 params << 'NULL'
               else
-                values << self[col.name]
+                if self.class.serialized_attributes[col.name]
+                  values << YAML.dump(self[col.name])
+                else
+                  values << self[col.name]
+                end
                 params << '?'
               end
               counter += 1
@@ -526,7 +531,8 @@ module ActiveRecord
                 end
               when /DB2/i               # DB2 for zOS
                 case server_info.DBMS_VER
-                  when /09/ || /10/             # DB2 for zOS version 9 and version 10
+                  when /09/             # DB2 for zOS version 9 and version 10
+                  when /10/
                     @servertype = IBM_DB2_ZOS.new(self)
                   when /08/             # DB2 for zOS version 8
                     @servertype = IBM_DB2_ZOS_8.new(self)
@@ -558,6 +564,17 @@ module ActiveRecord
         else
           @start_id = 1
         end
+
+        #Check Arel version
+        begin
+          @arelVersion = Arel::VERSION.to_i
+        rescue
+          @arelVersion = 0
+        end
+
+        if(@arelVersion >=  3 )
+          @visitor = Arel::Visitors::IBM_DB.new self
+        end
       end
 
       # Optional connection attribute: database name space qualifier
@@ -612,13 +629,14 @@ module ActiveRecord
         Arel::Visitors::IBM_DB.new(pool)
       end
       
-      def to_sql(arel)
+      def to_sql(arel, binds = [])
         if arel.respond_to?(:ast)
-          visitor.accept(arel.ast)
+          visitor.accept(arel.ast) do
+            quote(*binds.shift.reverse)
+          end
         else
           arel
         end
-
       end
 
       # This adapter supports migrations.
@@ -1881,7 +1899,7 @@ module ActiveRecord
       end
 
       def check_reserved_words(col_name)
-        col_name
+        col_name.to_s
       end
 
       # This is supported by the DB2 for Linux, UNIX, Windows data servers
@@ -2492,7 +2510,7 @@ SET WITH DEFAULT #{@adapter.quote(default)}"
           if RESERVED_WORDS[col_name]
             '"' + RESERVED_WORDS[col_name] + '"'
           else
-            col_name
+            col_name.to_s
           end
         end
       else
@@ -2816,6 +2834,25 @@ module Arel
     end
 
     class ToSql < Arel::Visitors::Visitor #opening and closing the class to ensure backward compatibility
+      # In case when using Rails-2.3.x there is no arel used due to which the constructor has to be defined explicitly
+      # to ensure the same code works on any version of Rails
+      
+      #Check Arel version
+      begin
+        @arelVersion = Arel::VERSION.to_i
+      rescue
+        @arelVersion = 0
+      end
+
+      if(@arelVersion >= 3)
+        def initialize connection
+          @connection     = connection
+          @schema_cache   = connection.schema_cache if(connection.respond_to?(:schema_cache))
+          @quoted_tables  = {}
+          @quoted_columns = {}
+          @last_column    = nil
+        end
+      end
     end
 
     class IBM_DB < Arel::Visitors::ToSql
@@ -2834,7 +2871,6 @@ module Arel
           (visit(o.with) if o.with),
           o.cores.map { |x| visit_Arel_Nodes_SelectCore x }.join,
           ("ORDER BY #{o.orders.map { |x| visit x }.join(', ')}" unless o.orders.empty?),
-          (visit(o.lock) if o.lock),
         ].compact.join ' '
 
         if o.limit
@@ -2849,6 +2885,7 @@ module Arel
           offset = nil
         end
         @connection.add_limit_offset!(sql, {:limit => limit, :offset => offset})
+        sql << " #{(visit(o.lock) if o.lock)}"
         return sql
       end
 

data/test/cases/adapter_test.rb

@@ -1,205 +1,207 @@
 require "cases/helper"
 
-class AdapterTest < ActiveRecord::TestCase
-  def setup
-    @connection = ActiveRecord::Base.connection
-  end
+module ActiveRecord
+  class AdapterTest < ActiveRecord::TestCase
+    def setup
+      @connection = ActiveRecord::Base.connection
+    end
 
-  if current_adapter?(:IBM_DBAdapter)
-    def test_a_connection_attributes
-      if @connection.servertype.class.name.include?('::IBM_IDS')
-        return
-      end
-      if @connection.respond_to?(:schema)
-        previous_schema = ActiveRecord::Base.connection.schema
-        ActiveRecord::Base.connection.schema = 'SYSCAT'
-        assert_equal 'SYSCAT', ActiveRecord::Base.connection.schema
-        ActiveRecord::Base.connection.schema = previous_schema
-      else
-        warn "#{@connection.class} does not support client connection attribute schema_name"
-      end
+    if current_adapter?(:IBM_DBAdapter)
+      def test_a_connection_attributes
+        if @connection.servertype.class.name.include?('::IBM_IDS')
+          return
+        end
+        if @connection.respond_to?(:schema)
+          previous_schema = ActiveRecord::Base.connection.schema
+          ActiveRecord::Base.connection.schema = 'SYSCAT'
+          assert_equal 'SYSCAT', ActiveRecord::Base.connection.schema
+          ActiveRecord::Base.connection.schema = previous_schema
+        else
+          warn "#{@connection.class} does not support client connection attribute schema_name"
+        end
 
-      if @connection.respond_to?(:app_user)
-        ActiveRecord::Base.connection.app_user = 'new_user'
-        assert_equal 'new_user', ActiveRecord::Base.connection.app_user
-      else
-        warn "#{@connection.class} does not support client connection attribute SQL_ATTR_INFO_USER"
-      end
+        if @connection.respond_to?(:app_user)
+          ActiveRecord::Base.connection.app_user = 'new_user'
+          assert_equal 'new_user', ActiveRecord::Base.connection.app_user
+        else
+          warn "#{@connection.class} does not support client connection attribute SQL_ATTR_INFO_USER"
+        end
 
-      if @connection.respond_to?(:account)
-        ActiveRecord::Base.connection.account = 'new_acct'
-        assert_equal 'new_acct', ActiveRecord::Base.connection.account
-      else
-        warn "#{@connection.class} does not support client connection attribute SQL_ATTR_INFO_ACCTSTR"
-      end
+        if @connection.respond_to?(:account)
+          ActiveRecord::Base.connection.account = 'new_acct'
+          assert_equal 'new_acct', ActiveRecord::Base.connection.account
+        else
+          warn "#{@connection.class} does not support client connection attribute SQL_ATTR_INFO_ACCTSTR"
+        end
 
-      if @connection.respond_to?(:application)
-        ActiveRecord::Base.connection.application = 'new_app'
-        assert_equal 'new_app', ActiveRecord::Base.connection.application
-      else
-        warn "#{@connection.class} does not support client connection attribute SQL_ATTR_INFO_APPLNAME"
-      end
+        if @connection.respond_to?(:application)
+          ActiveRecord::Base.connection.application = 'new_app'
+          assert_equal 'new_app', ActiveRecord::Base.connection.application
+        else
+          warn "#{@connection.class} does not support client connection attribute SQL_ATTR_INFO_APPLNAME"
+        end
 
-      if @connection.respond_to?(:workstation)
-        ActiveRecord::Base.connection.workstation = 'new_wrkst'
-        assert_equal 'new_wrkst', ActiveRecord::Base.connection.workstation
-      else
-        warn "#{@connection.class} does not support client connection attribute SQL_ATTR_INFO_WRKSTNNAME"
+        if @connection.respond_to?(:workstation)
+          ActiveRecord::Base.connection.workstation = 'new_wrkst'
+          assert_equal 'new_wrkst', ActiveRecord::Base.connection.workstation
+        else
+          warn "#{@connection.class} does not support client connection attribute SQL_ATTR_INFO_WRKSTNNAME"
+        end
       end
     end
-  end
-
-  def test_tables
-    tables = @connection.tables
-    assert tables.include?("accounts")
-    assert tables.include?("authors")
-    assert tables.include?("tasks")
-    assert tables.include?("topics")
-  end
-
-  def test_table_exists?
-    assert @connection.table_exists?("accounts")
-    assert !@connection.table_exists?("nonexistingtable")
-  end
+  
+    def test_tables
+      tables = @connection.tables
+      assert tables.include?("accounts")
+      assert tables.include?("authors")
+      assert tables.include?("tasks")
+      assert tables.include?("topics")
+    end
 
-  def test_indexes
-    idx_name = "accounts_idx"
-
-    if @connection.respond_to?(:indexes)
-      indexes = @connection.indexes("accounts")
-      assert indexes.empty?
-
-      @connection.add_index :accounts, :firm_id, :name => idx_name
-      indexes = @connection.indexes("accounts")
-      assert_equal "accounts", indexes.first.table
-      # OpenBase does not have the concept of a named index
-      # Indexes are merely properties of columns.
-      assert_equal idx_name, indexes.first.name unless current_adapter?(:OpenBaseAdapter)
-      assert !indexes.first.unique
-      assert_equal ["firm_id"], indexes.first.columns
-    else
-      warn "#{@connection.class} does not respond to #indexes"
+    def test_table_exists?
+      assert @connection.table_exists?("accounts")
+      assert !@connection.table_exists?("nonexistingtable")
+      assert !@connection.table_exists?(nil)
     end
 
-  ensure
-    @connection.remove_index(:accounts, :name => idx_name) rescue nil
-  end
+    def test_indexes
+      idx_name = "accounts_idx"
+
+      if @connection.respond_to?(:indexes)
+        indexes = @connection.indexes("accounts")
+        assert indexes.empty?
+
+        @connection.add_index :accounts, :firm_id, :name => idx_name
+        indexes = @connection.indexes("accounts")
+        assert_equal "accounts", indexes.first.table
+        # OpenBase does not have the concept of a named index
+        # Indexes are merely properties of columns.
+        assert_equal idx_name, indexes.first.name unless current_adapter?(:OpenBaseAdapter)
+        assert !indexes.first.unique
+        assert_equal ["firm_id"], indexes.first.columns
+      else
+        warn "#{@connection.class} does not respond to #indexes"
+      end
 
-  def test_current_database
-    if @connection.respond_to?(:current_database)
-      assert_equal ARTest.connection_config['arunit']['database'], @connection.current_database
+    ensure
+      @connection.remove_index(:accounts, :name => idx_name) rescue nil
     end
-  end
 
-  if current_adapter?(:MysqlAdapter)
-    def test_charset
-      assert_not_nil @connection.charset
-      assert_not_equal 'character_set_database', @connection.charset
-      assert_equal @connection.show_variable('character_set_database'), @connection.charset
+    def test_current_database
+      if @connection.respond_to?(:current_database)
+        assert_equal ARTest.connection_config['arunit']['database'], @connection.current_database
+      end
     end
 
-    def test_collation
-      assert_not_nil @connection.collation
-      assert_not_equal 'collation_database', @connection.collation
-      assert_equal @connection.show_variable('collation_database'), @connection.collation
-    end
+    if current_adapter?(:MysqlAdapter)
+      def test_charset
+        assert_not_nil @connection.charset
+        assert_not_equal 'character_set_database', @connection.charset
+        assert_equal @connection.show_variable('character_set_database'), @connection.charset
+      end
 
-    def test_show_nonexistent_variable_returns_nil
-      assert_nil @connection.show_variable('foo_bar_baz')
-    end
+      def test_collation
+        assert_not_nil @connection.collation
+        assert_not_equal 'collation_database', @connection.collation
+        assert_equal @connection.show_variable('collation_database'), @connection.collation
+      end
 
-    def test_not_specifying_database_name_for_cross_database_selects
-      begin
-        assert_nothing_raised do
-          ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['arunit'].except(:database))
+      def test_show_nonexistent_variable_returns_nil
+        assert_nil @connection.show_variable('foo_bar_baz')
+      end
 
-          config = ARTest.connection_config
-          ActiveRecord::Base.connection.execute(
-            "SELECT #{config['arunit']['database']}.pirates.*, #{config['arunit2']['database']}.courses.* " \
-            "FROM #{config['arunit']['database']}.pirates, #{config['arunit2']['database']}.courses"
-          )
+      def test_not_specifying_database_name_for_cross_database_selects
+        begin
+          assert_nothing_raised do
+            ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['arunit'].except(:database))
+
+            config = ARTest.connection_config
+            ActiveRecord::Base.connection.execute(
+              "SELECT #{config['arunit']['database']}.pirates.*, #{config['arunit2']['database']}.courses.* " \
+              "FROM #{config['arunit']['database']}.pirates, #{config['arunit2']['database']}.courses"
+            )
+          end
+        ensure
+          ActiveRecord::Base.establish_connection 'arunit'
         end
-      ensure
-        ActiveRecord::Base.establish_connection 'arunit'
       end
     end
-  end
-
-  if current_adapter?(:PostgreSQLAdapter)
-    def test_encoding
-      assert_not_nil @connection.encoding
-    end
-  end
 
-  def test_table_alias
-    def @connection.test_table_alias_length() 10; end
-    class << @connection
-      alias_method :old_table_alias_length, :table_alias_length
-      alias_method :table_alias_length,     :test_table_alias_length
-    end
+    def test_table_alias
+      def @connection.test_table_alias_length() 10; end
+      class << @connection
+        alias_method :old_table_alias_length, :table_alias_length
+        alias_method :table_alias_length,     :test_table_alias_length
+      end
 
-    assert_equal 'posts',      @connection.table_alias_for('posts')
-    assert_equal 'posts_comm', @connection.table_alias_for('posts_comments')
-    assert_equal 'dbo_posts',  @connection.table_alias_for('dbo.posts')
+      assert_equal 'posts',      @connection.table_alias_for('posts')
+      assert_equal 'posts_comm', @connection.table_alias_for('posts_comments')
+      assert_equal 'dbo_posts',  @connection.table_alias_for('dbo.posts')
 
-    class << @connection
-      remove_method :table_alias_length
-      alias_method :table_alias_length, :old_table_alias_length
+      class << @connection
+        remove_method :table_alias_length
+        alias_method :table_alias_length, :old_table_alias_length
+      end
     end
-  end
 
-  # test resetting sequences in odd tables in postgreSQL
-  if ActiveRecord::Base.connection.respond_to?(:reset_pk_sequence!)
-    require 'models/movie'
-    require 'models/subscriber'
+    # test resetting sequences in odd tables in postgreSQL
+    if ActiveRecord::Base.connection.respond_to?(:reset_pk_sequence!)
+      require 'models/movie'
+      require 'models/subscriber'
 
-    def test_reset_empty_table_with_custom_pk
-      Movie.delete_all
-      Movie.connection.reset_pk_sequence! 'movies'
-      assert_equal 1, Movie.create(:name => 'fight club').id
-    end
+      def test_reset_empty_table_with_custom_pk
+        Movie.delete_all
+        Movie.connection.reset_pk_sequence! 'movies'
+        assert_equal 1, Movie.create(:name => 'fight club').id
+      end
 
-    if ActiveRecord::Base.connection.adapter_name != "FrontBase"
-      def test_reset_table_with_non_integer_pk
-        Subscriber.delete_all
-        Subscriber.connection.reset_pk_sequence! 'subscribers'
-        sub = Subscriber.new(:name => 'robert drake')
-        sub.id = 'bob drake'
-        assert_nothing_raised { sub.save! }
+      if ActiveRecord::Base.connection.adapter_name != "FrontBase"
+        def test_reset_table_with_non_integer_pk
+          Subscriber.delete_all
+          Subscriber.connection.reset_pk_sequence! 'subscribers'
+          sub = Subscriber.new(:name => 'robert drake')
+          sub.id = 'bob drake'
+          assert_nothing_raised { sub.save! }
+        end
       end
     end
-  end
 
-  def test_uniqueness_violations_are_translated_to_specific_exception
-    unless @connection.adapter_name == 'IBM_DB'
+    def test_uniqueness_violations_are_translated_to_specific_exception
       @connection.execute "INSERT INTO subscribers(nick) VALUES('me')"
       assert_raises(ActiveRecord::RecordNotUnique) do
         @connection.execute "INSERT INTO subscribers(nick) VALUES('me')"
       end
     end
-  end
 
-  def test_foreign_key_violations_are_translated_to_specific_exception
-    unless @connection.adapter_name == 'SQLite' || @connection.adapter_name == 'IBM_DB'
-      assert_raises(ActiveRecord::InvalidForeignKey) do
-        # Oracle adapter uses prefetched primary key values from sequence and passes them to connection adapter insert method
-        if @connection.prefetch_primary_key?
-          id_value = @connection.next_sequence_value(@connection.default_sequence_name("fk_test_has_fk", "id"))
-          @connection.execute "INSERT INTO fk_test_has_fk (id, fk_id) VALUES (#{id_value},0)"
-        else
-          @connection.execute "INSERT INTO fk_test_has_fk (fk_id) VALUES (0)"
+    def test_foreign_key_violations_are_translated_to_specific_exception
+      unless @connection.adapter_name == 'SQLite'
+        assert_raises(ActiveRecord::InvalidForeignKey) do
+          # Oracle adapter uses prefetched primary key values from sequence and passes them to connection adapter insert method
+          if @connection.prefetch_primary_key?
+            id_value = @connection.next_sequence_value(@connection.default_sequence_name("fk_test_has_fk", "id"))
+            @connection.execute "INSERT INTO fk_test_has_fk (id, fk_id) VALUES (#{id_value},0)"
+          else
+            @connection.execute "INSERT INTO fk_test_has_fk (fk_id) VALUES (0)"
+          end
         end
       end
     end
-  end
 
-  def test_deprecated_visitor_for
-    visitor_klass = Class.new(Arel::Visitors::ToSql)
-    Arel::Visitors::VISITORS['fuuu'] = visitor_klass
-    pool = stub(:spec => stub(:config => { :adapter => 'fuuu' }))
-    visitor = assert_deprecated {
-      ActiveRecord::ConnectionAdapters::AbstractAdapter.visitor_for(pool)
-    }
-    assert visitor.is_a?(visitor_klass)
+    def test_disable_referential_integrity
+      assert_nothing_raised do
+        @connection.disable_referential_integrity do
+          # Oracle adapter uses prefetched primary key values from sequence and passes them to connection adapter insert method
+          if @connection.prefetch_primary_key?
+            id_value = @connection.next_sequence_value(@connection.default_sequence_name("fk_test_has_fk", "id"))
+            @connection.execute "INSERT INTO fk_test_has_fk (id, fk_id) VALUES (#{id_value},0)"
+          else
+            @connection.execute "INSERT INTO fk_test_has_fk (fk_id) VALUES (0)"
+          end
+          # should deleted created record as otherwise disable_referential_integrity will try to enable contraints after executed block
+          # and will fail (at least on Oracle)
+          @connection.execute "DELETE FROM fk_test_has_fk"
+        end
+      end
+    end
   end
 end