================================================================================
Merge Diffs: /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/internal/databaseaccess/DatasourceCall.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf928_060821/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.10
Report generated at Mon Aug 21 16:21:59 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf928_060821/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.10	Mon Aug 21 14:06:36 2006
--- /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/internal/databaseaccess/DatasourceCall.java	Mon Aug 21 16:21:59 2006
***************
*** 423,428 ****
--- 423,429 ----
                          lastIndex = wordEndIndex;
                      }else{
                          DatabaseField field = createField(String.valueOf(parameterIndex));
+                         parameterIndex++;
                          appendIn(writer, field);
                      }
                  }
***************
*** 430,435 ****
--- 431,437 ----
          } catch (IOException exception) {
              throw ValidationException.fileError(exception);
          }
+         setQueryString(writer.toString());
      }
  
      /**
================================================================================
Merge Diffs: /ade/ailitche_toplink_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/models/cmp3/advanced/Address.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf928_060821/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.9
Report generated at Mon Aug 21 16:21:59 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf928_060821/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.9	Mon Aug 21 14:13:34 2006
--- /ade/ailitche_toplink_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/models/cmp3/advanced/Address.java	Mon Aug 21 16:21:59 2006
***************
*** 44,51 ****
      resultClass=oracle.toplink.essentials.testing.models.cmp3.advanced.Address.class
  ),
  @NamedNativeQuery(
!     name="findAllSQLAddressesByCity", 
!     query="select * from CMP3_ADDRESS where city = ?1",
      resultClass=oracle.toplink.essentials.testing.models.cmp3.advanced.Address.class
  )
  }
--- 44,66 ----
      resultClass=oracle.toplink.essentials.testing.models.cmp3.advanced.Address.class
  ),
  @NamedNativeQuery(
!     name="findAllSQLAddressesByCity_QuestionMark_Number", 
!     query="select * from CMP3_ADDRESS where city=?1",
!     resultClass=oracle.toplink.essentials.testing.models.cmp3.advanced.Address.class
! ),
! @NamedNativeQuery(
!     name="findAllSQLAddressesByCity_QuestionMark", 
!     query="select * from CMP3_ADDRESS where city=?",
!     resultClass=oracle.toplink.essentials.testing.models.cmp3.advanced.Address.class
! ),
! @NamedNativeQuery(
!     name="findAllSQLAddressesByCityAndCountry_QuestionMark_Number", 
!     query="select * from CMP3_ADDRESS where city=?1 and country=?2",
!     resultClass=oracle.toplink.essentials.testing.models.cmp3.advanced.Address.class
! ),
! @NamedNativeQuery(
!     name="findAllSQLAddressesByCityAndCountry_QuestionMark", 
!     query="select * from CMP3_ADDRESS where city=? and country=?",
      resultClass=oracle.toplink.essentials.testing.models.cmp3.advanced.Address.class
  )
  }
================================================================================
Merge Diffs: /ade/ailitche_toplink_main/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/ailitche/ailitche_ri_gf928_060821/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.31
Report generated at Mon Aug 21 16:21:59 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf928_060821/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.31	Mon Aug 21 15:07:07 2006
--- /ade/ailitche_toplink_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/ejb/ejbqltesting/JUnitEJBQLSimpleTestSuite.java	Mon Aug 21 16:21:59 2006
***************
*** 195,200 ****
--- 195,201 ----
      suite.addTest(new JUnitEJBQLSimpleTestSuite("selectUsingLockModeQueryHintTest"));
      suite.addTest(new JUnitEJBQLSimpleTestSuite("multipleExecutionOfNamedQueryTest"));
      suite.addTest(new JUnitEJBQLSimpleTestSuite("selectNamedNativeQueryWithPositionalParameterTest"));
+     suite.addTest(new JUnitEJBQLSimpleTestSuite("selectNativeQueryWithPositionalParameterTest"));
      
       return new TestSetup(suite) {
       
***************
*** 1878,1899 ****
      }
      
      public void selectNamedNativeQueryWithPositionalParameterTest() {
-         Exception exception = null;
          oracle.toplink.essentials.ejb.cmp3.EntityManager em = (oracle.toplink.essentials.ejb.cmp3.EntityManager) createEntityManager();
          
!         List results;
          try {
!             javax.persistence.Query query = em.createNamedQuery("findAllSQLAddressesByCity");
              query.setParameter(1, "Ottawa");
      
!             results = query.getResultList();
          } catch (Exception e) {
!             exception = e;
!         } finally {
!             em.close();
          }
          
!         Assert.assertNull("An exception was caught: " + exception, exception);
      }
      
    public static void main(String[] args)
--- 1879,2013 ----
      }
      
      public void selectNamedNativeQueryWithPositionalParameterTest() {
          oracle.toplink.essentials.ejb.cmp3.EntityManager em = (oracle.toplink.essentials.ejb.cmp3.EntityManager) createEntityManager();
          
!         List results_QuestionMark_Number = null;
!         List results_QuestionMark = null;
!         javax.persistence.Query query;
!         String errorMsg ="";
!         
!         boolean shouldCompareResults = true;
          try {
!             query = em.createNamedQuery("findAllSQLAddressesByCity_QuestionMark_Number");
              query.setParameter(1, "Ottawa");
      
!             results_QuestionMark_Number = query.getResultList();
          } catch (Exception e) {
!             errorMsg = errorMsg + "findAllSQLAddressesByCity_QuestionMark_Number: " + e.getMessage() +"\n";
!             shouldCompareResults = false;
          }
+         try {
+             query = em.createNamedQuery("findAllSQLAddressesByCity_QuestionMark");
+             query.setParameter(1, "Ottawa");
          
!             results_QuestionMark = query.getResultList();
!         } catch (Exception e) {
!             errorMsg = errorMsg + "findAllSQLAddressesByCity_QuestionMark: " + e.getMessage() +"\n";
!             shouldCompareResults = false;
!         }
!         if(shouldCompareResults) {
!             if(results_QuestionMark_Number.size() != results_QuestionMark.size()) {
!                 errorMsg = errorMsg + ("findAllSQLAddressesByCity_QuestionMark_Number and findAllSQLAddressesByCity_QuestionMark produced non-equal results");
!             }
!         }
!         
!         shouldCompareResults = true;
!         try {
!             query = em.createNamedQuery("findAllSQLAddressesByCityAndCountry_QuestionMark_Number");
!             query.setParameter(1, "Ottawa");
!             query.setParameter(2, "Canada");
!         
!             results_QuestionMark_Number = query.getResultList();
!         } catch (Exception e) {
!             errorMsg = errorMsg + "findAllSQLAddressesByCityAndCountry_QuestionMark_Number: " + e.getMessage() +"\n";
!             shouldCompareResults = false;
!         }
!         try {
!             query = em.createNamedQuery("findAllSQLAddressesByCityAndCountry_QuestionMark");
!             query.setParameter(1, "Ottawa");
!             query.setParameter(2, "Canada");
!         
!             results_QuestionMark = query.getResultList();
!         } catch (Exception e) {
!             errorMsg = errorMsg + "findAllSQLAddressesByCityAndCountry_QuestionMark: " + e.getMessage();
!             shouldCompareResults = false;
!         }
!         if(shouldCompareResults) {
!             if(results_QuestionMark_Number.size() != results_QuestionMark.size()) {
!                 errorMsg = errorMsg + ("findAllSQLAddressesByCityAndCountry_QuestionMark_Number and findAllSQLAddressesByCityAndCountry_QuestionMark produced non-equal results");
!             }
!         }
! 
!         if(errorMsg.length() > 0) {
!             Assert.fail(errorMsg);
!         }
!         em.close();
!     }
!     
!     public void selectNativeQueryWithPositionalParameterTest() {
!         oracle.toplink.essentials.ejb.cmp3.EntityManager em = (oracle.toplink.essentials.ejb.cmp3.EntityManager) createEntityManager();
!         
!         List results_QuestionMark_Number = null;
!         List results_QuestionMark = null;
!         javax.persistence.Query query;
!         String errorMsg ="";
!         
!         boolean shouldCompareResults = true;
!         try {
!             query = em.createNativeQuery("select * from CMP3_ADDRESS where city=?1", Address.class);
!             query.setParameter(1, "Ottawa");
!     
!             results_QuestionMark_Number = query.getResultList();
!         } catch (Exception e) {
!             errorMsg = errorMsg + "findAllSQLAddressesByCity_QuestionMark_Number: " + e.getMessage() +"\n";
!             shouldCompareResults = false;
!         }
!         try {
!             query = em.createNativeQuery("select * from CMP3_ADDRESS where city=?", Address.class);
!             query.setParameter(1, "Ottawa");
!         
!             results_QuestionMark = query.getResultList();
!         } catch (Exception e) {
!             errorMsg = errorMsg + "findAllSQLAddressesByCity_QuestionMark: " + e.getMessage() +"\n";
!             shouldCompareResults = false;
!         }
!         if(shouldCompareResults) {
!             if(results_QuestionMark_Number.size() != results_QuestionMark.size()) {
!                 errorMsg = errorMsg + ("findAllSQLAddressesByCity_QuestionMark_Number and findAllSQLAddressesByCity_QuestionMark produced non-equal results");
!             }
!         }
!         
!         shouldCompareResults = true;
!         try {
!             query = em.createNativeQuery("select * from CMP3_ADDRESS where city=?1 and country=?2", Address.class);
!             query.setParameter(1, "Ottawa");
!             query.setParameter(2, "Canada");
!         
!             results_QuestionMark_Number = query.getResultList();
!         } catch (Exception e) {
!             errorMsg = errorMsg + "findAllSQLAddressesByCityAndCountry_QuestionMark_Number: " + e.getMessage() +"\n";
!             shouldCompareResults = false;
!         }
!         try {
!             query = em.createNativeQuery("select * from CMP3_ADDRESS where city=? and country=?", Address.class);
!             query.setParameter(1, "Ottawa");
!             query.setParameter(2, "Canada");
!         
!             results_QuestionMark = query.getResultList();
!         } catch (Exception e) {
!             errorMsg = errorMsg + "findAllSQLAddressesByCityAndCountry_QuestionMark: " + e.getMessage();
!             shouldCompareResults = false;
!         }
!         if(shouldCompareResults) {
!             if(results_QuestionMark_Number.size() != results_QuestionMark.size()) {
!                 errorMsg = errorMsg + ("findAllSQLAddressesByCityAndCountry_QuestionMark_Number and findAllSQLAddressesByCityAndCountry_QuestionMark produced non-equal results");
!             }
!         }
! 
!         if(errorMsg.length() > 0) {
!             Assert.fail(errorMsg);
!         }
!         em.close();
      }
      
    public static void main(String[] args)
================================================================================
Merge Diffs: /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/EntityManagerImpl.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf928_060821/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.39
Report generated at Mon Aug 21 16:21:59 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf928_060821/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.39	Mon Aug 21 15:28:23 2006
--- /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/EntityManagerImpl.java	Mon Aug 21 16:21:59 2006
***************
*** 446,451 ****
--- 446,452 ----
          verifyOpen();
          ReadAllQuery query = new ReadAllQuery(resultType);
          query.setSQLString(sqlString);
+         query.setIsUserDefined(true);
          return query;
      }
       
================================================================================
Merge Diffs: /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/EntityManagerImpl.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf928_060821/ade_storage/000005/AB0952363AC40CBFE034080020E8C54E.15
Report generated at Mon Aug 21 16:21:59 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf928_060821/ade_storage/000005/AB0952363AC40CBFE034080020E8C54E.15	Mon Aug 21 15:32:08 2006
--- /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/EntityManagerImpl.java	Mon Aug 21 16:21:59 2006
***************
*** 225,230 ****
--- 225,231 ----
          ResultSetMappingQuery query = new ResultSetMappingQuery();
          query.setSQLResultSetMappingName(resultSetMapping);
          query.setSQLString(sqlString);
+         query.setIsUserDefined(true);
          return new EJBQueryImpl(query, this);
      }
  
================================================================================
Merge Diffs: /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/internal/databaseaccess/DatasourceCall.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf928_060821/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.10
Report generated at Mon Aug 21 16:26:41 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf928_060821/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.10	Mon Aug 21 14:06:36 2006
--- /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/internal/databaseaccess/DatasourceCall.java	Mon Aug 21 16:21:59 2006
***************
*** 423,428 ****
--- 423,429 ----
                          lastIndex = wordEndIndex;
                      }else{
                          DatabaseField field = createField(String.valueOf(parameterIndex));
+                         parameterIndex++;
                          appendIn(writer, field);
                      }
                  }
***************
*** 430,435 ****
--- 431,437 ----
          } catch (IOException exception) {
              throw ValidationException.fileError(exception);
          }
+         setQueryString(writer.toString());
      }
  
      /**
================================================================================
Merge Diffs: /ade/ailitche_toplink_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/models/cmp3/advanced/Address.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf928_060821/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.9
Report generated at Mon Aug 21 16:26:41 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf928_060821/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.9	Mon Aug 21 14:13:34 2006
--- /ade/ailitche_toplink_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/models/cmp3/advanced/Address.java	Mon Aug 21 16:21:59 2006
***************
*** 44,51 ****
      resultClass=oracle.toplink.essentials.testing.models.cmp3.advanced.Address.class
  ),
  @NamedNativeQuery(
!     name="findAllSQLAddressesByCity", 
!     query="select * from CMP3_ADDRESS where city = ?1",
      resultClass=oracle.toplink.essentials.testing.models.cmp3.advanced.Address.class
  )
  }
--- 44,66 ----
      resultClass=oracle.toplink.essentials.testing.models.cmp3.advanced.Address.class
  ),
  @NamedNativeQuery(
!     name="findAllSQLAddressesByCity_QuestionMark_Number", 
!     query="select * from CMP3_ADDRESS where city=?1",
!     resultClass=oracle.toplink.essentials.testing.models.cmp3.advanced.Address.class
! ),
! @NamedNativeQuery(
!     name="findAllSQLAddressesByCity_QuestionMark", 
!     query="select * from CMP3_ADDRESS where city=?",
!     resultClass=oracle.toplink.essentials.testing.models.cmp3.advanced.Address.class
! ),
! @NamedNativeQuery(
!     name="findAllSQLAddressesByCityAndCountry_QuestionMark_Number", 
!     query="select * from CMP3_ADDRESS where city=?1 and country=?2",
!     resultClass=oracle.toplink.essentials.testing.models.cmp3.advanced.Address.class
! ),
! @NamedNativeQuery(
!     name="findAllSQLAddressesByCityAndCountry_QuestionMark", 
!     query="select * from CMP3_ADDRESS where city=? and country=?",
      resultClass=oracle.toplink.essentials.testing.models.cmp3.advanced.Address.class
  )
  }
================================================================================
Merge Diffs: /ade/ailitche_toplink_main/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/ailitche/ailitche_ri_gf928_060821/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.31
Report generated at Mon Aug 21 16:26:41 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf928_060821/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.31	Mon Aug 21 15:07:07 2006
--- /ade/ailitche_toplink_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/ejb/ejbqltesting/JUnitEJBQLSimpleTestSuite.java	Mon Aug 21 16:21:59 2006
***************
*** 195,200 ****
--- 195,201 ----
      suite.addTest(new JUnitEJBQLSimpleTestSuite("selectUsingLockModeQueryHintTest"));
      suite.addTest(new JUnitEJBQLSimpleTestSuite("multipleExecutionOfNamedQueryTest"));
      suite.addTest(new JUnitEJBQLSimpleTestSuite("selectNamedNativeQueryWithPositionalParameterTest"));
+     suite.addTest(new JUnitEJBQLSimpleTestSuite("selectNativeQueryWithPositionalParameterTest"));
      
       return new TestSetup(suite) {
       
***************
*** 1878,1899 ****
      }
      
      public void selectNamedNativeQueryWithPositionalParameterTest() {
-         Exception exception = null;
          oracle.toplink.essentials.ejb.cmp3.EntityManager em = (oracle.toplink.essentials.ejb.cmp3.EntityManager) createEntityManager();
          
!         List results;
          try {
!             javax.persistence.Query query = em.createNamedQuery("findAllSQLAddressesByCity");
              query.setParameter(1, "Ottawa");
      
!             results = query.getResultList();
          } catch (Exception e) {
!             exception = e;
!         } finally {
!             em.close();
          }
          
!         Assert.assertNull("An exception was caught: " + exception, exception);
      }
      
    public static void main(String[] args)
--- 1879,2013 ----
      }
      
      public void selectNamedNativeQueryWithPositionalParameterTest() {
          oracle.toplink.essentials.ejb.cmp3.EntityManager em = (oracle.toplink.essentials.ejb.cmp3.EntityManager) createEntityManager();
          
!         List results_QuestionMark_Number = null;
!         List results_QuestionMark = null;
!         javax.persistence.Query query;
!         String errorMsg ="";
!         
!         boolean shouldCompareResults = true;
          try {
!             query = em.createNamedQuery("findAllSQLAddressesByCity_QuestionMark_Number");
              query.setParameter(1, "Ottawa");
      
!             results_QuestionMark_Number = query.getResultList();
          } catch (Exception e) {
!             errorMsg = errorMsg + "findAllSQLAddressesByCity_QuestionMark_Number: " + e.getMessage() +"\n";
!             shouldCompareResults = false;
          }
+         try {
+             query = em.createNamedQuery("findAllSQLAddressesByCity_QuestionMark");
+             query.setParameter(1, "Ottawa");
          
!             results_QuestionMark = query.getResultList();
!         } catch (Exception e) {
!             errorMsg = errorMsg + "findAllSQLAddressesByCity_QuestionMark: " + e.getMessage() +"\n";
!             shouldCompareResults = false;
!         }
!         if(shouldCompareResults) {
!             if(results_QuestionMark_Number.size() != results_QuestionMark.size()) {
!                 errorMsg = errorMsg + ("findAllSQLAddressesByCity_QuestionMark_Number and findAllSQLAddressesByCity_QuestionMark produced non-equal results");
!             }
!         }
!         
!         shouldCompareResults = true;
!         try {
!             query = em.createNamedQuery("findAllSQLAddressesByCityAndCountry_QuestionMark_Number");
!             query.setParameter(1, "Ottawa");
!             query.setParameter(2, "Canada");
!         
!             results_QuestionMark_Number = query.getResultList();
!         } catch (Exception e) {
!             errorMsg = errorMsg + "findAllSQLAddressesByCityAndCountry_QuestionMark_Number: " + e.getMessage() +"\n";
!             shouldCompareResults = false;
!         }
!         try {
!             query = em.createNamedQuery("findAllSQLAddressesByCityAndCountry_QuestionMark");
!             query.setParameter(1, "Ottawa");
!             query.setParameter(2, "Canada");
!         
!             results_QuestionMark = query.getResultList();
!         } catch (Exception e) {
!             errorMsg = errorMsg + "findAllSQLAddressesByCityAndCountry_QuestionMark: " + e.getMessage();
!             shouldCompareResults = false;
!         }
!         if(shouldCompareResults) {
!             if(results_QuestionMark_Number.size() != results_QuestionMark.size()) {
!                 errorMsg = errorMsg + ("findAllSQLAddressesByCityAndCountry_QuestionMark_Number and findAllSQLAddressesByCityAndCountry_QuestionMark produced non-equal results");
!             }
!         }
! 
!         if(errorMsg.length() > 0) {
!             Assert.fail(errorMsg);
!         }
!         em.close();
!     }
!     
!     public void selectNativeQueryWithPositionalParameterTest() {
!         oracle.toplink.essentials.ejb.cmp3.EntityManager em = (oracle.toplink.essentials.ejb.cmp3.EntityManager) createEntityManager();
!         
!         List results_QuestionMark_Number = null;
!         List results_QuestionMark = null;
!         javax.persistence.Query query;
!         String errorMsg ="";
!         
!         boolean shouldCompareResults = true;
!         try {
!             query = em.createNativeQuery("select * from CMP3_ADDRESS where city=?1", Address.class);
!             query.setParameter(1, "Ottawa");
!     
!             results_QuestionMark_Number = query.getResultList();
!         } catch (Exception e) {
!             errorMsg = errorMsg + "findAllSQLAddressesByCity_QuestionMark_Number: " + e.getMessage() +"\n";
!             shouldCompareResults = false;
!         }
!         try {
!             query = em.createNativeQuery("select * from CMP3_ADDRESS where city=?", Address.class);
!             query.setParameter(1, "Ottawa");
!         
!             results_QuestionMark = query.getResultList();
!         } catch (Exception e) {
!             errorMsg = errorMsg + "findAllSQLAddressesByCity_QuestionMark: " + e.getMessage() +"\n";
!             shouldCompareResults = false;
!         }
!         if(shouldCompareResults) {
!             if(results_QuestionMark_Number.size() != results_QuestionMark.size()) {
!                 errorMsg = errorMsg + ("findAllSQLAddressesByCity_QuestionMark_Number and findAllSQLAddressesByCity_QuestionMark produced non-equal results");
!             }
!         }
!         
!         shouldCompareResults = true;
!         try {
!             query = em.createNativeQuery("select * from CMP3_ADDRESS where city=?1 and country=?2", Address.class);
!             query.setParameter(1, "Ottawa");
!             query.setParameter(2, "Canada");
!         
!             results_QuestionMark_Number = query.getResultList();
!         } catch (Exception e) {
!             errorMsg = errorMsg + "findAllSQLAddressesByCityAndCountry_QuestionMark_Number: " + e.getMessage() +"\n";
!             shouldCompareResults = false;
!         }
!         try {
!             query = em.createNativeQuery("select * from CMP3_ADDRESS where city=? and country=?", Address.class);
!             query.setParameter(1, "Ottawa");
!             query.setParameter(2, "Canada");
!         
!             results_QuestionMark = query.getResultList();
!         } catch (Exception e) {
!             errorMsg = errorMsg + "findAllSQLAddressesByCityAndCountry_QuestionMark: " + e.getMessage();
!             shouldCompareResults = false;
!         }
!         if(shouldCompareResults) {
!             if(results_QuestionMark_Number.size() != results_QuestionMark.size()) {
!                 errorMsg = errorMsg + ("findAllSQLAddressesByCityAndCountry_QuestionMark_Number and findAllSQLAddressesByCityAndCountry_QuestionMark produced non-equal results");
!             }
!         }
! 
!         if(errorMsg.length() > 0) {
!             Assert.fail(errorMsg);
!         }
!         em.close();
      }
      
    public static void main(String[] args)
================================================================================
Merge Diffs: /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/EntityManagerImpl.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf928_060821/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.39
Report generated at Mon Aug 21 16:26:41 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf928_060821/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.39	Mon Aug 21 15:28:23 2006
--- /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/EntityManagerImpl.java	Mon Aug 21 16:21:59 2006
***************
*** 446,451 ****
--- 446,452 ----
          verifyOpen();
          ReadAllQuery query = new ReadAllQuery(resultType);
          query.setSQLString(sqlString);
+         query.setIsUserDefined(true);
          return query;
      }
       
================================================================================
Merge Diffs: /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/EntityManagerImpl.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf928_060821/ade_storage/000005/AB0952363AC40CBFE034080020E8C54E.15
Report generated at Mon Aug 21 16:26:41 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf928_060821/ade_storage/000005/AB0952363AC40CBFE034080020E8C54E.15	Mon Aug 21 15:32:08 2006
--- /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/EntityManagerImpl.java	Mon Aug 21 16:21:59 2006
***************
*** 225,230 ****
--- 225,231 ----
          ResultSetMappingQuery query = new ResultSetMappingQuery();
          query.setSQLResultSetMappingName(resultSetMapping);
          query.setSQLString(sqlString);
+         query.setIsUserDefined(true);
          return new EJBQueryImpl(query, this);
      }