composite_primary_keys 7.0.13 → 7.0.14

data/lib/composite_primary_keys/sanitization.rb

@@ -1,52 +1,52 @@
-module ActiveRecord
-  module Sanitization
-    module ClassMethods
-      protected
-      # Accepts a hash of SQL conditions and replaces those attributes
-      # that correspond to a +composed_of+ relationship with their expanded
-      # aggregate attribute values.
-      # Given:
-      #     class Person < ActiveRecord::Base
-      #       composed_of :address, class_name: "Address",
-      #         mapping: [%w(address_street street), %w(address_city city)]
-      #     end
-      # Then:
-      #     { address: Address.new("813 abc st.", "chicago") }
-      #       # => { address_street: "813 abc st.", address_city: "chicago" }
-      def expand_hash_conditions_for_aggregates(attrs)
-        expanded_attrs = {}
-        attrs.each do |attr, value|
-          if attr.is_a?(CompositePrimaryKeys::CompositeKeys)
-            attr.each_with_index do |key,i|
-              expanded_attrs[key] = value.flatten[i]
-            end
-          elsif aggregation = reflect_on_aggregation(attr.to_sym)
-            mapping = aggregation.mapping
-            mapping.each do |field_attr, aggregate_attr|
-              if mapping.size == 1 && !value.respond_to?(aggregate_attr)
-                expanded_attrs[field_attr] = value
-              else
-                expanded_attrs[field_attr] = value.send(aggregate_attr)
-              end
-            end
-          else
-            expanded_attrs[attr] = value
-          end
-        end
-        expanded_attrs
-      end
-
-      def quoted_id
-        # CPK
-        #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))}
-        else
-          quote_value(id, column_for_attribute(self.class.primary_key))
-        end
-      end
-    end
-  end
-end
+module ActiveRecord
+  module Sanitization
+    module ClassMethods
+      protected
+      # Accepts a hash of SQL conditions and replaces those attributes
+      # that correspond to a +composed_of+ relationship with their expanded
+      # aggregate attribute values.
+      # Given:
+      #     class Person < ActiveRecord::Base
+      #       composed_of :address, class_name: "Address",
+      #         mapping: [%w(address_street street), %w(address_city city)]
+      #     end
+      # Then:
+      #     { address: Address.new("813 abc st.", "chicago") }
+      #       # => { address_street: "813 abc st.", address_city: "chicago" }
+      def expand_hash_conditions_for_aggregates(attrs)
+        expanded_attrs = {}
+        attrs.each do |attr, value|
+          if attr.is_a?(CompositePrimaryKeys::CompositeKeys)
+            attr.each_with_index do |key,i|
+              expanded_attrs[key] = value.flatten[i]
+            end
+          elsif aggregation = reflect_on_aggregation(attr.to_sym)
+            mapping = aggregation.mapping
+            mapping.each do |field_attr, aggregate_attr|
+              if mapping.size == 1 && !value.respond_to?(aggregate_attr)
+                expanded_attrs[field_attr] = value
+              else
+                expanded_attrs[field_attr] = value.send(aggregate_attr)
+              end
+            end
+          else
+            expanded_attrs[attr] = value
+          end
+        end
+        expanded_attrs
+      end
+
+      def quoted_id
+        # CPK
+        #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))}
+        else
+          quote_value(id, column_for_attribute(self.class.primary_key))
+        end
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/validations/uniqueness.rb

@@ -1,40 +1,38 @@
-module ActiveRecord
-  module Validations
-    class UniquenessValidator
-      def validate_each(record, attribute, value)
-        finder_class = find_finder_class_for(record)
-        table = finder_class.arel_table
-
-        coder = record.class.serialized_attributes[attribute.to_s]
-
-        if value && coder
-          value = coder.dump value
-        end
-
-        relation = build_relation(finder_class, table, attribute, value)
-        # CPK
-        # relation = relation.and(table[finder_class.primary_key.to_sym].not_eq(record.send(: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)
-          end
-          relation = relation.and(condition)
-        end
-
-        Array.wrap(options[:scope]).each do |scope_item|
-          scope_value = record.send(scope_item)
-          relation = relation.and(table[scope_item].eq(scope_value))
-        end
-
-        if finder_class.unscoped.where(relation).exists?
-          record.errors.add(attribute, :taken, options.except(:case_sensitive, :scope).merge(:value => value))
-        end
-      end
-    end
-  end
+module ActiveRecord
+  module Validations
+    class UniquenessValidator
+      def validate_each(record, attribute, value)
+        finder_class = find_finder_class_for(record)
+        table = finder_class.arel_table
+        value = map_enum_attribute(finder_class,attribute,value)
+        value = deserialize_attribute(record, 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
+
+          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 = 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)
+          error_options[:value] = value
+
+          record.errors.add(attribute, :taken, error_options)
+        end
+      end
+    end
+  end
 end

