Author: cbegin
Date: Thu Jan 22 21:55:29 2009
New Revision: 736946
URL: http://svn.apache.org/viewvc?rev=736946&view=rev
Log:
added discriminator test
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/DraftPost.java
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/databases/blog/blog-derby-dataload.sql
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/databases/blog/blog-derby-schema.sql
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/api/SqlSessionTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/BlogMapper.xml
ibatis/trunk/java/ibatis-3/version.properties
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/databases/blog/blog-derby-dataload.sql
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/databases/blog/blog-derby-dataload.sql?rev=736946&r1=736945&r2=736946&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/databases/blog/blog-derby-dataload.sql
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/databases/blog/blog-derby-dataload.sql
Thu Jan 22 21:55:29 2009
@@ -4,13 +4,13 @@
INSERT INTO blog (id,author_id,title) VALUES (1,101,'Jim Business');
INSERT INTO blog (id,author_id,title) VALUES (2,102,'Bally Slog');
-INSERT INTO post (id,blog_id,author_id,created_on,section,subject,body) VALUES
(1,1,101,'2007-12-05-00.00.00','NEWS','Corn nuts','I think if I never smelled
another corn nut it would be too soon...');
-INSERT INTO post (id,blog_id,author_id,created_on,section,subject,body) VALUES
(2,1,101,'2008-01-12-00.00.00','VIDEOS','Paul Hogan on Toy Dogs','That''s not a
dog. THAT''s a dog!');
-INSERT INTO post (id,blog_id,author_id,created_on,section,subject,body) VALUES
(3,2,102,'2007-12-05-00.00.00','PODCASTS','Monster Trucks','I think monster
trucks are great...');
-INSERT INTO post (id,blog_id,author_id,created_on,section,subject,body) VALUES
(4,2,102,'2008-01-12-00.00.00','IMAGES','Tea Parties','A tea party is no place
to hold a business meeting...');
+INSERT INTO post (id,blog_id,author_id,created_on,section,subject,body,draft)
VALUES (1,1,101,'2007-12-05-00.00.00','NEWS','Corn nuts','I think if I never
smelled another corn nut it would be too soon...',1);
+INSERT INTO post (id,blog_id,author_id,created_on,section,subject,body,draft)
VALUES (2,1,101,'2008-01-12-00.00.00','VIDEOS','Paul Hogan on Toy
Dogs','That''s not a dog. THAT''s a dog!',0);
+INSERT INTO post (id,blog_id,author_id,created_on,section,subject,body,draft)
VALUES (3,2,102,'2007-12-05-00.00.00','PODCASTS','Monster Trucks','I think
monster trucks are great...',1);
+INSERT INTO post (id,blog_id,author_id,created_on,section,subject,body,draft)
VALUES (4,2,102,'2008-01-12-00.00.00','IMAGES','Tea Parties','A tea party is no
place to hold a business meeting...',0);
--BAD POST
-INSERT INTO post (id,blog_id,author_id,created_on,section,subject,body) VALUES
(5,null,101,'2008-01-12-00.00.00','IMAGES','An orphaned post','this post is
orphaned');
+INSERT INTO post (id,blog_id,author_id,created_on,section,subject,body,draft)
VALUES (5,null,101,'2008-01-12-00.00.00','IMAGES','An orphaned post','this post
is orphaned',0);
INSERT INTO tag (id,name) VALUES (1,'funny');
INSERT INTO tag (id,name) VALUES (2,'cool');
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/databases/blog/blog-derby-schema.sql
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/databases/blog/blog-derby-schema.sql?rev=736946&r1=736945&r2=736946&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/databases/blog/blog-derby-schema.sql
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/databases/blog/blog-derby-schema.sql
Thu Jan 22 21:55:29 2009
@@ -33,6 +33,7 @@
section VARCHAR(25) NOT NULL,
subject VARCHAR(255) NOT NULL,
body CLOB NOT NULL,
+ draft INT NOT NULL,
PRIMARY KEY (id),
FOREIGN KEY (blog_id) REFERENCES blog(id)
);
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/DraftPost.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/DraftPost.java?rev=736946&view=auto
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/DraftPost.java
(added)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/blog/DraftPost.java
Thu Jan 22 21:55:29 2009
@@ -0,0 +1,4 @@
+package domain.blog;
+
+public class DraftPost extends Post {
+}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/api/SqlSessionTest.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/api/SqlSessionTest.java?rev=736946&r1=736945&r2=736946&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/api/SqlSessionTest.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/api/SqlSessionTest.java
Thu Jan 22 21:55:29 2009
@@ -15,11 +15,9 @@
public class SqlSessionTest extends BaseDataTest {
private static SqlSessionFactory sqlMapper;
- private static DataSource blogDataSource;
-
@BeforeClass
public static void setup() throws Exception {
- blogDataSource = createBlogDataSource();
+ createBlogDataSource();
final String resource = "org/apache/ibatis/parser/MapperConfig.xml";
final Reader reader = Resources.getResourceAsReader(resource);
sqlMapper = new SqlSessionFactoryBuilder().build(reader);
@@ -214,6 +212,10 @@
final Comment comment = comments.get(0);
Assert.assertEquals(1, comment.getId());
+
+ Assert.assertEquals(DraftPost.class, blog.getPosts().get(0).getClass());
+ Assert.assertEquals(Post.class, blog.getPosts().get(1).getClass());
+
} finally {
session.close();
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/BlogMapper.xml
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/BlogMapper.xml?rev=736946&r1=736945&r2=736946&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/BlogMapper.xml
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/BlogMapper.xml
Thu Jan 22 21:55:29 2009
@@ -44,8 +44,13 @@
<association property="author" column="post_author_id"
resultMap="joinedAuthor"/>
<collection property="comments" column="post_id"
resultMap="joinedComment"/>
<collection property="tags" column="post_id" resultMap="joinedTag"/>
+ <discriminator javaType="int" column="draft">
+ <case value="1" resultMap="draftPost"/>
+ </discriminator>
</resultMap>
+ <resultMap id="draftPost" type="domain.blog.DraftPost" extends="joinedPost"/>
+
<resultMap id="blogJoinedWithPostsAndAuthor" type="Blog">
<id property="id" column="blog_id" />
<result property="title" column="blog_title"/>
@@ -70,6 +75,7 @@
P.created_on as post_created_on,
P.section as post_section,
P.subject as post_subject,
+ P.draft as draft,
P.body as post_body,
C.id as comment_id,
C.post_id as comment_post_id,
Modified: ibatis/trunk/java/ibatis-3/version.properties
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/version.properties?rev=736946&r1=736945&r2=736946&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/version.properties (original)
+++ ibatis/trunk/java/ibatis-3/version.properties Thu Jan 22 21:55:29 2009
@@ -1,5 +1,5 @@
#Build version info
-#Fri Jan 09 23:57:44 MST 2009
+#Thu Jan 22 22:47:43 MST 2009
version=3.0.0
-buildDate=2009/01/09 23\:57
-buildNum=110
+buildDate=2009/01/22 22\:47
+buildNum=114
