composite_primary_keys 12.0.2 → 12.0.10

data/test/abstract_unit.rb

@@ -1,113 +1,114 @@
-spec_name = ENV['ADAPTER'] || 'sqlite'
-require 'bundler/setup'
-require 'minitest/autorun'
-
-Bundler.require(:default, spec_name.to_sym)
-require 'composite_primary_keys'
-
-# Require the connection spec
-PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
-
-spec = CompositePrimaryKeys::ConnectionSpec[spec_name]
-puts "Loaded #{spec_name}"
-
-# And now connect to the database
-ActiveRecord::Base.establish_connection(spec)
-
-# Tell active record about the configuration
-ActiveRecord::Base.configurations = {test: spec}
-
-# Tell ActiveRecord where to find models
-ActiveSupport::Dependencies.autoload_paths << File.join(PROJECT_ROOT, 'test', 'fixtures')
-
-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_tests = true
-  self.test_order = :random
-
-  def assert_date_from_db(expected, actual, message = nil)
-    # 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')
-    elsif current_adapter?(:SybaseAdapter)
-      assert_equal expected.to_s, actual.to_date.to_s, message
-    else
-      assert_equal expected.to_s, actual.to_s, message
-    end
-  end
-
-  def assert_queries(num = 1)
-    ActiveRecord::Base.connection.class.class_eval do
-      self.query_count = 0
-      alias_method :execute, :execute_with_query_counting
-    end
-    yield
-  ensure
-    ActiveRecord::Base.connection.class.class_eval do
-      alias_method :execute, :execute_without_query_counting
-    end
-    assert_equal num, ActiveRecord::Base.connection.query_count, '#{ActiveRecord::Base.connection.query_count} instead of #{num} queries were executed.'
-  end
-
-  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
-      @klass_info = classes[@key_test]
-      @klass, @primary_keys = @klass_info[:class], @klass_info[:primary_keys]
-      order = @klass.primary_key.is_a?(String) ? @klass.primary_key : @klass.primary_key.join(',')
-      @first = @klass.order(order).first
-      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
-
-  # Oracle metadata is in all caps.
-  def with_quoted_identifiers(s)
-    s.gsub(/'(\w+)'/) { |m|
-      if ActiveRecord::Base.configurations[:test]['adapter'] =~ /oracle/i
-        m.upcase
-      else
-        m
-      end
-    }
-  end
-end
-
-def current_adapter?(type)
-  ActiveRecord::ConnectionAdapters.const_defined?(type) &&
-    ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters.const_get(type))
-end
-
-ActiveRecord::Base.connection.class.class_eval do
-  cattr_accessor :query_count
-  alias_method :execute_without_query_counting, :execute
-  def execute_with_query_counting(sql, name = nil)
-    self.query_count += 1
-    execute_without_query_counting(sql, name)
-  end
-end
-
-ActiveRecord::Base.logger = Logger.new(ENV['CPK_LOGFILE'] || STDOUT)
+spec_name = ENV['ADAPTER'] || 'sqlite'
+require 'bundler'
+require 'minitest/autorun'
+
+Bundler.setup(:default, spec_name.to_sym)
+Bundler.require(:default, spec_name.to_sym)
+require 'composite_primary_keys'
+
+# Require the connection spec
+PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
+
+spec = CompositePrimaryKeys::ConnectionSpec[spec_name]
+puts "Loaded #{spec_name}"
+
+# And now connect to the database
+ActiveRecord::Base.establish_connection(spec)
+
+# Tell active record about the configuration
+ActiveRecord::Base.configurations = {test: spec}
+
+# Tell ActiveRecord where to find models
+ActiveSupport::Dependencies.autoload_paths << File.join(PROJECT_ROOT, 'test', 'fixtures')
+
+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_tests = true
+  self.test_order = :random
+
+  def assert_date_from_db(expected, actual, message = nil)
+    # 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')
+    elsif current_adapter?(:SybaseAdapter)
+      assert_equal expected.to_s, actual.to_date.to_s, message
+    else
+      assert_equal expected.to_s, actual.to_s, message
+    end
+  end
+
+  def assert_queries(num = 1)
+    ActiveRecord::Base.connection.class.class_eval do
+      self.query_count = 0
+      alias_method :execute, :execute_with_query_counting
+    end
+    yield
+  ensure
+    ActiveRecord::Base.connection.class.class_eval do
+      alias_method :execute, :execute_without_query_counting
+    end
+    assert_equal num, ActiveRecord::Base.connection.query_count, '#{ActiveRecord::Base.connection.query_count} instead of #{num} queries were executed.'
+  end
+
+  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
+      @klass_info = classes[@key_test]
+      @klass, @primary_keys = @klass_info[:class], @klass_info[:primary_keys]
+      order = @klass.primary_key.is_a?(String) ? @klass.primary_key : @klass.primary_key.join(',')
+      @first = @klass.order(order).first
+      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
+
+  # Oracle metadata is in all caps.
+  def with_quoted_identifiers(s)
+    s.gsub(/'(\w+)'/) { |m|
+      if ActiveRecord::Base.configurations[:test]['adapter'] =~ /oracle/i
+        m.upcase
+      else
+        m
+      end
+    }
+  end
+end
+
+def current_adapter?(type)
+  ActiveRecord::ConnectionAdapters.const_defined?(type) &&
+    ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters.const_get(type))
+end
+
+ActiveRecord::Base.connection.class.class_eval do
+  cattr_accessor :query_count
+  alias_method :execute_without_query_counting, :execute
+  def execute_with_query_counting(sql, name = nil)
+    self.query_count += 1
+    execute_without_query_counting(sql, name)
+  end
+end
+
+ActiveRecord::Base.logger = Logger.new(ENV['CPK_LOGFILE'] || STDOUT)

