composite_primary_keys 2.3.2 → 2.3.5

data/History.txt

@@ -1,3 +1,7 @@
+== 2.3.5 2009-12-16
+
+* Fixed several bugs in has_one and has_many associations when :primary_key specified [kpumuk]
+
 == 2.3.2 2009-07-16
 
 * explicitly load associations.rb due to some getting an unitialized constant error
@@ -46,7 +50,7 @@
 
 == 1.0.4 2008-07-15
 
-* support for oracle_enhanced adapter [thx Raimonds Simanovskis] 
+* support for oracle_enhanced adapter [thx Raimonds Simanovskis]
 
 == 1.0.3 2008-07-13
 
@@ -116,7 +120,7 @@
 == 0.8.4 / 2007-5-3
 
 * 1 bugfix
-  * Corrected ids_list => ids in the exception message. That'll teach me for not adding unit tests before fixing bugs. 
+  * Corrected ids_list => ids in the exception message. That'll teach me for not adding unit tests before fixing bugs.
 
 == 0.8.3 / 2007-5-3
 
@@ -154,11 +158,11 @@
 == 0.1.4
 * it was important that #{primary_key} for composites --> 'key1,key2' and not 'key1key2' so created PrimaryKeys class
 
-== 0.0.1 
+== 0.0.1
 * Initial version
 * set_primary_keys(*keys) is the activation class method to transform an ActiveRecord into a composite primary key AR
-* find(*ids) supports the passing of 
-  * id sets: Foo.find(2,1), 
-  * lists of id sets: Foo.find([2,1], [7,3], [8,12]), 
+* find(*ids) supports the passing of
+  * id sets: Foo.find(2,1),
+  * lists of id sets: Foo.find([2,1], [7,3], [8,12]),
   * and even stringified versions of the above:
   * Foo.find '2,1' or Foo.find '2,1;7,3'

data/Manifest.txt

@@ -24,6 +24,7 @@ lib/composite_primary_keys/connection_adapters/sqlite3_adapter.rb
 lib/composite_primary_keys/fixtures.rb
 lib/composite_primary_keys/migration.rb
 lib/composite_primary_keys/reflection.rb
+lib/composite_primary_keys/validations/uniqueness.rb
 lib/composite_primary_keys/version.rb
 loader.rb
 local/database_connections.rb.sample

data/Rakefile

