composite_primary_keys 8.1.1 → 8.1.2

data/lib/composite_primary_keys/relation/calculations.rb

@@ -21,7 +21,7 @@ module CompositePrimaryKeys
         column_alias = column_name
 
         bind_values = nil
-        
+
         # CPK
         # if operation == "count" && (relation.limit_value || relation.offset_value)
         if operation == "count"
@@ -36,6 +36,7 @@ module CompositePrimaryKeys
           select_value = operation_over_aggregate_column(column, operation, distinct)
 
           column_alias = select_value.alias
+          column_alias ||= @klass.connection.column_name_for_operation(operation, select_value)
           relation.select_values = [select_value]
 
           query_builder = relation.arel
@@ -69,6 +70,7 @@ module CompositePrimaryKeys
         subquery = relation.arel.as(subquery_alias)
 
         sm = Arel::SelectManager.new relation.engine
+        sm.bind_values = relation.arel.bind_values
         # CPK
         # select_value = operation_over_aggregate_column(column_alias, 'count', distinct)
         select_value = operation_over_aggregate_column(Arel.sql("*"), 'count', false)
@@ -76,4 +78,4 @@ module CompositePrimaryKeys
       end
     end
   end
-end
+end

data/lib/composite_primary_keys/relation/finder_methods.rb

@@ -11,7 +11,7 @@ module CompositePrimaryKeys
           if relation.limit_value
             limited_ids = limited_ids_for(relation)
             # CPK
-            #limited_ids.empty? ? relation.none! : relation.where!(table[primary_key].in(limited_ids))
+            # limited_ids.empty? ? relation.none! : relation.where!(table[primary_key].in(limited_ids))
             limited_ids.empty? ? relation.none! : relation.where!(cpk_in_predicate(table, self.primary_keys, limited_ids))
           end
           relation.except(:limit, :offset)
@@ -20,16 +20,17 @@ module CompositePrimaryKeys
 
       def limited_ids_for(relation)
         # CPK
-        #values = @klass.connection.columns_for_distinct(
-        #  "#{quoted_table_name}.#{quoted_primary_key}", relation.order_values)
+        # values = @klass.connection.columns_for_distinct(
+        #     "#{quoted_table_name}.#{quoted_primary_key}", relation.order_values)
         columns = @klass.primary_keys.map do |key|
           "#{quoted_table_name}.#{connection.quote_column_name(key)}"
         end
         values = @klass.connection.columns_for_distinct(columns, relation.order_values)
 
         relation = relation.except(:select).select(values).distinct!
+        arel = relation.arel
 
-        id_rows = @klass.connection.select_all(relation.arel, 'SQL', relation.bind_values)
+        id_rows = @klass.connection.select_all(arel, 'SQL', arel.bind_values + relation.bind_values)
 
         # CPK
         #id_rows.map {|row| row[primary_key]}
@@ -37,12 +38,14 @@ module CompositePrimaryKeys
       end
       
       def exists?(conditions = :none)
-        # conditions can be:
-        #   Array - ['department_id = ? and location_id = ?', 1, 1]
-        #   Array -> [1,2]
-        #   CompositeKeys -> [1,2]
+        if ::ActiveRecord::Base === conditions
+          conditions = conditions.id
+          ::ActiveSupport::Deprecation.warn(<<-MSG.squish)
+          You are passing an instance of ActiveRecord::Base to `exists?`.
+          Please pass the id of the object by calling `.id`
+          MSG
+        end
 
-        conditions = conditions.id if ::ActiveRecord::Base === conditions
         return false if !conditions
 
         relation = apply_join_dependency(self, construct_join_dependency)
@@ -50,14 +53,14 @@ module CompositePrimaryKeys
 
         relation = relation.except(:select, :order).select(::ActiveRecord::FinderMethods::ONE_AS_ONE).limit(1)
 