data/test/connections/databases.ci.yml

@@ -1,19 +1,22 @@
-mysql:
-  adapter: mysql2
-  username: travis
-  password: ""
-  encoding: utf8mb4
-  charset: utf8mb4
-  collation: utf8mb4_bin
-  database: composite_primary_keys_unittest
-
-postgresql:
-  adapter: postgresql
-  database: composite_primary_keys_unittest
-  username: postgres
-  host: localhost
-
-sqlite:
-  adapter: sqlite3
-  database: <%= File.join(project_root, 'db', 'composite_primary_keys_unittest.sqlite') %>
-
+mysql:
+  adapter: mysql2
+  username: github
+  password: github
+  host: 127.0.0.1
+  port: 3306
+  encoding: utf8mb4
+  charset: utf8mb4
+  collation: utf8mb4_bin
+  database: composite_primary_keys_unittest
+
+postgresql:
+  adapter: postgresql
+  database: composite_primary_keys_unittest
+  username: postgres
+  password: postgres
+  host: localhost
+
+sqlite:
+  adapter: sqlite3
+  database: <%= File.join(project_root, 'db', 'composite_primary_keys_unittest.sqlite') %>
+

data/test/fixtures/article.rb

@@ -2,5 +2,9 @@ class Article < ActiveRecord::Base
   validates :id, uniqueness: true, numericality: true, allow_nil: true, allow_blank: true, on: :create
   has_many :readings, :dependent => :delete_all
   has_many :users, :through => :readings
+
+  has_many :comments, :dependent => :delete_all
+  has_many :employee_commentators, :through => :comments, :source => :person, :source_type => :employee
+  has_many :user_commentators, :through => :comments, :source => :person, :source_type => "User"
 end
 

data/test/fixtures/articles.yml

@@ -1,7 +1,8 @@
 first:
-  id: 1
   name: Article One
   
 second:
-  id: 2
-  name: Article Two
+  name: Article Two
+
+third:
+  name: Article Three

data/test/fixtures/comment.rb

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

data/test/fixtures/comments.yml

@@ -1,16 +1,17 @@
-comment1:
+employee_comment:
   id: 1
+  article: first
   person_id: 1
   person_type: Employee
-  
-comment2:
+
+user_comment_1:
   id: 2
+  article: second
   person_id: 1
   person_type: User
-  hack_id: 7
-  
-comment3:
+
+user_comment_2:
   id: 3
-  person_id: 7
-  person_type: Hack
-  
+  article: second
+  person_id: 2
+  person_type: User

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

@@ -1,126 +1,112 @@
-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 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
+);

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

@@ -1,19 +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 KITCHEN_SINK;
-drop table RESTAURANTS;
-drop table RESTAURANTS_SUBURBS;
-drop table PRODUCTS_RESTAURANTS;
-drop table TOPICS;
-drop table TOPIC_SOURCES;
+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;