composite_primary_keys 7.0.15 → 7.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0655d26f0b98d96ce4e4a5e87d1a6cae68391b7d
-  data.tar.gz: c26046f30f2032540ff93522328a40cdbc735d0a
+  metadata.gz: a3eaf57bc39ed46c4a72d72d5340f36e808066af
+  data.tar.gz: 34c682ff2f92cfa89c1f198b33101b4a9f255cdb
 SHA512:
-  metadata.gz: ecf66e28ac34b92bf9a27a20806bd9fb26e88b1f2b984b2cb43c5e86f325f224f25e5844f4dde8ba8fa80316f85cda8c5d27ae49b616bb48b2bdf6948b56766c
-  data.tar.gz: cf120e29e8d8c6d38861505f01364e28cf96430d7fcd1c97c24fa7d6077b65a8d18a4aad3a1f1751d22536ac0c65d8859ff97b6d3b67056872b40b22f7904d67
+  metadata.gz: f807e7a2cd19630d36813aaebc4ada9c08d386c66723f01d3d66b51d220c586c1f94145c26192a5968a7f1b2c0261f8486e78882b09099e93f6609505877bab1
+  data.tar.gz: 6b1b0a788652b9912159ba9f6529778688275cf3648055e73b2f51239a2604c27f7527d92d86468b1d2c05adc4dad6942ef454b2bf4d0c43ce6a607dff51ffc8

data/History.rdoc

@@ -1,3 +1,7 @@
+== 7.0.16 (2015-12-13)
+
+* Add support for #delete_all for CPK tables (Charlie Savage)
+
 == 7.0.15 (2015-09-02)
 
 * Fix bug in calculations - such as average (Charlie Savage)

data/lib/composite_primary_keys.rb

@@ -30,6 +30,9 @@ unless defined?(ActiveRecord)
   require 'active_record'
 end
 
+# Arel files we override
+require 'arel/visitors/to_sql'
+
 # AR files we override
 require 'active_record/counter_cache'
 require 'active_record/fixtures'
@@ -66,6 +69,8 @@ require 'active_record/relation/query_methods'
 require 'active_record/validations/uniqueness'
 
 # CPK files
+require 'composite_primary_keys/arel/visitors/to_sql'
+
 require 'composite_primary_keys/persistence'
 require 'composite_primary_keys/base'
 require 'composite_primary_keys/core'

data/lib/composite_primary_keys/arel/visitors/to_sql.rb

@@ -0,0 +1,20 @@
+module Arel
+  module Visitors
+    class ToSql
+      def visit_Arel_Nodes_In o, a
+        if Array === o.right && o.right.empty?
+          '1=0'
+        else
+          a = o.left if Arel::Attributes::Attribute === o.left
+          # CPK
+          #"#{visit o.left, a} IN (#{visit o.right, a})"
+          if o.left.name.is_a?(Array)
+          "(#{visit o.left, a}) IN (#{visit o.right, a})"
+          else
+            "#{visit o.left, a} IN (#{visit o.right, a})"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/associations/join_dependency/join_association.rb

@@ -1,22 +1,22 @@
-module ActiveRecord
-  module Associations
-    class JoinDependency
-      class JoinAssociation
-        def build_constraint(klass, table, key, foreign_table, foreign_key)
-          # CPK
-          # constraint = table[key].eq(foreign_table[foreign_key])
-          constraint = cpk_join_predicate(table, key, foreign_table, foreign_key)
-
-          if klass.finder_needs_type_condition?
-            constraint = table.create_and([
-              constraint,
-              klass.send(:type_condition, table)
-            ])
-          end
-
-          constraint
-        end
-      end
-    end
-  end
-end
+module ActiveRecord
+  module Associations
+    class JoinDependency
+      class JoinAssociation
+        def build_constraint(klass, table, key, foreign_table, foreign_key)
+          # CPK
+          # constraint = table[key].eq(foreign_table[foreign_key])
+          constraint = cpk_join_predicate(table, key, foreign_table, foreign_key)
+
+          if klass.finder_needs_type_condition?
+            constraint = table.create_and([
+              constraint,
+              klass.send(:type_condition, table)
+            ])
+          end
+
+          constraint
+        end
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/associations/preloader/belongs_to.rb

