composite_primary_keys 7.0.3 → 7.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e6b7d1159c668d23e4edcdf8b2fcb0634a81c7a
-  data.tar.gz: ba6783910246e18e7aaa729e0fec71160ca8c7fb
+  metadata.gz: 7a45d32305e2b207027f386128b7b77714e65486
+  data.tar.gz: 1e574a8bedaeaca37da16e406fc6e3d1246bcee3
 SHA512:
-  metadata.gz: a2943835037daa080b7a2d1f1e4d18a60d761968729c45460d8a4ce4da1f980aaa53f9c346e18459f7d3347811df83de0d4710835d3c1f8792a2f0f00255a787
-  data.tar.gz: 9e2b28913094cb75c372572a8c4eaed1d167cef8fd73b091aeb75e93799dbac68d1ccfe0be1ca1478d4469533fa81caf7df6ea866396320881daba4f64b2b796
+  metadata.gz: 390a1b12a5d5f1c2cf8a5c40538445f98432508dd4d68223a9ce7aa431f79280b49de4ab3cd344b8bd2e43116e0eac7ed19d07bcec56186a635330e77f5b1db7
+  data.tar.gz: 27f2fa1cc51821ae47ac57cd8d504cb58d7b7528b7a5f0096c4134f6595194ef729e48297b8df887b635829e2c0c1f26113591aaa5d951c73b49c541754454d5

data/History.rdoc

@@ -1,3 +1,9 @@
+== 7.0.4 (2014-07-?)
+
+* Fix overriding of Relation#where_values_hash (Pavel)
+* Add travis CI support (Pavel)
+* Run AR's original relation_for_destroy when primary key is not composite (Pavel)
+
 == 7.0.3 (2014-07-04)
 
 * Fixes for Rails 4.1.2+ compatibility (Tom Hughes)

data/lib/composite_primary_keys/persistence.rb

@@ -10,6 +10,11 @@ module CompositePrimaryKeys
         #  self.class.arel_table[pk].eq(substitute))
         #relation.bind_values = [[column, id]]
 
+        # run AR's original relation_for_destroy when primary key is not composite
+        if Array(self.class.primary_key).size <= 1
+          return super
+        end
+
         relation = self.class.unscoped
 
         Array(self.class.primary_key).each_with_index do |key, index|

data/lib/composite_primary_keys/relation.rb

@@ -60,7 +60,7 @@ module ActiveRecord
 
     def add_cpk_where_values_hash
       class << self
-        def where_values_hash
+        def where_values_hash(relation_table_name = table_name)
           # CPK adds this so that it finds the Equality nodes beneath the And node:
           #equalities = where_values.grep(Arel::Nodes::Equality).find_all { |node|
           #  node.left.relation.name == table_name
@@ -68,7 +68,7 @@ module ActiveRecord
           nodes_from_and = where_values.grep(Arel::Nodes::And).map {|and_node| and_node.children.grep(Arel::Nodes::Equality) }.flatten
 
           equalities = (nodes_from_and + where_values.grep(Arel::Nodes::Equality)).find_all { |node|
-            node.left.relation.name == table_name
+            node.left.relation.name == relation_table_name
           }
 
           binds = Hash[bind_values.find_all(&:first).map { |column, v| [column.name, v] }]

data/lib/composite_primary_keys/version.rb

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

data/test/connections/databases.ci.yml

@@ -0,0 +1,15 @@
+mysql:
+  adapter: mysql2
+  username: travis
+  password: ""
+  database: composite_primary_keys_unittest
+
+sqlite3:
+  adapter: sqlite3
+  database: db/composite_primary_keys_unittest.sqlite
+
+postgresql:
+  adapter: postgresql
+  database: composite_primary_keys_unittest
+  username: postgres
+  host: localhost

data/test/fixtures/restaurants_suburb.rb

@@ -0,0 +1,3 @@
+class RestaurantsSuburb < ActiveRecord::Base
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 7.0.3
+  version: 7.0.4
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-04 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -86,6 +86,7 @@ files:
 - test/README_tests.rdoc
 - test/abstract_unit.rb
 - test/connections/connection_spec.rb
+- test/connections/databases.ci.yml
 - test/connections/databases.example.yml
 - test/connections/databases.yml
 - test/connections/native_ibm_db/connection.rb
@@ -139,6 +140,7 @@ files:
 - test/fixtures/reference_types.yml
 - test/fixtures/restaurant.rb
 - test/fixtures/restaurants.yml
+- test/fixtures/restaurants_suburb.rb
 - test/fixtures/restaurants_suburbs.yml
 - test/fixtures/room.rb
 - test/fixtures/room_assignment.rb