composite_primary_keys 13.0.0 → 14.0.2

data/test/abstract_unit.rb

@@ -1,114 +1,118 @@
-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)
+spec_name = ENV['ADAPTER'] || 'postgresql'
+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')
+Dir[File.join(PROJECT_ROOT, 'test', 'fixtures', '*.rb')].each do |file_path|
+  require_file = file_path.sub(PROJECT_ROOT, '..').sub('.rb', '')
+  require_relative require_file
+end
+
+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/connection_spec.rb

@@ -1,27 +1,27 @@
-require 'yaml'
-require 'erb'
-
-module CompositePrimaryKeys
-  class ConnectionSpec
-    def self.[](adapter)
-      config[adapter.to_s].dup
-    end
-
-    private
-
-    def self.config
-      @config ||= begin
-        # Find the file location
-        path = File.join(PROJECT_ROOT, 'test', 'connections', 'databases.yml')
-
-        # Run any erb code
-        template = ERB.new(File.read(path))
-        project_root = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
-        data = template.result(binding)
-
-        # And now to YAML
-        YAML.load(data)
-      end
-    end
-  end
-end
+require 'yaml'
+require 'erb'
+
+module CompositePrimaryKeys
+  class ConnectionSpec
+    def self.[](adapter)
+      config[adapter.to_s].dup
+    end
+
+    private
+
+    def self.config
+      @config ||= begin
+        # Find the file location
+        path = File.join(PROJECT_ROOT, 'test', 'connections', 'databases.yml')
+
+        # Run any erb code
+        template = ERB.new(File.read(path))
+        project_root = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
+        data = template.result(binding)
+
+        # And now to YAML
+        YAML.load(data)
+      end
+    end
+  end
+end

data/test/connections/databases.example.yml

@@ -1,40 +1,40 @@
-# To run tests:
-#  1. Copy this file to test/connections/databases.yml.
-#  2. Update to match the databases you want to test against.
-
-ibm_db:
-  database: ocdpdev
-  username: db2inst1
-  password: password
-  host: localhost
-
-mysql:
-  adapter: mysql2
-  username: root
-  password: mysql
-  database: composite_primary_keys_unittest
-
-oracle:
-  adapter: oracle_enhanced
-  database: xe
-  username: SYSTEM
-  password: oracle
-  host: localhost
-
-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') %>
-
-sqlserver:
-  adapter: sqlserver
-  username: cpk
-  password: cpk
-  database: composite_primary_keys_unittest
-  host: localhost
-  port: 1433
+# To run tests:
+#  1. Copy this file to test/connections/databases.yml.
+#  2. Update to match the databases you want to test against.
+
+ibm_db:
+  database: ocdpdev
+  username: db2inst1
+  password: password
+  host: localhost
+
+mysql:
+  adapter: mysql2
+  username: root
+  password: mysql
+  database: composite_primary_keys_unittest
+
+oracle:
+  adapter: oracle_enhanced
+  database: xe
+  username: SYSTEM
+  password: oracle
+  host: localhost
+
+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') %>
+
+sqlserver:
+  adapter: sqlserver
+  username: cpk
+  password: cpk
+  database: composite_primary_keys_unittest
+  host: localhost
+  port: 1433

data/test/connections/databases.yml

@@ -1,39 +1,40 @@
-# To run tests:
-#  1. Copy this file to test/connections/databases.yml.
-#  2. Update to match the databases you want to test against.
-
-ibm_db:
-  database: ocdpdev
-  username: db2inst1
-  password: password
-  host: localhost
-
-mysql:
-  adapter: mysql2
-  username: root
-  database: composite_primary_keys_unittest
-
-oracle:
-  adapter: oracle_enhanced
-  database: xe
-  username: SYSTEM
-  password: oracle
-  host: localhost
-
-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') %>
-
-sqlserver:
-  adapter: sqlserver
-  username: cpk
-  password: cpk
-  database: composite_primary_keys_unittest
-  host: localhost
-  port: 1433
+# To run tests:
+#  1. Copy this file to test/connections/databases.yml.
+#  2. Update to match the databases you want to test against.
+
+ibm_db:
+  database: ocdpdev
+  username: db2inst1
+  password: password
+  host: localhost
+
+mysql:
+  adapter: mysql2
+  username: root
+  password: mysql
+  database: composite_primary_keys_unittest
+
+oracle:
+  adapter: oracle_enhanced
+  database: xe
+  username: SYSTEM
+  password: oracle
+  host: localhost
+
+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') %>
+
+sqlserver:
+  adapter: sqlserver
+  username: cpk
+  password: cpk
+  database: composite_primary_keys_unittest
+  host: localhost
+  port: 1433

data/test/fixtures/article.rb

@@ -1,10 +1,10 @@
-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
-
+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,8 +1,8 @@
-first:
-  name: Article One
-  
-second:
-  name: Article Two
-
-third:
+first:
+  name: Article One
+  
+second:
+  name: Article Two
+
+third:
   name: Article Three

