From 0cb937b14ba3c2a309ba3515002e1935b31ed3b9 Mon Sep 17 00:00:00 2001
From: Par Winzell <zell@threerings.net>
Date: Tue, 21 Aug 2007 15:07:07 +0000
Subject: [PATCH]

---
 src/java/com/samskivert/jdbc/depot/BindVisitor.java     | 4 ++--
 src/java/com/samskivert/jdbc/depot/BuildVisitor.java    | 4 ++--
 src/java/com/samskivert/jdbc/depot/DepotMarshaller.java | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/java/com/samskivert/jdbc/depot/BindVisitor.java b/src/java/com/samskivert/jdbc/depot/BindVisitor.java
index 77eb6f3..06ca6f1 100644
--- a/src/java/com/samskivert/jdbc/depot/BindVisitor.java
+++ b/src/java/com/samskivert/jdbc/depot/BindVisitor.java
@@ -241,9 +241,9 @@ public class BindVisitor implements ExpressionVisitor
         DepotMarshaller marsh = _types.getMarshaller(insertClause.getPersistentClass());
 
         Object pojo = insertClause.getPojo();
-        Set<String> generatedFields = insertClause.getIdentityFields();
+        Set<String> idFields = insertClause.getIdentityFields();
         for (String field : marsh.getColumnFieldNames()) {
-            if (!generatedFields.contains(field)) {
+            if (!idFields.contains(field)) {
                 marsh.getFieldMarshaller(field).readFromObject(pojo, _stmt, _argIdx ++);
             }
         }
diff --git a/src/java/com/samskivert/jdbc/depot/BuildVisitor.java b/src/java/com/samskivert/jdbc/depot/BuildVisitor.java
index 3f35191..5bab31b 100644
--- a/src/java/com/samskivert/jdbc/depot/BuildVisitor.java
+++ b/src/java/com/samskivert/jdbc/depot/BuildVisitor.java
@@ -451,12 +451,12 @@ public abstract class BuildVisitor implements ExpressionVisitor
         }
         _builder.append(") values(");
 
-        Set<String> generatedFields = insertClause.getIdentityFields();
+        Set<String> idFields = insertClause.getIdentityFields();
         for (int ii = 0; ii < fields.length; ii++) {
             if (ii > 0) {
                 _builder.append(", ");
             }
-            if (generatedFields.contains(fields[ii])) {
+            if (idFields.contains(fields[ii])) {
                 _builder.append("DEFAULT");
             } else {
                 _builder.append("?");
diff --git a/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java b/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java
index b2e059c..0026bf2 100644
--- a/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java
+++ b/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java
@@ -257,8 +257,8 @@ public class DepotMarshaller<T extends PersistentRecord>
     }
 
     /**
-     * Returns the {@link ValueGenerator} used to generate primary keys for this persistent object,
-     * or null if it does not use a key generator.
+     * Returns the {@link ValueGenerator} objects used to automatically generate field values for
+     * us when a new record is inserted.
      */
     public Iterable<ValueGenerator> getValueGenerators ()
     {
@@ -989,5 +989,4 @@ public class DepotMarshaller<T extends PersistentRecord>
 
     /** The name of the table we use to track schema versions. */
     protected static final String SCHEMA_VERSION_TABLE = "DepotSchemaVersion";
-
 }