Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1056 from kazuki43zoo/default-resultset-type
Add defaultResultSetType as global configuration
- Loading branch information
Showing
13 changed files
with
228 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
116 changes: 116 additions & 0 deletions
116
src/test/java/org/apache/ibatis/builder/AnnotationMapperBuilderTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| /** | ||
| * Copyright 2009-2019 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. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.ibatis.builder; | ||
|
|
||
| import org.apache.ibatis.annotations.Insert; | ||
| import org.apache.ibatis.annotations.Options; | ||
| import org.apache.ibatis.annotations.Select; | ||
| import org.apache.ibatis.builder.annotation.MapperAnnotationBuilder; | ||
| import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator; | ||
| import org.apache.ibatis.mapping.MappedStatement; | ||
| import org.apache.ibatis.mapping.ResultSetType; | ||
| import org.apache.ibatis.mapping.StatementType; | ||
| import org.apache.ibatis.session.Configuration; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| class AnnotationMapperBuilderTest { | ||
|
|
||
| @Test | ||
| void withOptions() { | ||
| Configuration configuration = new Configuration(); | ||
| MapperAnnotationBuilder builder = new MapperAnnotationBuilder(configuration, Mapper.class); | ||
| builder.parse(); | ||
|
|
||
| MappedStatement mappedStatement = configuration.getMappedStatement("selectWithOptions"); | ||
| assertThat(mappedStatement.getFetchSize()).isEqualTo(200); | ||
| assertThat(mappedStatement.getTimeout()).isEqualTo(10); | ||
| assertThat(mappedStatement.getStatementType()).isEqualTo(StatementType.STATEMENT); | ||
| assertThat(mappedStatement.getResultSetType()).isEqualTo(ResultSetType.SCROLL_INSENSITIVE); | ||
| assertThat(mappedStatement.isFlushCacheRequired()).isTrue(); | ||
| assertThat(mappedStatement.isUseCache()).isFalse(); | ||
| assertThat(mappedStatement.getResultSets()).containsExactly("resultSets"); | ||
|
|
||
| mappedStatement = configuration.getMappedStatement("insertWithOptions"); | ||
| assertThat(mappedStatement.getKeyGenerator()).isInstanceOf(Jdbc3KeyGenerator.class); | ||
| assertThat(mappedStatement.getKeyColumns()).containsExactly("key_column"); | ||
| assertThat(mappedStatement.getKeyProperties()).containsExactly("keyProperty"); | ||
| } | ||
|
|
||
| @Test | ||
| void withOptionsAndWithoutOptionsAttributesWhenSpecifyDefaultValue() { | ||
| Configuration configuration = new Configuration(); | ||
| configuration.setDefaultResultSetType(ResultSetType.SCROLL_INSENSITIVE); | ||
| MapperAnnotationBuilder builder = new MapperAnnotationBuilder(configuration, Mapper.class); | ||
| builder.parse(); | ||
|
|
||
| MappedStatement mappedStatement = configuration.getMappedStatement("selectWithOptionsAndWithoutOptionsAttributes"); | ||
| assertThat(mappedStatement.getResultSetType()).isEqualTo(ResultSetType.SCROLL_INSENSITIVE); | ||
| } | ||
|
|
||
|
|
||
| @Test | ||
| void withOptionsAndWithoutOptionsAttributesWhenNotSpecifyDefaultValue() { | ||
| Configuration configuration = new Configuration(); | ||
| MapperAnnotationBuilder builder = new MapperAnnotationBuilder(configuration, Mapper.class); | ||
| builder.parse(); | ||
|
|
||
| MappedStatement mappedStatement = configuration.getMappedStatement("selectWithOptionsAndWithoutOptionsAttributes"); | ||
| assertThat(mappedStatement.getResultSetType()).isEqualTo(ResultSetType.DEFAULT); | ||
| } | ||
|
|
||
| @Test | ||
| void withoutOptionsWhenSpecifyDefaultValue() { | ||
| Configuration configuration = new Configuration(); | ||
| configuration.setDefaultResultSetType(ResultSetType.SCROLL_INSENSITIVE); | ||
| MapperAnnotationBuilder builder = new MapperAnnotationBuilder(configuration, Mapper.class); | ||
| builder.parse(); | ||
|
|
||
| MappedStatement mappedStatement = configuration.getMappedStatement("selectWithoutOptions"); | ||
| assertThat(mappedStatement.getResultSetType()).isEqualTo(ResultSetType.SCROLL_INSENSITIVE); | ||
| } | ||
|
|
||
| @Test | ||
| void withoutOptionsWhenNotSpecifyDefaultValue() { | ||
| Configuration configuration = new Configuration(); | ||
| MapperAnnotationBuilder builder = new MapperAnnotationBuilder(configuration, Mapper.class); | ||
| builder.parse(); | ||
|
|
||
| MappedStatement mappedStatement = configuration.getMappedStatement("selectWithoutOptions"); | ||
| assertThat(mappedStatement.getResultSetType()).isEqualTo(ResultSetType.DEFAULT); | ||
| } | ||
|
|
||
| interface Mapper { | ||
|
|
||
| @Insert("insert into test (name) values(#{name})") | ||
| @Options(useGeneratedKeys = true, keyColumn = "key_column", keyProperty = "keyProperty") | ||
| void insertWithOptions(String name); | ||
|
|
||
| @Select("select * from test") | ||
| @Options(fetchSize = 200, timeout = 10, statementType = StatementType.STATEMENT, resultSetType = ResultSetType.SCROLL_INSENSITIVE, flushCache = Options.FlushCachePolicy.TRUE, useCache = false, resultSets = "resultSets") | ||
| String selectWithOptions(Integer id); | ||
|
|
||
| @Select("select * from test") | ||
| @Options | ||
| String selectWithOptionsAndWithoutOptionsAttributes(Integer id); | ||
|
|
||
| @Select("select * from test") | ||
| String selectWithoutOptions(Integer id); | ||
|
|
||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters