composite_primary_keys 6.0.8 → 7.0.0

data/lib/composite_primary_keys/relation/finder_methods.rb

@@ -1,94 +1,132 @@
 module CompositePrimaryKeys
   module ActiveRecord
     module FinderMethods
-      def construct_limited_ids_condition(relation)
-        orders = relation.order_values
-        # CPK
-        # values = @klass.connection.distinct("#{@klass.connection.quote_table_name table_name}.#{primary_key}", orders)
-        keys = @klass.primary_keys.map do |key|
-          "#{@klass.connection.quote_table_name @klass.table_name}.#{key}"
+      def apply_join_dependency(relation, join_dependency)
+        relation = relation.except(:includes, :eager_load, :preload)
+        relation = relation.joins join_dependency
+
+        if using_limitable_reflections?(join_dependency.reflections)
+          relation
+        else
+          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!(cpk_in_predicate(table, self.primary_keys, limited_ids))
+          end
+          relation.except(:limit, :offset)
         end
-        values = @klass.connection.distinct(keys.join(', '), orders)
-
-        relation = relation.dup
+      end
 
-        ids_array = relation.select(values).collect {|row| row[primary_key]}
+      def limited_ids_for(relation)
         # CPK
-        # ids_array.empty? ? raise(ThrowResult) : table[primary_key].in(ids_array)
-
-        # OR together each and expression (key=value and key=value) that matches an id set
-        # since we only need to match 0 or more records
-        or_expressions = ids_array.map do |id_set|
-          # AND together "key=value" exprssios to match each id set
-          and_expressions = [self.primary_keys, id_set].transpose.map do |key, id|
-            table[key].eq(id)
-          end
-          Arel::Nodes::And.new(and_expressions)
+        #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!
 
-        first = or_expressions.shift
-        Arel::Nodes::Grouping.new(or_expressions.inject(first) do |memo, expr|
-            Arel::Nodes::Or.new(memo, expr)
-        end)
+        id_rows = @klass.connection.select_all(relation.arel, 'SQL', relation.bind_values)
+
+        # CPK
+        #id_rows.map {|row| row[primary_key]}
+        id_rows.map {|row| row.values}
       end
 
-      def exists?(id = nil)
-        # ID can be:
+      def exists?(conditions = :none)
+        # conditions can be:
         #   Array - ['department_id = ? and location_id = ?', 1, 1]
         #   Array -> [1,2]
         #   CompositeKeys -> [1,2]
 
-        id = id.id if ::ActiveRecord::Base === id
+        conditions = conditions.id if ::ActiveRecord::Base === conditions
+        return false if !conditions
+
+        relation = apply_join_dependency(self, construct_join_dependency)
+        return false if ::ActiveRecord::NullRelation === relation
 
-        join_dependency = construct_join_dependency_for_association_find
-        relation = construct_relation_for_association_find(join_dependency)
-        relation = relation.except(:select).select("1").limit(1)
+        relation = relation.except(:select, :order).select(::ActiveRecord::FinderMethods::ONE_AS_ONE).limit(1)
 
         # CPK
-        #case id
+        #case conditions
         #when Array, Hash
-        #  relation = relation.where(id)
+        #  relation = relation.where(conditions)
         #else
-        #  relation = relation.where(table[primary_key].eq(id)) if id
+        #  relation = relation.where(table[primary_key].eq(conditions)) if conditions != :none
         #end
 
-        case id
+        case conditions
         when CompositePrimaryKeys::CompositeKeys
-          relation = relation.where(cpk_id_predicate(table, primary_key, id))
+          relation = relation.where(cpk_id_predicate(table, primary_key, conditions))
         when Array
           pk_length = @klass.primary_keys.length
 
-          if id.length == pk_length # E.g. id = ['France', 'Paris']
-            return self.exists?(id.to_composite_keys)
-          else # Assume that id contains where relation
-            relation = relation.where(id)
+          if conditions.length == pk_length # E.g. conditions = ['France', 'Paris']
+            return self.exists?(conditions.to_composite_keys)
+          else # Assume that conditions contains where relation
+            relation = relation.where(conditions)
           end
         when Hash
