composite_primary_keys 3.0.7 → 3.0.8

data/History.txt

@@ -1,3 +1,8 @@
+== 3.0.8 2010-12-04
+* Fix for translation issue in unique validation.  Thanks to Daniel Berger for the patch.
+* Fix to support child classes of composite primary key models
+
+
 == 3.0.7 2010-11-29
 * Fix has and belongs to many associations implementation.
 

data/lib/composite_primary_keys/base.rb

@@ -23,11 +23,6 @@ module ActiveRecord
           include CompositeInstanceMethods
           include CompositePrimaryKeys::ActiveRecord::AssociationPreload
         EOV
-
-        class << unscoped
-          include CompositePrimaryKeys::ActiveRecord::FinderMethods::InstanceMethods
-          include CompositePrimaryKeys::ActiveRecord::Relation::InstanceMethods
-        end
       end
 
       def composite?
@@ -89,6 +84,20 @@ module ActiveRecord
       def ids_to_s(many_ids, id_sep = CompositePrimaryKeys::ID_SEP, list_sep = ',', left_bracket = '(', right_bracket = ')')
         many_ids.map {|ids| "#{left_bracket}#{CompositePrimaryKeys::CompositeKeys.new(ids)}#{right_bracket}"}.join(list_sep)
       end
+
+      def relation #:nodoc:
+        @relation ||= begin
+          result = Relation.new(self, arel_table)
+          # CPK
+          class << result
+            include CompositePrimaryKeys::ActiveRecord::FinderMethods::InstanceMethods
+            include CompositePrimaryKeys::ActiveRecord::Relation::InstanceMethods
+          end
+          result
+        end
+
+        finder_needs_type_condition? ? @relation.where(type_condition) : @relation
+      end
     end
 
     module CompositeInstanceMethods

data/lib/composite_primary_keys/validations/uniqueness.rb

@@ -6,6 +6,11 @@ module ActiveRecord
         table = finder_class.unscoped
 
         table_name   = record.class.quoted_table_name
+
+        if value && record.class.serialized_attributes.key?(attribute.to_s)
+          value = YAML.dump value
+        end
+
         sql, params  = mount_sql_and_params(finder_class, table_name, attribute, value)
 
         relation = table.where(sql, *params)
@@ -15,7 +20,7 @@ module ActiveRecord
           relation = relation.where(scope_item => scope_value)
         end
 
-        unless record.new_record?
+        if record.persisted?
           # CPK
           if record.composite?
             predicate = nil
@@ -31,87 +36,9 @@ module ActiveRecord
         end
 
         if relation.exists?
-          record.errors.add(attribute, :taken, :default => options[:message], :value => value)
+          record.errors.add(attribute, :taken, options.except(:case_sensitive, :scope).merge(:value => value))
         end
       end
     end
   end
-end
-
-#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
+end

data/lib/composite_primary_keys/version.rb

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

data/test/debug.log

@@ -558,4 +558,18 @@ PGError: ERROR:  operator does not exist: character varying = integer
 LINE 1: ...ments".person_type = 'User') AND ("comments".person_id = 1))
                                                                   ^
 HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
+: SELECT "hacks".* FROM "hacks" INNER JOIN "comments" ON ("hacks"."name" = "comments"."hack_id") WHERE (("comments".person_type = 'User') AND ("comments".person_id = 1))
+  SQL (35.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (1.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+PGError: ERROR:  column "tariff_idstart_date" does not exist
+LINE 1: SELECT COUNT(DISTINCT tariff_idstart_date) FROM "tariffs" LE...
+                              ^
+: SELECT COUNT(DISTINCT tariff_idstart_date) FROM "tariffs" LEFT OUTER JOIN "product_tariffs" ON "product_tariffs"."tariff_id" = "tariffs"."tariff_id" AND "product_tariffs"."tariff_start_date" = "tariffs"."start_date"
+PGError: ERROR:  operator does not exist: character varying = integer
+LINE 1: ...ments".person_type = 'User') AND ("comments".person_id = 1))
+                                                                  ^
+HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
 : SELECT "hacks".* FROM "hacks" INNER JOIN "comments" ON ("hacks"."name" = "comments"."hack_id") WHERE (("comments".person_type = 'User') AND ("comments".person_id = 1))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 23
   prerelease: false
   segments: 
   - 3
   - 0
-  - 7
-  version: 3.0.7
+  - 8
+  version: 3.0.8
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-29 00:00:00 -07:00
+date: 2010-12-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency