================================================================================
Merge Diffs: /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/internal/expressions/RelationExpression.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf672_060822/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.12
Report generated at Tue Aug 22 14:47:44 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf672_060822/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.12	Tue Aug 22 14:30:28 2006
--- /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/internal/expressions/RelationExpression.java	Tue Aug 22 14:47:44 2006
***************
*** 382,387 ****
--- 382,392 ----
              if(funcExp.getOperator().isAnyOrAll()) {
                  SubSelectExpression subSelectExp = (SubSelectExpression)funcExp.getChildren().elementAt(1);
                  ReportQuery subQuery = subSelectExp.getSubQuery();
+                 
+                 // some db (derby) require that in EXIST(SELECT...) subquery returns a single column
+                 subQuery.getItems().clear();
+                 subQuery.addItem("one", new ConstantExpression(new Integer(1), subQuery.getExpressionBuilder()));
+                 
                  Expression subSelectCriteria = subQuery.getSelectionCriteria();
                  ExpressionBuilder subBuilder = subQuery.getExpressionBuilder();
  
================================================================================
Merge Diffs: /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/internal/expressions/RelationExpression.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf672_060822/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.12
Report generated at Tue Aug 22 14:48:00 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf672_060822/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.12	Tue Aug 22 14:30:28 2006
--- /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/internal/expressions/RelationExpression.java	Tue Aug 22 14:47:44 2006
***************
*** 382,387 ****
--- 382,392 ----
              if(funcExp.getOperator().isAnyOrAll()) {
                  SubSelectExpression subSelectExp = (SubSelectExpression)funcExp.getChildren().elementAt(1);
                  ReportQuery subQuery = subSelectExp.getSubQuery();
+                 
+                 // some db (derby) require that in EXIST(SELECT...) subquery returns a single column
+                 subQuery.getItems().clear();
+                 subQuery.addItem("one", new ConstantExpression(new Integer(1), subQuery.getExpressionBuilder()));
+                 
                  Expression subSelectCriteria = subQuery.getSelectionCriteria();
                  ExpressionBuilder subBuilder = subQuery.getExpressionBuilder();