composite_primary_keys 8.1.8 → 9.0.0.beta1

data/test/abstract_unit.rb

@@ -1,3 +1,5 @@
+ENV["TESTING_CPK"] = "true"
+
 PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
 # To make debugging easier, test within this source tree versus an installed gem
@@ -13,7 +15,6 @@ spec_name = ENV['ADAPTER'] || 'postgresql'
 spec = CompositePrimaryKeys::ConnectionSpec[spec_name]
 
 # And now connect to the database
-adapter = spec['adapter']
 require File.join(PROJECT_ROOT, "test", "connections", "native_#{spec_name}", "connection")
 
 # Tell active record about the configuration
@@ -26,14 +27,14 @@ 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_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")
@@ -60,11 +61,11 @@ class ActiveSupport::TestCase
   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,15 +76,15 @@ 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)

data/test/connections/connection_spec.rb

@@ -1,18 +1,18 @@
-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')
-        YAML.load_file(path)
-      end
-    end
-  end
-end
+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')
+        YAML.load_file(path)
+      end
+    end
+  end
+end

data/test/connections/databases.yml

@@ -1,39 +1,9 @@
-# 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.
+#  3. Build the database using rake <databasename>:build_database
+postgresql:
+  adapter: postgresql
+  database: composite_primary_keys_unittest
+  username: postgres
+  host: localhost

data/test/connections/native_ibm_db/connection.rb

@@ -1,19 +1,19 @@
-print "Using IBM2 \n"
-
-gem 'ibm_db'
-require 'IBM_DB'
-
-RAILS_CONNECTION_ADAPTERS = %w( mysql postgresql sqlite firebird sqlserver db2 oracle sybase openbase frontbase ibm_db )
-
-db1 = 'composite_primary_keys_unittest'
-
-connection_options = {
-  :adapter  => "ibm_db",
-  :database => "ocdpdev",
-  :username => "db2inst1",
-  :password => "password",                      
-  :host => '192.168.2.21'
-}
-
-ActiveRecord::Base.configurations = { db1 => connection_options }
+print "Using IBM2 \n"
+
+gem 'ibm_db'
+require 'IBM_DB'
+
+RAILS_CONNECTION_ADAPTERS = %w( mysql postgresql sqlite firebird sqlserver db2 oracle sybase openbase frontbase ibm_db )
+
+db1 = 'composite_primary_keys_unittest'
+
+connection_options = {
+  :adapter  => "ibm_db",
+  :database => "ocdpdev",
+  :username => "db2inst1",
+  :password => "password",                      
+  :host => '192.168.2.21'
+}
+
+ActiveRecord::Base.configurations = { db1 => connection_options }
 ActiveRecord::Base.establish_connection(connection_options)

data/test/connections/native_mysql/connection.rb

@@ -1,17 +1,17 @@
-print "Using native MySQL\n"
-
-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 test/connections/databases.yml
-SPEC = CompositePrimaryKeys::ConnectionSpec['mysql']
-
-def establish_connection
-  ActiveRecord::Base.establish_connection(SPEC)
-end
-establish_connection
+print "Using native MySQL\n"
+
+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 test/connections/databases.yml
+SPEC = CompositePrimaryKeys::ConnectionSpec['mysql']
+
+def establish_connection
+  ActiveRecord::Base.establish_connection(SPEC)
+end
+establish_connection

data/test/connections/native_postgresql/connection.rb

@@ -1,13 +1,13 @@
-print "Using native Postgresql\n"
-
-def connection_string
-  options = Hash.new
-  options['U'] = SPEC['username']  if SPEC['username']
-  options['h'] = SPEC['host']  if SPEC['host']
-  options['p'] = SPEC['port']  if SPEC['port']
-  options.map { |key, value| "-#{key} #{value}" }.join(" ")
-end
-
-# Adapter config setup in text/connections/databases.yml
-SPEC = CompositePrimaryKeys::ConnectionSpec['postgresql']
+print "Using native Postgresql\n"
+
+def connection_string
+  options = Hash.new
+  options['U'] = SPEC['username']  if SPEC['username']
+  options['h'] = SPEC['host']  if SPEC['host']
+  options['p'] = SPEC['port']  if SPEC['port']
+  options.map { |key, value| "-#{key} #{value}" }.join(" ")
+end
+
+# Adapter config setup in text/connections/databases.yml
+SPEC = CompositePrimaryKeys::ConnectionSpec['postgresql']
 ActiveRecord::Base.establish_connection(SPEC)

data/test/connections/native_sqlite3/connection.rb

@@ -1,9 +1,9 @@
-print "Using native Sqlite3\n"
-
-def connection_string
-  SPEC['database']
-end
-
-# Adapter config setup in text/connections/databases.yml
-SPEC = CompositePrimaryKeys::ConnectionSpec['sqlite3']
-ActiveRecord::Base.establish_connection(SPEC)
+print "Using native Sqlite3\n"
+
+def connection_string
+  SPEC['database']
+end
+
+# Adapter config setup in text/connections/databases.yml
+SPEC = CompositePrimaryKeys::ConnectionSpec['sqlite3']
+ActiveRecord::Base.establish_connection(SPEC)

