forked from mybatis/mybatis-3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Allow using actual argument name as bind parameter on a single collec…
…tion Fixes mybatisgh-1237
- Loading branch information
1 parent
42818bf
commit d1346e3
Showing
5 changed files
with
252 additions
and
16 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
148 changes: 148 additions & 0 deletions
148
src/test/java/org/apache/ibatis/submitted/param_name_resolve/ActualParamNameTest.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,148 @@ | ||
| /** | ||
| * Copyright 2009-2020 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.submitted.param_name_resolve; | ||
|
|
||
| import org.apache.ibatis.annotations.Select; | ||
| import org.apache.ibatis.io.Resources; | ||
| import org.apache.ibatis.jdbc.ScriptRunner; | ||
| import org.apache.ibatis.session.SqlSession; | ||
| import org.apache.ibatis.session.SqlSessionFactory; | ||
| import org.apache.ibatis.session.SqlSessionFactoryBuilder; | ||
| import org.junit.jupiter.api.BeforeAll; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import java.io.Reader; | ||
| import java.sql.Connection; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
|
|
||
| class ActualParamNameTest { | ||
|
|
||
| private static SqlSessionFactory sqlSessionFactory; | ||
|
|
||
| @BeforeAll | ||
| static void setUp() throws Exception { | ||
| // create an SqlSessionFactory | ||
| try (Reader reader = Resources | ||
| .getResourceAsReader("org/apache/ibatis/submitted/param_name_resolve/mybatis-config.xml")) { | ||
| sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader); | ||
| sqlSessionFactory.getConfiguration().addMapper(Mapper.class); | ||
| } | ||
|
|
||
| // populate in-memory database | ||
| try (Connection conn = sqlSessionFactory.getConfiguration().getEnvironment().getDataSource().getConnection(); | ||
| Reader reader = Resources | ||
| .getResourceAsReader("org/apache/ibatis/submitted/param_name_resolve/CreateDB.sql")) { | ||
| ScriptRunner runner = new ScriptRunner(conn); | ||
| runner.setLogWriter(null); | ||
| runner.runScript(reader); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| void testSingleListParameterWhenUseActualParamNameIsTrue() { | ||
| try (SqlSession sqlSession = sqlSessionFactory.openSession()) { | ||
| Mapper mapper = sqlSession.getMapper(Mapper.class); | ||
| // use actual name | ||
| { | ||
| long count = mapper.getUserCountUsingList(Arrays.asList(1, 2)); | ||
| assertEquals(2, count); | ||
| } | ||
| // use 'collection' as alias | ||
| { | ||
| long count = mapper.getUserCountUsingListWithAliasIsCollection(Arrays.asList(1, 2)); | ||
| assertEquals(2, count); | ||
| } | ||
| // use 'list' as alias | ||
| { | ||
| long count = mapper.getUserCountUsingListWithAliasIsList(Arrays.asList(1, 2)); | ||
| assertEquals(2, count); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| void testSingleArrayParameterWhenUseActualParamNameIsTrue() { | ||
| try (SqlSession sqlSession = sqlSessionFactory.openSession()) { | ||
| Mapper mapper = sqlSession.getMapper(Mapper.class); | ||
| // use actual name | ||
| { | ||
| long count = mapper.getUserCountUsingArray(1, 2); | ||
| assertEquals(2, count); | ||
| } | ||
| // use 'array' as alias | ||
| { | ||
| long count = mapper.getUserCountUsingArrayWithAliasArray(1, 2); | ||
| assertEquals(2, count); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| interface Mapper { | ||
| @Select({ | ||
| "<script>", | ||
| " select count(*) from users u where u.id in", | ||
| " <foreach item='item' index='index' collection='ids' open='(' separator=',' close=')'>", | ||
| " #{item}", | ||
| " </foreach>", | ||
| "</script>" | ||
| }) | ||
| Long getUserCountUsingList(List<Integer> ids); | ||
|
|
||
| @Select({ | ||
| "<script>", | ||
| " select count(*) from users u where u.id in", | ||
| " <foreach item='item' index='index' collection='collection' open='(' separator=',' close=')'>", | ||
| " #{item}", | ||
| " </foreach>", | ||
| "</script>" | ||
| }) | ||
| Long getUserCountUsingListWithAliasIsCollection(List<Integer> ids); | ||
|
|
||
| @Select({ | ||
| "<script>", | ||
| " select count(*) from users u where u.id in", | ||
| " <foreach item='item' index='index' collection='list' open='(' separator=',' close=')'>", | ||
| " #{item}", | ||
| " </foreach>", | ||
| "</script>" | ||
| }) | ||
| Long getUserCountUsingListWithAliasIsList(List<Integer> ids); | ||
|
|
||
| @Select({ | ||
| "<script>", | ||
| " select count(*) from users u where u.id in", | ||
| " <foreach item='item' index='index' collection='ids' open='(' separator=',' close=')'>", | ||
| " #{item}", | ||
| " </foreach>", | ||
| "</script>" | ||
| }) | ||
| Long getUserCountUsingArray(Integer... ids); | ||
|
|
||
| @Select({ | ||
| "<script>", | ||
| " select count(*) from users u where u.id in", | ||
| " <foreach item='item' index='index' collection='array' open='(' separator=',' close=')'>", | ||
| " #{item}", | ||
| " </foreach>", | ||
| "</script>" | ||
| }) | ||
| Long getUserCountUsingArrayWithAliasArray(Integer... ids); | ||
| } | ||
|
|
||
| } |
24 changes: 24 additions & 0 deletions
24
src/test/java/org/apache/ibatis/submitted/param_name_resolve/CreateDB.sql
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,24 @@ | ||
| -- | ||
| -- Copyright 2009-2020 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. | ||
| -- | ||
|
|
||
| drop table users if exists; | ||
|
|
||
| create table users ( | ||
| id int, | ||
| name varchar(20) | ||
| ); | ||
|
|
||
| insert into users (id, name) values (1, 'User1'), (2, 'User2'), (3, 'User3'); |
36 changes: 36 additions & 0 deletions
36
src/test/java/org/apache/ibatis/submitted/param_name_resolve/mybatis-config.xml
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,36 @@ | ||
| <?xml version="1.0" encoding="UTF-8" ?> | ||
| <!-- | ||
| Copyright 2009-2020 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. | ||
| --> | ||
| <!DOCTYPE configuration | ||
| PUBLIC "-//mybatis.org//DTD Config 3.0//EN" | ||
| "http://mybatis.org/dtd/mybatis-3-config.dtd"> | ||
|
|
||
| <configuration> | ||
|
|
||
| <environments default="development"> | ||
| <environment id="development"> | ||
| <transactionManager type="JDBC" /> | ||
| <dataSource type="UNPOOLED"> | ||
| <property name="driver" value="org.hsqldb.jdbcDriver"/> | ||
| <property name="url" value="jdbc:hsqldb:mem:param_name_resolve"/> | ||
| <property name="username" value="sa"/> | ||
| </dataSource> | ||
| </environment> | ||
| </environments> | ||
|
|
||
| </configuration> |