@@ -1,65 +1,65 @@
-require 'rubygems'
-require 'rake'
-require 'rake/clean'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-require 'rake/contrib/rubyforgepublisher'
-require 'fileutils'
-require 'hoe'
-include FileUtils
-require File.join(File.dirname(__FILE__), 'lib', 'composite_primary_keys', 'version')
-
-AUTHOR = "Dr Nic Williams"
-EMAIL = "drnicwilliams@gmail.com"
-DESCRIPTION = "Composite key support for ActiveRecords"
-GEM_NAME = "composite_primary_keys" # what ppl will type to install your gem
-if File.exists?("~/.rubyforge/user-config.yml")
-  # TODO this should prob go in a local/ file
-  config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
-  RUBYFORGE_USERNAME = config["username"]
-end
-RUBYFORGE_PROJECT = "compositekeys"
-HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
-
-REV = nil #File.read(".svn/entries")[/committed-rev="(\d+)"/, 1] rescue nil
-VERS = ENV['VERSION'] || (CompositePrimaryKeys::VERSION::STRING + (REV ? ".#{REV}" : ""))
-CLEAN.include ['**/.*.sw?', '*.gem', '.config','debug.log','*.db','logfile','log/**/*','**/.DS_Store', '.project']
-RDOC_OPTS = ['--quiet', '--title', "newgem documentation",
-    "--opname", "index.html",
-    "--line-numbers", 
-    "--main", "README",
-    "--inline-source"]
-
-class Hoe
-  def extra_deps 
-    @extra_deps.reject { |x| Array(x).first == 'hoe' } 
-  end 
-end
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-hoe = Hoe.new(GEM_NAME, VERS) do |p|
-  p.author = AUTHOR 
-  p.description = DESCRIPTION
-  p.email = EMAIL
-  p.summary = DESCRIPTION
-  p.url = HOMEPATH
-  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  p.test_globs = ["test/**/test*.rb"]
-  p.clean_globs |= CLEAN  #An array of file patterns to delete on clean.
-
-  # == Optional
-  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.extra_deps = [['activerecord', '>= 2.3.2']]  #An array of rubygem dependencies.
-  #p.spec_extras    - A hash of extra values to set in the gemspec.
-end
-
-CHANGES = hoe.paragraphs_of('History.txt', 0..1).join("\n\n")
-PATH    = RUBYFORGE_PROJECT
-hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
-
-PROJECT_ROOT = File.expand_path(".")
-
-require 'loader'
+require 'rubygems'
+require 'rake'
+require 'rake/clean'
+require 'rake/testtask'
+require 'rake/rdoctask'
+require 'rake/packagetask'
+require 'rake/gempackagetask'
+require 'rake/contrib/rubyforgepublisher'
+require 'fileutils'
+require 'hoe'
+include FileUtils
+require File.join(File.dirname(__FILE__), 'lib', 'composite_primary_keys', 'version')
+
+AUTHOR = "Dr Nic Williams"
+EMAIL = "drnicwilliams@gmail.com"
+DESCRIPTION = "Composite key support for ActiveRecords"
+GEM_NAME = "composite_primary_keys" # what ppl will type to install your gem
+if File.exists?("~/.rubyforge/user-config.yml")
+  # TODO this should prob go in a local/ file
+  config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
+  RUBYFORGE_USERNAME = config["username"]
+end
+RUBYFORGE_PROJECT = "compositekeys"
+HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
+
+REV = nil #File.read(".svn/entries")[/committed-rev="(\d+)"/, 1] rescue nil
+VERS = ENV['VERSION'] || (CompositePrimaryKeys::VERSION::STRING + (REV ? ".#{REV}" : ""))
+CLEAN.include ['**/.*.sw?', '*.gem', '.config','debug.log','*.db','logfile','log/**/*','**/.DS_Store', '.project']
+RDOC_OPTS = ['--quiet', '--title', "newgem documentation",
+    "--opname", "index.html",
+    "--line-numbers",
+    "--main", "README",
+    "--inline-source"]
+
+class Hoe
+  def extra_deps
+    @extra_deps.reject { |x| Array(x).first == 'hoe' }
+  end
+end
+
+# Generate all the Rake tasks
+# Run 'rake -T' to see list of generated tasks (from gem root directory)
+hoe = Hoe.new(GEM_NAME, VERS) do |p|
+  p.author = AUTHOR
+  p.description = DESCRIPTION
+  p.email = EMAIL
+  p.summary = DESCRIPTION
+  p.url = HOMEPATH
+  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
+  p.test_globs = ["test/**/test*.rb"]
+  p.clean_globs |= CLEAN  #An array of file patterns to delete on clean.
+
+  # == Optional
+  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
+  p.extra_deps = [['activerecord', '>= 2.3.5']]  #An array of rubygem dependencies.
+  #p.spec_extras    - A hash of extra values to set in the gemspec.
+end
+
+CHANGES = hoe.paragraphs_of('History.txt', 0..1).join("\n\n")
+PATH    = RUBYFORGE_PROJECT
+hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
+
+PROJECT_ROOT = File.expand_path(".")
+
+require 'loader'

data/lib/composite_primary_keys.rb

@@ -44,6 +44,7 @@ require 'composite_primary_keys/base'
 require 'composite_primary_keys/calculations'
 require 'composite_primary_keys/migration'
 require 'composite_primary_keys/attribute_methods'
+require 'composite_primary_keys/validations/uniqueness'
 
 ActiveRecord::Base.class_eval do
   include CompositePrimaryKeys::ActiveRecord::Base

data/lib/composite_primary_keys/associations.rb

@@ -180,11 +180,12 @@ module ActiveRecord::Associations::ClassMethods
                 raise AssociationNotSupported, "Polymorphic joins not supported for composite keys"
               else
                 foreign_key = options[:foreign_key] || reflection.active_record.name.foreign_key
+                primary_key = options[:primary_key] || parent.primary_key
                 " LEFT OUTER JOIN %s ON %s " % [
                   table_name_and_alias,
                   composite_join_clause(
                     full_keys(aliased_table_name, foreign_key),
-                    full_keys(parent.aliased_table_name, parent.primary_key)),
+                    full_keys(parent.aliased_table_name, primary_key)),
                 ]
             end
           when :belongs_to
@@ -338,7 +339,7 @@ module ActiveRecord::Associations
           @finder_sql << " AND (#{conditions})" if conditions
 
         else
-          @finder_sql = full_columns_equals(@reflection.klass.table_name, @reflection.primary_key_name, @owner.quoted_id)
+          @finder_sql = full_columns_equals(@reflection.klass.table_name, @reflection.primary_key_name, owner_quoted_id)
           @finder_sql << " AND (#{conditions})" if conditions
       end
 