-          relation = relation.where(id)
+          relation = relation.where(conditions)
+        end
+
+        connection.select_value(relation, "#{name} Exists", relation.bind_values) ? true : false
+      end
+
+      def find_with_ids(*ids)
+        raise UnknownPrimaryKey.new(@klass) if primary_key.nil?
+
+        expects_array = ids.first.kind_of?(Array)
+        return ids.first if expects_array && ids.first.empty?
+
+        # CPK - don't do this, we want an array of arrays
+        #ids = ids.flatten.compact.uniq
+
+        case ids.size
+          when 0
+            raise RecordNotFound, "Couldn't find #{@klass.name} without an ID"
+          when 1
+            result = find_one(ids.first)
+            # CPK
+            # expects_array ? [ result ] : result
+            result
+          else
+            find_some(ids)
         end
-        connection.select_value(relation.to_sql) ? true : false
       end
 
-      def find_with_ids(*ids, &block)
-        return to_a.find { |*block_args| yield(*block_args) } if block_given?
+      def find_one(id)
+        # CPK
+        #id = id.id if ActiveRecord::Base === id
+        id = id.id if ::ActiveRecord::Base === id
 
-        # Supports:
-        #   find('1,2')             ->  ['1,2']
-        #   find(1,2)               ->  [1,2]
-        #   find([1,2])             -> [['1,2']]
-        #   find([1,2], [3,4])      -> [[1,2],[3,4]]
-        #
-        # Does *not* support:
-        #   find('1,2', '3,4')      ->  ['1,2','3,4']
+        # 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))
 
-        # Normalize incoming data.  Note the last arg can be nil.  Happens
-        # when find is called with nil options which is then passed on
-        # to find_with_ids.
-        ids.compact!
+        record = relation.take
+        raise_record_not_found_exception!(id, 0, 1) unless record
+        record
+      end
 
-        ids = [ids] unless ids.first.kind_of?(Array)
+      def find_some(ids)
+        # CPK
+        # result = where(table[primary_key].in(ids)).to_a
 
-        results = ids.map do |cpk_ids|
+        result = ids.map do |cpk_ids|
           cpk_ids = if cpk_ids.length == 1
             cpk_ids.first.split(CompositePrimaryKeys::ID_SEP).to_composite_keys
           else
@@ -114,8 +152,24 @@ module CompositePrimaryKeys
           records
         end.flatten
 
-        ids.length == 1 ? results.first : results
+        expected_size =
+          if limit_value && ids.size > limit_value
+            limit_value
+          else
+            ids.size
+          end
+
+        # 11 ids with limit 3, offset 9 should give 2 results.
+        if offset_value && (ids.size - offset_value < expected_size)
+          expected_size = ids.size - offset_value
+        end
+
+        if result.size == expected_size
+          result
+        else
+          raise_record_not_found_exception!(ids, result.size, expected_size)
+        end
       end
     end
   end
-end
+end

data/lib/composite_primary_keys/version.rb

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

data/test/abstract_unit.rb

@@ -6,7 +6,6 @@ require 'composite_primary_keys'
 
 require 'active_support/test_case'
 require 'minitest/autorun'
-require 'mocha/mini_test'
 
 # Now load the connection spec
 require File.join(PROJECT_ROOT, "test", "connections", "connection_spec")
@@ -28,13 +27,13 @@ I18n.config.enforce_available_locales = true
 
 class ActiveSupport::TestCase
   include ActiveRecord::TestFixtures
-
+  
   self.fixture_path = File.dirname(__FILE__) + "/fixtures/"
   self.use_instantiated_fixtures = false
   self.use_transactional_fixtures = true
 
   def assert_date_from_db(expected, actual, message = nil)
-    # SQL Server doesn't have a separate column type just for dates,
+    # SQL Server doesn't have a separate column type just for dates, 
     # so the time is in the string and incorrectly formatted
     if current_adapter?(:SQLServerAdapter)
       assert_equal expected.strftime("%Y/%m/%d 00:00:00"), actual.strftime("%Y/%m/%d 00:00:00")
@@ -61,11 +60,11 @@ class ActiveSupport::TestCase
   def assert_no_queries(&block)
     assert_queries(0, &block)
   end
-
+  
   cattr_accessor :classes
 
   protected
-
+  
   def testing_with(&block)
     classes.keys.each do |key_test|
       @key_test = key_test
