================================================================================ Merge Diffs: /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/platform/database/DB2MainframePlatform.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf803_060705/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.6 Report generated at Wed Jul 5 14:20:39 2006 -------------------------------------------------------------------------------- *** /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/platform/database/DB2MainframePlatform.java Wed Jul 5 14:20:39 2006 --- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf803_060705/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.6 Wed Jul 5 14:09:58 2006 *************** *** 21,30 **** // Copyright (c) 1998, 2006, Oracle. All rights reserved. package oracle.toplink.essentials.platform.database; - import java.io.StringWriter; - import oracle.toplink.essentials.expressions.ExpressionOperator; - import oracle.toplink.essentials.queryframework.ValueReadQuery; /** * Purpose: Provides DB2 Mainframe specific behaviour.

--- 21,27 ---- *************** *** 44,60 **** addOperator(ExpressionOperator.simpleLogicalNoParens(ExpressionOperator.Concat, "CONCAT")); } - - /** - * INTERNAL: - * Build the identity query for native sequencing. - */ - public ValueReadQuery buildSelectQueryForNativeSequence() { - ValueReadQuery selectQuery = new ValueReadQuery(); - StringWriter writer = new StringWriter(); - writer.write("SELECT IDENTITY_VAL_LOCAL() FROM SYSIBM.SYSDUMMY1"); - - selectQuery.setSQLString(writer.toString()); - return selectQuery; - } } --- 41,44 ---- ================================================================================ Merge Diffs: /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/platform/database/DB2MainframePlatform.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf803_060705/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.6 Report generated at Wed Jul 5 14:21:01 2006 -------------------------------------------------------------------------------- *** /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/platform/database/DB2MainframePlatform.java Wed Jul 5 14:20:39 2006 --- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf803_060705/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.6 Wed Jul 5 14:09:58 2006 *************** *** 21,30 **** // Copyright (c) 1998, 2006, Oracle. All rights reserved. package oracle.toplink.essentials.platform.database; - import java.io.StringWriter; - import oracle.toplink.essentials.expressions.ExpressionOperator; - import oracle.toplink.essentials.queryframework.ValueReadQuery; /** * Purpose: Provides DB2 Mainframe specific behaviour.

--- 21,27 ---- *************** *** 44,60 **** addOperator(ExpressionOperator.simpleLogicalNoParens(ExpressionOperator.Concat, "CONCAT")); } - - /** - * INTERNAL: - * Build the identity query for native sequencing. - */ - public ValueReadQuery buildSelectQueryForNativeSequence() { - ValueReadQuery selectQuery = new ValueReadQuery(); - StringWriter writer = new StringWriter(); - writer.write("SELECT IDENTITY_VAL_LOCAL() FROM SYSIBM.SYSDUMMY1"); - - selectQuery.setSQLString(writer.toString()); - return selectQuery; - } } --- 41,44 ----