Polishing #1334

Author: kazuki43zoo

src/test/java/org/apache/ibatis/submitted/result_set_type/CreateDB.sql

@@ -14,43 +14,40 @@
 --    limitations under the License.
 --
 
-drop table resultsettype.users if exists
+drop table users if exists
 go
 
-drop procedure resultsettype.getusers if exists
+drop procedure getusers if exists
 go
 
-create schema resultsettype
-go
-
-create table resultsettype.users (
+create table users (
   id int,
   name varchar(20)
 )
 go
 
-create procedure resultsettype.getusers()
+create procedure getusers()
 modifies sql data
 dynamic result sets 1
 BEGIN ATOMIC
-  declare cur cursor for select * from resultsettype.users order by id;
+  declare cur cursor for select * from users order by id;
   open cur;
 END
 go
 
-insert into resultsettype.users (id, name) values(1, 'User1')
+insert into users (id, name) values(1, 'User1')
 go
 
-insert into resultsettype.users (id, name) values(2, 'User1')
+insert into users (id, name) values(2, 'User1')
 go
 
-insert into resultsettype.users (id, name) values(3, 'User1')
+insert into users (id, name) values(3, 'User1')
 go
 
-insert into resultsettype.users (id, name) values(4, 'User1')
+insert into users (id, name) values(4, 'User1')
 go
 
-insert into resultsettype.users (id, name) values(5, 'User1')
+insert into users (id, name) values(5, 'User1')
 go
 
 

src/test/java/org/apache/ibatis/submitted/result_set_type/Mapper.xml

@@ -24,65 +24,65 @@
 
   <select id="getUserWithStatementAndUnset" resultType="org.apache.ibatis.submitted.result_set_type.User"
           statementType="STATEMENT">
-		select * from resultsettype.users order by id
+		select * from users order by id
 	</select>
   <select id="getUserWithStatementAndDefault" resultType="org.apache.ibatis.submitted.result_set_type.User"
           statementType="STATEMENT" resultSetType="DEFAULT">
-		select * from resultsettype.users order by id
+		select * from users order by id
 	</select>
   <select id="getUserWithStatementAndForwardOnly" resultType="org.apache.ibatis.submitted.result_set_type.User"
           statementType="STATEMENT" resultSetType="FORWARD_ONLY">
-		select * from resultsettype.users order by id
+		select * from users order by id
 	</select>
   <select id="getUserWithStatementAndScrollInsensitive" resultType="org.apache.ibatis.submitted.result_set_type.User"
           statementType="STATEMENT" resultSetType="SCROLL_INSENSITIVE">
-		select * from resultsettype.users order by id
+		select * from users order by id
 	</select>
   <select id="getUserWithStatementAndScrollSensitive" resultType="org.apache.ibatis.submitted.result_set_type.User"
           statementType="STATEMENT" resultSetType="SCROLL_SENSITIVE">
-		select * from resultsettype.users order by id
+		select * from users order by id
 	</select>
 
   <select id="getUserWithPreparedAndUnset" resultType="org.apache.ibatis.submitted.result_set_type.User"
           statementType="PREPARED">
-		select * from resultsettype.users order by id
+		select * from users order by id
 	</select>
   <select id="getUserWithPreparedAndDefault" resultType="org.apache.ibatis.submitted.result_set_type.User"
           statementType="PREPARED" resultSetType="DEFAULT">
-		select * from resultsettype.users order by id
+		select * from users order by id
 	</select>
   <select id="getUserWithPreparedAndForwardOnly" resultType="org.apache.ibatis.submitted.result_set_type.User"
           statementType="PREPARED" resultSetType="FORWARD_ONLY">
-		select * from resultsettype.users order by id
+		select * from users order by id
 	</select>
   <select id="getUserWithPreparedAndScrollInsensitive" resultType="org.apache.ibatis.submitted.result_set_type.User"
           statementType="PREPARED" resultSetType="SCROLL_INSENSITIVE">
-		select * from resultsettype.users order by id
+		select * from users order by id
 	</select>
   <select id="getUserWithPreparedAndScrollSensitive" resultType="org.apache.ibatis.submitted.result_set_type.User"
           statementType="PREPARED" resultSetType="SCROLL_SENSITIVE">
-		select * from resultsettype.users order by id
+		select * from users order by id
 	</select>
 
   <select id="getUserWithCallableAndUnset" resultType="org.apache.ibatis.submitted.result_set_type.User"
           statementType="CALLABLE">
-		{call resultsettype.getusers()}
+		{call getusers()}
 	</select>
   <select id="getUserWithCallableAndDefault" resultType="org.apache.ibatis.submitted.result_set_type.User"
           statementType="CALLABLE" resultSetType="DEFAULT">
-		{call resultsettype.getusers()}
+		{call getusers()}
 	</select>
   <select id="getUserWithCallableAndForwardOnly" resultType="org.apache.ibatis.submitted.result_set_type.User"
           statementType="CALLABLE" resultSetType="FORWARD_ONLY">
-		{call resultsettype.getusers()}
+		{call getusers()}
 	</select>
   <select id="getUserWithCallableAndScrollInsensitive" resultType="org.apache.ibatis.submitted.result_set_type.User"
           statementType="CALLABLE" resultSetType="SCROLL_INSENSITIVE">
-		{call resultsettype.getusers()}
+		{call getusers()}
 	</select>
   <select id="getUserWithCallableAndScrollSensitive" resultType="org.apache.ibatis.submitted.result_set_type.User"
           statementType="CALLABLE" resultSetType="SCROLL_SENSITIVE">
-		{call resultsettype.getusers()}
+		{call getusers()}
 	</select>
 
 </mapper>

src/test/java/org/apache/ibatis/submitted/result_set_type/mybatis-config.xml

@@ -29,7 +29,7 @@
 			</transactionManager>
 			<dataSource type="UNPOOLED">
 				<property name="driver" value="org.hsqldb.jdbcDriver" />
-				<property name="url" value="jdbc:hsqldb:mem:basetest" />
+				<property name="url" value="jdbc:hsqldb:mem:resultsettype" />
 				<property name="username" value="sa" />
 			</dataSource>
 		</environment>