================================================================================
Merge Diffs: /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/EJBQueryImpl.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf928_060817/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.44
Report generated at Thu Aug 17 12:36:08 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf928_060817/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.44 Thu Aug 17 11:04:55 2006
--- /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/EJBQueryImpl.java Thu Aug 17 12:36:08 2006
***************
*** 108,113 ****
--- 108,114 ----
if (getDatabaseQuery().isDataReadQuery()){
DataModifyQuery query = new DataModifyQuery();
query.setSQLString(databaseQuery.getSQLString());
+ query.setIsUserDefined(databaseQuery.isUserDefined());
query.setFlushOnExecute(databaseQuery.getFlushOnExecute());
databaseQuery = query;
}
***************
*** 121,126 ****
--- 122,128 ----
DataReadQuery query = new DataReadQuery();
query.setUseAbstractRecord(false);
query.setSQLString(databaseQuery.getSQLString());
+ query.setIsUserDefined(databaseQuery.isUserDefined());
query.setFlushOnExecute(databaseQuery.getFlushOnExecute());
databaseQuery = query;
}
***************
*** 246,251 ****
--- 248,254 ----
public static DatabaseQuery buildSQLDatabaseQuery(Class resultClass, String sqlString, HashMap hints) {
ReadAllQuery query = new ReadAllQuery(resultClass);
query.setSQLString(sqlString);
+ query.setIsUserDefined(true);
// apply any query hints
applyHints(hints, query);
***************
*** 277,282 ****
--- 280,286 ----
ResultSetMappingQuery query = new ResultSetMappingQuery();
query.setSQLResultSetMappingName(sqlResultSetMappingName);
query.setSQLString(sqlString);
+ query.setIsUserDefined(true);
// apply any query hints
applyHints(hints, query);
***************
*** 298,303 ****
--- 302,308 ----
DataReadQuery query = new DataReadQuery();
query.setUseAbstractRecord(false);
query.setSQLString(sqlString);
+ query.setIsUserDefined(true);
// apply any query hints
applyHints(hints, query);
================================================================================
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_060817/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.8
Report generated at Thu Aug 17 12:36:08 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf928_060817/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.8 Thu Aug 17 11:41:45 2006
--- /ade/ailitche_toplink_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/models/cmp3/advanced/Address.java Thu Aug 17 12:36:08 2006
***************
*** 37,46 ****
--- 37,54 ----
*/
@Entity
@Table(name="CMP3_ADDRESS")
+ @NamedNativeQueries({
@NamedNativeQuery(
name="findAllSQLAddresses",
query="select * from CMP3_ADDRESS",
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
+ )
+ }
)
@NamedQuery(
name="findAllAddressesByPostalCode",
================================================================================
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_060817/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.30
Report generated at Thu Aug 17 12:36:08 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf928_060817/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.30 Thu Aug 17 11:43:08 2006
--- /ade/ailitche_toplink_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/ejb/ejbqltesting/JUnitEJBQLSimpleTestSuite.java Thu Aug 17 12:36:08 2006
***************
*** 194,199 ****
--- 194,200 ----
suite.addTest(new JUnitEJBQLSimpleTestSuite("selectAverageQueryForByteColumnTest"));
suite.addTest(new JUnitEJBQLSimpleTestSuite("selectUsingLockModeQueryHintTest"));
suite.addTest(new JUnitEJBQLSimpleTestSuite("multipleExecutionOfNamedQueryTest"));
+ suite.addTest(new JUnitEJBQLSimpleTestSuite("selectNamedNativeQueryWithPositionalParameterTest"));
return new TestSetup(suite) {
***************
*** 1875,1881 ****
Assert.assertTrue("Simple select between with parameter test failed", comparer.compareObjects(result, expectedResult));
}
!
public static void main(String[] args)
{
--- 1876,1900 ----
Assert.assertTrue("Simple select between with parameter test failed", comparer.compareObjects(result, expectedResult));
}
!
! 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)
{
================================================================================
Merge Diffs: /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/EJBQueryImpl.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf928_060817/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.44
Report generated at Thu Aug 17 12:36:47 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf928_060817/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.44 Thu Aug 17 11:04:55 2006
--- /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/EJBQueryImpl.java Thu Aug 17 12:36:08 2006
***************
*** 108,113 ****
--- 108,114 ----
if (getDatabaseQuery().isDataReadQuery()){
DataModifyQuery query = new DataModifyQuery();
query.setSQLString(databaseQuery.getSQLString());
+ query.setIsUserDefined(databaseQuery.isUserDefined());
query.setFlushOnExecute(databaseQuery.getFlushOnExecute());
databaseQuery = query;
}
***************
*** 121,126 ****
--- 122,128 ----
DataReadQuery query = new DataReadQuery();
query.setUseAbstractRecord(false);
query.setSQLString(databaseQuery.getSQLString());
+ query.setIsUserDefined(databaseQuery.isUserDefined());
query.setFlushOnExecute(databaseQuery.getFlushOnExecute());
databaseQuery = query;
}
***************
*** 246,251 ****
--- 248,254 ----
public static DatabaseQuery buildSQLDatabaseQuery(Class resultClass, String sqlString, HashMap hints) {
ReadAllQuery query = new ReadAllQuery(resultClass);
query.setSQLString(sqlString);
+ query.setIsUserDefined(true);
// apply any query hints
applyHints(hints, query);
***************
*** 277,282 ****
--- 280,286 ----
ResultSetMappingQuery query = new ResultSetMappingQuery();
query.setSQLResultSetMappingName(sqlResultSetMappingName);
query.setSQLString(sqlString);
+ query.setIsUserDefined(true);
// apply any query hints
applyHints(hints, query);
***************
*** 298,303 ****
--- 302,308 ----
DataReadQuery query = new DataReadQuery();
query.setUseAbstractRecord(false);
query.setSQLString(sqlString);
+ query.setIsUserDefined(true);
// apply any query hints
applyHints(hints, query);
================================================================================
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_060817/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.8
Report generated at Thu Aug 17 12:36:47 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf928_060817/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.8 Thu Aug 17 11:41:45 2006
--- /ade/ailitche_toplink_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/models/cmp3/advanced/Address.java Thu Aug 17 12:36:08 2006
***************
*** 37,46 ****
--- 37,54 ----
*/
@Entity
@Table(name="CMP3_ADDRESS")
+ @NamedNativeQueries({
@NamedNativeQuery(
name="findAllSQLAddresses",
query="select * from CMP3_ADDRESS",
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
+ )
+ }
)
@NamedQuery(
name="findAllAddressesByPostalCode",
================================================================================
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_060817/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.30
Report generated at Thu Aug 17 12:36:47 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf928_060817/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.30 Thu Aug 17 11:43:08 2006
--- /ade/ailitche_toplink_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/ejb/ejbqltesting/JUnitEJBQLSimpleTestSuite.java Thu Aug 17 12:36:08 2006
***************
*** 194,199 ****
--- 194,200 ----
suite.addTest(new JUnitEJBQLSimpleTestSuite("selectAverageQueryForByteColumnTest"));
suite.addTest(new JUnitEJBQLSimpleTestSuite("selectUsingLockModeQueryHintTest"));
suite.addTest(new JUnitEJBQLSimpleTestSuite("multipleExecutionOfNamedQueryTest"));
+ suite.addTest(new JUnitEJBQLSimpleTestSuite("selectNamedNativeQueryWithPositionalParameterTest"));
return new TestSetup(suite) {
***************
*** 1875,1881 ****
Assert.assertTrue("Simple select between with parameter test failed", comparer.compareObjects(result, expectedResult));
}
!
public static void main(String[] args)
{
--- 1876,1900 ----
Assert.assertTrue("Simple select between with parameter test failed", comparer.compareObjects(result, expectedResult));
}
!
! 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)
{