openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwsut...@apache.org
Subject svn commit: r447584 [1/8] - in /incubator/openjpa/sandboxes/OPENJPA-24: ./ openjpa-all/ openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/ openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ openjpa-jdbc/src/main/java/org/apache/openjpa/jd...
Date Mon, 18 Sep 2006 21:58:05 GMT
Author: kwsutter
Date: Mon Sep 18 14:57:52 2006
New Revision: 447584

URL: http://svn.apache.org/viewvc?view=rev&rev=447584
Log:
Merged in changes from HEAD (revision through 447569).

Added:
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-all/
      - copied from r447570, incubator/openjpa/trunk/openjpa-all/
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-all/pom.xml
      - copied unchanged from r447570, incubator/openjpa/trunk/openjpa-all/pom.xml
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/BinaryOpExpState.java
      - copied unchanged from r447571, incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/BinaryOpExpState.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ExpContext.java
      - copied unchanged from r447571, incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ExpContext.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ExpState.java
      - copied unchanged from r447571, incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ExpState.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/QueryExpressionsState.java
      - copied unchanged from r447571, incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/QueryExpressionsState.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/package.html
      - copied unchanged from r447574, incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/package.html
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/meta/NonPersistentMetaData.java
      - copied unchanged from r447579, incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/NonPersistentMetaData.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/
      - copied from r447574, incubator/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/EntityL3.java
      - copied unchanged from r447574, incubator/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/EntityL3.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/MappedSuperclassBase.java
      - copied unchanged from r447574, incubator/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/MappedSuperclassBase.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/MappedSuperclassL2.java
      - copied unchanged from r447574, incubator/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/MappedSuperclassL2.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestMultipleMappedSuperclassHierarchy.java
      - copied unchanged from r447574, incubator/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestMultipleMappedSuperclassHierarchy.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/
      - copied from r447574, incubator/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/CascadingOneManyChild.java
      - copied unchanged from r447574, incubator/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/CascadingOneManyChild.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/CascadingOneManyParent.java
      - copied unchanged from r447574, incubator/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/CascadingOneManyParent.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/IFace.java
      - copied unchanged from r447574, incubator/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/IFace.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TargetedIFaceRelationParent.java
      - copied unchanged from r447574, incubator/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TargetedIFaceRelationParent.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestCascadingOneManyWithForeignKey.java
      - copied unchanged from r447574, incubator/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestCascadingOneManyWithForeignKey.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestTargetedIFaceRelations.java
      - copied unchanged from r447574, incubator/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestTargetedIFaceRelations.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/css/
      - copied from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/css/
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/css/docbook.css
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/css/docbook.css
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/
      - copied from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/appid-hierarchy.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/appid-hierarchy.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/basic-coll.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/basic-coll.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/embedded-coll.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/embedded-coll.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/enhancement.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/enhancement.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/entitymanager.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/entitymanager.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/entitymanagerfactory.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/entitymanagerfactory.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/inher-superclass-table.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/inher-superclass-table.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/inher-tpc.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/inher-tpc.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/inv-key-coll.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/inv-key-coll.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/joins-constant.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/joins-constant.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/jpa-arch.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/jpa-arch.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/jpa-assoc-table.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/jpa-assoc-table.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/jpa-basic-field.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/jpa-basic-field.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/jpa-data-model.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/jpa-data-model.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/jpa-direct-relation.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/jpa-direct-relation.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/jpa-discrim-all.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/jpa-discrim-all.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/jpa-embedded.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/jpa-embedded.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/jpa-exceptions.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/jpa-exceptions.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/jpa-inher-all.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/jpa-inher-all.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/jpa-inher-joined.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/jpa-inher-joined.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/jpa-map.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/jpa-map.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/jpa-mapping-identity.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/jpa-mapping-identity.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/jpa-meta-model.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/jpa-meta-model.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/jpa-query.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/jpa-query.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/jpa-state-transitions.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/jpa-state-transitions.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/jpa-transaction.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/jpa-transaction.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/persistence.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/persistence.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/secondary-table.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/secondary-table.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/sqlquery-model.png
      - copied unchanged from r447578, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/sqlquery-model.png
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/img/string-rel-map.png
      - copied unchanged from r447579, incubator/openjpa/trunk/openjpa-project/src/doc/manual/img/string-rel-map.png
