composite_primary_keys 2.3.5.1 → 3.0.0.b2

data/lib/composite_primary_keys/version.rb

@@ -1,9 +1,9 @@
 module CompositePrimaryKeys
   module VERSION #:nodoc:
-    MAJOR = 2
-    MINOR = 3
-    TINY  = 5
-    PATCH = 1
+    MAJOR = 3
+    MINOR = 0
+    TINY  = 0
+    PATCH = 'b2'
     STRING = [MAJOR, MINOR, TINY, PATCH].join('.')
   end
 end

data/scripts/console.rb

@@ -32,7 +32,7 @@ $LOAD_PATH.unshift 'lib'
 
 begin
   require 'local/paths'
-  $LOAD_PATH.unshift "#{ENV['EDGE_RAILS_DIR']}/activerecord/lib"  if ENV['EDGE_RAILS_DIR']
+  $LOAD_PATH.unshift "#{ENV['EDGE_RAILS_DIR']}/active_record/lib"  if ENV['EDGE_RAILS_DIR']
   $LOAD_PATH.unshift "#{ENV['EDGE_RAILS_DIR']}/activesupport/lib" if ENV['EDGE_RAILS_DIR']
 rescue
 end

data/tasks/Rakefile.rb

@@ -0,0 +1,13 @@
+#require 'rake'
+#require 'rake/testtask'
+#
+#require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
+#
+## Set up test tasks
+#for adapter in %w( mysql sqlite oracle oracle_enhanced postgresql ibm_db )
+#  Rake::TestTask.new("test_#{adapter}") do |t|
+#    t.libs << "test" << "test/connections/native_#{adapter}"
+#    t.pattern = "test/test_*.rb"
+#    t.verbose = true
+#  end
+#nd

data/tasks/databases/mysql.rake

@@ -1,30 +1,26 @@
+require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
+
 namespace :mysql do
   desc 'Build the MySQL test databases'
   task :build_databases => :load_connection do 
-    puts File.join(SCHEMA_PATH, 'mysql.sql')
-    options_str = ENV['cpk_adapter_options_str']
+    options_str = connection_string
     # creates something like "-u#{username} -p#{password} -S#{socket}"
