composite_primary_keys 13.0.1 → 13.0.2

data/tasks/databases/mysql.rake

@@ -1,40 +1,40 @@
-namespace :mysql do
-  task :setup do
-    require 'bundler'
-    Bundler.require(:default, :mysql)
-  end
-
-  task :create_database => :setup do
-    spec = CompositePrimaryKeys::ConnectionSpec['mysql']
-    ActiveRecord::Base.clear_all_connections!
-    new_spec = spec.dup
-    new_spec.delete('database')
-    connection = ActiveRecord::Base.establish_connection(new_spec)
-    ActiveRecord::Base.connection.create_database(spec['database'], charset: spec['charset'] || 'utf8mb4')
-    ActiveRecord::Base.clear_all_connections!
-  end
-
-  desc 'Build the MySQL test database'
-  task :build_database => [:create_database] do
-    path = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'mysql.sql')
-    sql = File.open(path, 'rb') do |file|
-      file.read
-    end
-
-    spec = CompositePrimaryKeys::ConnectionSpec['mysql']
-    connection = ActiveRecord::Base.establish_connection(spec)
-    sql.split(";").each do |statement|
-      ActiveRecord::Base.connection.execute(statement) unless statement.strip.length == 0
-    end
-  end
-
-  desc 'Drop the MySQL test database'
-  task :drop_database => :setup do
-    spec = CompositePrimaryKeys::ConnectionSpec['mysql']
-    connection = ActiveRecord::Base.establish_connection(spec)
-    ActiveRecord::Base.connection.drop_database(spec['database'])
-  end
-
-  desc 'Rebuild the MySQL test database'
-  task :rebuild_database => [:drop_database, :build_database]
-end
+namespace :mysql do
+  task :setup do
+    require 'bundler'
+    Bundler.require(:default, :mysql)
+  end
+
+  task :create_database => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['mysql']
+    ActiveRecord::Base.clear_all_connections!
+    new_spec = spec.dup
+    new_spec.delete('database')
+    connection = ActiveRecord::Base.establish_connection(new_spec)
+    ActiveRecord::Base.connection.create_database(spec['database'], charset: spec['charset'] || 'utf8mb4')
+    ActiveRecord::Base.clear_all_connections!
+  end
+
+  desc 'Build the MySQL test database'
+  task :build_database => [:create_database] do
+    path = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'mysql.sql')
+    sql = File.open(path, 'rb') do |file|
+      file.read
+    end
+
+    spec = CompositePrimaryKeys::ConnectionSpec['mysql']
+    connection = ActiveRecord::Base.establish_connection(spec)
+    sql.split(";").each do |statement|
+      ActiveRecord::Base.connection.execute(statement) unless statement.strip.length == 0
+    end
+  end
+
+  desc 'Drop the MySQL test database'
+  task :drop_database => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['mysql']
+    connection = ActiveRecord::Base.establish_connection(spec)
+    ActiveRecord::Base.connection.drop_database(spec['database'])
+  end
+
+  desc 'Rebuild the MySQL test database'
+  task :rebuild_database => [:drop_database, :build_database]
+end

data/tasks/databases/oracle.rake

@@ -1,41 +1,41 @@
-namespace :oracle do
-  task :setup do
-    require 'bundler'
-    Bundler.require(:default, :oracle)
-  end
-
-  desc 'Build the Oracle test database'
-  task :build_database => :setup do
-    spec = CompositePrimaryKeys::ConnectionSpec['oracle']
-    ActiveRecord::Base.clear_all_connections!
-    ActiveRecord::Base.establish_connection(spec)
-
-    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'oracle.sql')
-    sql = File.read(schema)
-
-    sql.split(';').each do |command|
-      ActiveRecord::Base.connection.execute(command) unless command.blank?
-    end
-
-    ActiveRecord::Base.clear_all_connections!
-  end
-
-  desc 'Drop the Oracle test database'
-  task :drop_database => :setup do
-    spec = CompositePrimaryKeys::ConnectionSpec['oracle']
-    ActiveRecord::Base.clear_all_connections!
-    ActiveRecord::Base.establish_connection(spec)
-
-    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'oracle.drop.sql')
-    sql = File.read(schema)
-
-    sql.split(';').each do |command|
-      ActiveRecord::Base.connection.execute(command)
-    end
-
-    ActiveRecord::Base.clear_all_connections!
-  end
-
-  desc 'Rebuild the Oracle test database'
-  task :rebuild_database => [:drop_database, :build_database]
-end
+namespace :oracle do
+  task :setup do
+    require 'bundler'
+    Bundler.require(:default, :oracle)
+  end
+
+  desc 'Build the Oracle test database'
+  task :build_database => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['oracle']
+    ActiveRecord::Base.clear_all_connections!
+    ActiveRecord::Base.establish_connection(spec)
+
+    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'oracle.sql')
+    sql = File.read(schema)
+
+    sql.split(';').each do |command|
+      ActiveRecord::Base.connection.execute(command) unless command.blank?
+    end
+
+    ActiveRecord::Base.clear_all_connections!
+  end
+
+  desc 'Drop the Oracle test database'
+  task :drop_database => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['oracle']
+    ActiveRecord::Base.clear_all_connections!
+    ActiveRecord::Base.establish_connection(spec)
+
+    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'oracle.drop.sql')
+    sql = File.read(schema)
+
+    sql.split(';').each do |command|
+      ActiveRecord::Base.connection.execute(command)
+    end
+
+    ActiveRecord::Base.clear_all_connections!
+  end
+
+  desc 'Rebuild the Oracle test database'
+  task :rebuild_database => [:drop_database, :build_database]
+end