@@ -386,7 +387,7 @@ module ActiveRecord::Associations
             "#{@reflection.klass.quoted_table_name}.#{@reflection.options[:as]}_id = #{@owner.quoted_id} AND " + 
             "#{@reflection.klass.quoted_table_name}.#{@reflection.options[:as]}_type = #{@owner.class.quote_value(@owner.class.base_class.name.to_s)}"
         else
-          @finder_sql = full_columns_equals(@reflection.klass.table_name, @reflection.primary_key_name, @owner.quoted_id)
+          @finder_sql = full_columns_equals(@reflection.klass.table_name, @reflection.primary_key_name, owner_quoted_id)
       end
 
       @finder_sql << " AND (#{conditions})" if conditions

data/lib/composite_primary_keys/base.rb

@@ -29,6 +29,8 @@ module CompositePrimaryKeys
             include CompositePrimaryKeys::ActiveRecord::AssociationPreload
             include CompositePrimaryKeys::ActiveRecord::Calculations
             include CompositePrimaryKeys::ActiveRecord::AttributeMethods
+
+            extend CompositePrimaryKeys::ActiveRecord::Validations::Uniqueness::ClassMethods
           EOV
         end
 

data/lib/composite_primary_keys/validations/uniqueness.rb

@@ -0,0 +1,77 @@
+module CompositePrimaryKeys
+  module ActiveRecord
+    module Validations
+      module Uniqueness
+        module ClassMethods
+          def validates_uniqueness_of(*attr_names)
+            configuration = { :case_sensitive => true }
+            configuration.update(attr_names.extract_options!)
+
+            validates_each(attr_names,configuration) do |record, attr_name, value|
+              # The check for an existing value should be run from a class that
+              # isn't abstract. This means working down from the current class
+              # (self), to the first non-abstract class. Since classes don't know
+              # their subclasses, we have to build the hierarchy between self and
+              # the record's class.
+              class_hierarchy = [record.class]
+              while class_hierarchy.first != self
+                class_hierarchy.insert(0, class_hierarchy.first.superclass)
+              end
+
+              # Now we can work our way down the tree to the first non-abstract
+              # class (which has a database table to query from).
+              finder_class = class_hierarchy.detect { |klass| !klass.abstract_class? }
+
+              column = finder_class.columns_hash[attr_name.to_s]
+
+              if value.nil?
+                comparison_operator = "IS ?"
+              elsif column.text?
+                comparison_operator = "#{connection.case_sensitive_equality_operator} ?"
+                value = column.limit ? value.to_s.mb_chars[0, column.limit] : value.to_s
+              else
+                comparison_operator = "= ?"
+              end
+
+              sql_attribute = "#{record.class.quoted_table_name}.#{connection.quote_column_name(attr_name)}"
+
+              if value.nil? || (configuration[:case_sensitive] || !column.text?)
+                condition_sql = "#{sql_attribute} #{comparison_operator}"
+                condition_params = [value]
+              else
+                condition_sql = "LOWER(#{sql_attribute}) #{comparison_operator}"
+                condition_params = [value.mb_chars.downcase]
+              end
+
+              if scope = configuration[:scope]
+                Array(scope).map do |scope_item|
+                  scope_value = record.send(scope_item)
+                  condition_sql << " AND " << attribute_condition("#{record.class.quoted_table_name}.#{scope_item}", scope_value)
+                  condition_params << scope_value
+                end
+              end
+
+              unless record.new_record?
+                if record.class.composite?
+                  record.class.primary_keys.each do |key|
+                    condition_sql << " AND #{record.class.quoted_table_name}.#{key} <> ?"
+                    condition_params << record.send(key)
+                  end
+                else
+                  condition_sql << " AND #{record.class.quoted_table_name}.#{record.class.primary_key} <> ?"
+                  condition_params << record.send(:id)
+                end
+              end
+
+              finder_class.with_exclusive_scope do
+                if finder_class.exists?([condition_sql, *condition_params])
+                  record.errors.add(attr_name, :taken, :default => configuration[:message], :value => value)
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/version.rb

@@ -1,8 +1,8 @@
-module CompositePrimaryKeys
-  module VERSION #:nodoc:
-    MAJOR = 2
-    MINOR = 3
-    TINY  = 2
-    STRING = [MAJOR, MINOR, TINY].join('.')
-  end
-end
+module CompositePrimaryKeys
+  module VERSION #:nodoc:
+    MAJOR = 2
+    MINOR = 3
+    TINY  = 5
+    STRING = [MAJOR, MINOR, TINY].join('.')
+  end
+end