-    sh %{ mysqladmin #{options_str} create "#{GEM_NAME}_unittest" }
-    sh %{ mysql #{options_str} "#{GEM_NAME}_unittest" < #{File.join(SCHEMA_PATH, 'mysql.sql')} }
+    sh %{ mysqladmin #{options_str} create "#{SPEC['database']}" }
+
+    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'mysql.sql')
+    sh %{ mysql #{options_str} "#{SPEC['database']}" < #{schema} }
   end
 
   desc 'Drop the MySQL test databases'
   task :drop_databases => :load_connection do 
-    options_str = ENV['cpk_adapter_options_str']
-    sh %{ mysqladmin #{options_str} -f drop "#{GEM_NAME}_unittest" }
+    options_str = connection_string
+    sh %{ mysqladmin #{options_str} -f drop "#{SPEC['database']}" }
   end
 
   desc 'Rebuild the MySQL test databases'
   task :rebuild_databases => [:drop_databases, :build_databases]
   
   task :load_connection do
-    require File.join(PROJECT_ROOT, %w[lib adapter_helper mysql])
-    spec = AdapterHelper::MySQL.load_connection_from_env
-    options = {}
-    options['u'] = spec[:username]  if spec[:username]
-    options['p'] = spec[:password]  if spec[:password]
-    options['S'] = spec[:sock]      if spec[:sock]
-    options_str = options.map { |key, value| "-#{key}#{value}" }.join(" ")
-    ENV['cpk_adapter_options_str'] = options_str
+    require File.join(PROJECT_ROOT, "test", "connections", "native_mysql", "connection")
   end
-end
+end

data/tasks/databases/oracle.rake

@@ -1,25 +1,24 @@
+require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
+
 namespace :oracle do
   desc 'Build the Oracle test databases'
-  task :build_databases => :load_connection do 
-    puts File.join(SCHEMA_PATH, 'oracle.sql')
-    options_str = ENV['cpk_adapter_options_str']
-    sh %( sqlplus #{options_str} < #{File.join(SCHEMA_PATH, 'oracle.sql')} )
+  task :build_databases => :load_connection do
+    options_str = connection_string
+
+    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'oracle.sql')
+    sh %( sqlplus #{options_str} < #{schema} )
   end
 
   desc 'Drop the Oracle test databases'
   task :drop_databases => :load_connection do 
-    puts File.join(SCHEMA_PATH, 'oracle.drop.sql')
-    options_str = ENV['cpk_adapter_options_str']
+    options_str = connection_string
     sh %( sqlplus #{options_str} < #{File.join(SCHEMA_PATH, 'oracle.drop.sql')} )
   end
 
   desc 'Rebuild the Oracle test databases'
   task :rebuild_databases => [:drop_databases, :build_databases]
-  
+
   task :load_connection do
-    require File.join(PROJECT_ROOT, %w[lib adapter_helper oracle])
-    spec = AdapterHelper::Oracle.load_connection_from_env
-    ENV['cpk_adapter_options_str'] = "#{spec[:username]}/#{spec[:password]}@#{spec[:host]}"
+    require File.join(PROJECT_ROOT, "test", "connections", "native_oracle", "connection")
   end
-  
 end

data/tasks/databases/postgresql.rake

@@ -1,26 +1,23 @@
+require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
+
 namespace :postgresql do
   desc 'Build the PostgreSQL test databases'
-  task :build_databases => :load_connection do 
-    sh %{ createdb "#{GEM_NAME}_unittest" }
-    sh %{ psql "#{GEM_NAME}_unittest" -f #{File.join(SCHEMA_PATH, 'postgresql.sql')} }
+  task :build_databases => :load_connection do
+    sh %{ createdb #{connection_string} "#{SPEC['database']}" }
+
+    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'postgresql.sql')
+    sh %{ psql #{connection_string} "#{SPEC['database']}" -f #{schema} }
   end
 
   desc 'Drop the PostgreSQL test databases'
   task :drop_databases => :load_connection do 
-    sh %{ dropdb "#{GEM_NAME}_unittest" }
+    sh %{ dropdb #{connection_string} "#{SPEC['database']}" }
   end
 
   desc 'Rebuild the PostgreSQL test databases'
   task :rebuild_databases => [:drop_databases, :build_databases]
 
   task :load_connection do
-    require File.join(PROJECT_ROOT, %w[lib adapter_helper postgresql])
-    spec = AdapterHelper::Postgresql.load_connection_from_env
-    options = {}
-    options['u'] = spec[:username]  if spec[:username]
-    options['p'] = spec[:password]  if spec[:password]
-    options_str = options.map { |key, value| "-#{key}#{value}" }.join(" ")
-    ENV['cpk_adapter_options_str'] = options_str
+    require File.join(PROJECT_ROOT, "test", "connections", "native_postgresql", "connection")
   end
-end
-
+end

data/tasks/databases/sqlite3.rake

@@ -1,19 +1,21 @@
+require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
+
 namespace :sqlite3 do
   desc 'Build the sqlite test databases'
-  task :build_databases => :load_connection do 
-    file = File.join(SCHEMA_PATH, 'sqlite.sql')
-    dbfile = File.join(PROJECT_ROOT, ENV['cpk_adapter_options_str'])
+  task :build_databases => :load_connection do
+    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'sqlite.sql')
+    dbfile = File.join(PROJECT_ROOT, connection_string)
     cmd = "mkdir -p #{File.dirname(dbfile)}"
     puts cmd
     sh %{ #{cmd} }
-    cmd = "sqlite3 #{dbfile} < #{file}"
+    cmd = "sqlite3 #{dbfile} < #{schema}"
     puts cmd
     sh %{ #{cmd} }
   end
 
   desc 'Drop the sqlite test databases'
   task :drop_databases => :load_connection do 
-    dbfile = ENV['cpk_adapter_options_str']
+    dbfile = connection_string
     sh %{ rm -f #{dbfile} }
   end
 
@@ -21,8 +23,6 @@ namespace :sqlite3 do
   task :rebuild_databases => [:drop_databases, :build_databases]
 
   task :load_connection do
-    require File.join(PROJECT_ROOT, %w[lib adapter_helper sqlite3])
-    spec = AdapterHelper::Sqlite3.load_connection_from_env
-    ENV['cpk_adapter_options_str'] = spec[:dbfile]
+    require File.join(PROJECT_ROOT, "test", "connections", "native_sqlite3", "connection")
   end
-end
+end

data/test/README_tests.txt

@@ -10,7 +10,7 @@ There are tests available for the following adapters:
 * postgresql
 * sqlite
 
-To run the tests for on of the adapters, follow these steps (using mysql in the example):
+To run the tests for on of the adapters follow these steps (using mysql in the example):
 
 * rake -T | grep mysql
 
@@ -21,47 +21,3 @@ To run the tests for on of the adapters, follow these steps (using mysql in the
 
 * rake mysql:build_databases
 * rake test_mysql
-
-== Testing against different ActiveRecord versions (or Edge Rails)
-
-ActiveRecord is a RubyGem within Rails, and is constantly being improved/changed on
-its repository (http://dev.rubyonrails.org). These changes may create errors for the CPK
-gem. So, we need a way to test CPK against Edge Rails, as well as officially released RubyGems.
-
-The default test (as above) uses the latest RubyGem in your cache.
-
-You can select an older RubyGem version by running the following:
-
-* rake ar:set VERSION=1.14.4 test_mysql
-
-== Edge Rails
-
-Before you can test CPK against Edge Rails, you must checkout a copy of edge rails somewhere (see http://dev.rubyonrails.org for for examples)
-
-* cd /path/to/gems
-* svn co http://svn.rubyonrails.org/rails/trunk rails
-
-Say the rails folder is /path/to/gems/rails
-
-Three ways to run CPK tests for Edge Rails:
-
-i)   Run:
-  
-        EDGE_RAILS_DIR=/path/to/gems/rails rake ar:edge test_mysql
-        
-ii)  In your .profile, set the environment variable EDGE_RAILS_DIR=/path/to/gems/rails, 
-     and once you reload your profile, run:  
-     
-        rake ar:edge test_mysql
-        
-iii) Store the path in local/paths.rb. Run:
-
-        cp local/paths.rb.sample local/paths.rb
-        # Now set ENV['EDGE_RAILS_DIR']=/path/to/gems/rails
-        rake ar:edge test_mysql
-
-These are all variations of the same theme:
-
-* Set the environment variable EDGE_RAILS_DIR to the path to Rails (which contains the activerecord/lib folder)
-* Run: rake ar:edge test_<adapter>
-  

data/test/abstract_unit.rb

@@ -1,20 +1,25 @@
-$:.unshift(ENV['AR_LOAD_PATH']) if ENV['AR_LOAD_PATH']
+dir = File.dirname(__FILE__)
+PROJECT_ROOT = File.expand_path(File.join(dir, '..'))
 
+adapter ||= 'postgresql'
+
+require 'pp'
 require 'test/unit'
 require 'hash_tricks'
 require 'rubygems'
 require 'active_record'
 require 'active_record/fixtures'
-begin
-  require 'connection'
-rescue MissingSourceFile => e
-  adapter = 'postgresql' #'sqlite'
-  require "#{File.dirname(__FILE__)}/connections/native_#{adapter}/connection"
-end
+require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
+require File.join(PROJECT_ROOT, "test", "connections", "native_#{adapter}", "connection")
 require 'composite_primary_keys'
 
+# Tell ActiveRecord where to find models
+ActiveSupport::Dependencies.autoload_paths << File.join(PROJECT_ROOT, 'test', 'fixtures')
+
 QUOTED_TYPE = ActiveRecord::Base.connection.quote_column_name('type') unless Object.const_defined?(:QUOTED_TYPE)
 
+ActiveRecord::Base.configurations[:test] = CompositePrimaryKeys::ConnectionSpec[adapter]
+
 class ActiveSupport::TestCase #:nodoc:
   include ActiveRecord::TestFixtures
   
@@ -52,10 +57,12 @@ class ActiveSupport::TestCase #:nodoc:
   end
   
   cattr_accessor :classes
-protected
+
+  protected
   
   def testing_with(&block)
-    classes.keys.each do |@key_test|
+    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(',')
@@ -69,10 +76,6 @@ protected
     composite? ? ids.to_composite_ids : ids.first
   end
   
-  def first_id_str
-    composite? ? first_id.join(CompositePrimaryKeys::ID_SEP) : first_id.to_s
-  end
-  
   def composite?
     @key_test != :single
   end  
@@ -92,5 +95,5 @@ ActiveRecord::Base.connection.class.class_eval do
   end
 end
 
-#ActiveRecord::Base.logger = Logger.new(STDOUT)
+ActiveRecord::Base.logger = Logger.new(STDOUT)
 #ActiveRecord::Base.colorize_logging = false

data/test/connections/connection_spec.rb

@@ -0,0 +1,19 @@
+require 'yaml'
+
+module CompositePrimaryKeys
+  class ConnectionSpec
+    def self.[](adapter)
+      config[adapter.to_s]
+    end
+
+    private
+
+    def self.config
+      @config ||= begin
+        path = File.join(PROJECT_ROOT, 'test', 'connections', 'databases.yml')
+        puts path
+        YAML.load_file(path)
+      end
+    end
+  end
+end

data/test/connections/databases.example.yml

@@ -0,0 +1,11 @@
+mysql:
+  adapter: mysql
+  username: root
+
+sqlite3:
+  adapter: sqlite3
+
+postgresql:
+  adapter: postgresql
+  username: postgres
+  host: localhost

data/test/connections/databases.yml

@@ -0,0 +1,13 @@
+mysql:
+  adapter: mysql
+  username: root
+  database: composite_primary_keys_unittest
+
+sqlite3:
+  adapter: sqlite3
+
+postgresql:
+  adapter: postgresql
+  database: composite_primary_keys_unittest
+  username: postgres
+  host: localhost

data/test/connections/native_mysql/connection.rb

@@ -2,12 +2,20 @@ print "Using native MySQL\n"
 require 'fileutils'
 require 'logger'
 require 'adapter_helper/mysql'
+require 'active_record'
 
 log_path = File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. .. log]))
 FileUtils.mkdir_p log_path
-puts "Logging to #{log_path}/debug.log"
 ActiveRecord::Base.logger = Logger.new("#{log_path}/debug.log")
 
-# Adapter config setup in locals/database_connections.rb
+def connection_string
+  options = {}
+  options['u'] = SPEC['username']  if SPEC['username']
+  options['p'] = SPEC['password']  if SPEC['password']
+  options['S'] = SPEC['sock']      if SPEC['sock']
+  options.map { |key, value| "-#{key} #{value}" }.join(" ")
+end
+
+  # Adapter config setup in locals/database_connections.rb
 connection_options = AdapterHelper::MySQL.load_connection_from_env
 ActiveRecord::Base.establish_connection(connection_options)

data/test/connections/native_oracle/connection.rb

@@ -2,13 +2,16 @@ print "Using native Oracle\n"
 require 'fileutils'
 require 'logger'
 require 'adapter_helper/oracle'
+require 'active_record'
 
 log_path = File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. .. log]))
 FileUtils.mkdir_p log_path
-puts "Logging to #{log_path}/debug.log"
 ActiveRecord::Base.logger = Logger.new("#{log_path}/debug.log")
 
+def connection_string
+  "#{connection_SPEC['username']}/#{connection_SPEC['password']}@#{connection_SPEC['host']}"
+end
+
 # Adapter config setup in locals/database_connections.rb
-connection_options = AdapterHelper::Oracle.load_connection_from_env
-puts connection_options.inspect
-ActiveRecord::Base.establish_connection(connection_options)
+spec = CompositePrimaryKeys::ConnectionSpec[:oracle]
+ActiveRecord::Base.establish_connection(spec)

data/test/connections/native_oracle_enhanced/connection.rb

@@ -0,0 +1,23 @@
+print "Using native Oracle Enhanced\n"
+require 'fileutils'
+require 'logger'
+require 'adapter_helper/oracle_enhanced'
+require 'active_record'
+
+log_path = File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. .. log]))
+FileUtils.mkdir_p log_path
+ActiveRecord::Base.logger = Logger.new("#{log_path}/debug.log")
+ActiveRecord::Base.logger.level = Logger::DEBUG
+
+def connection_string
+  "#{connection_SPEC['username']}/#{connection_SPEC['password']}@#{connection_SPEC['host']}"
+end
+
+# Adapter config setup in locals/database_connections.rb
+spec = CompositePrimaryKeys::ConnectionSpec[:oracle]
+ActiveRecord::Base.establish_connection(spec)
+
+# Change default options for Oracle Enhanced adapter
+ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = true
+# Change NLS_DATE_FORMAT to non-default format to verify that all tests should pass
+ActiveRecord::Base.connection.execute %q{alter session set nls_date_format = 'DD-MON-YYYY HH24:MI:SS'}

data/test/connections/native_postgresql/connection.rb

@@ -1,9 +1,17 @@
 print "Using native Postgresql\n"
+
 require 'logger'
-require 'adapter_helper/postgresql'
+require 'active_record'
+require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
+require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys', 'connection_adapters', 'postgresql_adapter')
 
-ActiveRecord::Base.logger = Logger.new("debug.log")
+def connection_string
+  options = {}
+  options['U'] = SPEC['username']  if SPEC['username']
+  options['p'] = SPEC['password']  if SPEC['password']
+  options.map { |key, value| "-#{key} #{value}" }.join(" ")
+end
 
-# Adapter config setup in locals/database_connections.rb
-connection_options = AdapterHelper::Postgresql.load_connection_from_env
-ActiveRecord::Base.establish_connection(connection_options)
+ActiveRecord::Base.logger = Logger.new("debug.log")
+SPEC = CompositePrimaryKeys::ConnectionSpec[:postgresql]
+ActiveRecord::Base.establish_connection(SPEC)