ibm_db 1.1.0 → 1.1.1

data/CHANGES

@@ -1,5 +1,11 @@
 Change Log
 ==============
+2009/07/28 (IBM_DB adapter 1.1.1, driver 1.1.0) :
+  - Fixed bug [26705] --> Fixed the problem of primary key value starting with 100
+  - Support for Activerecord-2.3.3
+    - Added method primary_key, which returns the primary key column name of the specified table
+    - Test suite updated
+
 2009/06/17 (IBM_DB adapter 1.1.0, driver 1.1.0) :
   - Support for Activerecord's Query Cache Mechanism
   - rename_column support for DB2 on LUW version 9.7, DB2 on zOS 9 and enhanced rename_column support for Informix Dynamic Server

data/lib/active_record/connection_adapters/ibm_db_adapter.rb

@@ -466,6 +466,13 @@ module ActiveRecord
 
         # Executes the +set schema+ statement using the schema identifier provided
         @servertype.set_schema(@schema) if @schema && @schema != @username
+
+        # Check for the start value for id (primary key column). By default it is 1
+        if config.has_key?(:start_id)
+          @start_id = config[:start_id]
+        else
+          @start_id = 1
+        end
       end
 
       # Optional connection attribute: database name space qualifier
@@ -973,7 +980,7 @@ module ActiveRecord
       # database types
       def native_database_types
         {
-          :primary_key => { :name => @servertype.primary_key},
+          :primary_key => { :name => @servertype.primary_key_definition(@start_id)},
           :string      => { :name => "varchar", :limit => 255 },
           :text        => { :name => "clob" },
           :integer     => { :name => "integer" },
@@ -1064,6 +1071,31 @@ module ActiveRecord
         return tables
       end
 
+      # Returns the primary key of the mentioned table
+      def primary_key(table_name)
+        pk_name = nil
+        if stmt = IBM_DB.primary_keys( @connection, nil, 
+                                       @servertype.set_case(@schema), 
+                                       @servertype.set_case(table_name))
+          begin
+            if ( pk_index_row = IBM_DB.fetch_array(stmt) )
+              pk_name = pk_index_row[3].downcase
+            end
+          rescue StandardError  # Handle driver fetch errors
+            error_msg = IBM_DB.conn_errormsg 
+            error_msg = IBM_DB.stmt_errormsg if error_msg.empty?
+            if error_msg && !error_msg.empty?
+              raise "Failed to retrieve primarykey metadata during fetch: #{error_msg}"
+            else
+              raise "An unexpected error occurred during retrieval of primary metadata"
+            end
+          ensure  # Free resources associated with the statement
+            IBM_DB.free_result(stmt) if stmt
+          end
+        end
+        return pk_name
+      end
+
       # Returns an array of non-primary key indexes for a specified table name
       def indexes(table_name, name = nil)
                 # to_s required because +table_name+ may be a symbol.
@@ -1176,8 +1208,8 @@ module ActiveRecord
         i = 0
         indexes.each do |index|
           if pk_index && index.columns == pk_index.columns
-        	 indexes.delete_at(i)
-	        end
+            indexes.delete_at(i)
+          end
           i = i+1
         end 
         # Returns the indexes array
@@ -1503,8 +1535,8 @@ To remove the column, the table must be dropped and recreated without the #{colu
         raise NotImplementedError, "rename_column is not implemented yet in the IBM_DB Adapter"
       end
 
-      def primary_key
-        return "INTEGER GENERATED BY DEFAULT AS IDENTITY (START WITH 100) PRIMARY KEY"
+      def primary_key_definition(start_id)
+        return "INTEGER GENERATED BY DEFAULT AS IDENTITY (START WITH #{start_id}) PRIMARY KEY"
       end
 
       # Returns the last automatically generated ID.
@@ -2040,8 +2072,8 @@ SET WITH DEFAULT #{@adapter.quote(default)}"
         end #End of begin
       end # End of rename_column
 
-      def primary_key
-        return "SERIAL(100) PRIMARY KEY"
+      def primary_key_definition(start_id)
+        return "SERIAL(#{start_id}) PRIMARY KEY"
       end
 
       def change_column(table_name, column_name, type, options)

data/test/cases/associations/eager_test.rb

@@ -223,6 +223,18 @@ class EagerAssociationTest < ActiveRecord::TestCase
     end
   end
 
+  def test_eager_association_loading_with_belongs_to_and_conditions_hash
+    comments = []
+    assert_nothing_raised do
+      comments = Comment.find(:all, :include => :post, :conditions => {:posts => {:id => 4}}, :limit => 3, :order => 'comments.id')
+    end
+    assert_equal 3, comments.length
+    assert_equal [5,6,7], comments.collect { |c| c.id }
+    assert_no_queries do
+      comments.first.post
+    end
+  end
+
   def test_eager_association_loading_with_belongs_to_and_conditions_string_with_quoted_table_name
     quoted_posts_id= Comment.connection.quote_table_name('posts') + '.' + Comment.connection.quote_column_name('id')
     assert_nothing_raised do

data/test/cases/base_test.rb

@@ -1763,7 +1763,7 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_scoped_find_with_group_and_having
-    developers = Developer.with_scope(:find => { :group => 'salary', :having => "SUM(salary) > 10000", :select => "SUM(salary) as salary" }) do
+    developers = Developer.with_scope(:find => { :group => 'developers.salary', :having => "SUM(salary) > 10000", :select => "SUM(salary) as salary" }) do
       Developer.find(:all)
     end
     assert_equal 3, developers.size
@@ -2021,7 +2021,7 @@ class BasicsTest < ActiveRecord::TestCase
   
   def test_inspect_instance
     topic = topics(:first)
-    assert_equal %(#<Topic id: 1, title: "The First Topic", author_name: "David", author_email_address: "david@loudthinking.com", written_on: "#{topic.written_on.to_s(:db)}", bonus_time: "#{topic.bonus_time.to_s(:db)}", last_read: "#{topic.last_read.to_s(:db)}", content: "Have a nice day", approved: false, replies_count: 1, parent_id: nil, type: nil>), topic.inspect
+    assert_equal %(#<Topic id: 1, title: "The First Topic", author_name: "David", author_email_address: "david@loudthinking.com", written_on: "#{topic.written_on.to_s(:db)}", bonus_time: "#{topic.bonus_time.to_s(:db)}", last_read: "#{topic.last_read.to_s(:db)}", content: "Have a nice day", approved: false, replies_count: 1, parent_id: nil, parent_title: nil, type: nil>), topic.inspect
   end
   
   def test_inspect_new_instance

data/test/cases/calculations_test.rb

@@ -2,6 +2,9 @@ require "cases/helper"
 require 'models/company'
 require 'models/topic'
 require 'models/edge'
+require 'models/owner'
+require 'models/pet'
+require 'models/toy'
 
 Company.has_many :accounts
 
@@ -10,7 +13,7 @@ class NumericData < ActiveRecord::Base
 end
 
 class CalculationsTest < ActiveRecord::TestCase
-  fixtures :companies, :accounts, :topics
+  fixtures :companies, :accounts, :topics, :owners, :pets, :toys
 
   def test_should_sum_field
     assert_equal 318, Account.sum(:credit_limit)
@@ -264,19 +267,6 @@ class CalculationsTest < ActiveRecord::TestCase
     assert_equal 4, Account.count(:distinct => true, :include => :firm, :select => :credit_limit)
   end
 
-  def test_should_count_scoped_select
-    Account.update_all("credit_limit = NULL")
-    assert_equal 0, Account.scoped(:select => "credit_limit").count
-  end
-
-  def test_should_count_scoped_select_with_options
-    Account.update_all("credit_limit = NULL")
-    Account.last.update_attribute('credit_limit', 49)
-    Account.first.update_attribute('credit_limit', 51)
-
-    assert_equal 1, Account.scoped(:select => "credit_limit").count(:conditions => ['credit_limit >= 50'])
-  end
-
   def test_should_count_manual_select_with_include
     assert_equal 6, Account.count(:select => "DISTINCT accounts.id", :include => :firm)
   end
@@ -297,6 +287,10 @@ class CalculationsTest < ActiveRecord::TestCase
     assert_raise(ArgumentError) { Account.count(1, 2, 3) }
   end
 
+  def test_count_with_scoped_has_many_through_association
+    assert_equal 1, owners(:blackbeard).toys.with_name('Bone').count
+  end
+
   def test_should_sum_expression
     if current_adapter?(:IBM_DBAdapter) && !ActiveRecord::Base.connection.servertype.class.name.include?('::IBM_IDS')
      assert_equal 636, Account.sum("2 * credit_limit")

data/test/cases/finder_test.rb

@@ -118,7 +118,13 @@ class FinderTest < ActiveRecord::TestCase
     assert !Customer.exists?(:address =>
       Address.new(existing_address.street + "1", existing_address.city, existing_address.country))
   end
-  
+
+  def test_exists_with_scoped_include
+    Developer.with_scope(:find => { :include => :projects, :order => "projects.name" }) do
+      assert Developer.exists?
+    end
+  end
+
   def test_find_by_array_of_one_id
     assert_kind_of(Array, Topic.find([ 1 ]))
     assert_equal(1, Topic.find([ 1 ]).length)

data/test/cases/fixtures_test.rb

@@ -522,6 +522,11 @@ class FoxyFixturesTest < ActiveRecord::TestCase
     assert_equal(Fixtures.identify(:foo), Fixtures.identify(:foo))
   end
 
+  def test_identifies_consistently
+    assert_equal 1281023246, Fixtures.identify(:ruby)
+    assert_equal 2140105598, Fixtures.identify(:sapphire_2)
+  end
+
   TIMESTAMP_COLUMNS = %w(created_at created_on updated_at updated_on)
 
   def test_populates_timestamp_columns

data/test/cases/migration_test.rb

@@ -1,5 +1,6 @@
 require "cases/helper"
 require 'bigdecimal/util'
+require 'mocha'
 
 require 'models/person'
 require 'models/topic'

data/test/cases/schema_dumper_test.rb

@@ -22,6 +22,13 @@ class SchemaDumperTest < ActiveRecord::TestCase
     assert_no_match %r{create_table "sqlite_sequence"}, output
   end
 
+  unless current_adapter?(:IBM_DBAdapter) #DB2 is case insensitive 
+    def test_schema_dump_includes_camelcase_table_name
+      output = standard_dump
+      assert_match %r{create_table "CamelCase"}, output
+    end
+  end
+
   def assert_line_up(lines, pattern, required = false)
     return assert(true) if lines.empty?
     matches = lines.map { |line| line.match(pattern) }
@@ -149,19 +156,24 @@ class SchemaDumperTest < ActiveRecord::TestCase
     end
   end
 
+  def test_schema_dumps_index_columns_in_right_order
+    index_definition = standard_dump.split(/\n/).grep(/add_index.*companies/).first.strip
+    assert_equal 'add_index "companies", ["firm_id", "type", "rating", "ruby_type"], :name => "company_index"', index_definition
+  end
+  
+  def test_schema_dump_should_honor_nonstandard_primary_keys
+    output = standard_dump
+    match = output.match(%r{create_table "movies"(.*)do})
+    assert_not_nil(match, "nonstandardpk table not found")
+    assert_match %r(:primary_key => "movieid"), match[1], "non-standard primary key not preserved"
+  end
+
   if current_adapter?(:MysqlAdapter)
     def test_schema_dump_should_not_add_default_value_for_mysql_text_field
       output = standard_dump
       assert_match %r{t.text\s+"body",\s+:null => false$}, output
     end
 
-    def test_mysql_schema_dump_should_honor_nonstandard_primary_keys
-      output = standard_dump
-      match = output.match(%r{create_table "movies"(.*)do})
-      assert_not_nil(match, "nonstandardpk table not found")
-      assert_match %r(:primary_key => "movieid"), match[1], "non-standard primary key not preserved"
-    end
-
     def test_schema_dump_includes_length_for_mysql_blob_and_text_fields
       output = standard_dump
       assert_match %r{t.binary\s+"tiny_blob",\s+:limit => 255$}, output

data/test/cases/validations_test.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 require "cases/helper"
+require 'mocha'
+
 require 'models/topic'
 require 'models/reply'
 require 'models/person'

data/test/connections/native_ibm_db/connection.rb

@@ -17,6 +17,7 @@ ActiveRecord::Base.configurations = {
     :app_user    => 'tester_11',
     :application => 'rails_tests',
     :workstation => 'auckland',
+    :start_id    => 100,
     :database    => 'ARUNIT'
   },
   'arunit2' => {
@@ -30,6 +31,7 @@ ActiveRecord::Base.configurations = {
     :app_user    => 'tester_11',
     :application => 'rails_tests',
     :workstation => 'auckland',
+    :start_id    => 100,
     :database    => 'ARUNIT2'
   }
 }

data/test/schema/i5/ibm_db_specific_schema.rb

@@ -125,6 +125,7 @@ execute <<_SQL
     approved SMALLINT DEFAULT 1,
     replies_count INT DEFAULT 0,
     parent_id INT DEFAULT NULL,
+    parent_title VARCHAR(255) DEFAULT NULL,
     type VARCHAR(255) DEFAULT NULL,
     PRIMARY KEY (id)
   );

data/test/schema/ids/ibm_db_specific_schema.rb

@@ -111,6 +111,7 @@ execute <<_SQL
     approved SMALLINT DEFAULT 1,
     replies_count INT DEFAULT 0,
     parent_id INT DEFAULT NULL,
+    parent_title VARCHAR(255) DEFAULT NULL,
     type VARCHAR(50) DEFAULT NULL,
     PRIMARY KEY (id)
   );

data/test/schema/luw/ibm_db_specific_schema.rb

@@ -125,6 +125,7 @@ execute <<_SQL
     approved SMALLINT DEFAULT 1,
     replies_count INT DEFAULT 0,
     parent_id INT DEFAULT NULL,
+    parent_title VARCHAR(255) DEFAULT NULL,
     type VARCHAR(255) DEFAULT NULL,
     PRIMARY KEY (id)
   );

