You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by jg...@apache.org on 2010/01/25 19:02:53 UTC
svn commit: r902897 - in /ibatis/java/ibator/trunk/core: ibator-core/doc/
ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/model/
ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/
ibator-systests-ibatis2-ja...
Author: jgbutler
Date: Mon Jan 25 18:02:52 2010
New Revision: 902897
URL: http://svn.apache.org/viewvc?rev=902897&view=rev
Log:
[ibator] add new "or" method to example classes
Modified:
ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/ExampleGenerator.java
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/conditional/java2/SelectByExampleTest.java
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java5/ConditionalJava5Test.java
ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/conditional/java5/ConditionalJava5Test.java
Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt?rev=902897&r1=902896&r2=902897&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt (original)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt Mon Jan 25 18:02:52 2010
@@ -30,7 +30,7 @@
columnOverrides (thanks to Dan Turkenkopf for the idea and a nice initial patch)
10. Gather column comments during introspection
11. IBATIS-592 - Additional attributes for SqlMaps
-12. Fixed addCriterionfor JDBC* methods so that they all do a null check
+12. Fixed addCriterionforJDBC* methods so that they all do a null check
13. Fixed IbatorRunner so that configuration errors are shown (thanks to Karel Rank)
14. Added XML ids to changeable attributes on introspected table, also
change the XML merger so that the XML ids no longer need to contain
@@ -39,6 +39,7 @@
16. IBATIS-605 - Added Informix Dialect
17. Added ability to set annotations on method parameters
18. Addedd support for "distinct" on select by example methods
+19. Added new "or" method to example classes
-------------------------------------------------------------------------------
Version 1.2.1:
Modified: ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java?rev=902897&r1=902896&r2=902897&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java (original)
+++ ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java Mon Jan 25 18:02:52 2010
@@ -95,6 +95,7 @@
method.addParameter(new Parameter(type, "example")); //$NON-NLS-1$
method.addBodyLine("this.orderByClause = example.orderByClause;"); //$NON-NLS-1$
method.addBodyLine("this.oredCriteria = example.oredCriteria;"); //$NON-NLS-1$
+ method.addBodyLine("this.distinct = example.distinct;"); //$NON-NLS-1$
commentGenerator.addGeneralMethodComment(method, introspectedTable);
topLevelClass.addMethod(method);
}
@@ -188,7 +189,19 @@
method.addParameter(new Parameter(FullyQualifiedJavaType
.getCriteriaInstance(), "criteria")); //$NON-NLS-1$
method.addBodyLine("oredCriteria.add(criteria);"); //$NON-NLS-1$
+ commentGenerator.addGeneralMethodComment(method, introspectedTable);
+ topLevelClass.addMethod(method);
+ method = new Method();
+ method.setVisibility(JavaVisibility.PUBLIC);
+ if (ibatorContext.getSuppressTypeWarnings(introspectedTable)) {
+ method.addSuppressTypeWarningsAnnotation();
+ }
+ method.setName("or"); //$NON-NLS-1$
+ method.setReturnType(FullyQualifiedJavaType.getCriteriaInstance());
+ method.addBodyLine("Criteria criteria = createCriteriaInternal();"); //$NON-NLS-1$
+ method.addBodyLine("oredCriteria.add(criteria);"); //$NON-NLS-1$
+ method.addBodyLine("return criteria;"); //$NON-NLS-1$
commentGenerator.addGeneralMethodComment(method, introspectedTable);
topLevelClass.addMethod(method);
Modified: ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/ExampleGenerator.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/ExampleGenerator.java?rev=902897&r1=902896&r2=902897&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/ExampleGenerator.java (original)
+++ ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/ExampleGenerator.java Mon Jan 25 18:02:52 2010
@@ -144,7 +144,16 @@
method.addParameter(new Parameter(FullyQualifiedJavaType
.getCriteriaInstance(), "criteria")); //$NON-NLS-1$
method.addBodyLine("oredCriteria.add(criteria);"); //$NON-NLS-1$
+ commentGenerator.addGeneralMethodComment(method, introspectedTable);
+ topLevelClass.addMethod(method);
+ method = new Method();
+ method.setVisibility(JavaVisibility.PUBLIC);
+ method.setName("or"); //$NON-NLS-1$
+ method.setReturnType(FullyQualifiedJavaType.getCriteriaInstance());
+ method.addBodyLine("Criteria criteria = createCriteriaInternal();"); //$NON-NLS-1$
+ method.addBodyLine("oredCriteria.add(criteria);"); //$NON-NLS-1$
+ method.addBodyLine("return criteria;"); //$NON-NLS-1$
commentGenerator.addGeneralMethodComment(method, introspectedTable);
topLevelClass.addMethod(method);
Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/conditional/java2/SelectByExampleTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/conditional/java2/SelectByExampleTest.java?rev=902897&r1=902896&r2=902897&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/conditional/java2/SelectByExampleTest.java (original)
+++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/conditional/java2/SelectByExampleTest.java Mon Jan 25 18:02:52 2010
@@ -1224,8 +1224,8 @@
dao.insert(record);
AwfulTableExample example = new AwfulTableExample();
- example.createCriteria().andFirstFirstNameLike("b%").andId2EqualTo(new Integer(222222));
- example.or(example.createCriteria().andFirstFirstNameLike("wi%"));
+ example.or().andFirstFirstNameLike("b%").andId2EqualTo(new Integer(222222));
+ example.or().andFirstFirstNameLike("wi%");
example.setOrderByClause("\"A_CuStOmEr iD\"");
List answer = dao.selectByExample(example);
assertEquals(2, answer.size());
Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java5/ConditionalJava5Test.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java5/ConditionalJava5Test.java?rev=902897&r1=902896&r2=902897&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java5/ConditionalJava5Test.java (original)
+++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java5/ConditionalJava5Test.java Mon Jan 25 18:02:52 2010
@@ -2658,8 +2658,8 @@
dao.insert(record);
AwfulTableExample example = new AwfulTableExample();
- example.createCriteria().andFirstFirstNameLike("b%").andId2EqualTo(222222);
- example.or(example.createCriteria().andFirstFirstNameLike("wi%"));
+ example.or().andFirstFirstNameLike("b%").andId2EqualTo(222222);
+ example.or().andFirstFirstNameLike("wi%");
example.setOrderByClause("\"A_CuStOmEr iD\"");
List<AwfulTable> answer = dao.selectByExample(example);
assertEquals(2, answer.size());
Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/conditional/java5/ConditionalJava5Test.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/conditional/java5/ConditionalJava5Test.java?rev=902897&r1=902896&r2=902897&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/conditional/java5/ConditionalJava5Test.java (original)
+++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/conditional/java5/ConditionalJava5Test.java Mon Jan 25 18:02:52 2010
@@ -2828,8 +2828,8 @@
mapper.insert(record);
AwfulTableExample example = new AwfulTableExample();
- example.createCriteria().andFirstFirstNameLike("b%").andId2EqualTo(222222);
- example.or(example.createCriteria().andFirstFirstNameLike("wi%"));
+ example.or().andFirstFirstNameLike("b%").andId2EqualTo(222222);
+ example.or().andFirstFirstNameLike("wi%");
example.setOrderByClause("\"A_CuStOmEr iD\"");
List<AwfulTable> answer = mapper.selectByExample(example);
assertEquals(2, answer.size());