-        # CPK
-        #case conditions
-        #when Array, Hash
-        #  relation = relation.where(conditions)
-        #else
-        #  relation = relation.where(table[primary_key].eq(conditions)) if conditions != :none
-        #end
-
+        # case conditions
+        # when Array, Hash
+        #   relation = relation.where(conditions)
+        # else
+        #   unless conditions == :none
+        #     relation = relation.where(primary_key => conditions)
+        #   end
+        # end
         case conditions
         when CompositePrimaryKeys::CompositeKeys
           relation = relation.where(cpk_id_predicate(table, primary_key, conditions))
@@ -80,14 +83,14 @@ module CompositePrimaryKeys
         raise UnknownPrimaryKey.new(@klass) if primary_key.nil?
 
         # CPK
-        #expects_array = ids.first.kind_of?(Array)
+        # expects_array = ids.first.kind_of?(Array)
         ids = CompositePrimaryKeys.normalize(ids)
         expects_array = ids.flatten != ids.flatten(1)
 
         return ids.first if expects_array && ids.first.empty?
 
         # CPK
-        #ids = ids.flatten.compact.uniq
+        # ids = ids.flatten.compact.uniq
         ids = expects_array ? ids.first : ids
 
         case ids.size
@@ -105,24 +108,27 @@ module CompositePrimaryKeys
 
       def find_one(id)
         # CPK
-        #id = id.id if ActiveRecord::Base === id
-        id = id.id if ::ActiveRecord::Base === id
+        # if ActiveRecord::Base === id
+        if ::ActiveRecord::Base === id
+          id = id.id
+          ActiveSupport::Deprecation.warn(<<-MSG.squish)
+          You are passing an instance of ActiveRecord::Base to `find`.
+          Please pass the id of the object by calling `.id`
+          MSG
+        end
 
-        # CPK
-        #column = columns_hash[primary_key]
-        #substitute = connection.substitute_at(column, bind_values.length)
-        #relation = where(table[primary_key].eq(substitute))
-        #relation.bind_values += [[column, id]]
-        #record = relation.take
         relation = self
         values = primary_keys.each_with_index.map do |primary_key, i|
           column = columns_hash[primary_key]
           relation.bind_values += [[column, id[i]]]
           connection.substitute_at(column, bind_values.length - 1)
         end
+
         relation = relation.where(cpk_id_predicate(table, primary_keys, values))
         record = relation.take
+
         raise_record_not_found_exception!(id, 0, 1) unless record
+
         record
       end
 

data/lib/composite_primary_keys/relation/predicate_builder.rb

@@ -2,12 +2,27 @@ module ActiveRecord
   class PredicateBuilder
     def self.expand(klass, table, column, value)
       queries = []
-      if klass && reflection = klass.reflect_on_association(column.to_sym)
-        if reflection.polymorphic? && base_class = polymorphic_base_class_from_value(value)
+
+      # Find the foreign key when using queries such as:
+      # Post.where(author: author)
+      #
+      # For polymorphic relationships, find the foreign key and type:
+      # PriceEstimate.where(estimate_of: treasure)
+      if klass && reflection = klass._reflect_on_association(column)
+        base_class = polymorphic_base_class_from_value(value)
+
+        if reflection.polymorphic? && base_class
           queries << build(table[reflection.foreign_type], base_class)
         end
 
         column = reflection.foreign_key
+
+        # CPK
+        # if base_class
+        if base_class && !(Base === value && value.composite?)
+          primary_key = reflection.association_primary_key(base_class)
+          value = convert_value_to_association_ids(value, primary_key)
+        end
       end
 
       #CPK
@@ -19,4 +34,4 @@ module ActiveRecord
       queries
     end
   end
-end
+end

data/lib/composite_primary_keys/relation/query_methods.rb