data/test/db_test.rb

@@ -1,53 +1,53 @@
-# assoc_test.rb
-
-path = File.expand_path(File.join(File.basename(__FILE__), "..", "lib", "composite_primary_keys"))
-puts path
-
-require File.join(path)
-require 'active_record'
-
-$configuration = {
-  :adapter  => 'postgresql',
-  :database => 'cpk_test',
-  :username => 'postgres'
-}
-
-ActiveRecord::Base.establish_connection($configuration) unless ActiveRecord::Base.connected?
-
-module GlobePG
-  class PGBase < ActiveRecord::Base
-    self.abstract_class = true
-   # establish_connection($configuration) unless connected?
-  end
-end
-
-module GlobePG
-  class TeacherToSchool < PGBase
-    set_table_name 'teacher_to_school'
-    self.primary_keys = ['teacherid', 'schoolid']
-
-    belongs_to :globe_teacher, :foreign_key => 'teacherid'
-    belongs_to :globe_school, :foreign_key => 'schoolid'
-  end
-end
-
-module GlobePG
-  class GlobeSchool < PGBase
-    set_table_name 'globe_school'
-    self.primary_key = 'schoolid'
-    has_many :teacher_to_schools, :foreign_key => :schoolid
-    has_many :globe_teachers, :through => :teacher_to_schools
-  end
-end
-
-module GlobePG
-  class GlobeTeacher < PGBase
-    set_table_name 'globe_teacher'
-    self.primary_key = 'teacherid'
-    has_many :teacher_to_schools, :foreign_key => :teacherid
-    has_many :globe_schools, :through => :teacher_to_schools
-  end
-end
-
-teacher = GlobePG::GlobeTeacher.find_by_teacherid('ZZGLOBEY')
+# assoc_test.rb
+
+path = File.expand_path(File.join(File.basename(__FILE__), "..", "lib", "composite_primary_keys"))
+puts path
+
+require File.join(path)
+require 'active_record'
+
+$configuration = {
+  :adapter  => 'postgresql',
+  :database => 'cpk_test',
+  :username => 'postgres'
+}
+
+ActiveRecord::Base.establish_connection($configuration) unless ActiveRecord::Base.connected?
+
+module GlobePG
+  class PGBase < ActiveRecord::Base
+    self.abstract_class = true
+   # establish_connection($configuration) unless connected?
+  end
+end
+
+module GlobePG
+  class TeacherToSchool < PGBase
+    set_table_name 'teacher_to_school'
+    self.primary_keys = ['teacherid', 'schoolid']
+
+    belongs_to :globe_teacher, :foreign_key => 'teacherid'
+    belongs_to :globe_school, :foreign_key => 'schoolid'
+  end
+end
+
+module GlobePG
+  class GlobeSchool < PGBase
+    set_table_name 'globe_school'
+    self.primary_key = 'schoolid'
+    has_many :teacher_to_schools, :foreign_key => :schoolid
+    has_many :globe_teachers, :through => :teacher_to_schools
+  end
+end
+
+module GlobePG
+  class GlobeTeacher < PGBase
+    set_table_name 'globe_teacher'
+    self.primary_key = 'teacherid'
+    has_many :teacher_to_schools, :foreign_key => :teacherid
+    has_many :globe_schools, :through => :teacher_to_schools
+  end
+end
+
+teacher = GlobePG::GlobeTeacher.find_by_teacherid('ZZGLOBEY')
 p teacher.globe_schools 

data/test/fixtures/article.rb

@@ -1,5 +1,5 @@
-class Article < ActiveRecord::Base
-  has_many :readings, :dependent => :delete_all
-  has_many :users, :through => :readings
-end
-
+class Article < ActiveRecord::Base
+  has_many :readings, :dependent => :delete_all
+  has_many :users, :through => :readings
+end
+

data/test/fixtures/articles.yml

@@ -1,7 +1,7 @@
-first:
-  id: 1
-  name: Article One
-  
-second:
-  id: 2
+first:
+  id: 1
+  name: Article One
+  
+second:
+  id: 2
   name: Article Two

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/comments.yml

@@ -1,16 +1,16 @@
-comment1:
-  id: 1
-  person_id: 1
-  person_type: Employee
-  
-comment2:
-  id: 2
-  person_id: 1
-  person_type: User
-  hack_id: 7
-  
-comment3:
-  id: 3
-  person_id: 7
-  person_type: Hack
+comment1:
+  id: 1
+  person_id: 1
+  person_type: Employee
+  
+comment2:
+  id: 2
+  person_id: 1
+  person_type: User
+  hack_id: 7
+  
+comment3:
+  id: 3
+  person_id: 7
+  person_type: Hack