@@ -1,19 +1,19 @@
-module ActiveRecord
-  module Associations
-    class Preloader
-      class BelongsTo
-        def query_scope(ids)
-          # CPK
-          # scope.where(association_key.in(ids))
-
-          if association_key_name.is_a?(Array)
-            predicate = cpk_in_predicate(table, association_key_name, ids)
-            scope.where(predicate)
-          else
-            scope.where(association_key.in(ids))
-          end
-        end
-      end
-    end
-  end
-end
+module ActiveRecord
+  module Associations
+    class Preloader
+      class BelongsTo
+        def query_scope(ids)
+          # CPK
+          # scope.where(association_key.in(ids))
+
+          if association_key_name.is_a?(Array)
+            predicate = cpk_in_predicate(table, association_key_name, ids)
+            scope.where(predicate)
+          else
+            scope.where(association_key.in(ids))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/composite_predicates.rb

@@ -1,51 +1,51 @@
-module CompositePrimaryKeys
-  module Predicates
-    def cpk_and_predicate(predicates)
-      if predicates.length == 1
-        predicates.first
-      else
-        Arel::Nodes::And.new(predicates)
-      end
-    end
-
-    def cpk_or_predicate(predicates)
-      or_predicate = predicates.map do |predicate|
-        ::Arel::Nodes::Grouping.new(predicate)
-      end.inject do |memo, node|
-        ::Arel::Nodes::Or.new(memo, node)
-      end
-      ::Arel::Nodes::Grouping.new(or_predicate)
-    end
-
-    def cpk_id_predicate(table, keys, values)
-      eq_predicates = keys.zip(values).map do |key, value|
-        table[key].eq(value)
-      end
-      cpk_and_predicate(eq_predicates)
-    end
-
-    def cpk_join_predicate(table1, key1, table2, key2)
-      key1_fields = Array(key1).map {|key| table1[key]}
-      key2_fields = Array(key2).map {|key| table2[key]}
-
-      eq_predicates = key1_fields.zip(key2_fields).map do |key_field1, key_field2|
-        key_field1.eq(key_field2)
-      end
-      cpk_and_predicate(eq_predicates)
-    end
-
-    def cpk_in_predicate(table, primary_keys, ids)
-      and_predicates = ids.map do |id|
-        cpk_id_predicate(table, primary_keys, id)
-      end
-      cpk_or_predicate(and_predicates)
-    end
-  end
-end
-
-ActiveRecord::Associations::AssociationScope.send(:include, CompositePrimaryKeys::Predicates)
-ActiveRecord::Associations::JoinDependency::JoinAssociation.send(:include, CompositePrimaryKeys::Predicates)
-ActiveRecord::Associations::Preloader::Association.send(:include, CompositePrimaryKeys::Predicates)
-ActiveRecord::Associations::HasManyThroughAssociation.send(:include, CompositePrimaryKeys::Predicates)
-ActiveRecord::Relation.send(:include, CompositePrimaryKeys::Predicates)
+module CompositePrimaryKeys
+  module Predicates
+    def cpk_and_predicate(predicates)
+      if predicates.length == 1
+        predicates.first
+      else
+        Arel::Nodes::And.new(predicates)
+      end
+    end
+
+    def cpk_or_predicate(predicates)
+      or_predicate = predicates.map do |predicate|
+        ::Arel::Nodes::Grouping.new(predicate)
+      end.inject do |memo, node|
+        ::Arel::Nodes::Or.new(memo, node)
+      end
+      ::Arel::Nodes::Grouping.new(or_predicate)
+    end
+
+    def cpk_id_predicate(table, keys, values)
+      eq_predicates = keys.zip(values).map do |key, value|
+        table[key].eq(value)
+      end
+      cpk_and_predicate(eq_predicates)
+    end
+
+    def cpk_join_predicate(table1, key1, table2, key2)
+      key1_fields = Array(key1).map {|key| table1[key]}
+      key2_fields = Array(key2).map {|key| table2[key]}
+
+      eq_predicates = key1_fields.zip(key2_fields).map do |key_field1, key_field2|
+        key_field1.eq(key_field2)
+      end
+      cpk_and_predicate(eq_predicates)
+    end
+
+    def cpk_in_predicate(table, primary_keys, ids)
+      and_predicates = ids.map do |id|
+        cpk_id_predicate(table, primary_keys, id)
+      end
+      cpk_or_predicate(and_predicates)
+    end
+  end
+end
+
+ActiveRecord::Associations::AssociationScope.send(:include, CompositePrimaryKeys::Predicates)
+ActiveRecord::Associations::JoinDependency::JoinAssociation.send(:include, CompositePrimaryKeys::Predicates)
+ActiveRecord::Associations::Preloader::Association.send(:include, CompositePrimaryKeys::Predicates)
+ActiveRecord::Associations::HasManyThroughAssociation.send(:include, CompositePrimaryKeys::Predicates)
+ActiveRecord::Relation.send(:include, CompositePrimaryKeys::Predicates)
 ActiveRecord::PredicateBuilder.send(:extend, CompositePrimaryKeys::Predicates)

