aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG
diff options
context:
space:
mode:
authorMark Catley <mark@nexx.co.nz>2008-06-21 23:41:30 +1200
committerJeremy Kemper <jeremy@bitsweat.net>2008-06-22 19:21:15 -0700
commit0fd3e4cd2b2b1b31304a922dc65284d5363f78b6 (patch)
tree512a7018a967141c3762c0553e25f5dc4851e70f /activerecord/CHANGELOG
parentbb6e8eea5a8190aaab67da0a7efedb3bb3d9fccb (diff)
downloadrails-0fd3e4cd2b2b1b31304a922dc65284d5363f78b6.tar.gz
rails-0fd3e4cd2b2b1b31304a922dc65284d5363f78b6.tar.bz2
rails-0fd3e4cd2b2b1b31304a922dc65284d5363f78b6.zip
Fix column collision with named_scope and :joins. [#46 state:resolved]
Diffstat (limited to 'activerecord/CHANGELOG')
-rw-r--r--activerecord/CHANGELOG2
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 0ac5ce960c..aaa7c3a0d1 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*Edge*
+* Fix column collision with named_scope and :joins. #46 [Duncan Beevers, Mark Catley]
+
* db:migrate:down and :up update schema_migrations. #369 [Michael Raidel, RaceCondition]
* PostgreSQL: support :conditions => [':foo::integer', { :foo => 1 }] without treating the ::integer typecast as a bind variable. [Tarmo Tänav]