composite_primary_keys 0.8.6 → 0.9.0

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

@@ -19,3 +19,9 @@ drop sequence groups_seq;
 drop table memberships;
 drop table membership_statuses;
 drop sequence membership_statuses_seq;
+drop table departments;
+drop table employees;
+drop sequence employees_seq;
+drop table comments;
+drop sequence comments_seq;
+drop table hacks;

data/test/fixtures/db_definitions/oracle.sql

@@ -108,4 +108,31 @@ create table membership_statuses (
 
 create sequence membership_statuses_seq
   start with 1000;
-  
+
+CREATE TABLE departments (
+  department_id number(11) NOT NULL,
+  location_id number(11) NOT NULL,
+  constraint departments_pk primary key(department_id, location_id)
+);
+
+CREATE TABLE employees (
+ id number(11) NOT NULL primary key,
+ department_id number(11) DEFAULT NULL,
+ location_id number(11) DEFAULT NULL 
+);
+
+create sequence employees_seq
+  start with 1000;
+
+CREATE TABLE comments (
+	id number(11) NOT NULL PRIMARY KEY,
+	person_id varchar(100) DEFAULT NULL,
+	person_type varchar(100) DEFAULT NULL
+);
+
+create sequence comments_seq
+  start with 1000;
+
+CREATE TABLE hacks (
+ name varchar(50) NOT NULL PRIMARY KEY
+);

data/test/fixtures/db_definitions/postgresql.sql

@@ -98,3 +98,27 @@ CREATE TABLE membership_statuses (
   PRIMARY KEY (id)
 );
 
+CREATE TABLE departments (
+  department_id int NOT NULL,
+  location_id int NOT NULL,
+  PRIMARY KEY (department_id, location_id)
+);
+
+CREATE TABLE employees (
+ id int NOT NULL,
+ department_id int DEFAULT NULL,
+ location_id int DEFAULT NULL,
+ PRIMARY KEY (id)
+);
+
+CREATE TABLE comments (
+	id int NOT NULL,
+	person_id varchar(100) DEFAULT NULL,
+	person_type varchar(100) DEFAULT NULL,
+	PRIMARY KEY (id)
+);
+
+CREATE TABLE hacks (
+ name varchar(50) NOT NULL,
+ PRIMARY KEY (name)
+);

data/test/fixtures/db_definitions/sqlite.sql

@@ -82,3 +82,24 @@ CREATE TABLE membership_statuses (
 	status varchar(50) NOT NULL
 );
 
+CREATE TABLE departments (
+  department_id INTEGER NOT NULL,
+  location_id INTEGER NOT NULL,
+  PRIMARY KEY (department_id, location_id)
+);
+
+CREATE TABLE employees (
+ id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ department_id INTEGER NULL,
+ location_id INTEGER NULL
+);
+
+CREATE TABLE comments (
+	id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	person_id varchar(100) NULL,
+	person_type varchar(100) NULL
+);
+
+CREATE TABLE hacks (
+ name varchar(50) NOT NULL PRIMARY KEY
+);

data/test/fixtures/department.rb

@@ -0,0 +1,5 @@
+class Department < ActiveRecord::Base
+  # set_primary_keys *keys - turns on composite key functionality
+  set_primary_keys :department_id, :location_id
+  has_many :employees, :foreign_key => [:department_id, :location_id]
+end

data/test/fixtures/departments.yml

@@ -0,0 +1,3 @@
+department1-cpk:
+  department_id: 1
+  location_id: 1

data/test/fixtures/employee.rb

@@ -0,0 +1,4 @@
+class Employee < ActiveRecord::Base
+	belongs_to :department, :foreign_key => [:department_id, :location_id]
+	has_many :comments, :as => :person
+end

data/test/fixtures/employees.yml

@@ -0,0 +1,9 @@
+employee1:
+  id: 1
+  department_id: 1
+  location_id: 1
+employee2:
+  id: 2
+  department_id: 1
+  location_id: 1
+

data/test/fixtures/hack.rb

@@ -0,0 +1,6 @@
+class Hack < ActiveRecord::Base
+  set_primary_keys :name
+  has_many :comments, :as => :person
+  
+  has_one :first_comment, :as => :person, :class_name => "Comment"
+end

data/test/fixtures/hacks.yml

@@ -0,0 +1,2 @@
+andrew:
+  name: andrew

data/test/fixtures/product.rb

@@ -1,6 +1,7 @@
 class Product < ActiveRecord::Base
-	set_primary_key :id  # redundant
+	set_primary_keys :id  # redundant
 	has_many :product_tariffs, :foreign_key => :product_id
 	has_one :product_tariff, :foreign_key => :product_id
-	has_many :tariffs, :through => :product_tariffs, :foreign_key => :product_id
+
+	has_many :tariffs, :through => :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
 end

data/test/fixtures/streets.yml

@@ -2,4 +2,14 @@ first:
   id: 1
   city_id: 1
   suburb_id: 1
-  name: First Street
+  name: First Street
+second1:
+  id: 2
+  city_id: 2
+  suburb_id: 1
+  name: First Street
+second2:
+  id: 3
+  city_id: 2
+  suburb_id: 1
+  name: Second Street

data/test/fixtures/suburb.rb

@@ -1,4 +1,6 @@
 class Suburb < ActiveRecord::Base
   set_primary_keys :city_id, :suburb_id
   has_many :streets,  :foreign_key => [:city_id, :suburb_id]
+  has_many :first_streets,  :foreign_key => [:city_id, :suburb_id], 
+          :class_name => 'Street', :conditions => "streets.name = 'First Street'"
 end

data/test/fixtures/suburbs.yml

@@ -1,4 +1,9 @@
 first:
   city_id: 1
   suburb_id: 1
-  name: First Suburb
+  name: First Suburb
+second:
+  city_id: 2
+  suburb_id: 1
+  name: Second Suburb
+  

data/test/fixtures/user.rb

@@ -1,5 +1,6 @@
 class User < ActiveRecord::Base
   has_many :readings
   has_many :articles, :through => :readings
+  has_many :comments, :as => :person
 end
 

data/test/test_associations.rb

@@ -78,13 +78,18 @@ class TestAssociations < Test::Unit::TestCase
     assert_not_nil @product_tariffs.first.instance_variable_get('@product'), '@product not set'
   end
   
-  def XXX_test_find_includes_extended
-    # TODO - what's the correct syntax?
-    assert @products = Product.find(:all, :include => {:product_tariffs => :tariffs})
-    assert_equal 3, @products.inject(0) {|sum, tariff| sum + tariff.instance_variable_get('@product_tariffs').length}, 
+  def test_find_includes_comp_belongs_to_tariff
+    assert @product_tariffs = ProductTariff.find(:all, :include => :tariff)
+    assert_equal 3, @product_tariffs.length
+    assert_not_nil @product_tariffs.first.instance_variable_get('@tariff'), '@tariff not set'
+  end
+  
+  def test_find_includes_extended
+    assert @products = Product.find(:all, :include => {:product_tariffs => :tariff})
+    assert_equal 3, @products.inject(0) {|sum, product| sum + product.instance_variable_get('@product_tariffs').length},
       "Incorrect number of product_tariffs returned"
     
-    assert @tariffs = Tariff.find(:all, :include => {:product_tariffs => :products})
+    assert @tariffs = Tariff.find(:all, :include => {:product_tariffs => :product})
     assert_equal 3, @tariffs.inject(0) {|sum, tariff| sum + tariff.instance_variable_get('@product_tariffs').length}, 
       "Incorrect number of product_tariffs returned"
   end
@@ -97,4 +102,23 @@ class TestAssociations < Test::Unit::TestCase
     assert_equal('(foo=1 AND bar=2)', where_clause)
   end
   
+  def test_has_many_through
+    @products = Product.find(:all, :include => :tariffs)
+    assert_equal 3, @products.inject(0) {|sum, product| sum + product.instance_variable_get('@tariffs').length},
+      "Incorrect number of tariffs returned"
+  end
+
+  def test_associations_with_conditions
+    @suburb = Suburb.find([2, 1])
+    assert_equal 2, @suburb.streets.size
+
+    @suburb = Suburb.find([2, 1])
+    assert_equal 1, @suburb.first_streets.size
+
+    @suburb = Suburb.find([2, 1], :include => :streets)
+    assert_equal 2, @suburb.streets.size
+
+    @suburb = Suburb.find([2, 1], :include => :first_streets)
+    assert_equal 1, @suburb.first_streets.size
+  end
 end

data/test/test_delete.rb

@@ -1,6 +1,8 @@
 require 'abstract_unit'
 require 'fixtures/reference_type'
 require 'fixtures/reference_code'
+require 'fixtures/department'
+require 'fixtures/employee'
 
 class TestDelete < Test::Unit::TestCase
 
@@ -16,7 +18,7 @@ class TestDelete < Test::Unit::TestCase
   }
   
   def setup
