提交 78aaf333 编写于 作者: T terrymanu

generateId Object => Number

上级 68042d6a
......@@ -215,7 +215,7 @@ public final class TableRule {
* @param columnName 列名称
* @return 生成的id
*/
public Object generateId(final String columnName) {
public Number generateId(final String columnName) {
Number result = autoIncrementColumnMap.get(columnName).generateId();
Preconditions.checkNotNull(result);
return result;
......
......@@ -161,7 +161,7 @@ public abstract class AbstractInsertParser implements SQLStatementParser {
int count = 0;
for (ShardingColumnContext each : shardingColumnContexts) {
if (each.isAutoIncrement()) {
Number autoIncrementedValue = (Number) getShardingRule().findTableRule(sqlContext.getTables().get(0).getName()).generateId(each.getColumnName());
Number autoIncrementedValue = getShardingRule().findTableRule(sqlContext.getTables().get(0).getName()).generateId(each.getColumnName());
if (parameters.isEmpty()) {
itemsToken.getItems().add(autoIncrementedValue.toString());
sqlExprs.add(new SQLNumberExpr(autoIncrementedValue));
......
......@@ -56,13 +56,13 @@ public class PreparedSQLRouter {
if (null == sqlContext) {
sqlContext = engine.parseSQL(logicSql, parameters);
} else {
List<Object> generatedIds = generateId();
List<Number> generatedIds = generateId();
parameters.addAll(generatedIds);
}
return engine.routeSQL(sqlContext, parameters);
}
private List<Object> generateId() {
private List<Number> generateId() {
if (!(sqlContext instanceof InsertSQLContext)) {
return Collections.emptyList();
}
......@@ -72,11 +72,11 @@ public class PreparedSQLRouter {
}
TableRule tableRule = tableRuleOptional.get();
GeneratedKeyContext generatedKeyContext = ((InsertSQLContext) sqlContext).getGeneratedKeyContext();
List<Object> result = new ArrayList<>(generatedKeyContext.getColumns().size());
List<Number> result = new ArrayList<>(generatedKeyContext.getColumns().size());
for (String each : generatedKeyContext.getColumns()) {
Object id = tableRule.generateId(each);
result.add(id);
generatedKeyContext.putValue(each, id);
Number generatedId = tableRule.generateId(each);
result.add(generatedId);
generatedKeyContext.putValue(each, generatedId);
}
return result;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册