Fixes now that compiling can happen (sort of).
This commit is contained in:
@@ -659,7 +659,7 @@ public class DepotMarshaller<T extends PersistentRecord> implements QueryMarshal
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
int nextValue = vg.nextGeneratedValue(conn, liaison, stmt);
|
long nextValue = vg.nextGeneratedValue(conn, liaison, stmt);
|
||||||
field.set(po, nextValue);
|
field.set(po, nextValue);
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ public class TableValueGenerator extends ValueGenerator
|
|||||||
", column=" + _valueColumnName + "]");
|
", column=" + _valueColumnName + "]");
|
||||||
}
|
}
|
||||||
// fetch the next available value
|
// fetch the next available value
|
||||||
int val = rs.getLong(1);
|
long val = rs.getLong(1);
|
||||||
|
|
||||||
// claim this value locklessly
|
// claim this value locklessly
|
||||||
writeStatement.setLong(1, val + _allocationSize);
|
writeStatement.setLong(1, val + _allocationSize);
|
||||||
|
|||||||
@@ -213,7 +213,7 @@ public abstract class BaseLiaison implements DatabaseLiaison
|
|||||||
|
|
||||||
// from DatabaseLiaison
|
// from DatabaseLiaison
|
||||||
public abstract void createGenerator (Connection conn, String tableName, String columnName,
|
public abstract void createGenerator (Connection conn, String tableName, String columnName,
|
||||||
int initialValue)
|
long initialValue)
|
||||||
throws SQLException;
|
throws SQLException;
|
||||||
|
|
||||||
// from DatabaseLiaison
|
// from DatabaseLiaison
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ public interface DatabaseLiaison
|
|||||||
* should have no negative effect like resetting it).
|
* should have no negative effect like resetting it).
|
||||||
*/
|
*/
|
||||||
public void createGenerator (Connection conn, String tableName, String columnName,
|
public void createGenerator (Connection conn, String tableName, String columnName,
|
||||||
int initialValue)
|
long initialValue)
|
||||||
throws SQLException;
|
throws SQLException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ public class DefaultLiaison extends BaseLiaison
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override // from DatabaseLiaison
|
@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
|
throws SQLException
|
||||||
{
|
{
|
||||||
// nothing doing
|
// nothing doing
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ public class HsqldbLiaison extends BaseLiaison
|
|||||||
|
|
||||||
@Override // from DatabaseLiaison
|
@Override // from DatabaseLiaison
|
||||||
public void createGenerator (Connection conn, String tableName,
|
public void createGenerator (Connection conn, String tableName,
|
||||||
String columnName, int initValue)
|
String columnName, long initValue)
|
||||||
throws SQLException
|
throws SQLException
|
||||||
{
|
{
|
||||||
if (initValue == 1) {
|
if (initValue == 1) {
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ public class MySQLLiaison extends BaseLiaison
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override // from DatabaseLiaison
|
@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
|
throws SQLException
|
||||||
{
|
{
|
||||||
// TODO: is there any way we can set the initial AUTO_INCREMENT value?
|
// TODO: is there any way we can set the initial AUTO_INCREMENT value?
|
||||||
|
|||||||
Reference in New Issue
Block a user