-    create_fixtures :reference_types, :reference_codes
+    create_fixtures :reference_types, :reference_codes, :departments, :employees
     self.class.classes = CLASSES
   end
   
@@ -63,4 +65,23 @@ class TestDelete < Test::Unit::TestCase
       @klass.delete_all
     end
   end
-end
+  
+  def test_clear_association
+      department = Department.find(1,1)
+      assert_equal 2, department.employees.size, "Employee count for department should be 2 before clear"
+      department.employees.clear
+      assert_equal 0, department.employees.size, "After clear size should 0"
+      department.reload
+      assert_equal 0, department.employees.size, "After clear count in database should have been 0"
+  end
+  
+  def test_delete_association
+      department = Department.find(1,1)
+      assert_equal 2, department.employees.size , "Employee count for department should be 2 before delete"
+	  first_employee = department.employees[0]
+      department.employees.delete(first_employee) 
+      assert_equal 1, department.employees.size, "After delete employees count should be 1."
+      department.reload
+      assert_equal 1, department.employees.size, "After delete employees count should be 1 after reload from DB."
+  end
+end

data/test/test_polymorphic.rb

@@ -0,0 +1,24 @@
+require 'abstract_unit'
+require 'fixtures/comment'
+require 'fixtures/user'
+require 'fixtures/employee'
+require 'fixtures/hack'
+
+class TestPolymorphic < Test::Unit::TestCase
+
+  def setup
+    create_fixtures :users, :employees, :comments, :hacks
+  end
+  
+  
+  def test_polymorphic_has_many
+    comments = Hack.find('andrew').comments
+    assert comments[0].person_id = 'andrew'
+  end
+  
+  def test_polymorphic_has_one
+    first_comment = Hack.find('andrew').first_comment
+    assert first_comment.person_id = 'andrew'
+  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">0.8.6</a>
+      <a href="http://rubyforge.org/projects/compositekeys" class="numbers">0.9.0</a>
     </div>
     <h1>&#x2192; Ruby on Rails</h1>
 
