From baf1bf5debd48be693bb10b9897d9e5e5a7dade9 Mon Sep 17 00:00:00 2001 From: Iwao AVE! Date: Thu, 1 Mar 2018 03:51:56 +0900 Subject: [PATCH 1/2] Unset default value of keyProperty. It causes a problem like #902 and makes it difficult to handle errors in Jdbc3KeyGenerator. --- src/main/java/org/apache/ibatis/annotations/Options.java | 2 +- .../ibatis/builder/annotation/MapperAnnotationBuilder.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/apache/ibatis/annotations/Options.java b/src/main/java/org/apache/ibatis/annotations/Options.java index ca0d937072f..124e81e09fb 100644 --- a/src/main/java/org/apache/ibatis/annotations/Options.java +++ b/src/main/java/org/apache/ibatis/annotations/Options.java @@ -58,7 +58,7 @@ public enum FlushCachePolicy { boolean useGeneratedKeys() default false; - String keyProperty() default "id"; + String keyProperty() default ""; String keyColumn() default ""; diff --git a/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java b/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java index 3434126d341..3134df28173 100644 --- a/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java +++ b/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java @@ -300,7 +300,7 @@ void parseStatement(Method method) { boolean useCache = isSelect; KeyGenerator keyGenerator; - String keyProperty = "id"; + String keyProperty = null; String keyColumn = null; if (SqlCommandType.INSERT.equals(sqlCommandType) || SqlCommandType.UPDATE.equals(sqlCommandType)) { // first check for SelectKey annotation - that overrides everything else From 65b9458bd1a49b33b0baa3ad21917a0757a7058a Mon Sep 17 00:00:00 2001 From: Iwao AVE! Date: Fri, 2 Mar 2018 00:15:45 +0900 Subject: [PATCH 2/2] Updated license years. --- src/main/java/org/apache/ibatis/annotations/Options.java | 2 +- .../ibatis/builder/annotation/MapperAnnotationBuilder.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/apache/ibatis/annotations/Options.java b/src/main/java/org/apache/ibatis/annotations/Options.java index 124e81e09fb..053dbc6c33d 100644 --- a/src/main/java/org/apache/ibatis/annotations/Options.java +++ b/src/main/java/org/apache/ibatis/annotations/Options.java @@ -1,5 +1,5 @@ /** - * Copyright 2009-2016 the original author or authors. + * Copyright 2009-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java b/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java index 3134df28173..648c47bde31 100644 --- a/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java +++ b/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java @@ -1,5 +1,5 @@ /** - * Copyright 2009-2017 the original author or authors. + * Copyright 2009-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.