From cb86b6def4f0f6880a7dcec005ba2406510ec398 Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <andrzej@threerings.net>
Date: Tue, 2 Mar 2010 21:30:20 +0000
Subject: [PATCH] If we're shadowing a field, let's try using the shadowed
 column's name.

---
 src/java/com/samskivert/depot/impl/BuildVisitor.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/java/com/samskivert/depot/impl/BuildVisitor.java b/src/java/com/samskivert/depot/impl/BuildVisitor.java
index 95f6a72..4a9e9af 100644
--- a/src/java/com/samskivert/depot/impl/BuildVisitor.java
+++ b/src/java/com/samskivert/depot/impl/BuildVisitor.java
@@ -869,7 +869,12 @@ public abstract class BuildVisitor implements FragmentVisitor<Void>
             _builder.append(".");
         }
 
-        appendIdentifier(fm.getColumnName());
+        // if the field is shadowed, be sure to use the shadowed column's name
+        if (tableClass != type && tableClass != null) {
+            appendIdentifier(_types.getColumnName(tableClass, field.name));
+        } else {
+            appendIdentifier(fm.getColumnName());
+        }
     }
 
     // output one of potentially many fields in an index expression