@@ -291,7 +291,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>, 1st June 2007<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 16th August 2007<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 = "0.8.6";
+var version = "0.9.0";
 MagicAnnouncement.show('compositekeys', version);

data/website/version.js

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

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4.1
+rubygems_version: 0.9.4.3
 specification_version: 1
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  version: 0.8.6
-date: 2007-06-12 00:00:00 +02:00
+  version: 0.9.0
+date: 2007-09-28 00:00:00 +10:00
 summary: Composite key support for ActiveRecords
 require_paths: 
 - lib
@@ -32,35 +32,70 @@ files:
 - History.txt
 - Manifest.txt
 - README.txt
+- README_DB2.txt
 - Rakefile
+- init.rb
 - install.rb
+- lib/adapter_helper/base.rb
+- lib/adapter_helper/mysql.rb
+- lib/adapter_helper/oracle.rb
+- lib/adapter_helper/postgresql.rb
+- lib/adapter_helper/sqlite3.rb
 - lib/composite_primary_keys.rb
 - lib/composite_primary_keys/associations.rb
 - lib/composite_primary_keys/base.rb
 - lib/composite_primary_keys/calculations.rb
 - lib/composite_primary_keys/composite_arrays.rb
+- lib/composite_primary_keys/connection_adapters/ibm_db_adapter.rb
 - lib/composite_primary_keys/connection_adapters/oracle_adapter.rb
 - lib/composite_primary_keys/connection_adapters/postgresql_adapter.rb
 - lib/composite_primary_keys/fixtures.rb
