diff --git a/src/main/java/com/samskivert/depot/impl/DepotMarshaller.java b/src/main/java/com/samskivert/depot/impl/DepotMarshaller.java index ca37373..8285bf4 100644 --- a/src/main/java/com/samskivert/depot/impl/DepotMarshaller.java +++ b/src/main/java/com/samskivert/depot/impl/DepotMarshaller.java @@ -659,7 +659,7 @@ public class DepotMarshaller implements QueryMarshal } try { - int nextValue = vg.nextGeneratedValue(conn, liaison, stmt); + long nextValue = vg.nextGeneratedValue(conn, liaison, stmt); field.set(po, nextValue); } catch (Exception e) { diff --git a/src/main/java/com/samskivert/depot/impl/TableValueGenerator.java b/src/main/java/com/samskivert/depot/impl/TableValueGenerator.java index 575c484..e58820b 100644 --- a/src/main/java/com/samskivert/depot/impl/TableValueGenerator.java +++ b/src/main/java/com/samskivert/depot/impl/TableValueGenerator.java @@ -111,7 +111,7 @@ public class TableValueGenerator extends ValueGenerator ", column=" + _valueColumnName + "]"); } // fetch the next available value - int val = rs.getLong(1); + long val = rs.getLong(1); // claim this value locklessly writeStatement.setLong(1, val + _allocationSize); diff --git a/src/main/java/com/samskivert/depot/impl/jdbc/BaseLiaison.java b/src/main/java/com/samskivert/depot/impl/jdbc/BaseLiaison.java index a50ae5e..d7c8bd3 100644 --- a/src/main/java/com/samskivert/depot/impl/jdbc/BaseLiaison.java +++ b/src/main/java/com/samskivert/depot/impl/jdbc/BaseLiaison.java @@ -213,7 +213,7 @@ public abstract class BaseLiaison implements DatabaseLiaison // from DatabaseLiaison public abstract void createGenerator (Connection conn, String tableName, String columnName, - int initialValue) + long initialValue) throws SQLException; // from DatabaseLiaison diff --git a/src/main/java/com/samskivert/depot/impl/jdbc/DatabaseLiaison.java b/src/main/java/com/samskivert/depot/impl/jdbc/DatabaseLiaison.java index ee33c88..cceb8ce 100644 --- a/src/main/java/com/samskivert/depot/impl/jdbc/DatabaseLiaison.java +++ b/src/main/java/com/samskivert/depot/impl/jdbc/DatabaseLiaison.java @@ -63,7 +63,7 @@ public interface DatabaseLiaison * should have no negative effect like resetting it). */ public void createGenerator (Connection conn, String tableName, String columnName, - int initialValue) + long initialValue) throws SQLException; /** diff --git a/src/main/java/com/samskivert/depot/impl/jdbc/DefaultLiaison.java b/src/main/java/com/samskivert/depot/impl/jdbc/DefaultLiaison.java index fe7305f..3659897 100644 --- a/src/main/java/com/samskivert/depot/impl/jdbc/DefaultLiaison.java +++ b/src/main/java/com/samskivert/depot/impl/jdbc/DefaultLiaison.java @@ -33,7 +33,7 @@ public class DefaultLiaison extends BaseLiaison } @Override // from DatabaseLiaison - public void createGenerator (Connection conn, String tableName, String columnName, int initValue) + public void createGenerator (Connection conn, String tableName, String columnName, long initValue) throws SQLException { // nothing doing diff --git a/src/main/java/com/samskivert/depot/impl/jdbc/HsqldbLiaison.java b/src/main/java/com/samskivert/depot/impl/jdbc/HsqldbLiaison.java index 2c461f3..157de57 100644 --- a/src/main/java/com/samskivert/depot/impl/jdbc/HsqldbLiaison.java +++ b/src/main/java/com/samskivert/depot/impl/jdbc/HsqldbLiaison.java @@ -49,7 +49,7 @@ public class HsqldbLiaison extends BaseLiaison @Override // from DatabaseLiaison public void createGenerator (Connection conn, String tableName, - String columnName, int initValue) + String columnName, long initValue) throws SQLException { if (initValue == 1) { diff --git a/src/main/java/com/samskivert/depot/impl/jdbc/MySQLLiaison.java b/src/main/java/com/samskivert/depot/impl/jdbc/MySQLLiaison.java index b4dda37..7bd4a29 100644 --- a/src/main/java/com/samskivert/depot/impl/jdbc/MySQLLiaison.java +++ b/src/main/java/com/samskivert/depot/impl/jdbc/MySQLLiaison.java @@ -36,7 +36,7 @@ public class MySQLLiaison extends BaseLiaison } @Override // from DatabaseLiaison - public void createGenerator (Connection conn, String tableName, String columnName, int initValue) + public void createGenerator (Connection conn, String tableName, String columnName, long initValue) throws SQLException { // TODO: is there any way we can set the initial AUTO_INCREMENT value?