@@ -1,41 +1,41 @@
-module CompositePrimaryKeys::ActiveRecord::QueryMethods
-
-  def reverse_sql_order(order_query)
-    # CPK
-    # order_query = ["#{quoted_table_name}.#{quoted_primary_key} ASC"] if order_query.empty?
-
-    # break apart CPKs 
-    order_query = primary_key.map do |key|
-      "#{quoted_table_name}.#{connection.quote_column_name(key)} ASC"
-    end if order_query.empty?
-
-    order_query.map do |o|
-      case o
-      when Arel::Nodes::Ordering
-        o.reverse
-      when String, Symbol
-        o.to_s.split(',').collect do |s|
-          s.strip!
-          s.gsub!(/\sasc\Z/i, ' DESC') || s.gsub!(/\sdesc\Z/i, ' ASC') || s.concat(' DESC')
-        end
-      else
-        o
-      end
-    end.flatten
-  end
-
-
-  def order(*args)    
-    args.map! do |arg|
-      if arg.is_a?(Arel::Nodes::Ordering) && arg.expr.name.is_a?(Array)
-        arg = arg.expr.name.map do |key|
-          cloned_node = arg.clone
-          cloned_node.expr.name = key
-          cloned_node
-        end
-      end
-      arg
-    end if composite?
-    super(*args)
-  end
-end
+module CompositePrimaryKeys::ActiveRecord::QueryMethods
+
+  def reverse_sql_order(order_query)
+    # CPK
+    # order_query = ["#{quoted_table_name}.#{quoted_primary_key} ASC"] if order_query.empty?
+
+    # break apart CPKs
+    order_query = primary_key.map do |key|
+      "#{quoted_table_name}.#{connection.quote_column_name(key)} ASC"
+    end if order_query.empty?
+
+    order_query.map do |o|
+      case o
+      when Arel::Nodes::Ordering
+        o.reverse
+      when String, Symbol
+        o.to_s.split(',').collect do |s|
+          s.strip!
+          s.gsub!(/\sasc\Z/i, ' DESC') || s.gsub!(/\sdesc\Z/i, ' ASC') || s.concat(' DESC')
+        end
+      else
+        o
+      end
+    end.flatten
+  end
+
+
+  def order(*args)
+    args.map! do |arg|
+      if arg.is_a?(Arel::Nodes::Ordering) && arg.expr.name.is_a?(Array)
+        arg = arg.expr.name.map do |key|
+          cloned_node = arg.clone
+          cloned_node.expr.name = key
+          cloned_node
+        end
+      end
+      arg
+    end if composite?
+    super(*args)
+  end
+end

data/lib/composite_primary_keys/sanitization.rb

@@ -16,6 +16,8 @@ module ActiveRecord
       def expand_hash_conditions_for_aggregates(attrs)
         expanded_attrs = {}
         attrs.each do |attr, value|
+          # CPK
+          # if aggregation = reflect_on_aggregation(attr.to_sym)
           if attr.is_a?(CompositePrimaryKeys::CompositeKeys)
             attr.each_with_index do |key,i|
               expanded_attrs[key] = value.respond_to?(:flatten) ? value.flatten[i] : value
@@ -38,13 +40,13 @@ module ActiveRecord
 
       def quoted_id
         # CPK
-        #quote_value(id, column_for_attribute(self.class.primary_key))
+        # self.class.quote_value(id, column_for_attribute(self.class.primary_key))
         if self.composite?
-          [self.class.primary_keys, ids].
-            transpose.
-            map {|attr_name,id| quote_value(id, column_for_attribute(attr_name))}
+          [self.class.primary_keys, ids].transpose.map { |attr_name,id|
+            self.class.quote_value(id, column_for_attribute(attr_name))
+          }
         else
-          quote_value(id, column_for_attribute(self.class.primary_key))
+          self.class.quote_value(id, column_for_attribute(self.class.primary_key))
         end
       end
     end

data/lib/composite_primary_keys/validations/uniqueness.rb

@@ -6,24 +6,28 @@ module ActiveRecord
         table = finder_class.arel_table
         value = map_enum_attribute(finder_class, attribute, value)
 
-        relation = build_relation(finder_class, table, attribute, value)
-        # CPK
-        # relation = relation.and(table[finder_class.primary_key.to_sym].not_eq(record.id)) if record.persisted?
-        if record.persisted?
-          not_eq_conditions = Array(finder_class.primary_key).zip(Array(record.send(:id))).map do |name, value|
-            table[name.to_sym].not_eq(value)
-          end
+        begin
+          relation = build_relation(finder_class, table, attribute, value)
+          # CPK
+          # relation = relation.and(table[finder_class.primary_key.to_sym].not_eq(record.id)) if record.persisted?
+          if record.persisted?
+            not_eq_conditions = Array(finder_class.primary_key).zip(Array(record.send(:id))).map do |name, value|
+              table[name.to_sym].not_eq(value)
+            end
 