data/test/fixtures/db_definitions/mysql.sql

@@ -172,3 +172,10 @@ create table room_assignments (
     room_id int(11) not null
 ) type=InnoDB;
 
+create table seats (
+  flight_number int(11) not null,
+  seat          int(11) not null,
+  customer      int,
+  primary key (flight_number, seat)
+) type=InnoDB;
+

data/test/fixtures/db_definitions/postgresql.sql

@@ -197,3 +197,10 @@ create table room_assignments (
     room_id    int not null
 );
 
+create table seats (
+  flight_number int not null,
+  seat          int not null,
+  customer      int,
+  primary key (flight_number, seat)
+);
+

data/test/fixtures/db_definitions/sqlite.sql

@@ -158,3 +158,9 @@ create table room_assignments (
 	room_id integer not null	
 );
 
+create table seats (
+  flight_number integer not_null,
+  seat integer not_null,
+  customer integer,
+  primary key (flight_number, seat)
+);

data/test/fixtures/membership.rb

@@ -4,4 +4,7 @@ class Membership < ActiveRecord::Base
   belongs_to :user
 	belongs_to :group
 	has_many :statuses, :class_name => 'MembershipStatus', :foreign_key => [:user_id, :group_id]
+
+  has_many :readings, :primary_key => :user_id, :foreign_key => :user_id
+  has_one :reading, :primary_key => :user_id, :foreign_key => :user_id, :order => 'id DESC'
 end

data/test/test_associations.rb

@@ -17,7 +17,8 @@ require 'fixtures/reading'
 
 class TestAssociations < ActiveSupport::TestCase
   fixtures :articles, :products, :tariffs, :product_tariffs, :suburbs, :streets, :restaurants, :restaurants_suburbs,
-           :dorms, :rooms, :room_attributes, :room_attribute_assignments, :students, :room_assignments, :users, :readings
+           :dorms, :rooms, :room_attributes, :room_attribute_assignments, :students, :room_assignments, :users, :readings,
+           :memberships
   
   def test_has_many_through_with_conditions_when_through_association_is_not_composite
     user = User.find(:first)
@@ -157,4 +158,28 @@ class TestAssociations < ActiveSupport::TestCase
     @restaurant = Restaurant.find([1,1], :include => :suburbs)
     assert_equal 2, @restaurant.suburbs.size  
   end
+  
+  def test_has_many_with_primary_key
+    @membership = Membership.find([1, 1])
+    
+    assert_equal 2, @membership.readings.size
+  end
+
+  def test_has_one_with_primary_key
+    @membership = Membership.find([1, 1])
+    
+    assert_equal 2, @membership.reading.id
+  end
+
+  def test_joins_has_many_with_primary_key
+    @membership = Membership.find(:first, :joins => :readings, :conditions => { :readings => { :id => 1 } })
+    
+    assert_equal [1, 1], @membership.id
+  end
+
+  def test_joins_has_one_with_primary_key
+    @membership = Membership.find(:first, :joins => :reading, :conditions => { :readings => { :id => 2 } })
+    
+    assert_equal [1, 1], @membership.id
+  end
 end

data/test/test_validations.rb

@@ -0,0 +1,11 @@
+require 'abstract_unit'
+require 'fixtures/seat'
+
+class TestValidations < ActiveSupport::TestCase
+  fixtures :seats
+
+  def test_uniqueness_validation_on_saved_record
+    s = Seat.find([1,1])
+    assert s.valid?
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  version: 2.3.2
+  version: 2.3.5
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-16 00:00:00 -05:00
+date: 2009-12-16 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.2
+        version: 2.3.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.2
+        version: 2.4.0
     version: 
 description: Composite key support for ActiveRecords
 email: drnicwilliams@gmail.com
@@ -73,6 +73,7 @@ files:
 - lib/composite_primary_keys/fixtures.rb
 - lib/composite_primary_keys/migration.rb
 - lib/composite_primary_keys/reflection.rb
+- lib/composite_primary_keys/validations/uniqueness.rb
 - lib/composite_primary_keys/version.rb
 - loader.rb
 - local/database_connections.rb.sample
@@ -194,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: compositekeys
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Composite key support for ActiveRecords
@@ -216,3 +217,4 @@ test_files:
 - test/test_santiago.rb
 - test/test_tutorial_examle.rb
 - test/test_update.rb
+- test/test_validations.rb