@@ -76,15 +75,15 @@ class ActiveSupport::TestCase
       yield
     end
   end
-
+  
   def first_id
     ids = (1..@primary_keys.length).map {|num| 1}
     composite? ? ids.to_composite_ids : ids.first
   end
-
+  
   def composite?
     @key_test != :single
-  end
+  end  
 
   # Oracle metadata is in all caps.
   def with_quoted_identifiers(s)

data/test/fixtures/db_definitions/db2-create-tables.sql

@@ -1,8 +1,8 @@
 CREATE TABLE reference_types (
-  reference_type_id integer NOT NULL generated by default as identity (start with 100, increment by 1, no cache),
-  type_label varchar(50) default NULL,
-  abbreviation varchar(50) default NULL,
-  description varchar(50) default NULL,
+  reference_type_id integer NOT NULL generated by default as identity (start with 100, increment by 1, no cache),  
+  type_label varchar(50) default NULL,  
+  abbreviation varchar(50) default NULL, 
+  description varchar(50) default NULL, 
   PRIMARY KEY (reference_type_id)
 );
 
@@ -74,7 +74,7 @@ CREATE TABLE groups (
   id integer NOT NULL ,
   name varchar(50) NOT NULL,
   PRIMARY KEY  (id)
-);
+);               
 
 CREATE TABLE memberships (
   user_id integer NOT NULL,
@@ -91,18 +91,17 @@ CREATE TABLE membership_statuses (
 );
 
 create table restaurants (
-  franchise_id integer not null,
-  store_id integer not null,
-  name varchar(100),
-  lock_version integer default 0,
-  primary key (franchise_id, store_id)
+	franchise_id integer not null,
+	store_id integer not null,
+	name varchar(100),
+	primary key (franchise_id, store_id)
 );
 
 create table restaurants_suburbs (
-  franchise_id integer not null,
-  store_id integer not null,
-  city_id integer not null,
-  suburb_id integer not null
+	franchise_id integer not null,
+	store_id integer not null,
+	city_id integer not null,
+	suburb_id integer not null
 );
 
 create table products_restaurants (
@@ -110,9 +109,3 @@ create table products_restaurants (
   franchise_id integer not null,
   store_id integer not null
 );
-
-create table model_with_callbacks (
-  reference_type_id integer,
-  reference_code integer NOT NULL,
-  PRIMARY KEY (reference_type_id,reference_code)
-);

data/test/fixtures/db_definitions/db2-drop-tables.sql

@@ -1,18 +1,17 @@
-drop table MEMBERSHIPS;
-drop table REFERENCE_CODES;
-drop table TARIFFS;
-drop table ARTICLES;
-drop table GROUPS;
-drop table MEMBERSHIP_STATUSES;
-drop table READINGS;
-drop table REFERENCE_TYPES;
-drop table STREETS;
-drop table PRODUCTS;
-drop table USERS;
-drop table SUBURBS;
-drop table PRODUCT_TARIFFS;
+drop table MEMBERSHIPS;                                                                                                                    
+drop table REFERENCE_CODES;                                                                                                                 
+drop table TARIFFS;                                                                                                                         
+drop table ARTICLES;                                                                                                                        
+drop table GROUPS;                                                                                                                          
+drop table MEMBERSHIP_STATUSES;                                                                                                             
+drop table READINGS;                                                                                                                        
+drop table REFERENCE_TYPES;                                                                                                                 
+drop table STREETS;                                                                                                                         
+drop table PRODUCTS;                                                                                                                        
+drop table USERS;                                                                                                                           
+drop table SUBURBS;                                                                                                                         
+drop table PRODUCT_TARIFFS; 
 drop table KITCHEN_SINK;
 drop table RESTAURANTS;
 drop table RESTAURANTS_SUBURBS;
 drop table PRODUCTS_RESTAURANTS;
-drop table MODEL_WITH_CALLBACKS;

data/test/fixtures/db_definitions/mysql.sql

@@ -123,7 +123,6 @@ create table restaurants (
     franchise_id int not null,
     store_id int not null,
     name varchar(100),
-    lock_version int default 0,
     primary key (franchise_id, store_id)
 );
 
@@ -191,9 +190,3 @@ create table employees_groups (
   employee_id int not null,
   group_id int not null
 );
-
-create table model_with_callbacks (
-    reference_type_id int not null,
-    reference_code int not null,
-    primary key (reference_type_id, reference_code)
-);

data/test/fixtures/db_definitions/oracle.drop.sql

@@ -40,4 +40,3 @@ drop sequence students_seq;
 drop table seats;
 drop table capitols;
 drop table products_restaurants;
-drop table model_with_callbacks;

data/test/fixtures/db_definitions/oracle.sql

@@ -131,7 +131,6 @@ create table restaurants (
     franchise_id number(11) not null,
     store_id     number(11) not null,
     name         varchar(100),
-    lock_version number(11) default 0,
     constraint restaurants_pk primary key (franchise_id, store_id)
 );
 
@@ -206,8 +205,3 @@ create table employees_groups (
   group_id int not null
 );
 
-create table model_with_callbacks(
-    reference_type_id number(11),
-    reference_code    number(11),
-    constraint model_with_callbacks_pk primary key (reference_type_id, reference_code)
-);

data/test/fixtures/db_definitions/postgresql.sql

@@ -125,7 +125,6 @@ create table restaurants (
     franchise_id int not null,
     store_id     int not null,
     name         varchar(100),
-    lock_version int default 0,
     primary key (franchise_id, store_id)
 );
 
@@ -193,9 +192,3 @@ create table employees_groups (
   employee_id int not null,
   group_id int not null
 );
-
-create table model_with_callbacks(
-    reference_type_id int,
-    reference_code    int         not null,
-    primary key (reference_type_id, reference_code)
-);

data/test/fixtures/db_definitions/sqlite.sql

@@ -83,7 +83,7 @@ create table membership_statuses (
     id integer not null primary key autoincrement,
     user_id int not null,
     group_id int not null,
-    status varchar(50) not null
+	status varchar(50) not null
 );
 
 create table departments (
@@ -111,49 +111,48 @@ create table hacks (
 );
 
 create table restaurants (
-    franchise_id integer not null,
-    store_id integer not null,
-    name varchar(100),
-    lock_version integer default 0,
-    primary key (franchise_id, store_id)
+	franchise_id integer not null,
+	store_id integer not null,
+	name varchar(100),
+	primary key (franchise_id, store_id)
 );
 
 create table restaurants_suburbs (
-    franchise_id integer not null,
-    store_id integer not null,
-    city_id integer not null,
-    suburb_id integer not null
+	franchise_id integer not null,
+	store_id integer not null,
+	city_id integer not null,
+	suburb_id integer not null
 );
 
 create table dorms (
-    id integer not null primary key autoincrement
+	id integer not null primary key autoincrement
 );
 
 create table rooms (
-    dorm_id integer not null,
-    room_id integer not null,
-    primary key (dorm_id, room_id)
+	dorm_id integer not null,
+	room_id integer not null,
+	primary key (dorm_id, room_id)
 );
 
 create table room_attributes (
-    id integer not null primary key autoincrement,
-    name varchar(50)
+	id integer not null primary key autoincrement,
+	name varchar(50)
 );
 
 create table room_attribute_assignments (
-    dorm_id integer not null,
-    room_id integer not null,
-    room_attribute_id integer not null
+	dorm_id integer not null,
+	room_id integer not null,
+	room_attribute_id integer not null
 );
 
 create table students (
-    id integer not null primary key autoincrement
+	id integer not null primary key autoincrement
 );
 
 create table room_assignments (
-    student_id integer not null,
-    dorm_id integer not null,
-    room_id integer not null
+	student_id integer not null,
+	dorm_id integer not null,
+	room_id integer not null	
 );
 
 create table seats (
@@ -171,8 +170,8 @@ create table capitols (
 
 create table products_restaurants (
   product_id integer not null,
-  franchise_id integer not null,
-  store_id integer not null
+	franchise_id integer not null,
+	store_id integer not null
 );
 
 create table employees_groups (
@@ -180,8 +179,3 @@ create table employees_groups (
   group_id integer not null
 );
 
-create table model_with_callbacks(
-    reference_type_id int(11),
-    reference_code int(11) not null,
-    primary key (reference_type_id, reference_code)
-);