data/lib/composite_primary_keys/composite_relation.rb

@@ -1,48 +1,48 @@
-module CompositePrimaryKeys
-  module CompositeRelation
-    include CompositePrimaryKeys::ActiveRecord::Batches
-    include CompositePrimaryKeys::ActiveRecord::Calculations
-    include CompositePrimaryKeys::ActiveRecord::FinderMethods
-    include CompositePrimaryKeys::ActiveRecord::QueryMethods
-
-    def delete(id_or_array)
-      # CPK
-      if self.composite?
-        id_or_array = if id_or_array.is_a?(CompositePrimaryKeys::CompositeKeys)
-                        [id_or_array]
-                      else
-                        Array(id_or_array)
-                      end
-
-        id_or_array.each do |id|
-          # Is the passed in id actually a record?
-          id = id.kind_of?(::ActiveRecord::Base) ? id.id : id
-          where(cpk_id_predicate(table, self.primary_key, id)).delete_all
-        end
-      else
-        where(primary_key => id_or_array).delete_all
-      end
-    end
-
-    def destroy(id_or_array)
-      # Without CPK:
-      #if id.is_a?(Array)
-      #  id.map { |one_id| destroy(one_id) }
-      #else
-      #  find(id).destroy
-      #end
-
-      id_or_array = if id_or_array.kind_of?(CompositePrimaryKeys::CompositeKeys)
-        [id_or_array]
-      else
-        Array(id_or_array)
-      end
-
-      id_or_array.each do |id|
-        where(cpk_id_predicate(table, self.primary_key, id)).each do |record|
-          record.destroy
-        end
-      end
-    end
-  end
-end
+module CompositePrimaryKeys
+  module CompositeRelation
+    include CompositePrimaryKeys::ActiveRecord::Batches
+    include CompositePrimaryKeys::ActiveRecord::Calculations
+    include CompositePrimaryKeys::ActiveRecord::FinderMethods
+    include CompositePrimaryKeys::ActiveRecord::QueryMethods
+
+    def delete(id_or_array)
+      # CPK
+      if self.composite?
+        id_or_array = if id_or_array.is_a?(CompositePrimaryKeys::CompositeKeys)
+                        [id_or_array]
+                      else
+                        Array(id_or_array)
+                      end
+
+        id_or_array.each do |id|
+          # Is the passed in id actually a record?
+          id = id.kind_of?(::ActiveRecord::Base) ? id.id : id
+          where(cpk_id_predicate(table, self.primary_key, id)).delete_all
+        end
+      else
+        where(primary_key => id_or_array).delete_all
+      end
+    end
+
+    def destroy(id_or_array)
+      # Without CPK:
+      #if id.is_a?(Array)
+      #  id.map { |one_id| destroy(one_id) }
+      #else
+      #  find(id).destroy
+      #end
+
+      id_or_array = if id_or_array.kind_of?(CompositePrimaryKeys::CompositeKeys)
+        [id_or_array]
+      else
+        Array(id_or_array)
+      end
+
+      id_or_array.each do |id|
+        where(cpk_id_predicate(table, self.primary_key, id)).each do |record|
+          record.destroy
+        end
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/connection_adapters/postgresql_adapter.rb

