composite_primary_keys 8.1.6 → 9.0.10

data/scripts/txt2js

@@ -1,65 +1,65 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'redcloth'
-require 'syntax/convertors/html'
-require 'erb'
-require 'active_support'
-
-version_path = File.join(File.dirname(__FILE__), '..', 'lib', 'composite_primary_keys', 'version.rb')
-require File.expand_path(version_path)
-
-version  = CompositePrimaryKeys::VERSION::STRING
-download = 'http://rubygems.org/gems/composite_primary_keys'
-
-class Fixnum
-  def ordinal
-    # teens
-    return 'th' if (10..19).include?(self % 100)
-    # others
-    case self % 10
-    when 1
-      return 'st'
-    when 2
-      return 'nd'
-    when 3
-      return 'rd'
-    else
-      return 'th'
-    end
-  end
-end
-
-class Time
-  def pretty
-    return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
-  end
-end
-
-def convert_syntax(syntax, source)
-  return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
-end
-
-if ARGV.length >= 1
-  src, template = ARGV
-  template ||= File.dirname(__FILE__) + '/../website/template.js'
-else
-  puts("Usage: #{File.split($0).last} source.txt [template.js] > output.html")
-  exit!
-end
-
-template = ERB.new(File.open(template).read)
-
-title = nil
-body = nil
-File.open(src) do |fsrc|
-  title_text = fsrc.readline
-  body_text = fsrc.read
-  title = RedCloth.new(title_text).to_html.gsub(%r!<.*?>!,'').strip
-  body = RedCloth.new(body_text)
-end
-stat = File.stat(src)
-created = stat.ctime
-modified = stat.mtime
-
-$stdout << template.result(binding)
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'redcloth'
+require 'syntax/convertors/html'
+require 'erb'
+require 'active_support'
+
+version_path = File.join(File.dirname(__FILE__), '..', 'lib', 'composite_primary_keys', 'version.rb')
+require File.expand_path(version_path)
+
+version  = CompositePrimaryKeys::VERSION::STRING
+download = 'http://rubygems.org/gems/composite_primary_keys'
+
+class Fixnum
+  def ordinal
+    # teens
+    return 'th' if (10..19).include?(self % 100)
+    # others
+    case self % 10
+    when 1
+      return 'st'
+    when 2
+      return 'nd'
+    when 3
+      return 'rd'
+    else
+      return 'th'
+    end
+  end
+end
+
+class Time
+  def pretty
+    return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
+  end
+end
+
+def convert_syntax(syntax, source)
+  return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
+end
+
+if ARGV.length >= 1
+  src, template = ARGV
+  template ||= File.dirname(__FILE__) + '/../website/template.js'
+else
+  puts("Usage: #{File.split($0).last} source.txt [template.js] > output.html")
+  exit!
+end
+
+template = ERB.new(File.open(template).read)
+
+title = nil
+body = nil
+File.open(src) do |fsrc|
+  title_text = fsrc.readline
+  body_text = fsrc.read
+  title = RedCloth.new(title_text).to_html.gsub(%r!<.*?>!,'').strip
+  body = RedCloth.new(body_text)
+end
+stat = File.stat(src)
+created = stat.ctime
+modified = stat.mtime
+
+$stdout << template.result(binding)

data/tasks/databases/mysql.rake

@@ -1,14 +1,16 @@
-require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
-require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
-
 namespace :mysql do
-  desc 'Create the MySQL test database'
-  task :create_database 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!
-    spec = CompositePrimaryKeys::ConnectionSpec['mysql'].dup
-    database_name = spec.delete('database')
-    connection = ActiveRecord::Base.establish_connection(spec)
-    ActiveRecord::Base.connection.create_database(database_name)
+    new_spec = spec.dup
+    new_spec.delete('database')
+    connection = ActiveRecord::Base.establish_connection(new_spec)
+    ActiveRecord::Base.connection.create_database(spec['database'])
     ActiveRecord::Base.clear_all_connections!
   end
 
@@ -19,24 +21,20 @@ namespace :mysql do
       file.read
     end
 