data/tasks/databases/postgresql.rake

@@ -1,39 +1,39 @@
-namespace :postgresql do
-  task :setup do
-    require 'bundler'
-    Bundler.require(:default, :postgresql)
-  end
-
-  task :create_database => :setup do
-    spec = CompositePrimaryKeys::ConnectionSpec['postgresql']
-    ActiveRecord::Base.clear_all_connections!
-    ActiveRecord::Base.establish_connection(spec.dup.merge('database' => 'postgres'))
-    ActiveRecord::Base.connection.create_database(spec['database'])
-    ActiveRecord::Base.clear_all_connections!
-  end
-
-  desc 'Build the Postgresql test database'
-  task :build_database => :create_database do
-    spec = CompositePrimaryKeys::ConnectionSpec['postgresql']
-    ActiveRecord::Base.clear_all_connections!
-    connection = ActiveRecord::Base.establish_connection(spec)
-
-    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'postgresql.sql')
-    sql = File.read(schema)
-
-    ActiveRecord::Base.connection.execute(sql)
-    ActiveRecord::Base.clear_all_connections!
-  end
-
-  desc 'Drop the Postgresql test database'
-  task :drop_database  => :setup do
-    spec = CompositePrimaryKeys::ConnectionSpec['postgresql']
-    ActiveRecord::Base.clear_all_connections!
-    connection = ActiveRecord::Base.establish_connection(spec.merge('database' => 'postgres'))
-    ActiveRecord::Base.connection.drop_database(spec['database'])
-    ActiveRecord::Base.clear_all_connections!
-  end
-
-  desc 'Rebuild the PostgreSQL test database'
-  task :rebuild_database => [:drop_database, :build_database]
+namespace :postgresql do
+  task :setup do
+    require 'bundler'
+    Bundler.require(:default, :postgresql)
+  end
+
+  task :create_database => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['postgresql']
+    ActiveRecord::Base.clear_all_connections!
+    ActiveRecord::Base.establish_connection(spec.dup.merge('database' => 'postgres'))
+    ActiveRecord::Base.connection.create_database(spec['database'])
+    ActiveRecord::Base.clear_all_connections!
+  end
+
+  desc 'Build the Postgresql test database'
+  task :build_database => :create_database do
+    spec = CompositePrimaryKeys::ConnectionSpec['postgresql']
+    ActiveRecord::Base.clear_all_connections!
+    connection = ActiveRecord::Base.establish_connection(spec)
+
+    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'postgresql.sql')
+    sql = File.read(schema)
+
+    ActiveRecord::Base.connection.execute(sql)
+    ActiveRecord::Base.clear_all_connections!
+  end
+
+  desc 'Drop the Postgresql test database'
+  task :drop_database  => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['postgresql']
+    ActiveRecord::Base.clear_all_connections!
+    connection = ActiveRecord::Base.establish_connection(spec.merge('database' => 'postgres'))
+    ActiveRecord::Base.connection.drop_database(spec['database'])
+    ActiveRecord::Base.clear_all_connections!
+  end
+
+  desc 'Rebuild the PostgreSQL test database'
+  task :rebuild_database => [:drop_database, :build_database]
 end

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