composite_primary_keys 9.0.9 → 9.0.10

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

@@ -1,30 +1,40 @@
-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/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/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
   

data/test/fixtures/department.rb

@@ -1,5 +1,5 @@
-class Department < ActiveRecord::Base
-  self.primary_keys = :department_id, :location_id
-  has_many :employees, :foreign_key => [:department_id, :location_id]
-  has_one :head, :class_name => 'Employee', :foreign_key => [:department_id, :location_id], :dependent => :delete
-end
+class Department < ActiveRecord::Base
+  self.primary_keys = :department_id, :location_id
+  has_many :employees, :foreign_key => [:department_id, :location_id]
+  has_one :head, :class_name => 'Employee', :foreign_key => [:department_id, :location_id], :dependent => :delete
+end

data/test/fixtures/departments.yml

@@ -1,15 +1,15 @@
-accounting:
-  department_id: 1
-  location_id: 1
-
-engineering:
-  department_id: 2
-  location_id: 1
-
-human_resources:
-  department_id: 3
-  location_id: 2
-
-offsite_accounting:
-  department_id: 1
-  location_id: 2
+accounting:
+  department_id: 1
+  location_id: 1
+
+engineering:
+  department_id: 2
+  location_id: 1
+
+human_resources:
+  department_id: 3
+  location_id: 2
+
+offsite_accounting:
+  department_id: 1
+  location_id: 2