data/lib/composite_primary_keys/version.rb

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

data/tasks/databases/sqlserver.rake

@@ -1,27 +1,40 @@
-require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
-require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
-
-namespace :sqlserver do
-  desc 'Build the SQL Server test database'
-  task :build_database => :load_connection do
-    options_str = connection_string
-
-    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'sqlserver.sql')
-    sh %( sqsh #{options_str} -i #{schema} )
-  end
-
-  desc 'Drop the SQL Server test database'
-  task :drop_database => :load_connection do 
-    options_str = connection_string
-    
-    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'sqlserver.drop.sql')
-    sh %( sqsh #{options_str} -i #{schema} )
-  end
-
-  desc 'Rebuild the SQL Server test database'
-  task :rebuild_database => [:drop_database, :build_database]
-
-  task :load_connection do
-    require File.join(PROJECT_ROOT, "test", "connections", "native_sqlserver", "connection")
-  end
-end
+require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
+require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
+
+require 'rbconfig'
+if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+  sql_cmd = "osql"
+else
+  sql_cmd = sqsh
+end
+
+namespace :sqlserver do
+  desc 'Build the SQL Server test database'
+  task :build_database => :load_connection do
+    options_str = connection_string
+
+    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions',
+                       'sqlserver.sql').gsub(File::SEPARATOR,
+                                             File::ALT_SEPARATOR ||
+                                             File::SEPARATOR)
+    sh %( #{sql_cmd} #{options_str} -i #{schema} )
+  end
+
+  desc 'Drop the SQL Server test database'
+  task :drop_database => :load_connection do
+    options_str = connection_string
+
+    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions',
+                       'sqlserver.drop.sql').gsub(File::SEPARATOR,
+                                                  File::ALT_SEPARATOR ||
+                                                  File::SEPARATOR)
+    sh %( #{sql_cmd} #{options_str} -i #{schema} )
+  end
+
+  desc 'Rebuild the SQL Server test database'
+  task :rebuild_database => [:drop_database, :build_database]
+
+  task :load_connection do
+    require File.join(PROJECT_ROOT, "test", "connections", "native_sqlserver", "connection")
+  end
+end

data/test/connections/databases.example.yml

@@ -1,18 +1,18 @@
-# To run tests:
-#  1. Copy this file to test/connections/databases.yml.
-#  2. Update to match the databases you want to test against.
-
-mysql:
-  adapter: mysql2
-  username: root
-  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
+# To run tests:
+#  1. Copy this file to test/connections/databases.yml.
+#  2. Update to match the databases you want to test against.
+
+mysql:
+  adapter: mysql2
+  username: root
+  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/connections/native_sqlserver/connection.rb

@@ -1,11 +1,14 @@
-print "Using native SQL Server\n"
-
-require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
-
-def connection_string
-  "-S #{SPEC['host']} -U #{SPEC['username']} -P\"#{SPEC['password']}\""
-end
-
-# Adapter config setup in locals/database_connections.rb
-SPEC = CompositePrimaryKeys::ConnectionSpec['sqlserver']
-ActiveRecord::Base.establish_connection(SPEC)
+print "Using native SQL Server\n"
+
+gem 'activerecord-sqlserver-adapter', '~>4.1.0'
+require 'activerecord-sqlserver-adapter'
+
+require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
+
+def connection_string
+  "-S #{SPEC['host']} -U #{SPEC['username']} -P\"#{SPEC['password']}\""
+end
+
+# Adapter config setup in locals/database_connections.rb
+SPEC = CompositePrimaryKeys::ConnectionSpec['sqlserver']
+ActiveRecord::Base.establish_connection(SPEC)

data/test/fixtures/db_definitions/mysql.sql

@@ -1,208 +1,208 @@
-create table topics (
-    id int not null auto_increment,  
-    name varchar(50) default null,  
-    feed_size int default null, 
-    primary key (id)
-);
-
-create table topic_sources (
-    topic_id int not null,
-    platform varchar(50) not null,
-    keywords varchar(50) default null,
-    primary key (topic_id,platform)
-);
-
-create table reference_types (
-    reference_type_id int not null auto_increment,
-    type_label varchar(50) default null,
-    abbreviation varchar(50) default null,
-    description varchar(50) default null,
-    primary key (reference_type_id)
-);
-
-create table reference_codes (
-    reference_type_id int not null,
-    reference_code int not null,
-    code_label varchar(50) default null,
-    abbreviation varchar(50) default null,
-    description varchar(50) default null,
-    primary key (reference_type_id, reference_code)
-);
-
-create table products (
-    id int not null auto_increment,
-    name varchar(50) default null,
-    primary key (id)
-);
-
-create table tariffs (
-    tariff_id int not null,
-    start_date date not null,
-    amount integer(11) default null,
-    created_at timestamp,
-    updated_at timestamp,
-    primary key (tariff_id, start_date)
-);
-
-create table product_tariffs (
-    product_id int not null,
-    tariff_id int not null,
-    tariff_start_date date not null,
-    primary key (product_id, tariff_id, tariff_start_date)
-);
-
-create table suburbs (
-    city_id int not null,
-    suburb_id int not null,
-    name varchar(50) not null,
-    primary key (city_id, suburb_id)
-);
-
-create table streets (
-    id int not null auto_increment,
-    city_id int not null,
-    suburb_id int not null,
-    name varchar(50) not null,
-    primary key (id)
-);
-
-create table users (
-    id int not null auto_increment,
-    name varchar(50) not null,
-    primary key (id)
-);
-
-create table articles (
-    id int not null auto_increment,
-    name varchar(50) not null,
-    primary key (id)
-);
-
-create table readings (
-    id int not null auto_increment,
-    user_id int not null,
-    article_id int not null,
-    rating int not null,
-    primary key (id)
-);
-
-create table groups (
-    id int not null auto_increment,
-    name varchar(50) not null,
-    primary key (id)
-);
-
-create table memberships (
-    user_id int not null,
-    group_id int not null,
-    primary key  (user_id,group_id)
-);
-
-create table membership_statuses (
-    id int not null auto_increment,
-    user_id int not null,
-    group_id int not null,
-    status varchar(50) not null,
-    primary key (id)
-);
-
-create table departments (
-    department_id int not null,
-    location_id int not null,
-    primary key (department_id, location_id)
-);
-
-create table employees (
-    id int not null auto_increment,
-    department_id int default null,
-    location_id int default null,
-    primary key (id)
-);
-
-create table comments (
-    id int not null auto_increment,
-    person_id int default null,
-    shown int default null,
-    person_type varchar(100) default null,
-    hack_id int default null,
-    primary key (id)
-);
-
-create table hacks (
-    id int not null auto_increment,
-    name varchar(50) not null,
-    primary key (id)
-);
-
-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)
-);
-
-create table restaurants_suburbs (
-    franchise_id int not null,
-    store_id int not null,
-    city_id int not null,
-    suburb_id int not null
-);
-
-create table dorms (
-    id int not null auto_increment,
-    primary key(id)
-);
-
-create table rooms (
-    dorm_id int not null,
-    room_id int not null,
-    primary key (dorm_id, room_id)
-);
-
-create table room_attributes (
-    id int not null auto_increment,
-    name varchar(50),
-    primary key(id)
-);
-
-create table room_attribute_assignments (
-    dorm_id int not null,
-    room_id int not null,
-    room_attribute_id int not null
-);
-
-create table students (
-    id int not null auto_increment,
-    primary key(id)
-);
-
-create table room_assignments (
-    student_id int not null,
-    dorm_id int not null,
-    room_id int not null
-);
-
-create table seats (
-  flight_number int not null,
-  seat          int not null,
-  customer      int,
-  primary key (flight_number, seat)
-);
-
-create table capitols (
-  country varchar(100) default null,
-  city varchar(100) default null,
-  primary key (country, city)
-);
-
-create table products_restaurants (
-  product_id int not null,
-  franchise_id int not null,
-  store_id int not null
-);
-
-create table employees_groups (
-  employee_id int not null,
-  group_id int not null
-);
+create table topics (
+    id int not null auto_increment,  
+    name varchar(50) default null,  
+    feed_size int default null, 
+    primary key (id)
+);
+
+create table topic_sources (
+    topic_id int not null,
+    platform varchar(50) not null,
+    keywords varchar(50) default null,
+    primary key (topic_id,platform)
+);
+
+create table reference_types (
+    reference_type_id int not null auto_increment,
+    type_label varchar(50) default null,
+    abbreviation varchar(50) default null,
+    description varchar(50) default null,
+    primary key (reference_type_id)
+);
+
+create table reference_codes (
+    reference_type_id int not null,
+    reference_code int not null,
+    code_label varchar(50) default null,
+    abbreviation varchar(50) default null,
+    description varchar(50) default null,
+    primary key (reference_type_id, reference_code)
+);
+
+create table products (
+    id int not null auto_increment,
+    name varchar(50) default null,
+    primary key (id)
+);
+
+create table tariffs (
+    tariff_id int not null,
+    start_date date not null,
+    amount integer(11) default null,
+    created_at timestamp,
+    updated_at timestamp,
+    primary key (tariff_id, start_date)
+);
+
+create table product_tariffs (
+    product_id int not null,
+    tariff_id int not null,
+    tariff_start_date date not null,
+    primary key (product_id, tariff_id, tariff_start_date)
+);
+
+create table suburbs (
+    city_id int not null,
+    suburb_id int not null,
+    name varchar(50) not null,
+    primary key (city_id, suburb_id)
+);
+
+create table streets (
+    id int not null auto_increment,
+    city_id int not null,
+    suburb_id int not null,
+    name varchar(50) not null,
+    primary key (id)
+);
+
+create table users (
+    id int not null auto_increment,
+    name varchar(50) not null,
+    primary key (id)
+);
+
+create table articles (
+    id int not null auto_increment,
+    name varchar(50) not null,
+    primary key (id)
+);
+
+create table readings (
+    id int not null auto_increment,
+    user_id int not null,
+    article_id int not null,
+    rating int not null,
+    primary key (id)
+);
+
+create table groups (
+    id int not null auto_increment,
+    name varchar(50) not null,
+    primary key (id)
+);
+
+create table memberships (
+    user_id int not null,
+    group_id int not null,
+    primary key  (user_id,group_id)
+);
+
+create table membership_statuses (
+    id int not null auto_increment,
+    user_id int not null,
+    group_id int not null,
+    status varchar(50) not null,
+    primary key (id)
+);
+
+create table departments (
+    department_id int not null,
+    location_id int not null,
+    primary key (department_id, location_id)
+);
+
+create table employees (
+    id int not null auto_increment,
+    department_id int default null,
+    location_id int default null,
+    primary key (id)
+);
+
+create table comments (
+    id int not null auto_increment,
+    person_id int default null,
+    shown int default null,
+    person_type varchar(100) default null,
+    hack_id int default null,
+    primary key (id)
+);
+
+create table hacks (
+    id int not null auto_increment,
+    name varchar(50) not null,
+    primary key (id)
+);
+
+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)
+);
+
+create table restaurants_suburbs (
+    franchise_id int not null,
+    store_id int not null,
+    city_id int not null,
+    suburb_id int not null
+);
+
+create table dorms (
+    id int not null auto_increment,
+    primary key(id)
+);
+
+create table rooms (
+    dorm_id int not null,
+    room_id int not null,
+    primary key (dorm_id, room_id)
+);
+
+create table room_attributes (
+    id int not null auto_increment,
+    name varchar(50),
+    primary key(id)
+);
+
+create table room_attribute_assignments (
+    dorm_id int not null,
+    room_id int not null,
+    room_attribute_id int not null
+);
+
+create table students (
+    id int not null auto_increment,
+    primary key(id)
+);
+
+create table room_assignments (
+    student_id int not null,
+    dorm_id int not null,
+    room_id int not null
+);
+
+create table seats (
+  flight_number int not null,
+  seat          int not null,
+  customer      int,
+  primary key (flight_number, seat)
+);
+
+create table capitols (
+  country varchar(100) default null,
+  city varchar(100) default null,
+  primary key (country, city)
+);
+
+create table products_restaurants (
+  product_id int not null,
+  franchise_id int not null,
+  store_id int not null
+);
+
+create table employees_groups (
+  employee_id int not null,
+  group_id int not null
+);