Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/abatorConfig.xml URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/abatorConfig.xml?view=diff&rev=508716&r1=508715&r2=508716 ============================================================================== --- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/abatorConfig.xml (original) +++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/abatorConfig.xml Fri Feb 16 22:14:18 2007 @@ -31,7 +31,17 @@ <table tableName="PKBlobs" /> <table tableName="PKFieldsBlobs" /> <table tableName="FieldsBlobs" /> - <table tableName="awful table" /> + <table tableName="awful table" alias="A"> + <property name="useColumnIndexes" value="true"/> + <generatedKey column="CuStOmEr iD" sqlStatement="HSQLDB" identity="true" /> + <columnOverride column="customer id" property="secondCustomerId" /> + <columnOverride column="first name" property="firstFirstName" /> + <columnOverride column="First Name" property="secondFirstName" /> + <ignoreColumn column="first Name" /> + <columnOverride column="first_name" property="thirdFirstName" /> + <columnOverride column="firstName" property="fourthFirstName" /> + <columnOverride column="from" delimitedColumnName="true" /> + </table> </abatorContext> <abatorContext generatorSet="Java2" defaultModelType="flat"> @@ -60,6 +70,17 @@ <table tableName="PKBlobs" /> <table tableName="PKFieldsBlobs" /> <table tableName="FieldsBlobs" /> + <table tableName="awful table" alias="A"> + <property name="useColumnIndexes" value="true"/> + <generatedKey column="CuStOmEr iD" sqlStatement="HSQLDB" identity="true" /> + <columnOverride column="customer id" property="secondCustomerId" /> + <columnOverride column="first name" property="firstFirstName" /> + <columnOverride column="First Name" property="secondFirstName" /> + <ignoreColumn column="first Name" /> + <columnOverride column="first_name" property="thirdFirstName" /> + <columnOverride column="firstName" property="fourthFirstName" /> + <columnOverride column="from" delimitedColumnName="true" /> + </table> </abatorContext> <abatorContext generatorSet="Legacy" defaultModelType="flat"> @@ -88,6 +109,17 @@ <table tableName="PKBlobs" /> <table tableName="PKFieldsBlobs" /> <table tableName="FieldsBlobs" /> + <table tableName="awful table" alias="A"> + <property name="useColumnIndexes" value="true"/> + <generatedKey column="CuStOmEr iD" sqlStatement="HSQLDB" identity="true" /> + <columnOverride column="customer id" property="secondCustomerId" /> + <columnOverride column="first name" property="firstFirstName" /> + <columnOverride column="First Name" property="secondFirstName" /> + <ignoreColumn column="first Name" /> + <columnOverride column="first_name" property="thirdFirstName" /> + <columnOverride column="firstName" property="fourthFirstName" /> + <columnOverride column="from" delimitedColumnName="true" /> + </table> </abatorContext> <abatorContext generatorSet="Java5" defaultModelType="hierarchical"> @@ -114,6 +146,17 @@ <table tableName="PKBlobs" /> <table tableName="PKFieldsBlobs" /> <table tableName="FieldsBlobs" /> + <table tableName="awful table" alias="A"> + <property name="useColumnIndexes" value="true"/> + <generatedKey column="CuStOmEr iD" sqlStatement="HSQLDB" identity="true" /> + <columnOverride column="customer id" property="secondCustomerId" /> + <columnOverride column="first name" property="firstFirstName" /> + <columnOverride column="First Name" property="secondFirstName" /> + <ignoreColumn column="first Name" /> + <columnOverride column="first_name" property="thirdFirstName" /> + <columnOverride column="firstName" property="fourthFirstName" /> + <columnOverride column="from" delimitedColumnName="true" /> + </table> </abatorContext> <abatorContext generatorSet="Java2" defaultModelType="hierarchical"> @@ -142,6 +185,17 @@ <table tableName="PKBlobs" /> <table tableName="PKFieldsBlobs" /> <table tableName="FieldsBlobs" /> + <table tableName="awful table" alias="A"> + <property name="useColumnIndexes" value="true"/> + <generatedKey column="CuStOmEr iD" sqlStatement="HSQLDB" identity="true" /> + <columnOverride column="customer id" property="secondCustomerId" /> + <columnOverride column="first name" property="firstFirstName" /> + <columnOverride column="First Name" property="secondFirstName" /> + <ignoreColumn column="first Name" /> + <columnOverride column="first_name" property="thirdFirstName" /> + <columnOverride column="firstName" property="fourthFirstName" /> + <columnOverride column="from" delimitedColumnName="true" /> + </table> </abatorContext> <abatorContext generatorSet="Legacy" defaultModelType="hierarchical"> @@ -170,6 +224,17 @@ <table tableName="PKBlobs" /> <table tableName="PKFieldsBlobs" /> <table tableName="FieldsBlobs" /> + <table tableName="awful table" alias="A"> + <property name="useColumnIndexes" value="true"/> + <generatedKey column="CuStOmEr iD" sqlStatement="HSQLDB" identity="true" /> + <columnOverride column="customer id" property="secondCustomerId" /> + <columnOverride column="first name" property="firstFirstName" /> + <columnOverride column="First Name" property="secondFirstName" /> + <ignoreColumn column="first Name" /> + <columnOverride column="first_name" property="thirdFirstName" /> + <columnOverride column="firstName" property="fourthFirstName" /> + <columnOverride column="from" delimitedColumnName="true" /> + </table> </abatorContext> <abatorContext generatorSet="Java5" defaultModelType="conditional"> @@ -196,6 +261,17 @@ <table tableName="PKBlobs" /> <table tableName="PKFieldsBlobs" /> <table tableName="FieldsBlobs" /> + <table tableName="awful table" alias="A"> + <property name="useColumnIndexes" value="true"/> + <generatedKey column="CuStOmEr iD" sqlStatement="HSQLDB" identity="true" /> + <columnOverride column="customer id" property="secondCustomerId" /> + <columnOverride column="first name" property="firstFirstName" /> + <columnOverride column="First Name" property="secondFirstName" /> + <ignoreColumn column="first Name" /> + <columnOverride column="first_name" property="thirdFirstName" /> + <columnOverride column="firstName" property="fourthFirstName" /> + <columnOverride column="from" delimitedColumnName="true" /> + </table> </abatorContext> <abatorContext generatorSet="Java2" defaultModelType="conditional"> @@ -224,6 +300,17 @@ <table tableName="PKBlobs" /> <table tableName="PKFieldsBlobs" /> <table tableName="FieldsBlobs" /> + <table tableName="awful table" alias="A"> + <property name="useColumnIndexes" value="true"/> + <generatedKey column="CuStOmEr iD" sqlStatement="HSQLDB" identity="true" /> + <columnOverride column="customer id" property="secondCustomerId" /> + <columnOverride column="first name" property="firstFirstName" /> + <columnOverride column="First Name" property="secondFirstName" /> + <ignoreColumn column="first Name" /> + <columnOverride column="first_name" property="thirdFirstName" /> + <columnOverride column="firstName" property="fourthFirstName" /> + <columnOverride column="from" delimitedColumnName="true" /> + </table> </abatorContext> <abatorContext generatorSet="Legacy" defaultModelType="conditional"> @@ -252,6 +339,17 @@ <table tableName="PKBlobs" /> <table tableName="PKFieldsBlobs" /> <table tableName="FieldsBlobs" /> + <table tableName="awful table" alias="A"> + <property name="useColumnIndexes" value="true"/> + <generatedKey column="CuStOmEr iD" sqlStatement="HSQLDB" identity="true" /> + <columnOverride column="customer id" property="secondCustomerId" /> + <columnOverride column="first name" property="firstFirstName" /> + <columnOverride column="First Name" property="secondFirstName" /> + <ignoreColumn column="first Name" /> + <columnOverride column="first_name" property="thirdFirstName" /> + <columnOverride column="firstName" property="fourthFirstName" /> + <columnOverride column="from" delimitedColumnName="true" /> + </table> </abatorContext> <abatorContext id="miscellaneousTests" generatorSet="Java5">
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java2/ConditionalJava2Tests.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java2/ConditionalJava2Tests.java?view=diff&rev=508716&r1=508715&r2=508716 ============================================================================== --- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java2/ConditionalJava2Tests.java (original) +++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java2/ConditionalJava2Tests.java Fri Feb 16 22:14:18 2007 @@ -23,6 +23,8 @@ import java.util.List; import abatortest.BaseTest; +import abatortest.generated.conditional.java2.dao.AwfulTableDAO; +import abatortest.generated.conditional.java2.dao.AwfulTableDAOImpl; import abatortest.generated.conditional.java2.dao.FieldsblobsDAO; import abatortest.generated.conditional.java2.dao.FieldsblobsDAOImpl; import abatortest.generated.conditional.java2.dao.FieldsonlyDAO; @@ -35,6 +37,8 @@ import abatortest.generated.conditional.java2.dao.PkfieldsblobsDAOImpl; import abatortest.generated.conditional.java2.dao.PkonlyDAO; import abatortest.generated.conditional.java2.dao.PkonlyDAOImpl; +import abatortest.generated.conditional.java2.model.AwfulTable; +import abatortest.generated.conditional.java2.model.AwfulTableExample; import abatortest.generated.conditional.java2.model.Fieldsblobs; import abatortest.generated.conditional.java2.model.FieldsblobsExample; import abatortest.generated.conditional.java2.model.FieldsblobsWithBLOBs; @@ -758,7 +762,6 @@ } } - @SuppressWarnings("unchecked") public void testPKFieldsSelectByExampleIn() { PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient); @@ -805,7 +808,7 @@ record.setId2(3); dao.insert(record); - List ids = new ArrayList(); + List<Integer> ids = new ArrayList<Integer>(); ids.add(1); ids.add(3); @@ -1766,6 +1769,1028 @@ example.createCriteria(); List answer = dao.selectByExampleWithBLOBs(example); assertEquals(2, answer.size()); + } catch (SQLException e) { + fail(e.getMessage()); + } + } + + public void testAwfulTableInsert() { + AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient); + + try { + AwfulTable record = new AwfulTable(); + + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("fred1"); + record.setFourthFirstName("fred4"); + record.setFrom("from field"); + record.setId1(1); + record.setId2(2); + record.setId5(5); + record.setId6(6); + record.setId7(7); + record.setSecondCustomerId(567); + record.setSecondFirstName("fred2"); + record.setThirdFirstName("fred3"); + + Integer generatedCustomerId = dao.insert(record); + assertEquals(57, generatedCustomerId.intValue()); + + AwfulTable returnedRecord = dao + .selectByPrimaryKey(generatedCustomerId); + + assertEquals(generatedCustomerId, returnedRecord.getCustomerId()); + assertEquals(record.geteMail(), returnedRecord.geteMail()); + assertEquals(record.getEmailaddress(), returnedRecord + .getEmailaddress()); + assertEquals(record.getFirstFirstName(), returnedRecord + .getFirstFirstName()); + assertEquals(record.getFourthFirstName(), returnedRecord + .getFourthFirstName()); + assertEquals(record.getFrom(), returnedRecord.getFrom()); + assertEquals(record.getId1(), returnedRecord.getId1()); + assertEquals(record.getId2(), returnedRecord.getId2()); + assertEquals(record.getId5(), returnedRecord.getId5()); + assertEquals(record.getId6(), returnedRecord.getId6()); + assertEquals(record.getId7(), returnedRecord.getId7()); + assertEquals(record.getSecondCustomerId(), returnedRecord + .getSecondCustomerId()); + assertEquals(record.getSecondFirstName(), returnedRecord + .getSecondFirstName()); + assertEquals(record.getThirdFirstName(), returnedRecord + .getThirdFirstName()); + } catch (SQLException e) { + fail(e.getMessage()); + } + } + + public void testAwfulTableUpdateByPrimaryKey() { + AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient); + + try { + AwfulTable record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("fred1"); + record.setFourthFirstName("fred4"); + record.setFrom("from field"); + record.setId1(1); + record.setId2(2); + record.setId5(5); + record.setId6(6); + record.setId7(7); + record.setSecondCustomerId(567); + record.setSecondFirstName("fred2"); + record.setThirdFirstName("fred3"); + + Integer generatedCustomerId = dao.insert(record); + + record.setId1(11); + record.setId2(22); + + int rows = dao.updateByPrimaryKey(record); + assertEquals(1, rows); + + AwfulTable returnedRecord = dao.selectByPrimaryKey(generatedCustomerId); + + assertEquals(generatedCustomerId, returnedRecord.getCustomerId()); + assertEquals(record.geteMail(), returnedRecord.geteMail()); + assertEquals(record.getEmailaddress(), returnedRecord + .getEmailaddress()); + assertEquals(record.getFirstFirstName(), returnedRecord + .getFirstFirstName()); + assertEquals(record.getFourthFirstName(), returnedRecord + .getFourthFirstName()); + assertEquals(record.getFrom(), returnedRecord.getFrom()); + assertEquals(record.getId1(), returnedRecord.getId1()); + assertEquals(record.getId2(), returnedRecord.getId2()); + assertEquals(record.getId5(), returnedRecord.getId5()); + assertEquals(record.getId6(), returnedRecord.getId6()); + assertEquals(record.getId7(), returnedRecord.getId7()); + assertEquals(record.getSecondCustomerId(), returnedRecord + .getSecondCustomerId()); + assertEquals(record.getSecondFirstName(), returnedRecord + .getSecondFirstName()); + assertEquals(record.getThirdFirstName(), returnedRecord + .getThirdFirstName()); + } catch (SQLException e) { + fail(e.getMessage()); + } + } + + public void testAwfulTableUpdateByPrimaryKeySelective() { + AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient); + + try { + AwfulTable record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("fred1"); + record.setFourthFirstName("fred4"); + record.setFrom("from field"); + record.setId1(1); + record.setId2(2); + record.setId5(5); + record.setId6(6); + record.setId7(7); + record.setSecondCustomerId(567); + record.setSecondFirstName("fred2"); + record.setThirdFirstName("fred3"); + + Integer generatedCustomerId = dao.insert(record); + + AwfulTable newRecord = new AwfulTable(); + newRecord.setCustomerId(generatedCustomerId); + newRecord.setId1(11); + newRecord.setId2(22); + + int rows = dao.updateByPrimaryKeySelective(newRecord); + assertEquals(1, rows); + + AwfulTable returnedRecord = dao.selectByPrimaryKey(generatedCustomerId); + + assertEquals(generatedCustomerId, returnedRecord.getCustomerId()); + assertEquals(record.geteMail(), returnedRecord.geteMail()); + assertEquals(record.getEmailaddress(), returnedRecord + .getEmailaddress()); + assertEquals(record.getFirstFirstName(), returnedRecord + .getFirstFirstName()); + assertEquals(record.getFourthFirstName(), returnedRecord + .getFourthFirstName()); + assertEquals(record.getFrom(), returnedRecord.getFrom()); + assertEquals(newRecord.getId1(), returnedRecord.getId1()); + assertEquals(newRecord.getId2(), returnedRecord.getId2()); + assertEquals(record.getId5(), returnedRecord.getId5()); + assertEquals(record.getId6(), returnedRecord.getId6()); + assertEquals(record.getId7(), returnedRecord.getId7()); + assertEquals(record.getSecondCustomerId(), returnedRecord + .getSecondCustomerId()); + assertEquals(record.getSecondFirstName(), returnedRecord + .getSecondFirstName()); + assertEquals(record.getThirdFirstName(), returnedRecord + .getThirdFirstName()); + } catch (SQLException e) { + fail(e.getMessage()); + } + } + + public void testAwfulTableDeleteByPrimaryKey() { + AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient); + + try { + AwfulTable record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("fred1"); + record.setFourthFirstName("fred4"); + record.setFrom("from field"); + record.setId1(1); + record.setId2(2); + record.setId5(5); + record.setId6(6); + record.setId7(7); + record.setSecondCustomerId(567); + record.setSecondFirstName("fred2"); + record.setThirdFirstName("fred3"); + + Integer generatedCustomerId = dao.insert(record); + + int rows = dao.deleteByPrimaryKey(generatedCustomerId); + assertEquals(1, rows); + + AwfulTableExample example = new AwfulTableExample(); + List answer = dao.selectByExample(example); + assertEquals(0, answer.size()); + } catch (SQLException e) { + fail(e.getMessage()); + } + } + + public void testAwfulTableDeleteByExample() { + AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient); + + try { + AwfulTable record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("fred1"); + record.setFourthFirstName("fred4"); + record.setFrom("from field"); + record.setId1(1); + record.setId2(2); + record.setId5(5); + record.setId6(6); + record.setId7(7); + record.setSecondCustomerId(567); + record.setSecondFirstName("fred2"); + record.setThirdFirstName("fred3"); + + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("fred11"); + record.setFourthFirstName("fred44"); + record.setFrom("from from field"); + record.setId1(11); + record.setId2(22); + record.setId5(55); + record.setId6(66); + record.setId7(77); + record.setSecondCustomerId(567567); + record.setSecondFirstName("fred22"); + record.setThirdFirstName("fred33"); + + dao.insert(record); + + AwfulTableExample example = new AwfulTableExample(); + List answer = dao.selectByExample(example); + assertEquals(2, answer.size()); + + example = new AwfulTableExample(); + example.createCriteria().andEMailLike("[EMAIL PROTECTED]"); + int rows = dao.deleteByExample(example); + assertEquals(1, rows); + + example.clear(); + answer = dao.selectByExample(example); + assertEquals(1, answer.size()); + } catch (SQLException e) { + fail(e.getMessage()); + } + } + + public void testAwfulTableSelectByPrimaryKey() { + AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient); + + try { + AwfulTable record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("fred1"); + record.setFourthFirstName("fred4"); + record.setFrom("from field"); + record.setId1(1); + record.setId2(2); + record.setId5(5); + record.setId6(6); + record.setId7(7); + record.setSecondCustomerId(567); + record.setSecondFirstName("fred2"); + record.setThirdFirstName("fred3"); + + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("fred11"); + record.setFourthFirstName("fred44"); + record.setFrom("from from field"); + record.setId1(11); + record.setId2(22); + record.setId5(55); + record.setId6(66); + record.setId7(77); + record.setSecondCustomerId(567567); + record.setSecondFirstName("fred22"); + record.setThirdFirstName("fred33"); + + Integer generatedKey = dao.insert(record); + + AwfulTable returnedRecord = dao.selectByPrimaryKey(generatedKey); + + assertNotNull(returnedRecord); + assertEquals(record.getCustomerId(), returnedRecord.getCustomerId()); + assertEquals(record.geteMail(), returnedRecord.geteMail()); + assertEquals(record.getEmailaddress(), returnedRecord + .getEmailaddress()); + assertEquals(record.getFirstFirstName(), returnedRecord + .getFirstFirstName()); + assertEquals(record.getFourthFirstName(), returnedRecord + .getFourthFirstName()); + assertEquals(record.getFrom(), returnedRecord.getFrom()); + assertEquals(record.getId1(), returnedRecord.getId1()); + assertEquals(record.getId2(), returnedRecord.getId2()); + assertEquals(record.getId5(), returnedRecord.getId5()); + assertEquals(record.getId6(), returnedRecord.getId6()); + assertEquals(record.getId7(), returnedRecord.getId7()); + assertEquals(record.getSecondCustomerId(), returnedRecord + .getSecondCustomerId()); + assertEquals(record.getSecondFirstName(), returnedRecord + .getSecondFirstName()); + assertEquals(record.getThirdFirstName(), returnedRecord + .getThirdFirstName()); + } catch (SQLException e) { + fail(e.getMessage()); + } + } + + public void testAwfulTableSelectByExampleLike() { + AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient); + + try { + AwfulTable record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("fred1"); + record.setFourthFirstName("fred4"); + record.setFrom("from field"); + record.setId1(1); + record.setId2(2); + record.setId5(5); + record.setId6(6); + record.setId7(7); + record.setSecondCustomerId(567); + record.setSecondFirstName("fred2"); + record.setThirdFirstName("fred3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("wilma1"); + record.setFourthFirstName("wilma4"); + record.setFrom("from field"); + record.setId1(11); + record.setId2(22); + record.setId5(55); + record.setId6(66); + record.setId7(77); + record.setSecondCustomerId(567567); + record.setSecondFirstName("wilma2"); + record.setThirdFirstName("wilma3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("pebbles1"); + record.setFourthFirstName("pebbles4"); + record.setFrom("from field"); + record.setId1(111); + record.setId2(222); + record.setId5(555); + record.setId6(666); + record.setId7(777); + record.setSecondCustomerId(567567); + record.setSecondFirstName("pebbles2"); + record.setThirdFirstName("pebbles3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("barney1"); + record.setFourthFirstName("barney4"); + record.setFrom("from field"); + record.setId1(1111); + record.setId2(2222); + record.setId5(5555); + record.setId6(6666); + record.setId7(7777); + record.setSecondCustomerId(567567); + record.setSecondFirstName("barney2"); + record.setThirdFirstName("barney3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("betty1"); + record.setFourthFirstName("betty4"); + record.setFrom("from field"); + record.setId1(11111); + record.setId2(22222); + record.setId5(55555); + record.setId6(66666); + record.setId7(77777); + record.setSecondCustomerId(567567); + record.setSecondFirstName("betty2"); + record.setThirdFirstName("betty3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("bammbamm1"); + record.setFourthFirstName("bammbamm4"); + record.setFrom("from field"); + record.setId1(111111); + record.setId2(222222); + record.setId5(555555); + record.setId6(666666); + record.setId7(777777); + record.setSecondCustomerId(567567); + record.setSecondFirstName("bammbamm2"); + record.setThirdFirstName("bammbamm3"); + dao.insert(record); + + AwfulTableExample example = new AwfulTableExample(); + example.createCriteria().andFirstFirstNameLike("b%"); + example.setOrderByClause("\"A_CuStOmEr iD\""); + List answer = dao.selectByExample(example); + assertEquals(3, answer.size()); + AwfulTable returnedRecord = (AwfulTable) answer.get(0); + assertEquals(1111, returnedRecord.getId1().intValue()); + assertEquals(2222, returnedRecord.getId2().intValue()); + returnedRecord = (AwfulTable) answer.get(1); + assertEquals(11111, returnedRecord.getId1().intValue()); + assertEquals(22222, returnedRecord.getId2().intValue()); + returnedRecord = (AwfulTable) answer.get(2); + assertEquals(111111, returnedRecord.getId1().intValue()); + assertEquals(222222, returnedRecord.getId2().intValue()); + } catch (SQLException e) { + fail(e.getMessage()); + } + } + + public void testAwfulTableSelectByExampleNotLike() { + AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient); + + try { + AwfulTable record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("fred1"); + record.setFourthFirstName("fred4"); + record.setFrom("from field"); + record.setId1(1); + record.setId2(2); + record.setId5(5); + record.setId6(6); + record.setId7(7); + record.setSecondCustomerId(567); + record.setSecondFirstName("fred2"); + record.setThirdFirstName("fred3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("wilma1"); + record.setFourthFirstName("wilma4"); + record.setFrom("from field"); + record.setId1(11); + record.setId2(22); + record.setId5(55); + record.setId6(66); + record.setId7(77); + record.setSecondCustomerId(567567); + record.setSecondFirstName("wilma2"); + record.setThirdFirstName("wilma3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("pebbles1"); + record.setFourthFirstName("pebbles4"); + record.setFrom("from field"); + record.setId1(111); + record.setId2(222); + record.setId5(555); + record.setId6(666); + record.setId7(777); + record.setSecondCustomerId(567567); + record.setSecondFirstName("pebbles2"); + record.setThirdFirstName("pebbles3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("barney1"); + record.setFourthFirstName("barney4"); + record.setFrom("from field"); + record.setId1(1111); + record.setId2(2222); + record.setId5(5555); + record.setId6(6666); + record.setId7(7777); + record.setSecondCustomerId(567567); + record.setSecondFirstName("barney2"); + record.setThirdFirstName("barney3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("betty1"); + record.setFourthFirstName("betty4"); + record.setFrom("from field"); + record.setId1(11111); + record.setId2(22222); + record.setId5(55555); + record.setId6(66666); + record.setId7(77777); + record.setSecondCustomerId(567567); + record.setSecondFirstName("betty2"); + record.setThirdFirstName("betty3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("bammbamm1"); + record.setFourthFirstName("bammbamm4"); + record.setFrom("from field"); + record.setId1(111111); + record.setId2(222222); + record.setId5(555555); + record.setId6(666666); + record.setId7(777777); + record.setSecondCustomerId(567567); + record.setSecondFirstName("bammbamm2"); + record.setThirdFirstName("bammbamm3"); + dao.insert(record); + + AwfulTableExample example = new AwfulTableExample(); + example.createCriteria().andFirstFirstNameNotLike("b%"); + example.setOrderByClause("\"A_CuStOmEr iD\""); + List answer = dao.selectByExample(example); + assertEquals(3, answer.size()); + AwfulTable returnedRecord = (AwfulTable) answer.get(0); + assertEquals(1, returnedRecord.getId1().intValue()); + assertEquals(2, returnedRecord.getId2().intValue()); + returnedRecord = (AwfulTable) answer.get(1); + assertEquals(11, returnedRecord.getId1().intValue()); + assertEquals(22, returnedRecord.getId2().intValue()); + returnedRecord = (AwfulTable) answer.get(2); + assertEquals(111, returnedRecord.getId1().intValue()); + assertEquals(222, returnedRecord.getId2().intValue()); + } catch (SQLException e) { + fail(e.getMessage()); + } + } + + public void testAwfulTableSelectByExampleComplexLike() { + AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient); + + try { + AwfulTable record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("fred1"); + record.setFourthFirstName("fred4"); + record.setFrom("from field"); + record.setId1(1); + record.setId2(2); + record.setId5(5); + record.setId6(6); + record.setId7(7); + record.setSecondCustomerId(567); + record.setSecondFirstName("fred2"); + record.setThirdFirstName("fred3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("wilma1"); + record.setFourthFirstName("wilma4"); + record.setFrom("from field"); + record.setId1(11); + record.setId2(22); + record.setId5(55); + record.setId6(66); + record.setId7(77); + record.setSecondCustomerId(567567); + record.setSecondFirstName("wilma2"); + record.setThirdFirstName("wilma3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("pebbles1"); + record.setFourthFirstName("pebbles4"); + record.setFrom("from field"); + record.setId1(111); + record.setId2(222); + record.setId5(555); + record.setId6(666); + record.setId7(777); + record.setSecondCustomerId(567567); + record.setSecondFirstName("pebbles2"); + record.setThirdFirstName("pebbles3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("barney1"); + record.setFourthFirstName("barney4"); + record.setFrom("from field"); + record.setId1(1111); + record.setId2(2222); + record.setId5(5555); + record.setId6(6666); + record.setId7(7777); + record.setSecondCustomerId(567567); + record.setSecondFirstName("barney2"); + record.setThirdFirstName("barney3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("betty1"); + record.setFourthFirstName("betty4"); + record.setFrom("from field"); + record.setId1(11111); + record.setId2(22222); + record.setId5(55555); + record.setId6(66666); + record.setId7(77777); + record.setSecondCustomerId(567567); + record.setSecondFirstName("betty2"); + record.setThirdFirstName("betty3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("bammbamm1"); + record.setFourthFirstName("bammbamm4"); + record.setFrom("from field"); + record.setId1(111111); + record.setId2(222222); + record.setId5(555555); + record.setId6(666666); + record.setId7(777777); + record.setSecondCustomerId(567567); + record.setSecondFirstName("bammbamm2"); + record.setThirdFirstName("bammbamm3"); + dao.insert(record); + + AwfulTableExample example = new AwfulTableExample(); + example.createCriteria().andFirstFirstNameLike("b%").andId2EqualTo(222222); + example.or(example.createCriteria().andFirstFirstNameLike("wi%")); + example.setOrderByClause("\"A_CuStOmEr iD\""); + List answer = dao.selectByExample(example); + assertEquals(2, answer.size()); + AwfulTable returnedRecord = (AwfulTable) answer.get(0); + assertEquals(11, returnedRecord.getId1().intValue()); + assertEquals(22, returnedRecord.getId2().intValue()); + returnedRecord = (AwfulTable) answer.get(1); + assertEquals(111111, returnedRecord.getId1().intValue()); + assertEquals(222222, returnedRecord.getId2().intValue()); + } catch (SQLException e) { + fail(e.getMessage()); + } + } + + public void testAwfulTableSelectByExampleIn() { + AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient); + + try { + AwfulTable record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("fred1"); + record.setFourthFirstName("fred4"); + record.setFrom("from field"); + record.setId1(1); + record.setId2(2); + record.setId5(5); + record.setId6(6); + record.setId7(7); + record.setSecondCustomerId(567); + record.setSecondFirstName("fred2"); + record.setThirdFirstName("fred3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("wilma1"); + record.setFourthFirstName("wilma4"); + record.setFrom("from field"); + record.setId1(11); + record.setId2(22); + record.setId5(55); + record.setId6(66); + record.setId7(77); + record.setSecondCustomerId(567567); + record.setSecondFirstName("wilma2"); + record.setThirdFirstName("wilma3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("pebbles1"); + record.setFourthFirstName("pebbles4"); + record.setFrom("from field"); + record.setId1(111); + record.setId2(222); + record.setId5(555); + record.setId6(666); + record.setId7(777); + record.setSecondCustomerId(567567); + record.setSecondFirstName("pebbles2"); + record.setThirdFirstName("pebbles3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("barney1"); + record.setFourthFirstName("barney4"); + record.setFrom("from field"); + record.setId1(1111); + record.setId2(2222); + record.setId5(5555); + record.setId6(6666); + record.setId7(7777); + record.setSecondCustomerId(567567); + record.setSecondFirstName("barney2"); + record.setThirdFirstName("barney3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("betty1"); + record.setFourthFirstName("betty4"); + record.setFrom("from field"); + record.setId1(11111); + record.setId2(22222); + record.setId5(55555); + record.setId6(66666); + record.setId7(77777); + record.setSecondCustomerId(567567); + record.setSecondFirstName("betty2"); + record.setThirdFirstName("betty3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("bammbamm1"); + record.setFourthFirstName("bammbamm4"); + record.setFrom("from field"); + record.setId1(111111); + record.setId2(222222); + record.setId5(555555); + record.setId6(666666); + record.setId7(777777); + record.setSecondCustomerId(567567); + record.setSecondFirstName("bammbamm2"); + record.setThirdFirstName("bammbamm3"); + dao.insert(record); + + List<Integer> ids = new ArrayList<Integer>(); + ids.add(1); + ids.add(11); + + AwfulTableExample example = new AwfulTableExample(); + example.createCriteria().andId1In(ids); + example.setOrderByClause("\"A_CuStOmEr iD\""); + List answer = dao.selectByExample(example); + + assertEquals(2, answer.size()); + AwfulTable returnedRecord = (AwfulTable) answer.get(0); + assertEquals(1, returnedRecord.getId1().intValue()); + assertEquals(2, returnedRecord.getId2().intValue()); + returnedRecord = (AwfulTable) answer.get(1); + assertEquals(11, returnedRecord.getId1().intValue()); + assertEquals(22, returnedRecord.getId2().intValue()); + } catch (SQLException e) { + fail(e.getMessage()); + } + } + + public void testAwfulTableSelectByExampleBetween() { + AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient); + + try { + AwfulTable record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("fred1"); + record.setFourthFirstName("fred4"); + record.setFrom("from field"); + record.setId1(1); + record.setId2(2); + record.setId5(5); + record.setId6(6); + record.setId7(7); + record.setSecondCustomerId(567); + record.setSecondFirstName("fred2"); + record.setThirdFirstName("fred3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("wilma1"); + record.setFourthFirstName("wilma4"); + record.setFrom("from field"); + record.setId1(11); + record.setId2(22); + record.setId5(55); + record.setId6(66); + record.setId7(77); + record.setSecondCustomerId(567567); + record.setSecondFirstName("wilma2"); + record.setThirdFirstName("wilma3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("pebbles1"); + record.setFourthFirstName("pebbles4"); + record.setFrom("from field"); + record.setId1(111); + record.setId2(222); + record.setId5(555); + record.setId6(666); + record.setId7(777); + record.setSecondCustomerId(567567); + record.setSecondFirstName("pebbles2"); + record.setThirdFirstName("pebbles3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("barney1"); + record.setFourthFirstName("barney4"); + record.setFrom("from field"); + record.setId1(1111); + record.setId2(2222); + record.setId5(5555); + record.setId6(6666); + record.setId7(7777); + record.setSecondCustomerId(567567); + record.setSecondFirstName("barney2"); + record.setThirdFirstName("barney3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("betty1"); + record.setFourthFirstName("betty4"); + record.setFrom("from field"); + record.setId1(11111); + record.setId2(22222); + record.setId5(55555); + record.setId6(66666); + record.setId7(77777); + record.setSecondCustomerId(567567); + record.setSecondFirstName("betty2"); + record.setThirdFirstName("betty3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("bammbamm1"); + record.setFourthFirstName("bammbamm4"); + record.setFrom("from field"); + record.setId1(111111); + record.setId2(222222); + record.setId5(555555); + record.setId6(666666); + record.setId7(777777); + record.setSecondCustomerId(567567); + record.setSecondFirstName("bammbamm2"); + record.setThirdFirstName("bammbamm3"); + dao.insert(record); + + AwfulTableExample example = new AwfulTableExample(); + example.createCriteria().andId1Between(1, 1000); + List answer = dao.selectByExample(example); + assertEquals(3, answer.size()); + } catch (SQLException e) { + fail(e.getMessage()); + } + } + + public void testAwfulTableSelectByExampleNoCriteria() { + AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient); + + try { + AwfulTable record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("fred1"); + record.setFourthFirstName("fred4"); + record.setFrom("from field"); + record.setId1(1); + record.setId2(2); + record.setId5(5); + record.setId6(6); + record.setId7(7); + record.setSecondCustomerId(567); + record.setSecondFirstName("fred2"); + record.setThirdFirstName("fred3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("wilma1"); + record.setFourthFirstName("wilma4"); + record.setFrom("from field"); + record.setId1(11); + record.setId2(22); + record.setId5(55); + record.setId6(66); + record.setId7(77); + record.setSecondCustomerId(567567); + record.setSecondFirstName("wilma2"); + record.setThirdFirstName("wilma3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("pebbles1"); + record.setFourthFirstName("pebbles4"); + record.setFrom("from field"); + record.setId1(111); + record.setId2(222); + record.setId5(555); + record.setId6(666); + record.setId7(777); + record.setSecondCustomerId(567567); + record.setSecondFirstName("pebbles2"); + record.setThirdFirstName("pebbles3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("barney1"); + record.setFourthFirstName("barney4"); + record.setFrom("from field"); + record.setId1(1111); + record.setId2(2222); + record.setId5(5555); + record.setId6(6666); + record.setId7(7777); + record.setSecondCustomerId(567567); + record.setSecondFirstName("barney2"); + record.setThirdFirstName("barney3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("betty1"); + record.setFourthFirstName("betty4"); + record.setFrom("from field"); + record.setId1(11111); + record.setId2(22222); + record.setId5(55555); + record.setId6(66666); + record.setId7(77777); + record.setSecondCustomerId(567567); + record.setSecondFirstName("betty2"); + record.setThirdFirstName("betty3"); + dao.insert(record); + + record = new AwfulTable(); + record.seteMail("[EMAIL PROTECTED]"); + record.setEmailaddress("[EMAIL PROTECTED]"); + record.setFirstFirstName("bammbamm1"); + record.setFourthFirstName("bammbamm4"); + record.setFrom("from field"); + record.setId1(111111); + record.setId2(222222); + record.setId5(555555); + record.setId6(666666); + record.setId7(777777); + record.setSecondCustomerId(567567); + record.setSecondFirstName("bammbamm2"); + record.setThirdFirstName("bammbamm3"); + dao.insert(record); + + AwfulTableExample example = new AwfulTableExample(); + example.createCriteria(); + example.setOrderByClause("\"A_CuStOmEr iD\" desc"); + + List answer = dao.selectByExample(example); + assertEquals(6, answer.size()); + AwfulTable returnedRecord = (AwfulTable) answer.get(0); + assertEquals(111111, returnedRecord.getId1().intValue()); + returnedRecord = (AwfulTable) answer.get(1); + assertEquals(11111, returnedRecord.getId1().intValue()); + returnedRecord = (AwfulTable) answer.get(2); + assertEquals(1111, returnedRecord.getId1().intValue()); + returnedRecord = (AwfulTable) answer.get(3); + assertEquals(111, returnedRecord.getId1().intValue()); + returnedRecord = (AwfulTable) answer.get(4); + assertEquals(11, returnedRecord.getId1().intValue()); + returnedRecord = (AwfulTable) answer.get(5); + assertEquals(1, returnedRecord.getId1().intValue()); } catch (SQLException e) { fail(e.getMessage()); } Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java2/SqlMapConfig.xml URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java2/SqlMapConfig.xml?view=diff&rev=508716&r1=508715&r2=508716 ============================================================================== --- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java2/SqlMapConfig.xml (original) +++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java2/SqlMapConfig.xml Fri Feb 16 22:14:18 2007 @@ -23,5 +23,6 @@ <sqlMap resource="abatortest/generated/conditional/java2/xml/PKFIELDS_SqlMap.xml" /> <sqlMap resource="abatortest/generated/conditional/java2/xml/PKFIELDSBLOBS_SqlMap.xml" /> <sqlMap resource="abatortest/generated/conditional/java2/xml/PKONLY_SqlMap.xml" /> + <sqlMap resource="abatortest/generated/conditional/java2/xml/awful table_SqlMap.xml" /> </sqlMapConfig>
