composite_primary_keys 12.0.9 → 13.0.2

data/tasks/databases/sqlite.rake

@@ -1,25 +1,25 @@
-namespace :sqlite do
-  task :setup do
-    require 'bundler'
-    Bundler.require(:default, :sqlite)
-  end
-
-  desc 'Build the sqlite test database'
-  task :build_database => :setup do
-    spec = CompositePrimaryKeys::ConnectionSpec['sqlite']
-    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'sqlite.sql')
-    FileUtils.mkdir_p(File.dirname(spec['database']))
-    cmd = "sqlite3 #{spec['database']} < #{schema}"
-    puts cmd
-    sh %{ #{cmd} }
-  end
-
-  desc 'Drop the sqlite test database'
-  task :drop_database => :setup do
-    spec = CompositePrimaryKeys::ConnectionSpec['sqlite']
-    sh %{ rm -f #{spec['database']} }
-  end
-
-  desc 'Rebuild the sqlite test database'
-  task :rebuild_database => [:drop_database, :build_database]
-end
+namespace :sqlite do
+  task :setup do
+    require 'bundler'
+    Bundler.require(:default, :sqlite)
+  end
+
+  desc 'Build the sqlite test database'
+  task :build_database => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['sqlite']
+    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'sqlite.sql')
+    FileUtils.mkdir_p(File.dirname(spec['database']))
+    cmd = "sqlite3 #{spec['database']} < #{schema}"
+    puts cmd
+    sh %{ #{cmd} }
+  end
+
+  desc 'Drop the sqlite test database'
+  task :drop_database => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['sqlite']
+    sh %{ rm -f #{spec['database']} }
+  end
+
+  desc 'Rebuild the sqlite test database'
+  task :rebuild_database => [:drop_database, :build_database]
+end

data/tasks/databases/sqlserver.rake

@@ -1,43 +1,43 @@
-namespace :sqlserver do
-  task :setup do
-    require 'bundler'
-    Bundler.require(:default, :sqlserver)
-  end
-
-  task :create_database => :setup do
-    spec = CompositePrimaryKeys::ConnectionSpec['sqlserver']
-    database = spec.delete('database')
-    ActiveRecord::Base.clear_all_connections!
-
-    ActiveRecord::Base.establish_connection(spec)
-    ActiveRecord::Base.connection.execute("CREATE DATABASE [#{database}]")
-    ActiveRecord::Base.clear_all_connections!
-  end
-
-  task :build_database => :create_database do
-    spec = CompositePrimaryKeys::ConnectionSpec['sqlserver']
-    ActiveRecord::Base.establish_connection(spec)
-
-    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'sqlserver.sql')
-    sql = File.read(schema)
-    ActiveRecord::Base.connection.execute(sql)
-    ActiveRecord::Base.clear_all_connections!
-  end
-
-  desc 'Drop the SQL Server test database'
-  task :drop_database => :setup do
-    spec = CompositePrimaryKeys::ConnectionSpec['sqlserver']
-    ActiveRecord::Base.clear_all_connections!
-    ActiveRecord::Base.establish_connection(spec)
-    database = spec.delete('database')
-    ActiveRecord::Base.connection.execute(<<-SQL)
-      USE master;
-      ALTER DATABASE [#{database}] SET SINGLE_USER WITH ROLLBACK IMMEDIATE;
-      DROP DATABASE [#{database}];
-    SQL
-    ActiveRecord::Base.clear_all_connections!
-  end
-
-  desc 'Rebuild the SQL Server test database'
-  task :rebuild_database => [:drop_database, :build_database]
-end
+namespace :sqlserver do
+  task :setup do
+    require 'bundler'
+    Bundler.require(:default, :sqlserver)
+  end
+
+  task :create_database => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['sqlserver']
+    database = spec.delete('database')
+    ActiveRecord::Base.clear_all_connections!
+
+    ActiveRecord::Base.establish_connection(spec)
+    ActiveRecord::Base.connection.execute("CREATE DATABASE [#{database}]")
+    ActiveRecord::Base.clear_all_connections!
+  end
+
+  task :build_database => :create_database do
+    spec = CompositePrimaryKeys::ConnectionSpec['sqlserver']
+    ActiveRecord::Base.establish_connection(spec)
+
+    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'sqlserver.sql')
+    sql = File.read(schema)
+    ActiveRecord::Base.connection.execute(sql)
+    ActiveRecord::Base.clear_all_connections!
+  end
+
+  desc 'Drop the SQL Server test database'
+  task :drop_database => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['sqlserver']
+    ActiveRecord::Base.clear_all_connections!
+    ActiveRecord::Base.establish_connection(spec)
+    database = spec.delete('database')
+    ActiveRecord::Base.connection.execute(<<-SQL)
+      USE master;
+      ALTER DATABASE [#{database}] SET SINGLE_USER WITH ROLLBACK IMMEDIATE;
+      DROP DATABASE [#{database}];
+    SQL
+    ActiveRecord::Base.clear_all_connections!
+  end
+
+  desc 'Rebuild the SQL Server test database'
+  task :rebuild_database => [:drop_database, :build_database]
+end

data/tasks/website.rake

@@ -1,18 +1,18 @@
-desc 'Generate website files'
-task :website_generate do
-  sh %{ ruby scripts/txt2html website/index.txt > website/index.html }
-  sh %{ ruby scripts/txt2js website/version.txt > website/version.js }
-  sh %{ ruby scripts/txt2js website/version-raw.txt > website/version-raw.js }
-end
-
-desc 'Upload website files to rubyforge'
-task :website_upload do
-  config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
-  host = "#{config["username"]}@rubyforge.org"
-  remote_dir = "/var/www/gforge-projects/compositekeys/"
-  local_dir = 'website'
-  sh %{scp -r #{local_dir}/* #{host}:#{remote_dir}}
-end
-
-desc 'Generate and upload website files'
-task :website => [:website_generate, :website_upload]
+desc 'Generate website files'
+task :website_generate do
+  sh %{ ruby scripts/txt2html website/index.txt > website/index.html }
+  sh %{ ruby scripts/txt2js website/version.txt > website/version.js }
+  sh %{ ruby scripts/txt2js website/version-raw.txt > website/version-raw.js }
+end
+
+desc 'Upload website files to rubyforge'
+task :website_upload do
+  config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
+  host = "#{config["username"]}@rubyforge.org"
+  remote_dir = "/var/www/gforge-projects/compositekeys/"
+  local_dir = 'website'
+  sh %{scp -r #{local_dir}/* #{host}:#{remote_dir}}
+end
+
+desc 'Generate and upload website files'
+task :website => [:website_generate, :website_upload]

data/test/README_tests.rdoc

@@ -1,56 +1,56 @@
-= Composite Primary Keys - Testing Readme
-
-== Testing an adapter
-
-There are tests available for the following adapters:
-
-* ibmdb
-* mysql
-* oracle
-* oracle_enhanced
-* postgresql
-* sqlite3
-
-To run the tests for one of the adapters follow these steps (using mysql in the example):
-
-* You will need the following gems:
-    - rake
-    - activerecord (3.1.0.rc5 or later)
-    - mysql (or the adapter of your choice)
-
-* Put your database connection settings in test/connections/databases.yml.
-  Look at databases.example.yml for examples.
-
-    mysql:
-      adapter: mysql
-      username: root
-      database: composite_primary_keys_unittest
-
-* rake -T mysql
-
-    rake mysql:build_database         # Build the MySQL test databases
-    rake mysql:drop_database          # Drop the MySQL test databases
-    rake mysql:rebuild_database       # Rebuild the MySQL test databases
-    rake mysql:test                    # Run tests using the mysql adapter
-
-* rake mysql:build_database
-* rake mysql:test
-
-== Running tests individually
-
-You can specify which test you'd like to run on the command line:
-
-* rake mysql:test TEST=test/test_equal.rb
-
-If you want to run closer to the metal you can cd into the test/
-directory and run the tests like so:
-
-* ADAPTER=mysql ruby test_equal.rb
-
-== Logging
-
-By default, ActiveRecord's log messages are sent to standard out when
-running the tests. If you would prefer to send them to a file, specify
-it as the environment variable CPK_LOGFILE:
-
-* CPK_LOGFILE=cpk_test.log rake mysql:test
+= Composite Primary Keys - Testing Readme
+
+== Testing an adapter
+
+There are tests available for the following adapters:
+
+* ibmdb
+* mysql
+* oracle
+* oracle_enhanced
+* postgresql
+* sqlite3
+
+To run the tests for one of the adapters follow these steps (using mysql in the example):
+
+* You will need the following gems:
+    - rake
+    - activerecord (3.1.0.rc5 or later)
+    - mysql (or the adapter of your choice)
+
+* Put your database connection settings in test/connections/databases.yml.
+  Look at databases.example.yml for examples.
+
+    mysql:
+      adapter: mysql
+      username: root
+      database: composite_primary_keys_unittest
+
+* rake -T mysql
+
+    rake mysql:build_database         # Build the MySQL test databases
+    rake mysql:drop_database          # Drop the MySQL test databases
+    rake mysql:rebuild_database       # Rebuild the MySQL test databases
+    rake mysql:test                    # Run tests using the mysql adapter
+
+* rake mysql:build_database
+* rake mysql:test
+
+== Running tests individually
+
+You can specify which test you'd like to run on the command line:
+
+* rake mysql:test TEST=test/test_equal.rb
+
+If you want to run closer to the metal you can cd into the test/
+directory and run the tests like so:
+
+* ADAPTER=mysql ruby test_equal.rb
+
+== Logging
+
+By default, ActiveRecord's log messages are sent to standard out when
+running the tests. If you would prefer to send them to a file, specify
+it as the environment variable CPK_LOGFILE:
+
+* CPK_LOGFILE=cpk_test.log rake mysql:test

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.ci.yml

@@ -1,22 +1,22 @@
-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') %>
-
+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/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
+