From f3a14252ed6b4720598fe7dd03b023ba506a193b Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Wed, 20 Dec 2006 21:51:46 +0000
Subject: [PATCH] TableKeyGenerator was not using the annotation specified
 initial value.

---
 src/java/com/samskivert/jdbc/depot/TableKeyGenerator.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/java/com/samskivert/jdbc/depot/TableKeyGenerator.java b/src/java/com/samskivert/jdbc/depot/TableKeyGenerator.java
index fc3fdfd..92363a1 100644
--- a/src/java/com/samskivert/jdbc/depot/TableKeyGenerator.java
+++ b/src/java/com/samskivert/jdbc/depot/TableKeyGenerator.java
@@ -41,7 +41,7 @@ public class TableKeyGenerator implements KeyGenerator
         _pkColumnValue = defStr(annotation.pkColumnValue(), "default");
         _valueColumnName = defStr(annotation.valueColumnName(), "value");
         _allocationSize = annotation.allocationSize();
-        _initialValue = _allocationSize > 0 ? _allocationSize : 1;
+        _initialValue = annotation.initialValue();
     }
 
     // from interface KeyGenerator
@@ -72,9 +72,8 @@ public class TableKeyGenerator implements KeyGenerator
 
             JDBCUtil.close(stmt);
             stmt = null;
-            stmt = conn.prepareStatement(
-                "INSERT INTO " + _table + " SET " + _pkColumnName + " = ?, " +
-                _valueColumnName + " = ? ");
+            stmt = conn.prepareStatement("INSERT INTO " + _table + " SET " +
+                                         _pkColumnName + " = ?, " + _valueColumnName + " = ?");
             stmt.setString(1, _pkColumnValue);
             stmt.setInt(2, _initialValue);
             stmt.executeUpdate();