================================================================================
Merge Diffs: /ade/cdelahun_toplinkmain/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/ejb/ejbqltesting/JUnitEJBQLSimpleTestSuite.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/cdelahun/cdelahun_ri_fix_selectcountonetoonetest_for_gf675_changes_060814/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.29
Report generated at Mon Aug 14 15:08:25 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/cdelahun/cdelahun_ri_fix_selectcountonetoonetest_for_gf675_changes_060814/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.29	Mon Aug 14 14:32:32 2006
--- /ade/cdelahun_toplinkmain/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/ejb/ejbqltesting/JUnitEJBQLSimpleTestSuite.java	Mon Aug 14 15:08:25 2006
***************
*** 1635,1641 ****
          
          ReportQuery query = new ReportQuery();		
  		query.setReferenceClass(PhoneNumber.class);
! 		query.addCount("COUNT", new ExpressionBuilder().get("owner").distinct());
          query.returnSingleAttribute();
  		query.dontRetrievePrimaryKeys();
  		query.setName("selectEmployeesThatHavePhoneNumbers");
--- 1635,1642 ----
          
          ReportQuery query = new ReportQuery();		
  		query.setReferenceClass(PhoneNumber.class);
! 		//need to specify Long return type
! 		query.addCount("COUNT", new ExpressionBuilder().get("owner").distinct(), Long.class);
          query.returnSingleAttribute();
  		query.dontRetrievePrimaryKeys();
  		query.setName("selectEmployeesThatHavePhoneNumbers");
================================================================================
Merge Diffs: /ade/cdelahun_toplinkmain/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/ejb/ejbqltesting/JUnitEJBQLSimpleTestSuite.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/cdelahun/cdelahun_ri_fix_selectcountonetoonetest_for_gf675_changes_060814/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.29
Report generated at Mon Aug 14 15:13:17 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/cdelahun/cdelahun_ri_fix_selectcountonetoonetest_for_gf675_changes_060814/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.29	Mon Aug 14 14:32:32 2006
--- /ade/cdelahun_toplinkmain/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/ejb/ejbqltesting/JUnitEJBQLSimpleTestSuite.java	Mon Aug 14 15:08:25 2006
***************
*** 1635,1641 ****
          
          ReportQuery query = new ReportQuery();		
  		query.setReferenceClass(PhoneNumber.class);
! 		query.addCount("COUNT", new ExpressionBuilder().get("owner").distinct());
          query.returnSingleAttribute();
  		query.dontRetrievePrimaryKeys();
  		query.setName("selectEmployeesThatHavePhoneNumbers");
--- 1635,1642 ----
          
          ReportQuery query = new ReportQuery();		
  		query.setReferenceClass(PhoneNumber.class);
! 		//need to specify Long return type
! 		query.addCount("COUNT", new ExpressionBuilder().get("owner").distinct(), Long.class);
          query.returnSingleAttribute();
  		query.dontRetrievePrimaryKeys();
  		query.setName("selectEmployeesThatHavePhoneNumbers");