Permalink
Browse files

Checkin correct history file this time.

  • Loading branch information...
1 parent a34481e commit da5c097ec6b00f42e4e7b7b700c464b0b8b935bb @cfis cfis committed Nov 4, 2011
Showing with 18 additions and 333 deletions.
  1. +17 −332 History.txt
  2. +1 −1 lib/composite_primary_keys/version.rb
View
@@ -1,338 +1,23 @@
-Revision: 0000000000000000000000000000000000000000
-Author:
-Date: 12/31/1969 5:00:00 PM
-Message:
-Working dir changes
-
-3 files changed
-----
-Modified : History.txt
-Modified : composite_primary_keys.gemspec
-Modified : lib/composite_primary_keys/version.rb
-
-Revision: b4a1523984fe51fd75a9283eaea6ee243c8890fa
-Author: Charlie Savage
-Date: 10/19/2011 8:19:03 PM
-Message:
-Merge pull request #73 from tomhughes/master
-
-Make polymorphic belongs_to work in rails 3.1.1
-----
-Modified : lib/composite_primary_keys/associations/association_scope.rb
-
-Revision: 2ce5b3e7d122ccbfba1b8c8a63c89bc0e9d31e60
-Author: Tom Hughes
-Date: 10/7/2011 1:43:51 PM
-Message:
-Update for changes to polymorphic belongs_to in rails 3.1.1
-
-
-----
-Modified : lib/composite_primary_keys/associations/association_scope.rb
-
-Revision: f8e39c5e882dfab10d536480a1e9ce510ab5ec82
-Author: Charlie Savage
-Date: 9/23/2011 12:44:27 PM
-Message:
-Merge pull request #67 from rsutphin/no_relative_paths
-
-Eliminate relative paths from the test suite.
-----
-Modified : test/abstract_unit.rb
-Modified : test/test_associations.rb
-Modified : test/test_attribute_methods.rb
-Modified : test/test_attributes.rb
-Modified : test/test_composite_arrays.rb
-Modified : test/test_create.rb
-Modified : test/test_delete.rb
-Modified : test/test_dup.rb
-Modified : test/test_equal.rb
-Modified : test/test_exists.rb
-Modified : test/test_find.rb
-Modified : test/test_habtm.rb
-Modified : test/test_ids.rb
-Modified : test/test_miscellaneous.rb
-Modified : test/test_pagination.rb
-Modified : test/test_polymorphic.rb
-Modified : test/test_predicates.rb
-Modified : test/test_santiago.rb
-Modified : test/test_suite.rb
-Modified : test/test_tutorial_example.rb
-Modified : test/test_update.rb
-Modified : test/test_validations.rb
-Modified : .gitignore
-Modified : composite_primary_keys.gemspec
-Modified : test/README_tests.txt
-Modified : test/abstract_unit.rb
-Modified : test/connections/databases.example.yml
-Deleted : test/connections/databases.yml
-Modified : test/fixtures/comments.yml
-Modified : test/fixtures/db_definitions/mysql.sql
-Modified : test/fixtures/db_definitions/oracle.drop.sql
-Modified : test/fixtures/db_definitions/oracle.sql
-Modified : test/fixtures/db_definitions/postgresql.sql
-Modified : test/fixtures/db_definitions/sqlite.sql
-Modified : test/fixtures/hack.rb
-Modified : test/fixtures/hacks.yml
-Modified : test/fixtures/reference_type.rb
-Modified : test/test_associations.rb
-Modified : test/test_attribute_methods.rb
-Modified : test/test_polymorphic.rb
-
-Revision: ae04762c17d2c81228e2d8f82634f2b8d9e08eac
-Author: Charlie Savage
-Date: 9/23/2011 12:43:26 PM
-Message:
-Merge pull request #71 from rsutphin/clean_test_runner_no_rel
-
-Minor improvements to the CPK test runner w/o relative path changes
-----
-Modified : .gitignore
-Modified : composite_primary_keys.gemspec
-Modified : test/README_tests.txt
-Modified : test/abstract_unit.rb
-Modified : test/connections/databases.example.yml
-Deleted : test/connections/databases.yml
-Modified : test/fixtures/reference_type.rb
-
-Revision: 4d539868f58e4b8cf7a771da7b92f4dd651cf343
-Author: Rhett Sutphin
-Date: 9/19/2011 11:00:25 AM
-Message:
-Remove stray puts.
-
-
-----
-Modified : test/fixtures/reference_type.rb
-
-Revision: d229c75b7b4fb08658c3b9a655a705cb55556a17
-Author: Rhett Sutphin
-Date: 9/19/2011 10:55:56 AM
-Message:
-Allow AR logs to go to a file when running tests.
-
-The test runner configures ActiveRecord to send its messages to STDOUT. This
-is helpful for debugging, but a lot of noise if you're just trying to see if
-everything passed. This commit allows you to specify a file to use instead
-via the CPK_LOGFILE environment variable. (STDOUT is still the default.)
-----
-Modified : test/README_tests.txt
-Modified : test/abstract_unit.rb
-
-Revision: 5a2de3eb6c4cd1487685c925acaa7119bbc5d92b
-Author: Rhett Sutphin
-Date: 9/19/2011 10:24:56 AM
-Message:
-Use ADAPTER env variable to select database to test.
-
-Commit 579c29fe0ee9a881ca3ecf89f58820796a716a26 changed the test setup in
-abstract_unit so that it used the first adapter in databases.yml
-(as presented by the YAML parser; not necessarily the first one in the file),
-rather than looking at the ADAPTER env variable. This change broke the
-database-specific rake tasks (they would run against the database selected
-by databases.yml rather than the one the user requested) and made parts of the
-testing README incorrect.
-
-This commit restores the ability to use the ADAPTER env var to select a
-database to test against. This works in both the rake tasks and when running
-from the command line:
+== 4.1.1 2011-08-31
+* Support for AR 3.1.1
+* Make polymorphic belongs_to work in rails 3.1.1 (Tom Hughes)
+* Eliminate relative paths from the test suite (Rhett Sutphin)
+* Minor improvements to the CPK test runner w/o relative path changes (Rhett Sutphin)
+* Remove stray puts (Rhett Sutphin)
+* Allow AR logs to go to a file when running tests. This commit allows you to
+ specify a file to use instead via the CPK_LOGFILE environment variable.
+ STDOUT is still the default. (Rhett Sutphin)
+* Use ADAPTER env variable to select database to test. For example:
ADAPTER=sqlite3 ruby test/test_suite.rb
+ (Rhett Sutphin)
-The default adapter is `postgresql`, as was previously the case.
-
-Incidentally, this commit also removes & ignores the committed
-test/connections/databases.yml file in preference to the (existing)
-databases.examples.yml file. This change will make it easier for contributors
-to avoid accidentally contributing changes to the test database configuration.
-----
-Modified : .gitignore
-Modified : test/README_tests.txt
-Modified : test/abstract_unit.rb
-Modified : test/connections/databases.example.yml
-Deleted : test/connections/databases.yml
-
-Revision: df3408db296eca14707161268440d19c1c6bfb40
-Author: Rhett Sutphin
-Date: 9/19/2011 10:07:58 AM
-Message:
-Eliminate constant redef warnings during test runs.
-
-Under ruby 1.8, requires are only tracked by the literal path that's passed
-to `require`. This commit ensures that `'composite_primary_keys/version'` is
-only ever required by that specific path, preventing its contents from being
-redefined when the test suite is loaded.
-----
-Modified : composite_primary_keys.gemspec
-Modified : test/abstract_unit.rb
-
-Revision: 07389e084fef1427bde01fe9dbcde52505a1301a
-Author: Charlie Savage
-Date: 9/21/2011 9:31:13 PM
-Message:
-Merge pull request #70 from rsutphin/missing_fixture_decl
-
-Add missing fixture declarations.
-----
-Modified : test/test_associations.rb
-Modified : test/test_attribute_methods.rb
-Modified : test/fixtures/comments.yml
-Modified : test/fixtures/db_definitions/mysql.sql
-Modified : test/fixtures/db_definitions/oracle.drop.sql
-Modified : test/fixtures/db_definitions/oracle.sql
-Modified : test/fixtures/db_definitions/postgresql.sql
-Modified : test/fixtures/db_definitions/sqlite.sql
-Modified : test/fixtures/hack.rb
-Modified : test/fixtures/hacks.yml
-Modified : test/test_polymorphic.rb
-
-Revision: a932c797dd0124e27058b3705763ca8f9ade7007
-Author: Charlie Savage
-Date: 9/21/2011 9:28:58 PM
-Message:
-Merge pull request #69 from rsutphin/postgresql_83
-
-Fix polymorphic test failure on PostgreSQL 8.3+ and Oracle
-----
-Modified : test/fixtures/comments.yml
-Modified : test/fixtures/db_definitions/mysql.sql
-Modified : test/fixtures/db_definitions/oracle.drop.sql
-Modified : test/fixtures/db_definitions/oracle.sql
-Modified : test/fixtures/db_definitions/postgresql.sql
-Modified : test/fixtures/db_definitions/sqlite.sql
-Modified : test/fixtures/hack.rb
-Modified : test/fixtures/hacks.yml
-Modified : test/test_polymorphic.rb
-
-Revision: 4e6b005338e6bc9a6f363d36101aa36f9eba12eb
-Author: Rhett Sutphin
-Date: 9/21/2011 1:11:05 PM
-Message:
-Add missing fixture declarations.
-
-These two test cases were missing declarations for some of the fixtures on
-which they rely. This caused them to confusingly fail the first time the
-suite was executed after recreating the schema and then pass thereafter.
-----
-Modified : test/test_associations.rb
-Modified : test/test_attribute_methods.rb
-
-Revision: c3407f739841304ad949beab302494a83326dd07
-Author: Rhett Sutphin
-Date: 9/21/2011 11:12:03 AM
-Message:
-Standardize on integer PKs in polymorphic fixtures.
-
-The mix of string and integer PKs and FKs in the comments table and the three
-tables (employees, users, and hacks) to which it refers causes problems in
-databases that do strict type checking in SELECTs. (Problems observed on
-PostgreSQL 8.3+ and Oracle.) This commit makes all the FKs and PKs integers to
-eliminate these problems.
-
-N.b.: this commit includes changes to the test database schema; you will need
-to rebuild your test database after applying it. There are no changes for the
-db2 schema because it does not include the relevant tables. The changes to
-the MySQL schema were not tested.
-----
-Modified : test/fixtures/comments.yml
-Modified : test/fixtures/db_definitions/mysql.sql
-Modified : test/fixtures/db_definitions/oracle.drop.sql
-Modified : test/fixtures/db_definitions/oracle.sql
-Modified : test/fixtures/db_definitions/postgresql.sql
-Modified : test/fixtures/db_definitions/sqlite.sql
-Modified : test/fixtures/hack.rb
-Modified : test/fixtures/hacks.yml
-Modified : test/test_polymorphic.rb
-
-Revision: b1b7f8e84428b687345a625d23f48187f9649ee4
-Author: Rhett Sutphin
-Date: 9/19/2011 9:56:18 AM
-Message:
-Eliminate relative paths from the test suite.
-
-Converting all wd-relative requires into file-relative requires allows the
-test suite to be executed either from rake or directly, and from any
-directory. All of the following now work:
-
- cd [cpk-root]
- rake postgresql:test
- ruby test/test_suite.rb
- cd test
- ruby test_suite.rb
-----
-Modified : test/abstract_unit.rb
-Modified : test/test_associations.rb
-Modified : test/test_attribute_methods.rb
-Modified : test/test_attributes.rb
-Modified : test/test_composite_arrays.rb
-Modified : test/test_create.rb
-Modified : test/test_delete.rb
-Modified : test/test_dup.rb
-Modified : test/test_equal.rb
-Modified : test/test_exists.rb
-Modified : test/test_find.rb
-Modified : test/test_habtm.rb
-Modified : test/test_ids.rb
-Modified : test/test_miscellaneous.rb
-Modified : test/test_pagination.rb
-Modified : test/test_polymorphic.rb
-Modified : test/test_predicates.rb
-Modified : test/test_santiago.rb
-Modified : test/test_suite.rb
-Modified : test/test_tutorial_example.rb
-Modified : test/test_update.rb
-Modified : test/test_validations.rb
-
-Revision: e1611b0c9d4d3f39155a2444b2b2df4e707c789e
-Author: Charlie Savage
-Date: 9/15/2011 8:49:50 PM
-Message:
-Merge branch 'master' of github.com:drnic/composite_primary_keys
-
-
-----
-Modified : README.txt
-Modified : test/README_tests.txt
-Modified : composite_primary_keys.gemspec
-Modified : lib/composite_primary_keys.rb
-Modified : lib/composite_primary_keys/version.rb
-
-Revision: e249e44a12c3275fe4faa81cd37e75c494029a01
-Author: Charlie Savage
-Date: 9/13/2011 11:39:17 AM
-Message:
-Merge pull request #64 from backspace/master
-
-Not that anyone would be confused
-----
-Modified : README.txt
-Modified : test/README_tests.txt
-
-Revision: bb364112dd8eefb7cdf1160a8d91585f19b149bc
-Author: Buck
-Date: 9/13/2011 11:27:58 AM
-Message:
-Fix tiny file name typos
-
-
-----
-Modified : README.txt
-Modified : test/README_tests.txt
-
-Revision: 5134091aee77fae0bf1dbb4d6657a7d528c1a0ac
-Author: Charlie Savage
-Date: 8/31/2011 1:19:52 PM
-Message:
-Bump to 4.0.0 for Rails 3.1 support.
-
-
-----
-Modified : composite_primary_keys.gemspec
-Modified : lib/composite_primary_keys.rb
-Modified : lib/composite_primary_keys/version.rb
-
-
-== 4.0.0 August 31
+* Eliminate constant redef warnings during test runs (Rhett Sutphin)
+* Add missing fixture declarations (Rhett Sutphin)
+* Standardize on integer PKs in polymorphic fixtures (Rhett Sutphin)
+* Fix tiny file name typos (Buck)
+
+== 4.0.0 2011-08-31
* Support for AR 3.1
== 4.0.0.beta9 2011-08-22
@@ -2,7 +2,7 @@ module CompositePrimaryKeys
module VERSION
MAJOR = 4
MINOR = 1
- TINY = 0
+ TINY = 1
STRING = [MAJOR, MINOR, TINY].join('.')
end
end

0 comments on commit da5c097

Please sign in to comment.