-          condition = not_eq_conditions.shift
-          not_eq_conditions.each do |not_eq_condition|
-            condition = condition.or(not_eq_condition)
+            condition = not_eq_conditions.shift
+            not_eq_conditions.each do |not_eq_condition|
+              condition = condition.or(not_eq_condition)
+            end
+            relation = relation.and(condition)
           end
-          relation = relation.and(condition)
+          # End CPK
+          relation = scope_relation(record, table, relation)
+          relation = finder_class.unscoped.where(relation)
+          relation = relation.merge(options[:conditions]) if options[:conditions]
+        rescue RangeError
+          relation = finder_class.none
         end
-        
-        relation = scope_relation(record, table, relation)
-        relation = finder_class.unscoped.where(relation)
-        relation = relation.merge(options[:conditions]) if options[:conditions]
 
         if relation.exists?
           error_options = options.except(:case_sensitive, :scope, :conditions)
@@ -34,4 +38,4 @@ module ActiveRecord
       end
     end
   end
-end
+end

data/lib/composite_primary_keys/version.rb

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

data/tasks/databases/oracle.rake

@@ -1,25 +1,27 @@
-require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
-require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
-
-namespace :oracle do
-  desc 'Build the Oracle test database'
-  task :build_database => :load_connection do
-    options_str = connection_string
-
-    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'oracle.sql')
-    sh %( sqlplus #{options_str} < #{schema} )
-  end
-
-  desc 'Drop the Oracle test database'
-  task :drop_database => :load_connection do 
-    options_str = connection_string
-    sh %( sqlplus #{options_str} < #{File.join(SCHEMA_PATH, 'oracle.drop.sql')} )
-  end
-
-  desc 'Rebuild the Oracle test database'
-  task :rebuild_database => [:drop_database, :build_database]
-
-  task :load_connection do
-    require File.join(PROJECT_ROOT, "test", "connections", "native_oracle", "connection")
-  end
-end
+require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
+require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
+
+namespace :oracle do
+  desc 'Build the Oracle test database'
+  task :build_database => :load_connection do
+    options_str = connection_string
+
+    sql = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'oracle.sql')
+    sh %( sqlplus #{options_str} < #{sql} )
+  end
+
+  desc 'Drop the Oracle test database'
+  task :drop_database => :load_connection do
+    options_str = connection_string
+
+    sql = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'oracle.drop.sql')
+    sh %( sqlplus #{options_str} < #{sql} )
+  end
+
+  desc 'Rebuild the Oracle test database'
+  task :rebuild_database => [:drop_database, :build_database]
+
+  task :load_connection do
+    require File.join(PROJECT_ROOT, "test", "connections", "native_oracle", "connection")
+  end
+end

data/tasks/databases/oracle_enhanced.rake

@@ -0,0 +1,27 @@
+require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
+require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
+
+namespace :oracle_enhanced do
+  desc 'Build the Oracle test database'
+  task :build_database => :load_connection do
+    options_str = connection_string
+
+    sql = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'oracle.sql')
+    sh %( sqlplus #{options_str} < #{sql} )
+  end
+
+  desc 'Drop the Oracle test database'
+  task :drop_database => :load_connection do
+    options_str = connection_string
+
+    sql = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'oracle.drop.sql')
+    sh %( sqlplus #{options_str} < #{sql} )
+  end
+
+  desc 'Rebuild the Oracle test database'
+  task :rebuild_database => [:drop_database, :build_database]
+
+  task :load_connection do
+    require File.join(PROJECT_ROOT, "test", "connections", "native_oracle_enhanced", "connection")
+  end
+end

data/test/connections/databases.ci.yml

@@ -1,15 +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
+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