aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2008-05-01 15:03:16 -0500
committerDavid Heinemeier Hansson <david@loudthinking.com>2008-05-01 15:03:16 -0500
commitab4d455d6d149fba9243444f4c7c7f78ecb78a96 (patch)
tree43fcf2886d7a4c4e7c9945f603f233125790a3eb
parente2af713d1c71b4f319e5435a63011a7bc23f77c3 (diff)
downloadrails-ab4d455d6d149fba9243444f4c7c7f78ecb78a96.tar.gz
rails-ab4d455d6d149fba9243444f4c7c7f78ecb78a96.tar.bz2
rails-ab4d455d6d149fba9243444f4c7c7f78ecb78a96.zip
Added missing files
-rw-r--r--activerecord/CHANGELOG2
-rw-r--r--activerecord/test/fixtures/subscriptions.yml12
-rw-r--r--activerecord/test/models/subscription.rb4
3 files changed, 18 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index f72d8aceaa..941221afc7 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed has_many :through .create with no parameters caused a "can't dup NilClass" error (Steven Soroka) [#85]
+
* Added block-setting of attributes for Base.create like Base.new already has (Adam Meehan) [#39]
* Fixed that pessimistic locking you reference the quoted table name (Josh Susser) [#67]
diff --git a/activerecord/test/fixtures/subscriptions.yml b/activerecord/test/fixtures/subscriptions.yml
new file mode 100644
index 0000000000..371bfd3422
--- /dev/null
+++ b/activerecord/test/fixtures/subscriptions.yml
@@ -0,0 +1,12 @@
+webster_awdr:
+ id: 1
+ subscriber_id: webster132
+ book_id: 1
+webster_rfr:
+ id: 2
+ subscriber_id: webster132
+ book_id: 2
+alterself_awdr:
+ id: 3
+ subscriber_id: alterself
+ book_id: 3 \ No newline at end of file
diff --git a/activerecord/test/models/subscription.rb b/activerecord/test/models/subscription.rb
new file mode 100644
index 0000000000..4bdb36ea46
--- /dev/null
+++ b/activerecord/test/models/subscription.rb
@@ -0,0 +1,4 @@
+class Subscription < ActiveRecord::Base
+ belongs_to :subscriber
+ belongs_to :book
+end