From 0fd3e4cd2b2b1b31304a922dc65284d5363f78b6 Mon Sep 17 00:00:00 2001
From: Mark Catley <mark@nexx.co.nz>
Date: Sat, 21 Jun 2008 23:41:30 +1200
Subject: Fix column collision with named_scope and :joins.  [#46
 state:resolved]

---
 activerecord/CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'activerecord/CHANGELOG')

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]
-- 
cgit v1.2.3