data/test/fixtures/capitol.rb

@@ -1,3 +1,3 @@
-class Capitol < ActiveRecord::Base
-  self.primary_keys = :country, :city
-end
+class Capitol < ActiveRecord::Base
+  self.primary_keys = :country, :city
+end

data/test/fixtures/capitols.yml

@@ -1,16 +1,16 @@
-netherlands:
-  country: The Netherlands
-  city: Amsterdam
-
-france:
-  country: France
-  city: Paris
-
-canada:
-  country: Canada
-  city: Ottawa
-
-mexico:
-  country: Mexico
-  city: Mexico City
-  
+netherlands:
+  country: The Netherlands
+  city: Amsterdam
+
+france:
+  country: France
+  city: Paris
+
+canada:
+  country: Canada
+  city: Ottawa
+
+mexico:
+  country: Mexico
+  city: Mexico City
+  

data/test/fixtures/comment.rb

@@ -1,5 +1,5 @@
-class Comment < ActiveRecord::Base
-  belongs_to :person, :polymorphic => true
-  belongs_to :article
-end
-
+class Comment < ActiveRecord::Base
+  belongs_to :person, :polymorphic => true
+  belongs_to :article
+end
+

data/test/fixtures/comments.yml

@@ -1,17 +1,17 @@
-employee_comment:
-  id: 1
-  article: first
-  person_id: 1
-  person_type: Employee
-
-user_comment_1:
-  id: 2
-  article: second
-  person_id: 1
-  person_type: User
-
-user_comment_2:
-  id: 3
-  article: second
-  person_id: 2
-  person_type: User
+employee_comment:
+  id: 1
+  article: first
+  person_id: 1
+  person_type: Employee
+
+user_comment_1:
+  id: 2
+  article: second
+  person_id: 1
+  person_type: User
+
+user_comment_2:
+  id: 3
+  article: second
+  person_id: 2
+  person_type: User

data/test/fixtures/department.rb

@@ -1,16 +1,16 @@
-class Department < ActiveRecord::Base
-  self.primary_keys = :id, :location_id
-
-  has_many :employees,
-           # We intentionally redefine primary key for test purposes. #455
-           :primary_key =>  [:id, :location_id],
-           :foreign_key => [:department_id, :location_id]
-
-  has_many :comments, :through => :employees
-
-  has_one :head, :class_name => 'Employee',  :autosave => true, :dependent => :delete,
-                 # We intentionally redefine primary key for test purposes. #455
-                 :primary_key =>  [:id, :location_id],
-                 :foreign_key => [:department_id, :location_id]
-
-end
+class Department < ActiveRecord::Base
+  self.primary_keys = :id, :location_id
+
+  has_many :employees,
+           # We intentionally redefine primary key for test purposes. #455
+           :primary_key =>  [:id, :location_id],
+           :foreign_key => [:department_id, :location_id]
+
+  has_many :comments, :through => :employees
+
+  has_one :head, :class_name => 'Employee',  :autosave => true, :dependent => :delete,
+                 # We intentionally redefine primary key for test purposes. #455
+                 :primary_key =>  [:id, :location_id],
+                 :foreign_key => [:department_id, :location_id]
+
+end

data/test/fixtures/dorm.rb

@@ -1,3 +1,3 @@
-class Dorm < ActiveRecord::Base
-  has_many :rooms, -> {includes(:room_attributes)}, :primary_key => [:id]
+class Dorm < ActiveRecord::Base
+  has_many :rooms, -> {includes(:room_attributes)}, :primary_key => [:id]
 end

data/test/fixtures/dorms.yml

@@ -1,5 +1,5 @@
-branner:
-    id: 1
-
-toyon:
+branner:
+    id: 1
+
+toyon:
     id: 2

data/test/fixtures/employee.rb

@@ -1,5 +1,5 @@
-class Employee < ActiveRecord::Base
-	belongs_to :department, :foreign_key => [:department_id, :location_id]
-	has_many :comments, :as => :person
-	has_and_belongs_to_many :groups
-end
+class Employee < ActiveRecord::Base
+	belongs_to :department, :foreign_key => [:department_id, :location_id]
+	has_many :comments, :as => :person
+	has_and_belongs_to_many :groups
+end

data/test/fixtures/group.rb

@@ -1,3 +1,3 @@
-class Group < ActiveRecord::Base
-  has_many :memberships
+class Group < ActiveRecord::Base
+  has_many :memberships
 end

data/test/fixtures/groups.yml

@@ -1,7 +1,7 @@
-cpk:
-  id: 1
-  name: Composite Primary Keys
-
-group2: 
-  id: 2
+cpk:
+  id: 1
+  name: Composite Primary Keys
+
+group2: 
+  id: 2
   name: Grupo Dos