+- lib/composite_primary_keys/migration.rb
 - lib/composite_primary_keys/reflection.rb
 - lib/composite_primary_keys/version.rb
+- loader.rb
+- local/database_connections.rb.sample
+- local/paths.rb.sample
+- local/tasks.rb.sample
+- scripts/console.rb
 - scripts/txt2html
 - scripts/txt2js
+- tasks/activerecord_selection.rake
+- tasks/databases.rake
+- tasks/databases/mysql.rake
+- tasks/databases/oracle.rake
+- tasks/databases/postgresql.rake
+- tasks/databases/sqlite3.rake
+- tasks/deployment.rake
+- tasks/local_setup.rake
+- tasks/website.rake
+- test/README_tests.txt
 - test/abstract_unit.rb
 - test/composite_arrays_test.rb
+- test/connections/native_ibm_db/connection.rb
 - test/connections/native_mysql/connection.rb
 - test/connections/native_oracle/connection.rb
 - test/connections/native_postgresql/connection.rb
 - test/connections/native_sqlite/connection.rb
 - test/fixtures/article.rb
 - test/fixtures/articles.yml
+- test/fixtures/comment.rb
+- test/fixtures/comments.yml
+- test/fixtures/db_definitions/db2-create-tables.sql
+- test/fixtures/db_definitions/db2-drop-tables.sql
 - test/fixtures/db_definitions/mysql.sql
 - test/fixtures/db_definitions/oracle.drop.sql
 - test/fixtures/db_definitions/oracle.sql
 - test/fixtures/db_definitions/postgresql.sql
 - test/fixtures/db_definitions/sqlite.sql
+- test/fixtures/department.rb
+- test/fixtures/departments.yml
+- test/fixtures/employee.rb
+- test/fixtures/employees.yml
 - test/fixtures/group.rb
 - test/fixtures/groups.yml
+- test/fixtures/hack.rb
+- test/fixtures/hacks.yml
 - test/fixtures/membership.rb
 - test/fixtures/membership_status.rb
 - test/fixtures/membership_statuses.yml
@@ -94,9 +129,11 @@ files:
 - test/test_ids.rb
 - test/test_miscellaneous.rb
 - test/test_pagination.rb
+- test/test_polymorphic.rb
 - test/test_santiago.rb
 - test/test_tutorial_examle.rb
 - test/test_update.rb
+- tmp/test.db
 - website/index.html
 - website/index.txt
 - website/javascripts/rounded_corners_lite.inc.js
@@ -118,6 +155,7 @@ test_files:
 - test/test_ids.rb
 - test/test_miscellaneous.rb
 - test/test_pagination.rb
+- test/test_polymorphic.rb
 - test/test_santiago.rb
 - test/test_tutorial_examle.rb
 - test/test_update.rb
@@ -128,6 +166,8 @@ extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.txt
+- README_DB2.txt
+- test/README_tests.txt
 - website/index.txt
 - website/version-raw.txt
 - website/version.txt