composite_primary_keys 7.0.15 → 7.0.16

data/lib/composite_primary_keys/fixtures.rb

@@ -1,22 +1,22 @@
-module ActiveRecord
-  class Fixture
-    def find
-      if model_class
-        # CPK
-        # model_class.find(fixture[model_class.primary_key])
-        ids = self.ids(model_class.primary_key)
-        model_class.find(ids)
-      else
-        raise FixtureClassNotFound, "No class attached to find."
-      end
-    end
-
-    def ids(key)
-      if key.is_a? Array
-        key.map {|a_key| fixture[a_key.to_s] }
-      else
-        fixture[key]
-      end
-    end
-  end
-end
+module ActiveRecord
+  class Fixture
+    def find
+      if model_class
+        # CPK
+        # model_class.find(fixture[model_class.primary_key])
+        ids = self.ids(model_class.primary_key)
+        model_class.find(ids)
+      else
+        raise FixtureClassNotFound, "No class attached to find."
+      end
+    end
+
+    def ids(key)
+      if key.is_a? Array
+        key.map {|a_key| fixture[a_key.to_s] }
+      else
+        fixture[key]
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/locking/optimistic.rb

@@ -1,55 +1,55 @@
-  module ActiveRecord
-    module Locking
-      module Optimistic
-        private
-          def _update_record(attribute_names = @attributes.keys) #:nodoc:
-            return super unless locking_enabled?
-            return 0 if attribute_names.empty?
-
-            lock_col = self.class.locking_column
-            previous_lock_value = send(lock_col).to_i
-            increment_lock
-
-            attribute_names += [lock_col]
-            attribute_names.uniq!
-
-            begin
-              relation = self.class.unscoped
-
-              if self.composite?
-                stmt = relation.where(
-                  relation.cpk_id_predicate(relation.table, self.class.primary_key, id_was).and(
-                    relation.table[lock_col].eq(self.class.quote_value(previous_lock_value, column_for_attribute(lock_col)))
-                  )
-                ).arel.compile_update(
-                  arel_attributes_with_values_for_update(attribute_names),
-                  self.class.primary_key
-                )
-              else
-                stmt = relation.where(
-                  relation.table[self.class.primary_key].eq(id).and(
-                    relation.table[lock_col].eq(self.class.quote_value(previous_lock_value, column_for_attribute(lock_col)))
-                  )
-                ).arel.compile_update(
-                  arel_attributes_with_values_for_update(attribute_names),
-                  self.class.primary_key
-                )
-              end
-
-              affected_rows = self.class.connection.update stmt
-
-              unless affected_rows == 1
-                raise ActiveRecord::StaleObjectError.new(self, "update")
-              end
-
-              affected_rows
-
-            # If something went wrong, revert the version.
-            rescue Exception
-              send(lock_col + '=', previous_lock_value)
-              raise
-            end
-          end
-      end
-    end
-  end
+  module ActiveRecord
+    module Locking
+      module Optimistic
+        private
+          def _update_record(attribute_names = @attributes.keys) #:nodoc:
+            return super unless locking_enabled?
+            return 0 if attribute_names.empty?
+
+            lock_col = self.class.locking_column
+            previous_lock_value = send(lock_col).to_i
+            increment_lock
+
+            attribute_names += [lock_col]
+            attribute_names.uniq!
+
+            begin
+              relation = self.class.unscoped
+
+              if self.composite?
+                stmt = relation.where(
+                  relation.cpk_id_predicate(relation.table, self.class.primary_key, id_was).and(
+                    relation.table[lock_col].eq(self.class.quote_value(previous_lock_value, column_for_attribute(lock_col)))
+                  )
+                ).arel.compile_update(
+                  arel_attributes_with_values_for_update(attribute_names),
+                  self.class.primary_key
+                )
+              else
+                stmt = relation.where(
+                  relation.table[self.class.primary_key].eq(id).and(
+                    relation.table[lock_col].eq(self.class.quote_value(previous_lock_value, column_for_attribute(lock_col)))
+                  )
+                ).arel.compile_update(
+                  arel_attributes_with_values_for_update(attribute_names),
+                  self.class.primary_key
+                )
+              end
+
+              affected_rows = self.class.connection.update stmt
+
+              unless affected_rows == 1
+                raise ActiveRecord::StaleObjectError.new(self, "update")
+              end
+
+              affected_rows
+
+            # If something went wrong, revert the version.
+            rescue Exception
+              send(lock_col + '=', previous_lock_value)
+              raise
+            end
+          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
+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/version.rb

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

