composite_primary_keys 0.6.3 → 0.7.0

data/Rakefile

@@ -18,7 +18,7 @@ RUBY_FORGE_PROJECT = "compositekeys"
 RUBY_FORGE_USER    = "nicwilliams"
 
 PKG_FILES = FileList[
-    "lib/**/*", "test/**/*", "examples/**/*", "doc/**/*", "[A-Z]*", "install.rb", "Rakefile"
+    "lib/**/*", "test/**/*", "examples/**/*", "doc/**/*", "scripts/**/*", "website/**/*", "[A-Z]*", "install.rb", "CHANGELOG", "README", "Rakefile"
 ].exclude(/\bCVS\b|~$/)
 
 

data/lib/composite_primary_keys/base.rb

@@ -151,7 +151,7 @@ module CompositePrimaryKeys
           connection.update(
             "UPDATE #{self.class.table_name} " +
             "SET #{quoted_comma_pair_list(connection, attributes_with_quotes(false))} " +
-            "WHERE (#{self.class.primary_key}) = (#{id})",
+            "WHERE (#{self.class.primary_key}) = (#{quoted_id})",
             "#{self.class.name} Update"
           )
           return true
@@ -276,10 +276,13 @@ module CompositePrimaryKeys
             # If ids = [[10, 50], [11, 51]], then :conditions => 
             #   "(#{table_name}.a, #{table_name}.b) IN ((10, 50), (11, 51))"
             
-            keys_sql = primary_keys.map {|key| "#{table_name}.#{key.to_s}"}.join(',')
-            ids_sql  = ids.map {|id_set| id_set.map {|id| sanitize(id)}.join(',')}.join('),(')
-            options.update :conditions => "(#{keys_sql}) IN ((#{ids_sql}))"
-  
+            conditions = ids.map do |id_set|
+              [primary_keys, id_set].transpose.map do |key, id|
+                "#{table_name}.#{key.to_s}=#{sanitize(id)}"
+              end.join(" AND ")
+            end.join(") OR (")
+            options.update :conditions => "(#{conditions})"
+            
             result = find_every(options)
   
             if result.size == ids.size

data/lib/composite_primary_keys/version.rb

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

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
-date: 2006-08-15 00:00:00 +02:00
+  version: 0.7.0
+date: 2006-08-31 00:00:00 +02:00
 summary: Support for composite primary keys in ActiveRecords
 require_paths: 
 - lib