@@ -1,46 +1,60 @@
-module ActiveRecord
-  module ConnectionAdapters
-    class PostgreSQLAdapter
-      def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
-        unless pk
-          # Extract the table from the insert sql. Yuck.
-          table_ref = extract_table_ref_from_insert_sql(sql)
-          pk = primary_key(table_ref) if table_ref
-        end
-
-        if pk
-          # CPK
-          # select_value("#{sql} RETURNING #{quote_column_name(pk)}")
-          select_value("#{sql} RETURNING #{quote_column_names(pk)}")
-        else
-          super
-        end
-      end
-      alias :create :insert
-
-      def sql_for_insert(sql, pk, id_value, sequence_name, binds)
-        unless pk
-          # Extract the table from the insert sql. Yuck.
-          table_ref = extract_table_ref_from_insert_sql(sql)
-          pk = primary_key(table_ref) if table_ref
-        end
-
-        # CPK
-        # sql = "#{sql} RETURNING #{quote_column_name(pk)}" if pk
-        sql = "#{sql} RETURNING #{quote_column_names(pk)}" if pk
-
-        [sql, binds]
-      end
-
-      # Returns a single value if query returns a single element
-      # otherwise returns an array coresponding to the composite keys
-      #
-      def last_inserted_id(result)
-        row = result && result.rows.first
-        if Array === row
-          row.size == 1 ? row[0] : row
-        end
-      end
-    end
-  end
-end
+module ActiveRecord
+  module ConnectionAdapters
+    class PostgreSQLAdapter
+      def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
+        unless pk
+          # Extract the table from the insert sql. Yuck.
+          table_ref = extract_table_ref_from_insert_sql(sql)
+          pk = primary_key(table_ref) if table_ref
+        end
+
+        if pk
+          # CPK
+          # select_value("#{sql} RETURNING #{quote_column_name(pk)}")
+          select_value("#{sql} RETURNING #{quote_column_names(pk)}")
+        else
+          super
+        end
+      end
+      alias :create :insert
+
+      def sql_for_insert(sql, pk, id_value, sequence_name, binds)
+        unless pk
+          # Extract the table from the insert sql. Yuck.
+          table_ref = extract_table_ref_from_insert_sql(sql)
+          pk = primary_key(table_ref) if table_ref
+        end
+
+        # CPK
+        # sql = "#{sql} RETURNING #{quote_column_name(pk)}" if pk
+        sql = "#{sql} RETURNING #{quote_column_names(pk)}" if pk
+
+        [sql, binds]
+      end
+
+      # Returns a single value if query returns a single element
+      # otherwise returns an array coresponding to the composite keys
+      #
+      def last_inserted_id(result)
+        row = result && result.rows.first
+        if Array === row
+          row.size == 1 ? row[0] : row
+        end
+      end
+
+      module Quoting
+        def quote_column_name(name) #:nodoc:
+          # CPK
+          # PGconn.quote_ident(name.to_s)
+          if name.is_a?(Array)
+            name.map do |column|
+              PGconn.quote_ident(column.to_s)
+            end.join(', ')
+          else
+            PGconn.quote_ident(name.to_s)
+          end
+        end
+      end
+    end
+  end
+end