data/tasks/databases/oracle.rake

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

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

data/test/connections/native_oracle/connection.rb

@@ -1,11 +1,11 @@
-print "Using native Oracle\n"
-
-require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
-
-def connection_string
-  "#{SPEC['username']}/#{SPEC['password']}@#{SPEC['host']}"
-end
-
-# Adapter config setup in locals/database_connections.rb
-SPEC = CompositePrimaryKeys::ConnectionSpec['oracle']
-ActiveRecord::Base.establish_connection(SPEC)
+print "Using native Oracle\n"
+
+require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
+
+def connection_string
+  "#{SPEC['username']}/#{SPEC['password']}@#{SPEC['host']}"
+end
+
+# Adapter config setup in locals/database_connections.rb
+SPEC = CompositePrimaryKeys::ConnectionSpec['oracle']
+ActiveRecord::Base.establish_connection(SPEC)

data/test/connections/native_oracle_enhanced/connection.rb

@@ -1,16 +1,16 @@
-print "Using native Oracle Enhanced\n"
-
-require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
-
-def connection_string
-  "#{SPEC['username']}/#{SPEC['password']}@#{SPEC['host']}"
-end
-
-# Adapter config setup in locals/database_connections.rb
-SPEC = CompositePrimaryKeys::ConnectionSpec[:oracle]
-ActiveRecord::Base.establish_connection(SPEC)
-
-# Change default options for Oracle Enhanced adapter
-ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = true
-# Change NLS_DATE_FORMAT to non-default format to verify that all tests should pass
-ActiveRecord::Base.connection.execute %q{alter session set nls_date_format = 'DD-MON-YYYY HH24:MI:SS'}
+print "Using native Oracle Enhanced\n"
+
+require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
+
+def connection_string
+  "#{SPEC['username']}/#{SPEC['password']}@#{SPEC['host']}"
+end
+
+# Adapter config setup in locals/database_connections.rb
+SPEC = CompositePrimaryKeys::ConnectionSpec[:oracle]
+ActiveRecord::Base.establish_connection(SPEC)
+
+# Change default options for Oracle Enhanced adapter
+ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = true
+# Change NLS_DATE_FORMAT to non-default format to verify that all tests should pass
+ActiveRecord::Base.connection.execute %q{alter session set nls_date_format = 'DD-MON-YYYY HH24:MI:SS'}

data/test/fixtures/comment.rb

@@ -1,7 +1,7 @@
-class Comment < ActiveRecord::Base
-  belongs_to :person, :polymorphic => true
-  belongs_to :hack
-
-  enum :shown => [ :true, :false ]
-end
-
+class Comment < ActiveRecord::Base
+  belongs_to :person, :polymorphic => true
+  belongs_to :hack
+
+  enum :shown => [ :true, :false ]
+end
+

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