data/test/schema/schema.rb

@@ -68,6 +68,10 @@ ActiveRecord::Schema.define do
     t.boolean :value
   end
 
+  create_table :camelcase, :force => true do |t|
+    t.string :name
+  end
+
   create_table :categories, :force => true do |t|
     t.string :name, :null => false
     t.string :type
@@ -116,6 +120,8 @@ ActiveRecord::Schema.define do
     t.integer :rating, :default => 1
   end
 
+  add_index :companies, [:firm_id, :type, :rating, :ruby_type], :name => "company_index"
+
   create_table :computers, :force => true do |t|
     t.integer :developer, :null => false
     t.integer :extendedWarranty, :null => false
@@ -157,6 +163,12 @@ ActiveRecord::Schema.define do
     t.integer :course_id, :null => false
   end
 
+  create_table :essays, :force => true do |t|
+    t.string :name
+    t.string :writer_id
+    t.string :writer_type
+  end
+
   create_table :events, :force => true do |t|
     t.string :title, :limit => 5
   end
@@ -285,6 +297,8 @@ ActiveRecord::Schema.define do
 
   create_table :owners, :primary_key => :owner_id ,:force => true do |t|
     t.string :name
+    t.column :updated_at, :datetime
+    t.column :happy_at,   :datetime
   end
 
   except 'IBM_DB' do
@@ -418,6 +432,7 @@ ActiveRecord::Schema.define do
      t.boolean  :approved, :default => true
      t.integer  :replies_count, :default => 0
      t.integer  :parent_id
+     t.string   :parent_title
      t.string   :type
     end
   end  

data/test/schema/zOS/ibm_db_specific_schema.rb

@@ -175,6 +175,7 @@ execute <<_SQL
     approved SMALLINT DEFAULT 1,
     replies_count INT DEFAULT 0,
     parent_id INT DEFAULT NULL,
+    parent_title VARCHAR(255) DEFAULT NULL,
     type VARCHAR(50) DEFAULT NULL,
     PRIMARY KEY (id)
   );

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ibm_db
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - IBM
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-16 00:00:00 +05:30
+date: 2009-07-30 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - ActiveRecord, at least 1.15.1
 rubyforge_project: rubyibm
-rubygems_version: 1.3.3
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: "Rails Driver and Adapter for IBM Data Servers: {DB2 on Linux/Unix/Windows, DB2 on zOS, DB2 on i5/OS, Informix (IDS)}"