-    Rake::Task['mysql:load_connection'].reenable
-    Rake::Task['mysql:load_connection'].invoke
-    #puts %(ActiveRecord::Base.connection.instance_variable_get(:@config)=#{(ActiveRecord::Base.connection.instance_variable_get(:@config)).inspect})
+    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 => :load_connection do
-    ActiveRecord::Base.connection.drop_database(SPEC['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]
-  
-  task :load_connection do
-    require File.join(PROJECT_ROOT, "test", "connections", "native_mysql", "connection")
-    establish_connection
-  end
 end

data/tasks/databases/oracle.rake

@@ -1,27 +1,41 @@
-require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
-require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
-
 namespace :oracle do
+  task :setup do
+    require 'bundler'
+    Bundler.require(:default, :oracle)
+  end
+
   desc 'Build the Oracle test database'
-  task :build_database => :load_connection do
-    options_str = connection_string
+  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
 
-    sql = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'oracle.sql')
-    sh %( sqlplus #{options_str} < #{sql} )
+    ActiveRecord::Base.clear_all_connections!
   end
 
   desc 'Drop the Oracle test database'
-  task :drop_database => :load_connection do
-    options_str = connection_string
+  task :drop_database => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['oracle']
+    ActiveRecord::Base.clear_all_connections!
+    ActiveRecord::Base.establish_connection(spec)
 
-    sql = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'oracle.drop.sql')
-    sh %( sqlplus #{options_str} < #{sql} )
+    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]
-
-  task :load_connection do
-    require File.join(PROJECT_ROOT, "test", "connections", "native_oracle", "connection")
-  end
 end

data/tasks/databases/postgresql.rake

@@ -1,48 +1,39 @@
-require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
-require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
-
 namespace :postgresql do
-  desc 'Create the PostgreSQL test database'
-  task :create_database 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!
-    spec = CompositePrimaryKeys::ConnectionSpec['postgresql'].dup
-    database_name = spec.delete('database')
-    spec['database'] = 'postgres'
-    connection = ActiveRecord::Base.establish_connection(spec)
-    ActiveRecord::Base.connection.create_database(database_name)
+    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
+  desc 'Build the Postgresql test database'
+  task :build_database => :create_database do
+    spec = CompositePrimaryKeys::ConnectionSpec['postgresql']
     ActiveRecord::Base.clear_all_connections!
-    spec = CompositePrimaryKeys::ConnectionSpec['postgresql'].dup
     connection = ActiveRecord::Base.establish_connection(spec)
 
-    path = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'postgresql.sql')
-    sql = File.open(path, 'rb') do |file|
-      file.read
-    end
+    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'postgresql.sql')
+    sql = File.read(schema)
 
-    Rake::Task['postgresql:load_connection'].invoke
     ActiveRecord::Base.connection.execute(sql)
+    ActiveRecord::Base.clear_all_connections!
   end
 
-  desc 'Drop the PostgreSQL test database'
-  task :drop_database => :load_connection do
+  desc 'Drop the Postgresql test database'
+  task :drop_database  => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['postgresql']
     ActiveRecord::Base.clear_all_connections!
-    spec = CompositePrimaryKeys::ConnectionSpec['postgresql'].dup
-    database_name = spec.delete('database')
-    spec['database'] = 'postgres'
-    connection = ActiveRecord::Base.establish_connection(spec)
-    ActiveRecord::Base.connection.drop_database(SPEC['database'])
+    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]
-
-  task :load_connection do
-    require File.join(PROJECT_ROOT, "test", "connections", "native_postgresql", "connection")
-  end
 end

data/tasks/databases/sqlite.rake

@@ -0,0 +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

data/tasks/databases/sqlserver.rake

@@ -1,27 +1,43 @@
-require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
-require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
-
 namespace :sqlserver do
-  desc 'Build the SQL Server test database'
-  task :build_database => :load_connection do
-    options_str = connection_string
+  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')
-    sh %( sqsh #{options_str} -i #{schema} )
+    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 => :load_connection do 
-    options_str = connection_string
-    
-    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'sqlserver.drop.sql')
-    sh %( sqsh #{options_str} -i #{schema} )
+  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]
-
-  task :load_connection do
-    require File.join(PROJECT_ROOT, "test", "connections", "native_sqlserver", "connection")
-  end
 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/abstract_unit.rb

@@ -1,4 +1,6 @@
-PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+spec_name = ENV['ADAPTER'] || 'postgresql'
+require 'bundler'
+Bundler.require(:default, spec_name.to_sym)
 
 # To make debugging easier, test within this source tree versus an installed gem
 $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
@@ -6,15 +8,19 @@ require 'composite_primary_keys'
 require 'minitest/autorun'
 require 'active_support/test_case'
 
-# Now load the connection spec
-require File.join(PROJECT_ROOT, "test", "connections", "connection_spec")
+# Require the connection spec
+PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
 
-spec_name = ENV['ADAPTER'] || 'postgresql'
 spec = CompositePrimaryKeys::ConnectionSpec[spec_name]
+puts "Loaded #{spec_name}"
 
 # And now connect to the database
-adapter = spec['adapter']
-require File.join(PROJECT_ROOT, "test", "connections", "native_#{spec_name}", "connection")
+ActiveRecord::Base.establish_connection(spec)
+
+if defined?(ActiveRecord::ConnectionAdapters::SQLite3Adapter)
+  require 'composite_primary_keys/connection_adapters/sqlite3_adapter'
+end
 
 # Tell active record about the configuration
 ActiveRecord::Base.configurations[:test] = spec
@@ -26,17 +32,17 @@ I18n.config.enforce_available_locales = true
 
 class ActiveSupport::TestCase
   include ActiveRecord::TestFixtures
-  
-  self.fixture_path = File.dirname(__FILE__) + "/fixtures/"
+
+  self.fixture_path = File.dirname(__FILE__) + '/fixtures/'
   self.use_instantiated_fixtures = false
-  self.use_transactional_fixtures = true
+  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, 
+    # 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")
+      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
@@ -54,17 +60,17 @@ class ActiveSupport::TestCase
     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."
+    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
@@ -75,19 +81,19 @@ class ActiveSupport::TestCase
       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  
+  end
 
   # Oracle metadata is in all caps.
   def with_quoted_identifiers(s)
-    s.gsub(/"(\w+)"/) { |m|
+    s.gsub(/'(\w+)'/) { |m|
       if ActiveRecord::Base.configurations[:test]['adapter'] =~ /oracle/i
         m.upcase
       else