@@ -1,126 +1,126 @@
-CREATE TABLE topics (
-  id integer NOT NULL,  
-  name varchar(50) default NULL,  
-  feed_size integer default NULL, 
-  PRIMARY KEY (id)
-);
-
-CREATE TABLE topic_sources (
-  topic_id integer NOT NULL,
-  platform varchar(50) NOT NULL,
-  keywords varchar(50) default NULL,
-  PRIMARY KEY (topic_id,platform)
-);
-
-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, 
-  PRIMARY KEY (reference_type_id)
-);
-
-CREATE TABLE reference_codes (
-  reference_type_id integer,
-  reference_code integer 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 integer NOT NULL,
-  name varchar(50) default NULL,
-  PRIMARY KEY  (id)
-);
-
-CREATE TABLE tariffs (
-  tariff_id integer NOT NULL,
-  start_date date NOT NULL,
-  amount integer default NULL,
-  PRIMARY KEY  (tariff_id,start_date)
-);
-
-CREATE TABLE product_tariffs (
-  product_id integer NOT NULL,
-  tariff_id integer NOT NULL,
-  tariff_start_date date NOT NULL,
-  PRIMARY KEY  (product_id,tariff_id,tariff_start_date)
-);
-
-CREATE TABLE suburbs (
-  city_id integer NOT NULL,
-  suburb_id integer NOT NULL,
-  name varchar(50) NOT NULL,
-  PRIMARY KEY  (city_id,suburb_id)
-);
-
-CREATE TABLE streets (
-  id integer NOT NULL ,
-  city_id integer NOT NULL,
-  suburb_id integer NOT NULL,
-  name varchar(50) NOT NULL,
-  PRIMARY KEY  (id)
-);
-
-CREATE TABLE users (
-  id integer NOT NULL ,
-  name varchar(50) NOT NULL,
-  PRIMARY KEY  (id)
-);
-
-CREATE TABLE articles (
-  id integer NOT NULL ,
-  name varchar(50) NOT NULL,
-  PRIMARY KEY  (id)
-);
-
-CREATE TABLE readings (
-  id integer NOT NULL ,
-  user_id integer NOT NULL,
-  article_id integer NOT NULL,
-  rating integer NOT NULL,
-  PRIMARY KEY  (id)
-);
-
-CREATE TABLE groups (
-  id integer NOT NULL ,
-  name varchar(50) NOT NULL,
-  PRIMARY KEY  (id)
-);               
-
-CREATE TABLE memberships (
-  user_id integer NOT NULL,
-  group_id integer NOT NULL,
-  PRIMARY KEY  (user_id,group_id)
-);
-
-CREATE TABLE membership_statuses (
-  id integer NOT NULL ,
-  user_id integer NOT NULL,
-  group_id integer NOT NULL,
-  status varchar(50) NOT NULL,
-  PRIMARY KEY (id)
-);
-
-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)
-);
-
-create table restaurants_suburbs (
-	franchise_id integer not null,
-	store_id integer not null,
-	city_id integer not null,
-	suburb_id integer not null
-);
-
-create table products_restaurants (
-  product_id integer not null,
-  franchise_id integer not null,
-  store_id integer not null
-);
+CREATE TABLE topics (
+  id integer NOT NULL,  
+  name varchar(50) default NULL,  
+  feed_size integer default NULL, 
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE topic_sources (
+  topic_id integer NOT NULL,
+  platform varchar(50) NOT NULL,
+  keywords varchar(50) default NULL,
+  PRIMARY KEY (topic_id,platform)
+);
+
+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, 
+  PRIMARY KEY (reference_type_id)
+);
+
+CREATE TABLE reference_codes (
+  reference_type_id integer,
+  reference_code integer 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 integer NOT NULL,
+  name varchar(50) default NULL,
+  PRIMARY KEY  (id)
+);
+
+CREATE TABLE tariffs (
+  tariff_id integer NOT NULL,
+  start_date date NOT NULL,
+  amount integer default NULL,
+  PRIMARY KEY  (tariff_id,start_date)
+);
+
+CREATE TABLE product_tariffs (
+  product_id integer NOT NULL,
+  tariff_id integer NOT NULL,
+  tariff_start_date date NOT NULL,
+  PRIMARY KEY  (product_id,tariff_id,tariff_start_date)
+);
+
+CREATE TABLE suburbs (
+  city_id integer NOT NULL,
+  suburb_id integer NOT NULL,
+  name varchar(50) NOT NULL,
+  PRIMARY KEY  (city_id,suburb_id)
+);
+
+CREATE TABLE streets (
+  id integer NOT NULL ,
+  city_id integer NOT NULL,
+  suburb_id integer NOT NULL,
+  name varchar(50) NOT NULL,
+  PRIMARY KEY  (id)
+);
+
+CREATE TABLE users (
+  id integer NOT NULL ,
+  name varchar(50) NOT NULL,
+  PRIMARY KEY  (id)
+);
+
+CREATE TABLE articles (
+  id integer NOT NULL ,
+  name varchar(50) NOT NULL,
+  PRIMARY KEY  (id)
+);
+
+CREATE TABLE readings (
+  id integer NOT NULL ,
+  user_id integer NOT NULL,
+  article_id integer NOT NULL,
+  rating integer NOT NULL,
+  PRIMARY KEY  (id)
+);
+
+CREATE TABLE groups (
+  id integer NOT NULL ,
+  name varchar(50) NOT NULL,
+  PRIMARY KEY  (id)
+);               
+
+CREATE TABLE memberships (
+  user_id integer NOT NULL,
+  group_id integer NOT NULL,
+  PRIMARY KEY  (user_id,group_id)
+);
+
+CREATE TABLE membership_statuses (
+  id integer NOT NULL ,
+  user_id integer NOT NULL,
+  group_id integer NOT NULL,
+  status varchar(50) NOT NULL,
+  PRIMARY KEY (id)
+);
+
+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)
+);
+
+create table restaurants_suburbs (
+	franchise_id integer not null,
+	store_id integer not null,
+	city_id integer not null,
+	suburb_id integer not null
+);
+
+create table products_restaurants (
+  product_id integer not null,
+  franchise_id integer not null,
+  store_id integer not null
+);