Removed:
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerHandlerMapTableFieldStrategy.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/meta/PersistenceAwareClass.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/site/resources/css/
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/site/resources/manual/img/
Modified:
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingFactoryValue.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractUpdateManager.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreQuery.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/OperationOrderUpdateManager.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ProjectionResultObjectProvider.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AbstractVal.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Aggregate.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AndExpression.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Args.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/BindVariableAndExpression.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/BindVariableExpression.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CompareEqualExpression.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CompareExpression.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Concat.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Const.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ConstGetObjectId.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ConstInstanceofExpression.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ConstPath.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ContainsExpression.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ContainsKeyExpression.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Count.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CurrentDate.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Distinct.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/EmptyExpression.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/EndsWithExpression.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/EqualExpression.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Exp.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Extension.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/FilterValueImpl.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GetMapValue.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GetObjectId.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InExpression.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InKeyExpression.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InSubQExpression.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InValueExpression.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/IndexOf.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InstanceofExpression.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/IsEmptyExpression.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/IsNotEmptyExpression.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Lit.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/MatchesExpression.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Math.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NotContainsExpression.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NotEqualExpression.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NotExpression.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Null.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/OrExpression.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Param.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SQLEmbed.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SelectConstructor.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Size.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/StartsWithExpression.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/StringFunction.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/StringLength.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SubQ.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Substring.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ToLowerCase.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ToUpperCase.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Trim.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/UnaryOp.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Val.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Variable.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/DiscriminatorMappingInfo.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingRepository.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ColumnVersionStrategy.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ContainerFieldStrategy.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/IdentityJoinable.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/InValueDiscriminatorStrategy.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationToManyInverseKeyFieldStrategy.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/StateComparisonVersionStrategy.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractResult.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractSQLServerDictionary.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Joins.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/LogicalUnion.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/OracleDictionary.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Select.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/meta/localizer.properties
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/meta/strats/localizer.properties
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/schema/localizer.properties
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/localizer.properties
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/conf/Compatibility.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheStoreManager.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/event/BeanLifecycleCallbacks.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/event/MethodLifecycleCallbacks.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerFactory.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECleanState.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECopyState.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDeletedState.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDirtyState.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ENonTransState.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExpressionStoreQuery.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExtentImpl.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/HollowState.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCleanState.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedFlushedState.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedState.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDirtyState.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewDeletedState.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedFlushedState.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedState.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewState.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDeletedState.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDirtyState.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransNewState.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransState.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SingleFieldManager.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TCleanState.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TDirtyState.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TLoadedState.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TransientState.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/ParseException.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ClassMetaData.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InterfaceImplGenerator.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataDefaults.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/meta/NoneMetaDataFactory.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueMetaDataImpl.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/java/org/apache/openjpa/util/ImplHelper.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/resources/org/apache/openjpa/event/localizer.properties
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/localizer.properties
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-kernel/src/main/resources/org/apache/openjpa/meta/localizer.properties
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-lib/src/test/java/org/apache/openjpa/lib/test/AbstractTestCase.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlan.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPersistence.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Extent.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ExtentImpl.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlan.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlanImpl.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Generator.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/GeneratorImpl.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistence.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderExtension.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryResultCache.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryResultCacheImpl.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCache.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCacheImpl.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/README.txt
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/assembly.xml
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/pom.xml
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_overview_trans.xml
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/jpa_tutorials.xml
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/manual-xhtml-chunk.xsl
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/manual-xhtml.xsl
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/ref_guide_conf.xml
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/ref_guide_integration.xml
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/ref_guide_mapping.xml
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/ref_guide_meta.xml
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/ref_guide_pc.xml
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/ref_guide_remote.xml
    incubator/openjpa/sandboxes/OPENJPA-24/openjpa-project/src/doc/manual/samples_guide.xml
    incubator/openjpa/sandboxes/OPENJPA-24/pom.xml

Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingFactoryValue.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingFactoryValue.java?view=diff&rev=447584&r1=447583&r2=447584
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingFactoryValue.java (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingFactoryValue.java Mon Sep 18 14:57:52 2006
@@ -15,6 +15,7 @@
  */
 package org.apache.openjpa.jdbc.conf;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.openjpa.jdbc.meta.MetaDataPlusMappingFactory;
 import org.apache.openjpa.lib.conf.Configuration;
 import org.apache.openjpa.lib.conf.Configurations;
@@ -89,7 +90,7 @@
         // if no mapping factory set, check for default for this factory
         if (clsName == null || clsName.length() == 0) {
             String def;
-            if (mapping != null) {
+            if (!StringUtils.isEmpty(mapping)) {
                 def = unalias(metaPlugin.alias(metaClsName),
                     _mappedMetaFactoryDefaults, true);
                 if (def != null)

Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractUpdateManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractUpdateManager.java?view=diff&rev=447584&r1=447583&r2=447584
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractUpdateManager.java (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractUpdateManager.java Mon Sep 18 14:57:52 2006
@@ -35,6 +35,7 @@
 import org.apache.openjpa.kernel.PCState;
 import org.apache.openjpa.lib.conf.Configurable;
 import org.apache.openjpa.lib.conf.Configuration;
+import org.apache.openjpa.util.ImplHelper;
 import org.apache.openjpa.util.OpenJPAException;
 import org.apache.openjpa.util.OptimisticException;
 
@@ -139,6 +140,8 @@
         RowManager rowMgr, JDBCStore store, Collection exceps,
         Collection customs) {
         try {
+            BitSet dirty;
+
             if (sm.getPCState() == PCState.PNEW && !sm.isFlushed()) {
                 insert(sm, (ClassMapping) sm.getMetaData(), rowMgr, store,
                     customs);
@@ -146,18 +149,9 @@
                 || sm.getPCState() == PCState.PDELETED) {
                 delete(sm, (ClassMapping) sm.getMetaData(), rowMgr, store,
                     customs);
-            } else if ((sm.getPCState() == PCState.PDIRTY && (!sm.isFlushed() || sm
-                .isFlushedDirty()))
-                || (sm.getPCState() == PCState.PNEW && sm.isFlushedDirty())) {
-                BitSet dirty = sm.getDirty();
-                if (sm.isFlushed()) {
-                    dirty = (BitSet) dirty.clone();
-                    dirty.andNot(sm.getFlushed());
-                }
-
-                if (dirty.length() > 0)
-                    update(sm, dirty, (ClassMapping) sm.getMetaData(), rowMgr,
-                        store, customs);
+            } else if ((dirty = ImplHelper.getUpdateFields(sm)) != null) {
+                update(sm, dirty, (ClassMapping) sm.getMetaData(), rowMgr,
+                    store, customs);
             } else if (sm.isVersionUpdateRequired()) {
                 updateIndicators(sm, (ClassMapping) sm.getMetaData(), rowMgr,
                     store, customs, true);

Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java?view=diff&rev=447584&r1=447583&r2=447584
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java Mon Sep 18 14:57:52 2006
@@ -268,43 +268,43 @@
         Object oid = sm.getObjectId();
         ClassMapping mapping = (ClassMapping) sm.getMetaData();
         Result res = null;
-        if (info != null && info.result != null) {
-            res = info.result;
-            info.sm = sm;
-            if (info.mapping == null)
-                info.mapping = mapping;
-            mapping = info.mapping;
-        } else if (oid instanceof OpenJPAId
-            && !((OpenJPAId) oid).hasSubclasses()) {
-            Boolean custom = customLoad(sm, mapping, state, fetch);
-            if (custom != null)
-                return custom.booleanValue();
-            res = getInitializeStateResult(sm, mapping, fetch,
-                Select.SUBS_EXACT);
-            if (res == null && !selectPrimaryKey(sm, mapping, fetch))
-                return false;
-            if (res != null && !res.next())
-                return false;
-        } else {
-            ClassMapping[] mappings = mapping.
-                getIndependentAssignableMappings();
-            if (mappings.length == 1) {
-                mapping = mappings[0];
+        try {
+            if (info != null && info.result != null) {
+                res = info.result;
+                info.sm = sm;
+                if (info.mapping == null)
+                    info.mapping = mapping;
+                mapping = info.mapping;
+            } else if (oid instanceof OpenJPAId
+                && !((OpenJPAId) oid).hasSubclasses()) {
                 Boolean custom = customLoad(sm, mapping, state, fetch);
                 if (custom != null)
                     return custom.booleanValue();
                 res = getInitializeStateResult(sm, mapping, fetch,
-                    Select.SUBS_ANY_JOINABLE);
+                    Select.SUBS_EXACT);
                 if (res == null && !selectPrimaryKey(sm, mapping, fetch))
                     return false;
-            } else
-                res = getInitializeStateUnionResult(sm, mapping, mappings,
-                    fetch);
-            if (res != null && !res.next())
-                return false;
-        }
+                if (res != null && !res.next())
+                    return false;
+            } else {
+                ClassMapping[] mappings = mapping.
+                    getIndependentAssignableMappings();
+                if (mappings.length == 1) {
+                    mapping = mappings[0];
+                    Boolean custom = customLoad(sm, mapping, state, fetch);
+                    if (custom != null)
+                        return custom.booleanValue();
+                    res = getInitializeStateResult(sm, mapping, fetch,
+                        Select.SUBS_ANY_JOINABLE);
+                    if (res == null && !selectPrimaryKey(sm, mapping, fetch))
+                        return false;
+                } else
+                    res = getInitializeStateUnionResult(sm, mapping, mappings,
+                        fetch);
+                if (res != null && !res.next())
+                    return false;
+            }
 
-        try {
             // figure out what type of object this is; the state manager
             // only guarantees to provide a base class
             Class type;
@@ -367,7 +367,7 @@
         throws SQLException {
         Select sel = _sql.newSelect();
         if (!select(sel, mapping, subs, sm, null, fetch,
-            JDBCFetchConfiguration.EAGER_JOIN, true))
+            JDBCFetchConfiguration.EAGER_JOIN, true, false))
             return null;
 
         sel.wherePrimaryKey(sm.getObjectId(), mapping, this);
@@ -454,17 +454,17 @@
 
             // if the instance is hollow and there's a customized
             // get by id method, use it
-            if (sm.getLoaded().length() == 0)
-                if (mapping.customLoad(sm, this, null, jfetch))
-                    removeLoadedFields(sm, fields);
+            if (sm.getLoaded().length() == 0 
+                && mapping.customLoad(sm, this, null, jfetch))
+                removeLoadedFields(sm, fields);
 
             //### select is kind of a big object, and in some cases we don't
             //### use it... would it be worth it to have a small shell select
             //### object that only creates a real select when actually used?
 
             Select sel = _sql.newSelect();
-            if (select(sel, mapping, sel.SUBS_EXACT, sm, fields, jfetch,
-                EagerFetchModes.EAGER_JOIN, true)) {
+            if (select(sel, mapping, Select.SUBS_EXACT, sm, fields, jfetch,
+                EagerFetchModes.EAGER_JOIN, true, false)) {
                 sel.wherePrimaryKey(sm.getObjectId(), mapping, this);
                 res = sel.execute(this, jfetch, lockLevel);
                 try {
@@ -854,18 +854,20 @@
      * @param eager eager fetch mode to use
      * @param ident whether to select primary key columns as distinct
      * identifiers
+     * @param outer whether we're outer-joining to this type
      * @return true if the select is required, false otherwise
      */
     public boolean select(Select sel, ClassMapping mapping, int subs,
         OpenJPAStateManager sm, BitSet fields, JDBCFetchConfiguration fetch,
-        int eager, boolean ident) {
+        int eager, boolean ident, boolean outer) {
         // add class conditions so that they're cloned for any batched selects
         boolean joinedSupers = false;
         if ((sm == null || sm.getPCState() == PCState.TRANSIENT)
-            && (subs == sel.SUBS_JOINABLE || subs == sel.SUBS_NONE)) {
+            && (subs == Select.SUBS_JOINABLE || subs == Select.SUBS_NONE)) {
             loadSubclasses(mapping); 
+            Joins joins = (outer) ? sel.newOuterJoins() : null;
             joinedSupers = mapping.getDiscriminator().addClassConditions(sel,
-                subs == sel.SUBS_JOINABLE, null);
+                subs == Select.SUBS_JOINABLE, joins);
         }
 
         // create all our eager selects so that those fields are reserved
@@ -889,7 +891,7 @@
                 fetch.traverseJDBC(eagerToMany), eager);
 
         // optionally select subclass mappings
-        if (subs == sel.SUBS_JOINABLE || subs == sel.SUBS_ANY_JOINABLE)
+        if (subs == Select.SUBS_JOINABLE || subs == Select.SUBS_ANY_JOINABLE)
             selectSubclassMappings(sel, mapping, sm, fetch);
         if (sm != null)
             sel.setDistinct(false);

Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreQuery.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreQuery.java?view=diff&rev=447584&r1=447583&r2=447584
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreQuery.java (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreQuery.java Mon Sep 18 14:57:52 2006
@@ -27,10 +27,12 @@
 import java.util.Map;
 
 import org.apache.openjpa.event.LifecycleEventManager;
+import org.apache.openjpa.jdbc.kernel.exps.ExpContext;
 import org.apache.openjpa.jdbc.kernel.exps.GetColumn;
 import org.apache.openjpa.jdbc.kernel.exps.JDBCExpressionFactory;
 import org.apache.openjpa.jdbc.kernel.exps.JDBCStringContains;
 import org.apache.openjpa.jdbc.kernel.exps.JDBCWildcardMatch;
+import org.apache.openjpa.jdbc.kernel.exps.QueryExpressionsState;
 import org.apache.openjpa.jdbc.kernel.exps.SQLEmbed;
 import org.apache.openjpa.jdbc.kernel.exps.SQLExpression;
 import org.apache.openjpa.jdbc.kernel.exps.SQLValue;
@@ -150,14 +152,19 @@
             ? range.start : 0L;
         long end = (dict.supportsSelectEndIndex) ? range.end : Long.MAX_VALUE;
 
+        QueryExpressionsState[] states = new QueryExpressionsState[exps.length];
+        for (int i = 0; i < states.length; i++)
+            states[i] = new QueryExpressionsState();
+        ExpContext ctx = new ExpContext(_store, params, fetch);
+
         // add selects with populate WHERE conditions to list
         List sels = new ArrayList(mappings.length);
         List selMappings = new ArrayList(mappings.length);
         BitSet subclassBits = new BitSet();
         BitSet nextBits = new BitSet();
         boolean unionable = createWhereSelects(sels, mappings, selMappings,
-            subclasses, subclassBits, nextBits, facts, exps, params,
-            fetch, subclassMode)
+            subclasses, subclassBits, nextBits, facts, exps, states, ctx,
+            subclassMode)
             && subclassMode == JDBCFetchConfiguration.EAGER_JOIN
             && start == 0
             && end == Long.MAX_VALUE;
@@ -174,9 +181,9 @@
             Union union = _store.getSQLFactory().newUnion(
                 (Select[]) sels.toArray(new Select[sels.size()]));
             BitSet[] paged = populateUnion(union, mappings, subclasses, facts,
-                exps, params, fetch, lrs, eager, start, end);
+                exps, states, ctx, lrs, eager, start, end);
             union.setLRS(lrs);
-            rop = executeUnion(union, mappings, exps, paged, fetch);
+            rop = executeUnion(union, mappings, exps, states, ctx, paged);
         } else {
             if (sels.size() > 1)
                 rops = new ResultObjectProvider[sels.size()];
@@ -187,10 +194,10 @@
                 sel = (Select) sels.get(i);
                 paged = populateSelect(sel, (ClassMapping) selMappings.get(i),
                     subclassBits.get(i), (JDBCExpressionFactory) facts[idx],
-                    exps[idx], params, fetch, lrs, eager, start, end);
+                    exps[idx], states[idx], ctx, lrs, eager, start, end);
 
                 rop = executeSelect(sel, (ClassMapping) selMappings.get(i),
-                    exps[idx], paged, fetch, start, end);
+                    exps[idx], states[idx], ctx, paged, start, end);
                 if (rops != null)
                     rops[i] = rop;
 
@@ -220,16 +227,16 @@
      */
     private BitSet[] populateUnion(Union union, final ClassMapping[] mappings,
         final boolean subclasses, final ExpressionFactory[] facts,
-        final QueryExpressions[] exps, final Object[] params,
-        final JDBCFetchConfiguration fetch, final boolean lrs, final int eager,
+        final QueryExpressions[] exps, final QueryExpressionsState[] states,
+        final ExpContext ctx, final boolean lrs, final int eager,
         final long start, final long end) {
         final BitSet[] paged = (exps[0].projections.length > 0) ? null
             : new BitSet[mappings.length];
         union.select(new Union.Selector() {
             public void select(Select sel, int idx) {
                 BitSet bits = populateSelect(sel, mappings[idx], subclasses,
-                    (JDBCExpressionFactory) facts[idx], exps[idx], params,
-                    fetch, lrs, eager, start, end);
+                    (JDBCExpressionFactory) facts[idx], exps[idx], states[idx],
+                    ctx,  lrs, eager, start, end);
                 if (paged != null)
                     paged[idx] = bits;
             }
@@ -242,7 +249,7 @@
      */
     private BitSet populateSelect(Select sel, ClassMapping mapping,
         boolean subclasses, JDBCExpressionFactory fact, QueryExpressions exps,
-        Object[] params, JDBCFetchConfiguration fetch, boolean lrs, int eager,
+        QueryExpressionsState state, ExpContext ctx, boolean lrs, int eager,
         long start, long end) {
         sel.setLRS(lrs);
         sel.setRange(start, end);
@@ -250,13 +257,13 @@
         BitSet paged = null;
         if (exps.projections.length == 0) {
             paged = PagingResultObjectProvider.getPagedFields(sel, mapping,
-                _store, fetch, eager, end - start);
+                _store, ctx.fetch, eager, end - start);
             if (paged != null)
                 eager = JDBCFetchConfiguration.EAGER_JOIN;
         }
 
-        fact.select(this, mapping, subclasses, sel, exps, params, fetch,
-            eager);
+        fact.getSelectConstructor().select(sel, ctx, mapping, subclasses, exps,
+            state, eager);
         return paged;
     }
 
@@ -264,34 +271,34 @@
      * Execute the given union.
      */
     private ResultObjectProvider executeUnion(Union union,
-        ClassMapping[] mappings, QueryExpressions[] exps, BitSet[] paged,
-        JDBCFetchConfiguration fetch) {
+        ClassMapping[] mappings, QueryExpressions[] exps, 
+        QueryExpressionsState[] states, ExpContext ctx, BitSet[] paged) {
         if (exps[0].projections.length > 0)
-            return new ProjectionResultObjectProvider(union, _store,
-                fetch, exps);
+            return new ProjectionResultObjectProvider(union, exps, states, ctx);
 
         if (paged != null)
             for (int i = 0; i < paged.length; i++)
                 if (paged[i] != null)
                     return new PagingResultObjectProvider(union, mappings,
-                        _store, fetch, paged, Long.MAX_VALUE);
+                        _store, ctx.fetch, paged, Long.MAX_VALUE);
 
         return new InstanceResultObjectProvider(union, mappings[0], _store,
-            fetch);
+            ctx.fetch);
     }
 
     /**
      * Execute the given select.
      */
-    private ResultObjectProvider executeSelect(Select sel,
-        ClassMapping mapping, QueryExpressions exps, BitSet paged,
-        JDBCFetchConfiguration fetch, long start, long end) {
+    private ResultObjectProvider executeSelect(Select sel, ClassMapping mapping,
+        QueryExpressions exps, QueryExpressionsState state, ExpContext ctx, 
+        BitSet paged, long start, long end) {
         if (exps.projections.length > 0)
-            return new ProjectionResultObjectProvider(sel, _store, fetch, exps);
+            return new ProjectionResultObjectProvider(sel, exps, state, ctx);
         if (paged != null)
-            return new PagingResultObjectProvider(sel, mapping, _store, fetch, 
-                paged, end - start);
-        return new InstanceResultObjectProvider(sel, mapping, _store, fetch);
+            return new PagingResultObjectProvider(sel, mapping, _store, 
+                ctx.fetch, paged, end - start);
+        return new InstanceResultObjectProvider(sel, mapping, _store, 
+            ctx.fetch);
     }
 
     /**
@@ -301,10 +308,10 @@
     private boolean createWhereSelects(List sels, ClassMapping[] mappings,
         List selMappings, boolean subclasses, BitSet subclassBits,
         BitSet nextBits, ExpressionFactory[] facts, QueryExpressions[] exps,
-        Object[] params, JDBCFetchConfiguration fetch, int subclassMode) {
-        Select sel;
+        QueryExpressionsState[] states, ExpContext ctx, int subclassMode) {
         ClassMapping[] verts;
         boolean unionable = true;
+        Select sel;
         for (int i = 0; i < mappings.length; i++) {
             // determine vertical mappings to select separately
             verts = getVerticalMappings(mappings[i], subclasses, exps[i],
@@ -313,8 +320,8 @@
                 subclassBits.set(sels.size());
 
             // create criteria select and clone for each vert mapping
-            sel = ((JDBCExpressionFactory) facts[i]).evaluate(this, fetch,
-                exps[i], params);
+            sel = ((JDBCExpressionFactory) facts[i]).getSelectConstructor().
+                evaluate(ctx, null, null, exps[i], states[i]);
             for (int j = 0; j < verts.length; j++) {
                 selMappings.add(verts[j]);
                 if (j == verts.length - 1) {
@@ -437,16 +444,22 @@
 
         JDBCFetchConfiguration fetch = (JDBCFetchConfiguration) 
             ctx.getFetchConfiguration();
+        ExpContext ctx = new ExpContext(_store, params, fetch);
         DBDictionary dict = _store.getDBDictionary();
+        QueryExpressionsState[] state = new QueryExpressionsState[exps.length];
+        for (int i = 0; i < state.length; i++)
+            state[i] = new QueryExpressionsState();
 
         SQLBuffer[] sql = new SQLBuffer[mappings.length];
         JDBCExpressionFactory jdbcFactory;
         Select sel;
         for (int i = 0; i < mappings.length; i++) {
             jdbcFactory = (JDBCExpressionFactory) facts[i];
-            sel = jdbcFactory.evaluate(this, fetch, exps[i], params);
-            jdbcFactory.select(this, mappings[i], subclasses, sel, exps[i],
-                params, fetch, JDBCFetchConfiguration.EAGER_NONE);
+            sel = jdbcFactory.getSelectConstructor().evaluate(ctx, null, null,
+                exps[i], state[i]);
+            jdbcFactory.getSelectConstructor().select(sel, ctx, mappings[i], 
+                subclasses, exps[i], state[i], 
+                JDBCFetchConfiguration.EAGER_NONE);
 
             // specification of the "udpates" map indicates that this is
             // an update query; otherwise, this is a delete statement
@@ -465,7 +478,7 @@
         }
 
         // we need to make sure we have an active store connection
-        ctx.getStoreContext().beginStore();
+        _store.getContext().beginStore();
 
         Connection conn = _store.getConnection();
         long count = 0;
@@ -582,13 +595,18 @@
             ? range.start : 0L;
         long end = (dict.supportsSelectEndIndex) ? range.end : Long.MAX_VALUE;
 
+        QueryExpressionsState[] states = new QueryExpressionsState[exps.length];
+        for (int i = 0; i < states.length; i++)
+            states[i] = new QueryExpressionsState();
+        ExpContext ctx = new ExpContext(_store, params, fetch);
+
         // add selects with populate WHERE conditions to list
         List sels = new ArrayList(mappings.length);
         List selMappings = new ArrayList(mappings.length);
         BitSet subclassBits = new BitSet();
         BitSet nextBits = new BitSet();
         boolean unionable = createWhereSelects(sels, mappings, selMappings,
-            subclasses, subclassBits, nextBits, facts, exps, params, fetch, 
+            subclasses, subclassBits, nextBits, facts, exps, states, ctx, 
             subclassMode) && subclassMode == JDBCFetchConfiguration.EAGER_JOIN;
         if (sels.size() > 1)
             start = 0L;
@@ -596,8 +614,8 @@
         if (unionable) {
             Union union = _store.getSQLFactory().newUnion(
                 (Select[]) sels.toArray(new Select[sels.size()]));
-            populateUnion(union, mappings, subclasses, facts, exps, params,
-                fetch, false, eager, start, end);
+            populateUnion(union, mappings, subclasses, facts, exps, states, ctx,
+                false, eager, start, end);
             if (union.isUnion())
                 return new String[] {union.toSelect(false, fetch).getSQL(true)};
             sels = Arrays.asList(union.getSelects());
@@ -607,7 +625,7 @@
                 sel = (Select) sels.get(i);
                 populateSelect(sel, (ClassMapping) selMappings.get(i),
                     subclassBits.get(i), (JDBCExpressionFactory) facts[idx],
-                    exps[idx], params, fetch, false, eager, start, end);
+                    exps[idx], states[idx], ctx, false, eager, start, end);
                 if (nextBits.get(i))
                     idx++;
             }

Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/OperationOrderUpdateManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/OperationOrderUpdateManager.java?view=diff&rev=447584&r1=447583&r2=447584
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/OperationOrderUpdateManager.java (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/OperationOrderUpdateManager.java Mon Sep 18 14:57:52 2006
@@ -133,8 +133,9 @@
                 || rel.getIndex() >= row.getIndex())
                 continue;
 
-            // create an update to null the offending fk before deleting
-            update = new RowImpl(row.getTable(), Row.ACTION_UPDATE);
+            // create an update to null the offending fk before deleting.  use
+            // a primary row to be sure to copy delayed-flush pks/fks
+            update = new PrimaryRow(row.getTable(), Row.ACTION_UPDATE, null);
             row.copyInto(update, true);
             update.setForeignKey(fks[i], row.getForeignKeyIO(fks[i]), null);
             if (updates == null)

Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ProjectionResultObjectProvider.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ProjectionResultObjectProvider.java?view=diff&rev=447584&r1=447583&r2=447584
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ProjectionResultObjectProvider.java (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ProjectionResultObjectProvider.java Mon Sep 18 14:57:52 2006
@@ -15,6 +15,8 @@
  */
 package org.apache.openjpa.jdbc.kernel;
 
+import org.apache.openjpa.jdbc.kernel.exps.ExpContext;
+import org.apache.openjpa.jdbc.kernel.exps.QueryExpressionsState;
 import org.apache.openjpa.jdbc.kernel.exps.Val;
 import org.apache.openjpa.jdbc.sql.Result;
 import org.apache.openjpa.jdbc.sql.SelectExecutor;
@@ -29,32 +31,37 @@
     extends SelectResultObjectProvider {
 
     private final QueryExpressions[] _exps;
+    private final QueryExpressionsState[] _state;
+    private final ExpContext _ctx;
 
     /**
      * Constructor.
      *
      * @param sel the select to execute
-     * @param store the store manager to delegate loading to
-     * @param fetch the fetch configuration
      * @param exps the query expressions
+     * @param states the query expression states
+     * @param ctx the query execution context
      */
-    public ProjectionResultObjectProvider(SelectExecutor sel, JDBCStore store,
-        JDBCFetchConfiguration fetch, QueryExpressions exps) {
-        this(sel, store, fetch, new QueryExpressions[]{ exps });
+    public ProjectionResultObjectProvider(SelectExecutor sel, 
+        QueryExpressions exps, QueryExpressionsState state, ExpContext ctx) {
+        this(sel, new QueryExpressions[]{ exps }, 
+            new QueryExpressionsState[]{ state }, ctx);
     }
 
     /**
      * Constructor.
      *
      * @param sel the select to execute
-     * @param store the store manager to delegate loading to
-     * @param fetch the fetch configuration
      * @param exps the query expressions
+     * @param states the query expression states
+     * @param ctx the query execution context
      */
-    public ProjectionResultObjectProvider(SelectExecutor sel, JDBCStore store,
-        JDBCFetchConfiguration fetch, QueryExpressions[] exps) {
-        super(sel, store, fetch);
+    public ProjectionResultObjectProvider(SelectExecutor sel, 
+        QueryExpressions[] exps, QueryExpressionsState[] state, ExpContext ctx){
+        super(sel, ctx.store, ctx.fetch);
         _exps = exps;
+        _state = state;
+        _ctx = ctx;
     }
 
     public Object getResultObject()
@@ -63,8 +70,8 @@
         int idx = res.indexOf();
         Object[] arr = new Object[_exps[idx].projections.length];
         for (int i = 0; i < _exps[idx].projections.length; i++)
-            arr[i] = ((Val) _exps[idx].projections[i]).load(res, getStore(),
-                getFetchConfiguration());
+            arr[i] = ((Val) _exps[idx].projections[i]).load(_ctx, 
+                _state[idx].projections[i], res);
         return arr;
     }
 }

Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AbstractVal.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AbstractVal.java?view=diff&rev=447584&r1=447583&r2=447584
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AbstractVal.java (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AbstractVal.java Mon Sep 18 14:57:52 2006
@@ -15,8 +15,6 @@
  */
 package org.apache.openjpa.jdbc.kernel.exps;
 
-import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
-import org.apache.openjpa.jdbc.kernel.JDBCStore;
 import org.apache.openjpa.jdbc.sql.SQLBuffer;
 import org.apache.openjpa.jdbc.sql.Select;
 import org.apache.openjpa.kernel.exps.ExpressionVisitor;
@@ -40,30 +38,35 @@
         return false;
     }
 
-    public void appendIsEmpty(SQLBuffer sql, Select sel, JDBCStore store,
-        Object[] params, JDBCFetchConfiguration fetch) {
+    public Object toDataStoreValue(Select sel, ExpContext ctx, ExpState state, 
+        Object val) {
+        return val;
+    }
+
+    public void appendIsEmpty(Select sel, ExpContext ctx, ExpState state, 
+        SQLBuffer sql) {
         sql.append(FALSE);
     }
 
-    public void appendIsNotEmpty(SQLBuffer sql, Select sel, JDBCStore store,
-        Object[] params, JDBCFetchConfiguration fetch) {
+    public void appendIsNotEmpty(Select sel, ExpContext ctx, ExpState state, 
+        SQLBuffer sql){
         sql.append(TRUE);
     }
 
-    public void appendIsNull(SQLBuffer sql, Select sel,
-        JDBCStore store, Object[] params, JDBCFetchConfiguration fetch) {
-        appendTo(sql, 0, sel, store, params, fetch);
+    public void appendIsNull(Select sel, ExpContext ctx, ExpState state, 
+        SQLBuffer sql) {
+        appendTo(sel, ctx, state, sql, 0);
         sql.append(" IS ").appendValue(null);
     }
 
-    public void appendIsNotNull(SQLBuffer sql, Select sel,
-        JDBCStore store, Object[] params, JDBCFetchConfiguration fetch) {
-        appendTo(sql, 0, sel, store, params, fetch);
+    public void appendIsNotNull(Select sel, ExpContext ctx, ExpState state, 
+        SQLBuffer sql) {
+        appendTo(sel, ctx, state, sql, 0);
         sql.append(" IS NOT ").appendValue(null);
     }
 
-    public void appendSize(SQLBuffer sql, Select sel, JDBCStore store,
-        Object[] params, JDBCFetchConfiguration fetch) {
+    public void appendSize(Select sel, ExpContext ctx, ExpState state, 
+        SQLBuffer sql) {
         sql.append("1");
     }
 

Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Aggregate.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Aggregate.java?view=diff&rev=447584&r1=447583&r2=447584
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Aggregate.java (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Aggregate.java Mon Sep 18 14:57:52 2006
@@ -17,11 +17,8 @@
 
 import java.sql.SQLException;
 
-import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
-import org.apache.openjpa.jdbc.kernel.JDBCStore;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.meta.JavaSQLTypes;
-import org.apache.openjpa.jdbc.sql.Joins;
 import org.apache.openjpa.jdbc.sql.Result;
 import org.apache.openjpa.jdbc.sql.SQLBuffer;
 import org.apache.openjpa.jdbc.sql.Select;
@@ -40,7 +37,6 @@
     private final JDBCAggregateListener _listener;
     private final Val _arg;
     private final ClassMapping _candidate;
-    private Joins _joins = null;
     private ClassMetaData _meta = null;
     private Class _cast = null;
 
@@ -84,103 +80,77 @@
         _cast = type;
     }
 
-    public void initialize(Select sel, JDBCStore store, boolean nullTest) {
+    public ExpState initialize(Select sel, ExpContext ctx, int flags) {
+        if (_arg == null)
+            return ExpState.NULL;
+
         // note that we tell targets and args to extensions that are sql
         // paths to go ahead and join to their related object (if any),
         // because we assume that, unlike most operations, if a relation
         // field like a 1-1 is given as the target of an extension, then
         // the extension probably acts on some field or column in the
         // related object, not the 1-1 field itself
-        if (_arg != null) {
-            _arg.initialize(sel, store, false);
-            if (_arg instanceof PCPath)
-                ((PCPath) _arg).joinRelation();
-            _joins = _arg.getJoins();
-        }
-    }
-
-    public Joins getJoins() {
-        return _joins;
-    }
-
-    public Object toDataStoreValue(Object val, JDBCStore store) {
-        return val;
+        return _arg.initialize(sel, ctx, JOIN_REL);
     }
 
-    public void select(Select sel, JDBCStore store, Object[] params,
-        boolean pks, JDBCFetchConfiguration fetch) {
-        sel.select(newSQLBuffer(sel, store, params, fetch), this);
+    public void select(Select sel, ExpContext ctx, ExpState state, 
+        boolean pks) {
+        sel.select(newSQLBuffer(sel, ctx, state), this);
         sel.setAggregate(true);
     }
 
-    public void selectColumns(Select sel, JDBCStore store, Object[] params,
-        boolean pks, JDBCFetchConfiguration fetch) {
+    public void selectColumns(Select sel, ExpContext ctx, ExpState state, 
+        boolean pks) {
         if (_arg != null)
-            _arg.selectColumns(sel, store, params, true, fetch);
+            _arg.selectColumns(sel, ctx, state, true);
     }
 
-    public void groupBy(Select sel, JDBCStore store, Object[] params,
-        JDBCFetchConfiguration fetch) {
-        sel.groupBy(newSQLBuffer(sel, store, params, fetch));
+    public void groupBy(Select sel, ExpContext ctx, ExpState state) {
+        sel.groupBy(newSQLBuffer(sel, ctx, state));
     }
 
-    public void orderBy(Select sel, JDBCStore store, Object[] params,
-        boolean asc, JDBCFetchConfiguration fetch) {
-        sel.orderBy(newSQLBuffer(sel, store, params, fetch), asc, false);
+    public void orderBy(Select sel, ExpContext ctx, ExpState state, 
+        boolean asc) {
+        sel.orderBy(newSQLBuffer(sel, ctx, state), asc, false);
     }
 
-    private SQLBuffer newSQLBuffer(Select sel, JDBCStore store,
-        Object[] params, JDBCFetchConfiguration fetch) {
-        calculateValue(sel, store, params, null, fetch);
-        SQLBuffer buf = new SQLBuffer(store.getDBDictionary());
-        appendTo(buf, 0, sel, store, params, fetch);
-        clearParameters();
+    private SQLBuffer newSQLBuffer(Select sel, ExpContext ctx, ExpState state) {
+        calculateValue(sel, ctx, state, null, null);
+        SQLBuffer buf = new SQLBuffer(ctx.store.getDBDictionary());
+        appendTo(sel, ctx, state, buf, 0);
         return buf;
     }
 
-    public Object load(Result res, JDBCStore store,
-        JDBCFetchConfiguration fetch)
+    public Object load(ExpContext ctx, ExpState state, Result res)
         throws SQLException {
-        return Filters.convert(res.getObject(this,
-            JavaSQLTypes.JDBC_DEFAULT, null), getType());
+        return Filters.convert(res.getObject(this, JavaSQLTypes.JDBC_DEFAULT, 
+            null), getType());
     }
 
-    public void calculateValue(Select sel, JDBCStore store,
-        Object[] params, Val other, JDBCFetchConfiguration fetch) {
+    public void calculateValue(Select sel, ExpContext ctx, ExpState state, 
+        Val other, ExpState otherState) {
         if (_arg != null)
-            _arg.calculateValue(sel, store, params, null, fetch);
+            _arg.calculateValue(sel, ctx, state, null, null);
     }
 
-    public void clearParameters() {
-        if (_arg != null)
-            _arg.clearParameters();
-    }
-
-    public int length() {
+    public int length(Select sel, ExpContext ctx, ExpState state) {
         return 1;
     }
 
-    public void appendTo(SQLBuffer sql, int index, Select sel, JDBCStore store,
-        Object[] params, JDBCFetchConfiguration fetch) {
-        _listener.appendTo(sql, getArgs(sel, store, params, fetch),
-            _candidate, store);
-        sel.append(sql, _joins);
+    public void appendTo(Select sel, ExpContext ctx, ExpState state, 
+        SQLBuffer sql, int index) {
+        _listener.appendTo(sql, getArgs(sel, ctx, state), _candidate, 
+            ctx.store);
+        sel.append(sql, state.joins);
     }
 
-    private FilterValue[] getArgs(Select sel, JDBCStore store,
-        Object[] params, JDBCFetchConfiguration fetch) {
+    private FilterValue[] getArgs(Select sel, ExpContext ctx, ExpState state) {
         if (_arg == null)
             return null;
-        if (_arg instanceof Args) {
-            Val[] vals = ((Args) _arg).getVals();
-            FilterValue[] filts = new FilterValue[vals.length];
-            for (int i = 0; i < vals.length; i++)
-                filts[i] = new FilterValueImpl(vals[i], sel, store, params,
-                    fetch);
-            return filts;
-        }
+        if (_arg instanceof Args)
+            return ((Args) _arg).newFilterValues(sel, ctx, state);
         return new FilterValue[]{
-            new FilterValueImpl(_arg, sel, store, params, fetch)
+            new FilterValueImpl(sel, ctx, state, _arg)
         };
     }
 

Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AndExpression.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AndExpression.java?view=diff&rev=447584&r1=447583&r2=447584
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AndExpression.java (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AndExpression.java Mon Sep 18 14:57:52 2006
@@ -17,9 +17,6 @@
 
 import java.util.Map;
 
-import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
-import org.apache.openjpa.jdbc.kernel.JDBCStore;
-import org.apache.openjpa.jdbc.sql.Joins;
 import org.apache.openjpa.jdbc.sql.SQLBuffer;
 import org.apache.openjpa.jdbc.sql.Select;
 import org.apache.openjpa.kernel.exps.ExpressionVisitor;
@@ -34,9 +31,6 @@
 
     private final Exp _exp1;
     private final Exp _exp2;
-    private Joins _joins = null;
-    private boolean _paren1 = false;
-    private boolean _paren2 = false;
 
     /**
      * Constructor. Supply the expressions to combine.
@@ -46,40 +40,36 @@
         _exp2 = exp2;
     }
 
-    public void initialize(Select sel, JDBCStore store,
-        Object[] params, Map contains) {
-        _exp1.initialize(sel, store, params, contains);
-        _exp2.initialize(sel, store, params, contains);
-        _joins = sel.and(_exp1.getJoins(), _exp2.getJoins());
-
-        _paren1 = _exp1 instanceof OrExpression;
-        _paren2 = _exp2 instanceof OrExpression;
+    public ExpState initialize(Select sel, ExpContext ctx, Map contains) {
+        ExpState s1 = _exp1.initialize(sel, ctx, contains);
+        ExpState s2 = _exp2.initialize(sel, ctx, contains);
+        return new BinaryOpExpState(sel.and(s1.joins, s2.joins), s1, s2);
     }
 
-    public void appendTo(SQLBuffer buf, Select sel, JDBCStore store,
-        Object[] params, JDBCFetchConfiguration fetch) {
-        if (_paren1)
+    public void appendTo(Select sel, ExpContext ctx, ExpState state, 
+        SQLBuffer buf) {
+        BinaryOpExpState bstate = (BinaryOpExpState) state;
+        boolean paren1 = _exp1 instanceof OrExpression;
+        boolean paren2 = _exp2 instanceof OrExpression;
+        if (paren1)
             buf.append("(");
-        _exp1.appendTo(buf, sel, store, params, fetch);
-        if (_paren1)
+        _exp1.appendTo(sel, ctx, bstate.state1, buf);
+        if (paren1)
             buf.append(")");
         buf.append(" AND ");
-        if (_paren2)
+        if (paren2)
             buf.append("(");
-        _exp2.appendTo(buf, sel, store, params, fetch);
-        if (_paren2)
+        _exp2.appendTo(sel, ctx, bstate.state2, buf);
+        if (paren2)
             buf.append(")");
-        sel.append(buf, _joins);
-    }
-
-    public void selectColumns(Select sel, JDBCStore store,
-        Object[] params, boolean pks, JDBCFetchConfiguration fetch) {
-        _exp1.selectColumns(sel, store, params, pks, fetch);
-        _exp2.selectColumns(sel, store, params, pks, fetch);
+        sel.append(buf, state.joins);
     }
 
-    public Joins getJoins() {
-        return _joins;
+    public void selectColumns(Select sel, ExpContext ctx, ExpState state, 
+        boolean pks) {
+        BinaryOpExpState bstate = (BinaryOpExpState) state;
+        _exp1.selectColumns(sel, ctx, bstate.state1, pks);
+        _exp2.selectColumns(sel, ctx, bstate.state2, pks);
     }
 
     public void acceptVisit(ExpressionVisitor visitor) {

Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Args.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Args.java?view=diff&rev=447584&r1=447583&r2=447584
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Args.java (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Args.java Mon Sep 18 14:57:52 2006
@@ -15,8 +15,6 @@
  */
 package org.apache.openjpa.jdbc.kernel.exps;
 
-import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
-import org.apache.openjpa.jdbc.kernel.JDBCStore;
 import org.apache.openjpa.jdbc.sql.Joins;
 import org.apache.openjpa.jdbc.sql.Result;
 import org.apache.openjpa.jdbc.sql.SQLBuffer;
@@ -36,7 +34,6 @@
     implements Arguments {
 
     private final Val[] _args;
-    private Joins _joins = null;
     private ClassMetaData _meta = null;
 
     /**
@@ -57,6 +54,19 @@
             _args[len1] = val2;
     }
 
+    /**
+     * Return a filter value for each argument.
+     */
+    public FilterValue[] newFilterValues(Select sel, ExpContext ctx, 
+        ExpState state) {
+        ArgsExpState astate = (ArgsExpState) state; 
+        FilterValue[] filts = new FilterValue[_args.length];
+        for (int i = 0; i < _args.length; i++)
+            filts[i] = new FilterValueImpl(sel, ctx, astate.states[i], 
+                _args[i]); 
+        return filts;
+    }
+
     public Value[] getValues() {
         return _args;
     }
@@ -91,84 +101,88 @@
     public void setImplicitType(Class type) {
     }
 
-    public void initialize(Select sel, JDBCStore store, boolean nullTest) {
+    public ExpState initialize(Select sel, ExpContext ctx, int flags) {
+        ExpState[] states = new ExpState[_args.length];
+        Joins joins = null;
         for (int i = 0; i < _args.length; i++) {
-            _args[i].initialize(sel, store, nullTest);
-            if (_joins == null)
-                _joins = _args[i].getJoins();
+            states[i] = _args[i].initialize(sel, ctx, flags);
+            if (joins == null)
+                joins = states[i].joins;
             else
-                _joins = sel.and(_joins, _args[i].getJoins());
+                joins = sel.and(joins, states[i].joins);
         }
+        return new ArgsExpState(joins, states);
     }
 
-    public Joins getJoins() {
-        return _joins;
-    }
-
-    public Object toDataStoreValue(Object val, JDBCStore store) {
-        return val;
+    /**
+     * Expression state.
+     */
+    private static class ArgsExpState
+        extends ExpState {
+        
+        public ExpState[] states;
+
+        public ArgsExpState(Joins joins, ExpState[] states) {
+            super(joins);
+            this.states = states;
+        }
     }
 
-    public void select(Select sel, JDBCStore store, Object[] params,
-        boolean pks, JDBCFetchConfiguration fetch) {
+    public void select(Select sel, ExpContext ctx, ExpState state, 
+        boolean pks) {
     }
 
-    public void selectColumns(Select sel, JDBCStore store,
-        Object[] params, boolean pks, JDBCFetchConfiguration fetch) {
+    public void selectColumns(Select sel, ExpContext ctx, ExpState state, 
+        boolean pks) {
+        ArgsExpState astate = (ArgsExpState) state;
         for (int i = 0; i < _args.length; i++)
-            _args[i].selectColumns(sel, store, params, pks, fetch);
+            _args[i].selectColumns(sel, ctx, astate.states[i], pks);
     }
 
-    public void groupBy(Select sel, JDBCStore store, Object[] params,
-        JDBCFetchConfiguration fetch) {
+    public void groupBy(Select sel, ExpContext ctx, ExpState state) {
     }
 
-    public void orderBy(Select sel, JDBCStore store, Object[] params,
-        boolean asc, JDBCFetchConfiguration fetch) {
+    public void orderBy(Select sel, ExpContext ctx, ExpState state, 
+        boolean asc) {
     }
 
-    public Object load(Result res, JDBCStore store,
-        JDBCFetchConfiguration fetch) {
+    public Object load(ExpContext ctx, ExpState state, Result res) {
         return null;
     }
 
-    public void calculateValue(Select sel, JDBCStore store,
-        Object[] params, Val other, JDBCFetchConfiguration fetch) {
-        for (int i = 0; i < _args.length; i++)
-            _args[i].calculateValue(sel, store, params, null, fetch);
-    }
-
-    public void clearParameters() {
+    public void calculateValue(Select sel, ExpContext ctx, ExpState state, 
+        Val other, ExpState otherState) {
+        ArgsExpState astate = (ArgsExpState) state;
         for (int i = 0; i < _args.length; i++)
-            _args[i].clearParameters();
+            _args[i].calculateValue(sel, ctx, astate.states[i], null, null);
     }
 
-    public int length() {
+    public int length(Select sel, ExpContext ctx, ExpState state) {
         return 0;
     }
 
-    public void appendTo(SQLBuffer sql, int index, Select sel,
-        JDBCStore store, Object[] params, JDBCFetchConfiguration fetch) {
+    public void appendTo(Select sel, ExpContext ctx, ExpState state, 
+        SQLBuffer sql, int index) {
     }
 
-    public void appendIsEmpty(SQLBuffer sql, Select sel,
-        JDBCStore store, Object[] params, JDBCFetchConfiguration fetch) {
+    public void appendIsEmpty(Select sel, ExpContext ctx, ExpState state, 
+        SQLBuffer sql) {
     }
 
-    public void appendIsNotEmpty(SQLBuffer sql, Select sel,
-        JDBCStore store, Object[] params, JDBCFetchConfiguration fetch) {
+    public void appendIsNotEmpty(Select sel, ExpContext ctx, ExpState state, 
+        SQLBuffer sql){
     }
 
-    public void appendSize(SQLBuffer sql, Select sel, JDBCStore store,
-        Object[] params, JDBCFetchConfiguration fetch) {
+    public void appendSize(Select sel, ExpContext ctx, ExpState state, 
+        SQLBuffer sql) {
     }
 
-    public void appendIsNull(SQLBuffer sql, Select sel,
-        JDBCStore store, Object[] params, JDBCFetchConfiguration fetch) {
+    public void appendIsNull(Select sel, ExpContext ctx, ExpState state, 
+        SQLBuffer sql) {
     }
 
-    public void appendIsNotNull(SQLBuffer sql, Select sel,
-        JDBCStore store, Object[] params, JDBCFetchConfiguration fetch) {
+    public void appendIsNotNull(Select sel, ExpContext ctx, ExpState state, 
+        SQLBuffer sql) {
     }
 
     public void acceptVisit(ExpressionVisitor visitor) {

Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/BindVariableAndExpression.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/BindVariableAndExpression.java?view=diff&rev=447584&r1=447583&r2=447584
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/BindVariableAndExpression.java (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/BindVariableAndExpression.java Mon Sep 18 14:57:52 2006
@@ -17,9 +17,6 @@
 
 import java.util.Map;
 
-import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
-import org.apache.openjpa.jdbc.kernel.JDBCStore;
-import org.apache.openjpa.jdbc.sql.Joins;
 import org.apache.openjpa.jdbc.sql.SQLBuffer;
 import org.apache.openjpa.jdbc.sql.Select;
 import org.apache.openjpa.kernel.exps.ExpressionVisitor;
@@ -34,7 +31,6 @@
 
     private final BindVariableExpression _bind;
     private final Exp _exp;
-    private Joins _joins = null;
 
     /**
      * Constructor. Supply the two combined expressions.
@@ -44,30 +40,25 @@
         _exp = exp;
     }
 
-    public void initialize(Select sel, JDBCStore store,
-        Object[] params, Map contains) {
-        _bind.initialize(sel, store, params, contains);
-        _exp.initialize(sel, store, params, contains);
-        _joins = sel.and(_bind.getJoins(), _exp.getJoins());
+    public ExpState initialize(Select sel, ExpContext ctx, Map contains) {
+        ExpState s1 = _bind.initialize(sel, ctx, contains);
+        ExpState s2 = _exp.initialize(sel, ctx, contains);
+        return new BinaryOpExpState(sel.and(s1.joins, s2.joins), s1, s2);
     }
 
-    public void appendTo(SQLBuffer buf, Select sel, JDBCStore store,
-        Object[] params, JDBCFetchConfiguration fetch) {
+    public void appendTo(Select sel, ExpContext ctx, ExpState state, 
+        SQLBuffer buf) {
         boolean or = _exp instanceof OrExpression;
         if (or)
             buf.append("(");
-        _exp.appendTo(buf, sel, store, params, fetch);
+        _exp.appendTo(sel, ctx, ((BinaryOpExpState) state).state2, buf);
         if (or)
             buf.append(")");
     }
 
-    public void selectColumns(Select sel, JDBCStore store,
-        Object[] params, boolean pks, JDBCFetchConfiguration fetch) {
-        _exp.selectColumns(sel, store, params, pks, fetch);
-    }
-
-    public Joins getJoins() {
-        return _joins;
+    public void selectColumns(Select sel, ExpContext ctx, ExpState state, 
+        boolean pks) {
+        _exp.selectColumns(sel, ctx, ((BinaryOpExpState) state).state2, pks);
     }
 
     public void acceptVisit(ExpressionVisitor visitor) {

Modified: incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/BindVariableExpression.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/BindVariableExpression.java?view=diff&rev=447584&r1=447583&r2=447584
==============================================================================
--- incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/BindVariableExpression.java (original)
+++ incubator/openjpa/sandboxes/OPENJPA-24/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/BindVariableExpression.java Mon Sep 18 14:57:52 2006
@@ -17,9 +17,6 @@
 
 import java.util.Map;
 
-import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
-import org.apache.openjpa.jdbc.kernel.JDBCStore;
-import org.apache.openjpa.jdbc.sql.Joins;
 import org.apache.openjpa.jdbc.sql.SQLBuffer;
 import org.apache.openjpa.jdbc.sql.Select;
 import org.apache.openjpa.kernel.exps.ExpressionVisitor;
@@ -54,22 +51,17 @@
         return _var;
     }
 
-    public void initialize(Select sel, JDBCStore store,
-        Object[] params, Map contains) {
-        _var.initialize(sel, store, false);
+    public ExpState initialize(Select sel, ExpContext ctx, Map contains) {
+        return _var.initialize(sel, ctx, 0);
     }
 
-    public void appendTo(SQLBuffer buf, Select sel, JDBCStore store,
-        Object[] params, JDBCFetchConfiguration fetch) {
+    public void appendTo(Select sel, ExpContext ctx, ExpState state, 
+        SQLBuffer buf) {
         buf.append("1 = 1");
     }
 
-    public void selectColumns(Select sel, JDBCStore store,
-        Object[] params, boolean pks, JDBCFetchConfiguration fetch) {
-    }
-
-    public Joins getJoins() {
-        return _var.getJoins();
+    public void selectColumns(Select sel, ExpContext ctx, ExpState state, 
+        boolean pks) {
     }
 
     public void acceptVisit(ExpressionVisitor visitor) {



Mime
View raw message