composite_primary_keys 1.0.3 → 1.0.4

data/History.txt

@@ -1,3 +1,7 @@
+== 1.0.4 2008-07-15
+
+* support for oracle_enhanced adapter [thx Raimonds Simanovskis] 
+
 == 1.0.3 2008-07-13
 
 * more fixes and tests for has many through [thx Menno van der Sman]

data/tasks/databases.rake

@@ -1,7 +1,7 @@
 require 'active_record'
 
 # UNTESTED - firebird sqlserver sqlserver_odbc db2 sybase openbase
-for adapter in %w( mysql sqlite oracle postgresql ibm_db ) 
+for adapter in %w( mysql sqlite oracle oracle_enhanced postgresql ibm_db ) 
   Rake::TestTask.new("test_#{adapter}") { |t|
     t.libs << "test" << "test/connections/native_#{adapter}"
     t.pattern = "test/test_*.rb"

data/test/fixtures/db_definitions/oracle.drop.sql

@@ -27,4 +27,10 @@ drop sequence comments_seq;
 drop table hacks;
 drop table kitchen_sinks;
 drop table restaurants;
-drop table restaurants_suburbs;
+drop table restaurants_suburbs;
+drop table dorms;
+drop sequence dorms_seq;
+drop table rooms;
+drop table room_attributes;
+drop sequence room_attributes_seq;
+drop table room_attribute_assignments;

data/test/fixtures/db_definitions/oracle.sql

@@ -157,4 +157,33 @@ create table restaurants_suburbs (
 	store_id number(11) not null,
 	city_id number(11) not null,
 	suburb_id number(11) not null
+);
+
+create table dorms (
+	id number(11) not null,
+	constraint dorms_pk primary key (id)
+);
+
+create sequence dorms_seq
+  start with 1000;
+
+create table rooms (
+	dorm_id number(11) not null,
+	room_id number(11) not null,
+	constraint rooms_pk primary key (dorm_id, room_id)
+);
+
+create table room_attributes (
+	id number(11) not null,
+	name varchar(50),
+	constraint room_attributes_pk primary key (id)
+);
+
+create sequence room_attributes_seq
+  start with 1000;
+
+create table room_attribute_assignments (
+	dorm_id number(11) not null,
+	room_id number(11) not null,
+	room_attribute_id number(11) not null
 );

data/test/test_associations.rb

@@ -11,10 +11,11 @@ require 'fixtures/room_attribute'
 require 'fixtures/room_attribute_assignment'
 require 'fixtures/student'
 require 'fixtures/room_assignment'
+require 'fixtures/user'
 
 class TestAssociations < Test::Unit::TestCase
   fixtures :products, :tariffs, :product_tariffs, :suburbs, :streets, :restaurants, :restaurants_suburbs,
-           :dorms, :rooms, :room_attributes, :room_attribute_assignments, :students, :room_assignments
+           :dorms, :rooms, :room_attributes, :room_attribute_assignments, :students, :room_assignments, :users
   
   def test_quoted_table_columns
     assert_equal "product_tariffs.product_id,product_tariffs.tariff_id,product_tariffs.tariff_start_date", 
@@ -31,7 +32,7 @@ class TestAssociations < Test::Unit::TestCase
     assert_equal 0, room.room_attributes.find(:all, :conditions => ["room_attributes.name != ?", "keg"]).size
   end
 
-  def test_has_many_through_on_custom_finder_when_through_association_is_not_composite
+  def test_has_many_through_on_custom_finder_when_through_association_is_composite_finder_when_through_association_is_not_composite
     user = User.find(:first)
     assert_equal 1, user.find_custom_articles.size
   end

data/test/test_attributes.rb

@@ -1,84 +1,84 @@
-require 'abstract_unit'
-require 'fixtures/reference_type'
-require 'fixtures/reference_code'
-require 'fixtures/product'
-require 'fixtures/tariff'
-require 'fixtures/product_tariff'
-
-class TestAttributes < Test::Unit::TestCase
-  fixtures :reference_types, :reference_codes, :products, :tariffs, :product_tariffs
-  
-  CLASSES = {
-    :single => {
-      :class => ReferenceType,
-      :primary_keys => :reference_type_id,
-    },
-    :dual   => { 
-      :class => ReferenceCode,
-      :primary_keys => [:reference_type_id, :reference_code],
-    },
-  }
-  
-  def setup
-    self.class.classes = CLASSES
-  end
-  
-  def test_brackets
-    testing_with do
-      @first.attributes.each_pair do |attr_name, value|
-        assert_equal value, @first[attr_name]
-      end
-    end
-  end
-    
-  def test_brackets_primary_key
-    testing_with do
-      assert_equal @first.id, @first[@primary_keys], "[] failing for #{@klass}"
-      assert_equal @first.id, @first[@first.class.primary_key]
-    end
-  end
-
-  def test_brackets_assignment
-    testing_with do
-      @first.attributes.each_pair do |attr_name, value|
-        @first[attr_name]= !value.nil? ? value * 2 : '1'
-        assert_equal !value.nil? ? value * 2 : '1', @first[attr_name]
-      end
-    end
-  end
-    
-  def test_brackets_foreign_key_assignment
-    @flat = Tariff.find(1, Date.today.to_s(:db))
-    @second_free = ProductTariff.find(2,2,Date.today.to_s(:db))
-    @second_free_fk = [:tariff_id, :tariff_start_date]
-    @second_free[key = @second_free_fk] = @flat.id
-      compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
-      assert_equal @flat.id, @second_free[key]
-    @second_free[key = @second_free_fk.to_composite_ids] = @flat.id
-      assert_equal @flat.id, @second_free[key]
-      compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
-    @second_free[key = @second_free_fk.to_composite_ids] = @flat.id.to_s
-      assert_equal @flat.id, @second_free[key]
-      compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
-    @second_free[key = @second_free_fk.to_composite_ids] = @flat.id.to_s
-      assert_equal @flat.id, @second_free[key]
-      compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
-    @second_free[key = @second_free_fk.to_composite_ids.to_s] = @flat.id
-      assert_equal @flat.id, @second_free[key]
-      compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
-    @second_free[key = @second_free_fk.to_composite_ids.to_s] = @flat.id.to_s
-      assert_equal @flat.id, @second_free[key]
-      compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
-  end
-private
-  def compare_indexes(obj_name1, indexes1, obj_name2, indexes2)
-    obj1, obj2 = eval "[#{obj_name1}, #{obj_name2}]"
-    indexes1.length.times do |key_index|
-      assert_equal obj1[indexes1[key_index].to_s], 
-                   obj2[indexes2[key_index].to_s],
-                   "#{obj_name1}[#{indexes1[key_index]}]=#{obj1[indexes1[key_index].to_s].inspect} != " +
-                   "#{obj_name2}[#{indexes2[key_index]}]=#{obj2[indexes2[key_index].to_s].inspect}; " +
-                   "#{obj_name2} = #{obj2.inspect}"
-    end
-  end
+require 'abstract_unit'
+require 'fixtures/reference_type'
+require 'fixtures/reference_code'
+require 'fixtures/product'
+require 'fixtures/tariff'
+require 'fixtures/product_tariff'
+
+class TestAttributes < Test::Unit::TestCase
+  fixtures :reference_types, :reference_codes, :products, :tariffs, :product_tariffs
+  
+  CLASSES = {
+    :single => {
+      :class => ReferenceType,
+      :primary_keys => :reference_type_id,
+    },
+    :dual   => { 
+      :class => ReferenceCode,
+      :primary_keys => [:reference_type_id, :reference_code],
+    },
+  }
+  
+  def setup
+    self.class.classes = CLASSES
+  end
+  
+  def test_brackets
+    testing_with do
+      @first.attributes.each_pair do |attr_name, value|
+        assert_equal value, @first[attr_name]
+      end
+    end
+  end
+    
+  def test_brackets_primary_key
+    testing_with do
+      assert_equal @first.id, @first[@primary_keys], "[] failing for #{@klass}"
+      assert_equal @first.id, @first[@first.class.primary_key]
+    end
+  end
+
+  def test_brackets_assignment
+    testing_with do
+      @first.attributes.each_pair do |attr_name, value|
+        @first[attr_name]= !value.nil? ? value * 2 : '1'
+        assert_equal !value.nil? ? value * 2 : '1', @first[attr_name]
+      end
+    end
+  end
+    
+  def test_brackets_foreign_key_assignment
+    @flat = Tariff.find(1, Date.today.to_s(:db))
+    @second_free = ProductTariff.find(2,2,Date.today.to_s(:db))
+    @second_free_fk = [:tariff_id, :tariff_start_date]
+    @second_free[key = @second_free_fk] = @flat.id
+      compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
+      assert_equal @flat.id, @second_free[key]
+    @second_free[key = @second_free_fk.to_composite_ids] = @flat.id
+      assert_equal @flat.id, @second_free[key]
+      compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
+    @second_free[key = @second_free_fk.to_composite_ids] = @flat.id.to_s
+      assert_equal @flat.id, @second_free[key]
+      compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
+    @second_free[key = @second_free_fk.to_composite_ids] = @flat.id.to_s
+      assert_equal @flat.id, @second_free[key]
+      compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
+    @second_free[key = @second_free_fk.to_composite_ids.to_s] = @flat.id
+      assert_equal @flat.id, @second_free[key]
+      compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
+    @second_free[key = @second_free_fk.to_composite_ids.to_s] = @flat.id.to_s
+      assert_equal @flat.id, @second_free[key]
+      compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
+  end
+private
+  def compare_indexes(obj_name1, indexes1, obj_name2, indexes2)
+    obj1, obj2 = eval "[#{obj_name1}, #{obj_name2}]"
+    indexes1.length.times do |key_index|
+      assert_equal obj1[indexes1[key_index].to_s], 
+                   obj2[indexes2[key_index].to_s],
+                   "#{obj_name1}[#{indexes1[key_index]}]=#{obj1[indexes1[key_index].to_s].inspect} != " +
+                   "#{obj_name2}[#{indexes2[key_index]}]=#{obj2[indexes2[key_index].to_s].inspect}; " +
+                   "#{obj_name2} = #{obj2.inspect}"
+    end
+  end
 end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>Composite Primary Keys</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/compositekeys"; return false'>
       Get Version
-      <a href="http://rubyforge.org/projects/compositekeys" class="numbers">1.0.2</a>
+      <a href="http://rubyforge.org/projects/compositekeys" class="numbers">1.0.3</a>
     </div>
     <h1>&#x2192; Ruby on Rails</h1>
 
@@ -296,7 +296,7 @@ other stories and things.</p>
 
 	<p>Comments are welcome. Send an email to <a href="mailto:drnicwilliams@gmail.com">Dr Nic Williams</a>.</p>
     <p class="coda">
-      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 6th June 2008<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 15th July 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/version-raw.js

@@ -1,3 +1,3 @@
 // Announcement JS file
-var version = "1.0.2";
+var version = "1.0.3";
 MagicAnnouncement.show('compositekeys', version);

data/website/version.js

@@ -1,4 +1,4 @@
 // Version JS file
-var version = "1.0.2";
+var version = "1.0.3";
 
 document.write(" - " + version);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-13 00:00:00 -05:00
+date: 2008-07-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency