DataNucleus

Revision: 3793
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=3793&view=rev
Author:   andy_jefferson
Date:     2008-11-07 09:29:12 +0000 (Fri, 07 Nov 2008)

Log Message:
-----------
[NUCRDBMS-79] Move some methods up to DatastoreField

Modified Paths:
--------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DatastoreField.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/Column.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnImpl.java

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DatastoreField.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DatastoreField.java	2008-11-07 09:17:15 UTC (rev 3792)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DatastoreField.java	2008-11-07 09:29:12 UTC (rev 3793)
@@ -37,18 +37,24 @@
     MappedStoreManager getStoreManager();
 
     /**
+     * Accessor for the type of data stored in this field.
+     * @return The type of data in the field.
+     */
+    String getStoredJavaType();
+
+    /**
+     * Mutator for the identifier of the column.
+     * @param identifier The identifier
+     */
+    void setIdentifier(DatastoreIdentifier identifier);
+
+    /**
      * Accessor for the identifier for this object.
      * @return The identifier.
      */
     DatastoreIdentifier getIdentifier();
 
     /**
-     * Accessor for the type of data stored in this field.
-     * @return The type of data in the field.
-     */
-    String getStoredJavaType();
-
-    /**
      * Mutator to make the field the primary key.
      */
     void setAsPrimaryKey();
@@ -60,24 +66,79 @@
     boolean isPrimaryKey();
 
     /**
+     * Mutator for the nullability of the datastore field.
+     * @return The datastore field with the updated info
+     */
+    DatastoreField setNullable();
+
+    /**
      * Accessor for whether the field is nullable in the datastore.
      * @return whether the field is nullable
      */
     boolean isNullable();
 
     /**
-     * Accessor for the datastore mapping that this datastore field relates to.
-     * @return The datastore mapping
+     * Mutator for the defaultability of the datastore field.
+     * @return The datastore field with the updated info
      */
-    DatastoreMapping getDatastoreMapping();
+    DatastoreField setDefaultable(); 
 
     /**
+     * Accessor for whether the column is defaultable.
+     * @return whether the column is defaultable
+     */
+    boolean isDefaultable();
+
+    /**
+     * Mutator for the uniqueness of the column.
+     * @return The datastore field with the updated info
+     */
+    DatastoreField setUnique();
+
+    /**
+     * Accessor for whether the column is unique.
+     * @return whether the column is unique
+     */
+    boolean isUnique();
+
+    /**
+     * Mutator for the default Value
+     * @param object default value
+     */
+    void setDefaultValue(Object object);
+
+    /**
+     * Accessor for the default Value
+     * @return the default value
+     */
+    Object getDefaultValue();
+
+    /**
      * Method to associate this datastore field with its mapping.
      * @param mapping The mapping for this datastore field
      */
     void setDatastoreMapping(DatastoreMapping mapping);
 
     /**
+     * Accessor for the datastore mapping that this datastore field relates to.
+     * @return The datastore mapping
+     */
+    DatastoreMapping getDatastoreMapping();
+
+    /**
+     * Method to set the MetaData for this datastore field.
+     * Should only be called before completion of initialisation.
+     * @param md The MetaData
+     */
+    void setColumnMetaData(ColumnMetaData md);
+
+    /**
+     * Access the metadata definition defining this DatastoreField.
+     * @return the MetaData
+     */
+    ColumnMetaData getColumnMetaData();
+
+    /**
      * Accessor for the Mapping for this field.
      * @return The Mapping
      */
@@ -102,39 +163,8 @@
      * @param col the datastore field
      */
 	void copyConfigurationTo(DatastoreField col);
-	
-    /**
-     * Mutator for the nullability of the datastore field.
-     * @return The datastore field with the updated info
-     */
-    DatastoreField setNullable();
-    
-    /**
-     * Mutator for the defaultability of the datastore field.
-     * @return The datastore field with the updated info
-     */
-    DatastoreField setDefaultable(); 
 
     /**
-     * Mutator for the identifier of the column.
-     * @param identifier The identifier
-     */
-    void setIdentifier(DatastoreIdentifier identifier);
-
-    /**
-     * Access the metadata definition defining this DatastoreField.
-     * @return the MetaData
-     */
-    ColumnMetaData getColumnMetaData();
-
-    /**
-     * Method to set the MetaData for this datastore field.
-     * Should only be called before completion of initialisation.
-     * @param md The MetaData
-     */
-    void setColumnMetaData(ColumnMetaData md);
-
-    /**
      * Accessor for the MetaData of the field/property that this is the datastore field for.
      * @return MetaData of the field/property (if representing a field/property of a class).
      */

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/Column.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/Column.java	2008-11-07 09:17:15 UTC (rev 3792)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/Column.java	2008-11-07 09:29:12 UTC (rev 3793)
@@ -43,6 +43,13 @@
     boolean isUnlimitedLength();
 
     /**
+     * Mutator for the type information of the column.
+     * @param typeInfo The type info
+     * @return The column with the updated info
+     */
+    Column setTypeInfo(SQLTypeInfo typeInfo);
+
+    /**
      * Accessor for the type info for this column.
      * @return The type info
      */
@@ -76,13 +83,6 @@
     void validate(RDBMSColumnInfo ci);
 
     /**
-     * Mutator for the type information of the column.
-     * @param typeInfo The type info
-     * @return The column with the updated info
-     */
-    Column setTypeInfo(SQLTypeInfo typeInfo);
-
-    /**
      * Mutator for the constraints of the column.
      *
      * @param constraints The constraints
@@ -91,54 +91,23 @@
     Column setConstraints(String constraints);
 
     /**
-     * Mutator for the uniqueness of the column.
-     * @return The column with the updated info
-     **/
-    Column setUnique();
+     * @return Returns the constraints.
+     */
+    String getConstraints();
 
     /**
      * Accessor for whether the column has exact precision.
      * @return whether the column has exact precision
-     **/
+     */
     boolean isExactPrecision();
 
     /**
-     * Accessor for whether the column is defaultable.
-     * @return whether the column is defaultable
-     **/
-    boolean isDefaultable();
-
-    /**
-     * Accessor for whether the column is unique.
-     * @return whether the column is unique
-     **/
-    boolean isUnique();
-
-    /**
-     * Equality method.
-     * @param obj The Object to compare against
-     * @return Whether they are considered equal.
+     * Mutator for whether we set this column as autoIncrement/identity.
+     * @param auto_increment True if column is autoincrement/identity
      */
-    boolean equals(Object obj);
+    void setAutoIncrement(boolean auto_increment);
 
     /**
-     * Accessor for the default Value
-     * @return the default value
-     */
-    Object getDefaultValue();
-
-    /**
-     * Mutator for the default Value
-     * @param object default value
-     */
-    void setDefaultValue(Object object);
-
-    /**
-     * @return Returns the constraints.
-     */
-    String getConstraints();
-
-    /**
      * Accessor for the AutoIncrement. Either set in the metadata, or retrieved
      * from the DatabaseMetadata when validated
      * @return true if column is autoincrement
@@ -146,12 +115,6 @@
     boolean isAutoIncrement();
 
     /**
-     * Mutator for whether we set this column as autoIncrement/identity.
-     * @param auto_increment True if column is autoincrement/identity
-     */
-    void setAutoIncrement(boolean auto_increment);
-
-    /**
      * Checks the column definition as a primitive.
      * @throws DatastoreFieldDefinitionException
      */

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnImpl.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnImpl.java	2008-11-07 09:17:15 UTC (rev 3792)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnImpl.java	2008-11-07 09:29:12 UTC (rev 3793)
@@ -655,9 +655,9 @@
     }
 
     /* (non-Javadoc)
-     * @see org.datanucleus.store.rdbms.table.Column#setUnique()
+     * @see org.datanucleus.store.mapped.DatastoreField#setUnique()
      */
-    public final Column setUnique()
+    public final DatastoreField setUnique()
     {
         flags |= UNIQUE;
         return this;
@@ -680,7 +680,7 @@
     }
 
     /* (non-Javadoc)
-     * @see org.datanucleus.store.rdbms.table.Column#isNullable()
+     * @see org.datanucleus.store.mapped.DatastoreField#isNullable()
      */
     public final boolean isNullable()
     {
@@ -688,7 +688,7 @@
     }
 
     /* (non-Javadoc)
-     * @see org.datanucleus.store.rdbms.table.Column#isDefaultable()
+     * @see org.datanucleus.store.mapped.DatastoreField#isDefaultable()
      */
     public final boolean isDefaultable()
     {
@@ -696,16 +696,13 @@
     }
 
     /* (non-Javadoc)
-     * @see org.datanucleus.store.rdbms.table.Column#isUnique()
+     * @see org.datanucleus.store.mapped.DatastoreField#isUnique()
      */
     public final boolean isUnique()
     {
         return ((flags & UNIQUE) != 0);
     }
 
-    /* (non-Javadoc)
-     * @see org.datanucleus.store.rdbms.table.Column#equals(java.lang.Object)
-     */
     public boolean equals(Object obj)
     {
        if (obj == this)
@@ -722,17 +719,11 @@
         return table.equals(col.table) && identifier.equals(col.identifier);
     }
 
-    /* (non-Javadoc)
-     * @see org.datanucleus.store.rdbms.table.Column#hashCode()
-     */
     public int hashCode()
     {
         return table.hashCode() ^ identifier.hashCode();
     }
 
-    /* (non-Javadoc)
-     * @see org.datanucleus.store.rdbms.table.Column#toString()
-     */
     public String toString()
     {
         return table.toString() + "." + identifier;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3794
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=3794&view=rev
Author:   andy_jefferson
Date:     2008-11-07 09:30:51 +0000 (Fri, 07 Nov 2008)

Log Message:
-----------
[NUCRDBMS-79] Method rename for consistency

Modified Paths:
--------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DatastoreField.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/AbstractClassTable.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/AbstractTable.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnImpl.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/TableImpl.java

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DatastoreField.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DatastoreField.java	2008-11-07 09:29:12 UTC (rev 3793)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DatastoreField.java	2008-11-07 09:30:51 UTC (rev 3794)
@@ -139,10 +139,10 @@
     ColumnMetaData getColumnMetaData();
 
     /**
-     * Accessor for the Mapping for this field.
-     * @return The Mapping
+     * Accessor for the JavaTypeMapping for the field/property that owns this column.
+     * @return The JavaTypeMapping
      */
-    JavaTypeMapping getMapping();
+    JavaTypeMapping getJavaTypeMapping();
     
     /**
      * Accessor for the DatastoreContainerObject container of this field

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/AbstractClassTable.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/AbstractClassTable.java	2008-11-07 09:29:12 UTC (rev 3793)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/AbstractClassTable.java	2008-11-07 09:30:51 UTC (rev 3794)
@@ -221,7 +221,7 @@
                 DatastoreField refColumn = mapping.getDataStoreMapping(j).getDatastoreField();
                 if (mapping instanceof PersistenceCapableMapping)
                 {
-                    m = storeMgr.getMapping(clr.classForName(refColumn.getMapping().getType()));
+                    m = storeMgr.getMapping(clr.classForName(refColumn.getJavaTypeMapping().getType()));
                     ((PersistenceCapableMapping)masterMapping).addJavaTypeMapping(m);
                 }
 
@@ -267,7 +267,7 @@
 
                 // Set the column type based on the field.getType()
                 getStoreManager().getMappingManager().createDatastoreMapping(m, storeMgr, idColumn,
-                    refColumn.getMapping().getType());
+                    refColumn.getJavaTypeMapping().getType());
             }
 
             // Update highest field number if this is higher

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/AbstractTable.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/AbstractTable.java	2008-11-07 09:29:12 UTC (rev 3793)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/AbstractTable.java	2008-11-07 09:30:51 UTC (rev 3794)
@@ -272,8 +272,8 @@
 
             // Make sure the field JavaTypeMappings are compatible
             if (mapping != null &&
-                !mapping.getClass().isAssignableFrom(existingCol.getMapping().getClass()) &&
-                !existingCol.getMapping().getClass().isAssignableFrom(mapping.getClass())) 
+                !mapping.getClass().isAssignableFrom(existingCol.getJavaTypeMapping().getClass()) &&
+                !existingCol.getJavaTypeMapping().getClass().isAssignableFrom(mapping.getClass())) 
             {
                 // the mapping class must be the same (not really required, but to avoid user mistakes)
                 throw new DuplicateColumnNameException(this.toString(), existingCol, col);

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnImpl.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnImpl.java	2008-11-07 09:29:12 UTC (rev 3793)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnImpl.java	2008-11-07 09:30:51 UTC (rev 3794)
@@ -222,7 +222,7 @@
     /* (non-Javadoc)
      * @see org.datanucleus.store.rdbms.table.Column#getMapping()
      */
-    public JavaTypeMapping getMapping()
+    public JavaTypeMapping getJavaTypeMapping()
     {
         return datastoreMapping.getJavaTypeMapping();
     }

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/TableImpl.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/TableImpl.java	2008-11-07 09:29:12 UTC (rev 3793)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/TableImpl.java	2008-11-07 09:30:51 UTC (rev 3794)
@@ -896,11 +896,11 @@
                     DatastoreClass referencedTable = storeMgr.getDatastoreClass(col.getStoredJavaType(), clr);
                     if (referencedTable != null)
                     {
-                        for (int j = 0; j < col.getMapping().getNumberOfDatastoreFields(); j++)
+                        for (int j = 0; j < col.getJavaTypeMapping().getNumberOfDatastoreFields(); j++)
                         {
-                            colsInFKs.add(col.getMapping().getDataStoreMapping(j).getDatastoreField());
+                            colsInFKs.add(col.getJavaTypeMapping().getDataStoreMapping(j).getDatastoreField());
                         }
-                        ForeignKey fk = new ForeignKey(col.getMapping(), dba, referencedTable, true);
+                        ForeignKey fk = new ForeignKey(col.getJavaTypeMapping(), dba, referencedTable, true);
                         foreignKeys.add(fk);
                     }
                 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3825
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=3825&view=rev
Author:   andy_jefferson
Date:     2008-11-08 11:06:34 +0000 (Sat, 08 Nov 2008)

Log Message:
-----------
[NUCRDBMS-79] Move some more methods to DatastoreField

Modified Paths:
--------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DatastoreField.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/RDBMSMappingManager.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/InsertRequest.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/AbstractClassTable.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ClassTable.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/Column.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnImpl.java

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DatastoreField.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DatastoreField.java	2008-11-08 10:25:40 UTC (rev 3824)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DatastoreField.java	2008-11-08 11:06:34 UTC (rev 3825)
@@ -24,7 +24,7 @@
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
 
 /**
- * Representation of a Java field in a datastore.
+ * Representation of a Java field (component) in a datastore.
  * In the case of RDBMS this will be a column.
  * In the case of a file-based structure this may be a file.
  */ 
@@ -102,6 +102,21 @@
     boolean isUnique();
 
     /**
+     * Mutator for whether we set this column as an identity column.
+     * An "identity" column is typically treated differently in the datastore being
+     * given a value by the datastore itself.
+     * In RDBMS this would mean that the column is "AUTO_INCREMENT", "SERIAL" or 
+     * @param identity True if column is identity
+     */
+    DatastoreField setIdentity(boolean identity);
+
+    /**
+     * Accessor for the whether this column is an identity column.
+     * @return true if column is identity.
+     */
+    boolean isIdentity();
+
+    /**
      * Mutator for the default Value
      * @param object default value
      */

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/RDBMSMappingManager.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/RDBMSMappingManager.java	2008-11-08 10:25:40 UTC (rev 3824)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/RDBMSMappingManager.java	2008-11-08 11:06:34 UTC (rev 3825)
@@ -693,7 +693,7 @@
                     !fmd.isPrimaryKey())
                 {
                     // Increment any PK field if we are in base class, and increment any other field
-                    col.setAutoIncrement(true);
+                    col.setIdentity(true);
                 }
             }
         }
@@ -838,7 +838,7 @@
             if ((fmd.isPrimaryKey() && ((DatastoreClass)datastoreContainer).isBaseDatastoreClass()) || !fmd.isPrimaryKey())
             {
                 // Increment any PK field if we are in base class, and increment any other field
-                col.setAutoIncrement(true);
+                col.setIdentity(true);
             }
         }
 

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/InsertRequest.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/InsertRequest.java	2008-11-08 10:25:40 UTC (rev 3824)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/InsertRequest.java	2008-11-08 11:06:34 UTC (rev 3825)
@@ -518,7 +518,7 @@
                 for (int i=0;i<idMapping.getNumberOfDatastoreFields();i++)
                 {
                     Column col = (Column)idMapping.getDataStoreMapping(i).getDatastoreField();
-                    if (col.isAutoIncrement())
+                    if (col.isIdentity())
                     {
                         columnName = col.getIdentifier().toString();
                         break;
@@ -728,7 +728,7 @@
                             // Or we are not datastore attributed.
                             if (table instanceof SecondaryTable ||
                                 (!table.getStoreManager().isStrategyDatastoreAttributed(fmd.getValueStrategy(), false) 
-                                    && !c.isAutoIncrement()) ||
+                                    && !c.isIdentity()) ||
                                 !table.isBaseDatastoreClass())
                             {
                                 if (columnNames.length() > 0)

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/AbstractClassTable.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/AbstractClassTable.java	2008-11-08 10:25:40 UTC (rev 3824)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/AbstractClassTable.java	2008-11-08 11:06:34 UTC (rev 3825)
@@ -375,12 +375,12 @@
             if (this instanceof DatastoreClass && ((DatastoreClass)this).isBaseDatastoreClass())
             {
                 // Only the base class can be autoincremented
-                idColumn.setAutoIncrement(true);
+                idColumn.setIdentity(true);
             }
         }
 
         // Check if auto-increment and that it is supported by this RDBMS
-        if (idColumn.isAutoIncrement() && !dba.supportsOption(DatastoreAdapter.IDENTITY_COLUMNS))
+        if (idColumn.isIdentity() && !dba.supportsOption(DatastoreAdapter.IDENTITY_COLUMNS))
         {
             throw new NucleusException(LOCALISER.msg("057020", 
                 cmd.getFullClassName(), "datastore-identity")).setFatal();

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ClassTable.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ClassTable.java	2008-11-08 10:25:40 UTC (rev 3824)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ClassTable.java	2008-11-08 11:06:34 UTC (rev 3825)
@@ -1442,7 +1442,7 @@
         for (int i=0; i<columns.size(); i++)
         {
             Column col = columns.get(i);
-            if (col.isPrimaryKey() && col.isAutoIncrement())
+            if (col.isPrimaryKey() && col.isIdentity())
             {
                 return true;
             }

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/Column.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/Column.java	2008-11-08 10:25:40 UTC (rev 3824)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/Column.java	2008-11-08 11:06:34 UTC (rev 3825)
@@ -64,7 +64,7 @@
     /**
      * Accessor for the SQL definition of this column.
      * @return The SQL definition of the column
-     **/
+     */
     String getSQLDefinition();
 
     /**
@@ -84,10 +84,9 @@
 
     /**
      * Mutator for the constraints of the column.
-     *
      * @param constraints The constraints
      * @return The column with the updated info
-     **/
+     */
     Column setConstraints(String constraints);
 
     /**
@@ -96,19 +95,6 @@
     String getConstraints();
 
     /**
-     * Mutator for whether we set this column as autoIncrement/identity.
-     * @param auto_increment True if column is autoincrement/identity
-     */
-    Column setAutoIncrement(boolean auto_increment);
-
-    /**
-     * Accessor for the AutoIncrement. Either set in the metadata, or retrieved
-     * from the DatabaseMetadata when validated
-     * @return true if column is autoincrement
-     */
-    boolean isAutoIncrement();
-
-    /**
      * Checks the column definition as a primitive.
      * @throws DatastoreFieldDefinitionException
      */

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnImpl.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnImpl.java	2008-11-08 10:25:40 UTC (rev 3824)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnImpl.java	2008-11-08 11:06:34 UTC (rev 3825)
@@ -61,7 +61,7 @@
 
 /**
  * Implementation of a Column in an RDBMS datastore. 
- * Contains the full definition of the column, its type, size, whether it is autoincrement, 
+ * Contains the full definition of the column, its type, size, whether it is identity, 
  * nullable, part of the PK etc. The SQL column definition is generated here.
  */ 
 public class ColumnImpl implements Column
@@ -74,7 +74,7 @@
     private static final byte NULLABLE = (byte) (1<<1); // Column can store nulls?
     private static final byte UNIQUE = (byte) (1<<2); // Values are unique?
     private static final byte DEFAULTABLE = (byte) (1<<3); // Defaultable column on inserts?
-    private static final byte AUTOINCREMENT = (byte) (1<<4); // Auto-incrementing?
+    private static final byte IDENTITY = (byte) (1<<4); // AUTO_INCREMENT, SERIAL etc?
 
     /** Identifier for the column in the datastore. */
     protected DatastoreIdentifier identifier;
@@ -301,7 +301,7 @@
 
         // Add type specification.
         boolean specifyType = true;
-        if (adapter.supportsOption(DatastoreAdapter.IDENTITY_COLUMNS) && isAutoIncrement() &&
+        if (adapter.supportsOption(DatastoreAdapter.IDENTITY_COLUMNS) && isIdentity() &&
             !adapter.supportsOption(RDBMSAdapter.AUTO_INCREMENT_COLUMN_TYPE_SPECIFICATION))
         {
             specifyType = false;
@@ -382,7 +382,7 @@
         }
 
         // Nullability
-        if (adapter.supportsOption(DatastoreAdapter.IDENTITY_COLUMNS) && isAutoIncrement() &&
+        if (adapter.supportsOption(DatastoreAdapter.IDENTITY_COLUMNS) && isIdentity() &&
             !adapter.supportsOption(RDBMSAdapter.AUTO_INCREMENT_KEYS_NULL_SPECIFICATION))
         {
             // Do nothing since the adapter doesn't allow NULL specifications with autoincrement/identity
@@ -421,7 +421,7 @@
         }
 
         // Auto Increment
-        if (adapter.supportsOption(DatastoreAdapter.IDENTITY_COLUMNS) && isAutoIncrement())
+        if (adapter.supportsOption(DatastoreAdapter.IDENTITY_COLUMNS) && isIdentity())
         {
             def.append(" " + adapter.getAutoIncrementKeyword());
         }
@@ -496,7 +496,7 @@
         // TODO Make sure that this lines up with the defaultValue when set.
         try
         {
-            setAutoIncrement(getStoreManager().getDatastoreAdapter().isIdentityFieldDataType(ci.getColumnDef()));
+            setIdentity(getStoreManager().getDatastoreAdapter().isIdentityFieldDataType(ci.getColumnDef()));
         }
         catch( UnsupportedOperationException ex)
         {
@@ -591,10 +591,10 @@
             
             try
             {
-                if (isAutoIncrement() != getStoreManager().getDatastoreAdapter().isIdentityFieldDataType(ci.getColumnDef()))
+                if (isIdentity() != getStoreManager().getDatastoreAdapter().isIdentityFieldDataType(ci.getColumnDef()))
                 {
                     //TODO localise
-                    if (isAutoIncrement())
+                    if (isIdentity())
                     {
                         throw new NucleusException("Expected an auto increment column ("+getIdentifier()+
                             ") in the database, but it is not").setFatal();
@@ -672,17 +672,17 @@
     }
 
     /* (non-Javadoc)
-     * @see org.datanucleus.store.rdbms.table.Column#setAutoIncrement(boolean)
+     * @see org.datanucleus.store.mapped.DatastoreField#setIdentity(boolean)
      */
-    public Column setAutoIncrement(boolean auto_increment)
+    public DatastoreField setIdentity(boolean identity)
     {
-        if (auto_increment)
+        if (identity)
         {
-            flags |= AUTOINCREMENT;
+            flags |= IDENTITY;
         }
         else
         {
-            flags &= ~AUTOINCREMENT;
+            flags &= ~IDENTITY;
         }
         return this;
     }
@@ -720,11 +720,11 @@
     }
 
     /* (non-Javadoc)
-     * @see org.datanucleus.store.rdbms.table.Column#isAutoIncrement()
+     * @see org.datanucleus.store.mapped.DatastoreField#isIdentity()
      */
-    public boolean isAutoIncrement()
+    public boolean isIdentity()
     {
-        return ((flags & AUTOINCREMENT) != 0);
+        return ((flags & IDENTITY) != 0);
     }
 
     /* (non-Javadoc)
@@ -883,7 +883,7 @@
         col.flags &= ~PK;
         col.flags &= ~UNIQUE;
         col.flags &= ~NULLABLE;
-        col.flags &= ~AUTOINCREMENT;
+        col.flags &= ~IDENTITY;
         col.flags &= ~DEFAULTABLE;
         col.defaultValue = this.defaultValue;
         col.wrapperFunction = this.wrapperFunction;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3950
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=3950&view=rev
Author:   andy_jefferson
Date:     2008-11-15 15:15:44 +0000 (Sat, 15 Nov 2008)

Log Message:
-----------
[NUCRDBMS-79] Factor more mapping methods out of DatastoreAdapter and onto MappedStoreManager. Add storeMgr to MappingManager to avoid many method arg of MappedStoreManager

Modified Paths:
--------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DatastoreAdapter.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/AbstractMappingManager.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/DiscriminatorMapping.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/EmbeddedMapping.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/MappingManager.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/PersistenceCapableMapping.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/ReferenceMapping.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/SerialisedElementPCMapping.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/SerialisedKeyPCMapping.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/SerialisedValuePCMapping.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/SingleFieldMapping.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/SingleFieldMultiMapping.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/VersionMapping.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/adapter/DatabaseAdapter.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/adapter/OracleAdapter.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/RDBMSMappingManager.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleRDBMSMappingManager.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/AbstractClassTable.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ArrayTable.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ClassTable.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ClassView.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/CollectionTable.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnCreator.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/MapTable.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ProbeTable.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/SchemaTable.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/SequenceTable.java

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DatastoreAdapter.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DatastoreAdapter.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DatastoreAdapter.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -83,10 +83,11 @@
     public boolean supportsOption(String option);
 
     /**
-     * Accessor for the Mapping Manager for field mapping management.
+     * Accessor for a Mapping Manager suitable for use with this datastore adapter.
+     * @param storeMgr The StoreManager
      * @return The Mapping Manager.
      */
-    public abstract MappingManager getMappingManager();
+    public abstract MappingManager getMappingManager(MappedStoreManager storeMgr);
 
     /**
      * Accessor for the Vendor ID for this datastore.

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -102,6 +102,9 @@
     /** TypeManager for mapped information. */
     protected MappedTypeManager mappedTypeMgr = null;
 
+    /** Manager for the mapping between Java and datastore types. */
+    protected MappingManager mappingManager;
+
     /**
      * Map of DatastoreClass keyed by StateManager, for objects currently being inserted.
      * Defines to what level an object is inserted in the datastore.
@@ -225,7 +228,11 @@
      */
     public MappingManager getMappingManager()
     {
-        return dba.getMappingManager();
+        if (mappingManager == null)
+        {
+            mappingManager = dba.getMappingManager(this);
+        }
+        return mappingManager;
     }
 
     /**
@@ -238,7 +245,7 @@
      */
     public JavaTypeMapping getMapping(Class c, boolean serialised, boolean embedded, String fieldName)
     {
-        return getMappingManager().getMapping(c, serialised, embedded, this, fieldName);
+        return getMappingManager().getMapping(c, serialised, embedded, fieldName);
     }
 
     /**
@@ -248,7 +255,7 @@
      */
     public JavaTypeMapping getMapping(Class c)
     {
-        return getMappingManager().getMapping(c, false, false, this, (String)null);
+        return getMappingManager().getMapping(c, false, false, (String)null);
     }
 
     /**
@@ -259,7 +266,7 @@
      */
     public JavaTypeMapping getMapping(Class c, ClassLoaderResolver clr)
     {
-        return getMappingManager().getMapping(c, false, false, this, clr);
+        return getMappingManager().getMapping(c, false, false, clr);
     }
 
     /**
@@ -272,7 +279,7 @@
      */
     public JavaTypeMapping getMapping(Class c, ClassLoaderResolver clr, boolean serialised, boolean embedded)
     {
-        return getMappingManager().getMapping(c, serialised, embedded, this, clr);
+        return getMappingManager().getMapping(c, serialised, embedded, clr);
     }
 
     /**

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/AbstractMappingManager.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/AbstractMappingManager.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/AbstractMappingManager.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -46,14 +46,19 @@
  */
 public abstract class AbstractMappingManager implements MappingManager
 {
-	protected static final Localiser LOCALISER = Localiser.getInstance(
-	    "org.datanucleus.Localisation", ObjectManagerFactoryImpl.class.getClassLoader());
+    protected static final Localiser LOCALISER = Localiser.getInstance(
+        "org.datanucleus.Localisation", ObjectManagerFactoryImpl.class.getClassLoader());
 
+    /** Store Manager that this relates to. */
+    protected final MappedStoreManager storeMgr;
+
     /**
-     * Default constructor.
+     * Constructor for a mapping manager for an ORM datastore.
+     * @param storeMgr The StoreManager
      */
-    public AbstractMappingManager()
+    public AbstractMappingManager(MappedStoreManager storeMgr)
     {
+        this.storeMgr = storeMgr;
     }
 
     /**
@@ -72,14 +77,13 @@
      * @param c Java type
      * @param serialised Whether the type is serialised
      * @param embedded Whether the type is embedded
-     * @param storeMgr Manager for the datastore
      * @param fieldName Name of the field (for logging)
      * @return The mapping for the class.
      */
     public JavaTypeMapping getMapping(Class c, boolean serialised, boolean embedded, 
-            MappedStoreManager storeMgr, String fieldName)
+            String fieldName)
     {
-        Class mc = getMappingClass(c, serialised, embedded, fieldName, storeMgr);
+        Class mc = getMappingClass(c, serialised, embedded, fieldName);
         mc = getOverrideMappingClass(mc, null, -1); // Allow for overriding in subclasses
 
         JavaTypeMapping m = MappingFactory.createMapping(mc, storeMgr.getDatastoreAdapter(), c.getName());
@@ -99,12 +103,10 @@
      * @param c Java type
      * @param serialised Whether the type is serialised
      * @param embedded Whether the type is embedded
-     * @param storeMgr Manager for the store
      * @param clr ClassLoader resolver
      * @return The mapping for the class.
      */
-    public JavaTypeMapping getMapping(Class c, boolean serialised, boolean embedded, MappedStoreManager storeMgr, 
-                                      ClassLoaderResolver clr)
+    public JavaTypeMapping getMapping(Class c, boolean serialised, boolean embedded, ClassLoaderResolver clr)
     {
         JavaTypeMapping m;
         try
@@ -116,7 +118,7 @@
         catch (NoTableManagedException ex)
         {
             // Note that this doesnt allow for whether a field is serialised or embedded so they get the default mapping only
-            Class mc = getMappingClass(c, serialised, embedded, null, storeMgr);
+            Class mc = getMappingClass(c, serialised, embedded, null);
             mc = getOverrideMappingClass(mc, null, -1); // Allow for overriding in subclasses
             m = MappingFactory.createMapping(mc, storeMgr.getDatastoreAdapter(), c.getName());
             if (m == null)
@@ -128,7 +130,7 @@
             }
             if (m instanceof SimpleDatastoreRepresentation)
             {
-                createDatastoreMapping(m, storeMgr, null, m.getJavaTypeForDatastoreMapping(0));
+                createDatastoreMapping(m, null, m.getJavaTypeForDatastoreMapping(0));
             }
         }
         return m;
@@ -192,7 +194,6 @@
         {
             // Assumed to be a normal field
             AbstractClassMetaData acmd = null;
-            MappedStoreManager storeMgr = datastoreContainer.getStoreManager();
             if (fmd.getType().isInterface())
             {
                 acmd = storeMgr.getOMFContext().getMetaDataManager().getMetaDataForInterface(fmd.getType(), clr);
@@ -205,28 +206,28 @@
             if (fmd.isSerialized())
             {
                 // Field is marked as serialised then we have no other option - serialise it
-                mc = getMappingClass(fmd.getType(), true, false, fmd.getFullFieldName(), storeMgr);
+                mc = getMappingClass(fmd.getType(), true, false, fmd.getFullFieldName());
             }
             else if (fmd.getEmbeddedMetaData() != null)
             {
                 // Field has an <embedded> specification so use that
-                mc = getMappingClass(fmd.getType(), false, true, fmd.getFullFieldName(), storeMgr);
+                mc = getMappingClass(fmd.getType(), false, true, fmd.getFullFieldName());
             }
             else if (acmd != null && acmd.isEmbeddedOnly())
             {
                 // If the reference type is declared with embedded only
-                mc = getMappingClass(fmd.getType(), false, true, fmd.getFullFieldName(), storeMgr);
+                mc = getMappingClass(fmd.getType(), false, true, fmd.getFullFieldName());
             }
             else if (fmd.isEmbedded())
             {
                 // Otherwise, if the field is embedded then we request that it be serialised into the owner table
                 // This is particularly for java.lang.Object which should be "embedded" by default, and hence serialised
-                mc = getMappingClass(fmd.getType(), true, false, fmd.getFullFieldName(), storeMgr);
+                mc = getMappingClass(fmd.getType(), true, false, fmd.getFullFieldName());
             }
             else
             {
                 // Just get the basic mapping for the type
-                mc = getMappingClass(fmd.getType(), false, false, fmd.getFullFieldName(), storeMgr);
+                mc = getMappingClass(fmd.getType(), false, false, fmd.getFullFieldName());
             }
         }
         mc = getOverrideMappingClass(mc, fmd, roleForField); // Allow for overriding in subclasses
@@ -262,11 +263,9 @@
      * @param serialised Whether the field is serialised
      * @param embedded Whether the field is embedded
      * @param fieldName The full field name (for logging only)
-     * @param storeMgr Manager of the store
      * @return The mapping class for the class
      **/
-    protected Class getMappingClass(Class c, boolean serialised, boolean embedded, String fieldName, 
-            MappedStoreManager storeMgr)
+    protected Class getMappingClass(Class c, boolean serialised, boolean embedded, String fieldName)
     {
         ApiAdapter api = storeMgr.getApiAdapter();
         if (api.isPersistable(c))
@@ -355,14 +354,14 @@
         }
 
         // Try the default mapping (doesnt allow for serialised setting)
-        Class mappingClass = getDefaultJavaTypeMapping(storeMgr, c);
+        Class mappingClass = getDefaultJavaTypeMapping(c);
         if (mappingClass == null)
         {
             Class superClass = c.getSuperclass();
             while (superClass != null && !superClass.getName().equals(ClassNameConstants.Object) && 
                     mappingClass == null)
             {
-                mappingClass = getDefaultJavaTypeMapping(storeMgr, superClass);
+                mappingClass = getDefaultJavaTypeMapping(superClass);
                 superClass = superClass.getSuperclass();
             }
         }
@@ -381,7 +380,7 @@
                     Class[] interfaces = superClass.getInterfaces();
                     for( int i=0; i<interfaces.length && mappingClass == null; i++)
                     {
-                        mappingClass = getDefaultJavaTypeMapping(storeMgr, interfaces[i]);
+                        mappingClass = getDefaultJavaTypeMapping(interfaces[i]);
                     }
                     superClass = superClass.getSuperclass();
                 }
@@ -500,8 +499,7 @@
             else
             {
                 // Embedded Non-PC type
-                mc = getMappingClass(elementCls, serialised, embedded, fmd.getFullFieldName(), 
-                    container.getStoreManager());
+                mc = getMappingClass(elementCls, serialised, embedded, fmd.getFullFieldName());
             }
         }
         else
@@ -592,8 +590,7 @@
             else
             {
                 // Embedded Non-PC type
-                mc = getMappingClass(keyCls, serialised, embedded, fmd.getFullFieldName(),
-                    container.getStoreManager());
+                mc = getMappingClass(keyCls, serialised, embedded, fmd.getFullFieldName());
             }
         }
         else
@@ -684,15 +681,14 @@
             else
             {
                 // Embedded Non-PC type
-                mc = getMappingClass(valueCls, serialised, embedded, fmd.getFullFieldName(),
-                    container.getStoreManager());
+                mc = getMappingClass(valueCls, serialised, embedded, fmd.getFullFieldName());
             }
         }
         else
         {
             // TODO Allow for other value mappings
             throw new NucleusException("Attempt to get value mapping for field " + fmd.getFullFieldName() + 
-                " when not embedded or serialised - please report this to JPOX developers").setFatal();
+                " when not embedded or serialised - please report this to the developers").setFatal();
         }
 
         return mc;
@@ -701,10 +697,9 @@
     /**
      * Method to return the default java type mapping class for a specified java type.
      * @param javaType java type
-     * @param storeMgr Manager of the store
      * @return The mapping class to use (by default)
      */
-    protected Class getDefaultJavaTypeMapping(MappedStoreManager storeMgr, Class javaType)
+    protected Class getDefaultJavaTypeMapping(Class javaType)
     {
         Class cls = storeMgr.getMappedTypeManager().getMappingType(javaType.getName());        
         if (cls == null)

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/DiscriminatorMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/DiscriminatorMapping.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/DiscriminatorMapping.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -75,8 +75,8 @@
         }
 
         DatastoreField column = datastoreContainer.addDatastoreField(getType(), id, this, dismd.getColumnMetaData());
-        datastoreContainer.getStoreManager().getMappingManager().createDatastoreMapping(delegate, datastoreContainer.getStoreManager(), 
-            column, getType());
+        datastoreContainer.getStoreManager().getMappingManager().createDatastoreMapping(delegate, column, 
+            getType());
     }
 
     /**

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/EmbeddedMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/EmbeddedMapping.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/EmbeddedMapping.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -48,7 +48,7 @@
  * Mapping for an embedded PC object. 
  * The PC object can be embedded directly (1-1 relation) or be the element of 
  * a collection, or be the key or value of a map.
- **/
+ */
 public abstract class EmbeddedMapping extends SingleFieldMapping implements SimpleDatastoreRepresentation
 {
     /** Mappings of the fields of the embedded PC. */
@@ -193,15 +193,16 @@
                     }
 
                     JavaTypeMapping embFmdMapping;
+                    MappingManager mapMgr = datastoreContainer.getStoreManager().getMappingManager();
                     if (embeddedFmd != null)
                     {
                         // User has provided a field definition so map with that
-                        embFmdMapping = dba.getMappingManager().getMapping(datastoreContainer, embeddedFmd, dba, clr, JavaTypeMapping.MAPPING_FIELD);
+                        embFmdMapping = mapMgr.getMapping(datastoreContainer, embeddedFmd, dba, clr, JavaTypeMapping.MAPPING_FIELD);
                     }
                     else
                     {
                         // User hasn't provided a field definition so map with the classes own definition
-                        embFmdMapping = dba.getMappingManager().getMapping(datastoreContainer, pcFmd, dba, clr, JavaTypeMapping.MAPPING_FIELD);
+                        embFmdMapping = mapMgr.getMapping(datastoreContainer, pcFmd, dba, clr, JavaTypeMapping.MAPPING_FIELD);
                     }
 
                     this.addJavaTypeMapping(embFmdMapping);

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/MappingManager.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/MappingManager.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/MappingManager.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -26,14 +26,11 @@
 import org.datanucleus.store.mapped.DatastoreAdapter;
 import org.datanucleus.store.mapped.DatastoreContainerObject;
 import org.datanucleus.store.mapped.DatastoreField;
-import org.datanucleus.store.mapped.MappedStoreManager;
 
 /**
  * Representation of a MappingManager, mapping a java mapping type to a datastore mapping type.
  * Allows a java mapping type to map to multiple datastore mapping types.
  * Allows a default datastore mapping type be assigned to each java mapping type.
- * 
- * @version $Revision: 1.29 $
  */
 public interface MappingManager
 {
@@ -45,6 +42,40 @@
      */
     void loadDatastoreMapping(PluginManager mgr, ClassLoaderResolver clr, String vendorId);
 
+    /**
+     * Utility to register a datastore mapping for a java type, and the SQL/JDBC types it can be mapped to.
+     * This can also be called to change the default setting of a mapping - just supply the same
+     * values of java/JDBC/SQL types and a different default value
+     * @param javaTypeName Name of the java type
+     * @param datastoreMappingType The datastore mapping
+     * @param jdbcType The JDBC type that can be used
+     * @param sqlType The SQL type that can be used
+     * @param dflt Whether this type should be used as the default mapping for this Java type
+     */
+    void registerDatastoreMapping(String javaTypeName, Class datastoreMappingType, String jdbcType, 
+            String sqlType, boolean dflt);
+
+    /**
+     * Method to create the datastore mapping for a java type mapping at a particular index.
+     * @param mapping The java mapping
+     * @param fmd MetaData for the field
+     * @param index Index of the datastore field
+     * @param column The column
+     * @return The datastore mapping
+     */
+    DatastoreMapping createDatastoreMapping(JavaTypeMapping mapping, AbstractMemberMetaData fmd, int index, 
+            DatastoreField column);
+
+    /**
+     * Method to create the datastore mapping for a particular column and java type.
+     * @param mapping The java mapping
+     * @param column The column
+     * @param javaType The java type (isnt this stored in the java mapping ?)
+     * @return The datastore mapping
+     */
+    DatastoreMapping createDatastoreMapping(JavaTypeMapping mapping, DatastoreField column, 
+            String javaType);
+
     // --------------------------------------------- Java Types ---------------------------------------------
 
     /**
@@ -52,24 +83,20 @@
      * @param c The java type
      * @param serialised Whether the type is serialised
      * @param embedded Whether the type is embedded
-     * @param storeMgr Manager for the datastore
      * @param fieldName Name of the field (for logging only)
      * @return The mapping
      */
-    JavaTypeMapping getMapping(Class c, boolean serialised, boolean embedded, MappedStoreManager storeMgr, 
-            String fieldName);
+    JavaTypeMapping getMapping(Class c, boolean serialised, boolean embedded, String fieldName);
 
     /**
      * Accessor for a mapping, for a java type.
      * @param c The java type
      * @param serialised Whether the type is serialised
      * @param embedded Whether the type is embedded
-     * @param storeMgr Manager of the store
      * @param clr ClassLoader resolver
      * @return The mapping
      */
-    JavaTypeMapping getMapping(Class c, boolean serialised, boolean embedded, MappedStoreManager storeMgr, 
-            ClassLoaderResolver clr);
+    JavaTypeMapping getMapping(Class c, boolean serialised, boolean embedded, ClassLoaderResolver clr);
 
     /**
      * Accessor for a mapping for a field, mapped to a table
@@ -86,29 +113,6 @@
     // ----------------------------------------- Datastore Types ---------------------------------------------
 
     /**
-     * Method to create the datastore mapping for a java type mapping at a particular index.
-     * @param mapping The java mapping
-     * @param fmd MetaData for the field
-     * @param index Index of the datastore field
-     * @param srm Store Manager
-     * @param column The column
-     * @return The datastore mapping
-     */
-    DatastoreMapping createDatastoreMapping(JavaTypeMapping mapping, AbstractMemberMetaData fmd, int index, 
-            MappedStoreManager srm, DatastoreField column);
-
-    /**
-     * Method to create the datastore mapping for a particular column and java type.
-     * @param mapping The java mapping
-     * @param storeMgr Store Manager
-     * @param column The column
-     * @param javaType The java type (isnt this stored in the java mapping ?)
-     * @return The datastore mapping
-     */
-    DatastoreMapping createDatastoreMapping(JavaTypeMapping mapping, MappedStoreManager storeMgr, 
-            DatastoreField column, String javaType);
-
-    /**
      * Method to create a datastore field (column) in a container (table).
      * @param mapping The java mapping
      * @param javaType The java type
@@ -139,17 +143,4 @@
      */
     DatastoreField createDatastoreField(AbstractMemberMetaData fmd, DatastoreContainerObject datastoreContainer, 
             JavaTypeMapping mapping, ColumnMetaData colmd, DatastoreField reference, ClassLoaderResolver clr);
-
-    /**
-     * Utility to register a datastore mapping for a java type, and the SQL/JDBC types it can be mapped to.
-     * This can also be called to change the default setting of a mapping - just supply the same
-     * values of java/JDBC/SQL types and a different default value
-     * @param javaTypeName Name of the java type
-     * @param datastoreMappingType The datastore mapping
-     * @param jdbcType The JDBC type that can be used
-     * @param sqlType The SQL type that can be used
-     * @param dflt Whether this type should be used as the default mapping for this Java type
-     */
-    void registerDatastoreMapping(String javaTypeName, Class datastoreMappingType, String jdbcType, 
-            String sqlType, boolean dflt);
 }
\ No newline at end of file

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/PersistenceCapableMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/PersistenceCapableMapping.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/PersistenceCapableMapping.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -223,8 +223,7 @@
                     colmd, refDatastoreMapping.getDatastoreField(), clr);
 
                 // Add its datastore mapping
-                DatastoreMapping datastoreMapping = mmgr.createDatastoreMapping(mapping, storeMgr, col,
-                    refDatastoreMapping.getJavaTypeMapping().getJavaTypeForDatastoreMapping(i));
+                DatastoreMapping datastoreMapping = mmgr.createDatastoreMapping(mapping, col, refDatastoreMapping.getJavaTypeMapping().getJavaTypeForDatastoreMapping(i));
                 this.addDataStoreMapping(datastoreMapping);
             }
             else

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/ReferenceMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/ReferenceMapping.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/ReferenceMapping.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -22,6 +22,7 @@
 import org.datanucleus.ObjectManager;
 import org.datanucleus.StateManager;
 import org.datanucleus.exceptions.NucleusException;
+import org.datanucleus.exceptions.NucleusUserException;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.FieldRole;
@@ -153,7 +154,7 @@
             // Single column storing the identity of the related object
             MappingManager mmgr = datastoreContainer.getStoreManager().getMappingManager();
             DatastoreField col = mmgr.createDatastoreField(this, String.class.getName(), 0);
-            mmgr.createDatastoreMapping(this, mmd, 0, datastoreContainer.getStoreManager(), col);
+            mmgr.createDatastoreMapping(this, mmd, 0, col);
         }
     }
 
@@ -332,13 +333,19 @@
      */
     public ScalarExpression newLiteral(QueryExpression qs, Object value)
     {
-        ScalarExpression expr = new ObjectLiteral(qs, this, value, value.getClass().getName());
-        return expr;
+        if (mappingStrategy == ID_MAPPING)
+        {
+            throw new NucleusUserException("Querying of reference (interface/Object) fields is not possible when mapped using \"identity\" mapping strategy");
+        }
+        return new ObjectLiteral(qs, this, value, value.getClass().getName());
     }
 
     public ScalarExpression newScalarExpression(QueryExpression qs, LogicSetExpression te)
     {
-        ScalarExpression expr = new ReferenceExpression(qs, this, te);
-        return expr;
+        if (mappingStrategy == ID_MAPPING)
+        {
+            throw new NucleusUserException("Querying of reference (interface/Object) fields is not possible when mapped using \"identity\" mapping strategy");
+        }
+        return new ReferenceExpression(qs, this, te);
     }
 }
\ No newline at end of file

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/SerialisedElementPCMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/SerialisedElementPCMapping.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/SerialisedElementPCMapping.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -40,6 +40,6 @@
             colmd = mmd.getElementMetaData().getColumnMetaData()[0];
         }
         DatastoreField col = mmgr.createDatastoreField(this, getType(), colmd);
-        mmgr.createDatastoreMapping(this, mmd, 0, datastoreContainer.getStoreManager(), col);
+        mmgr.createDatastoreMapping(this, mmd, 0, col);
     }
 }
\ No newline at end of file

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/SerialisedKeyPCMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/SerialisedKeyPCMapping.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/SerialisedKeyPCMapping.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -40,6 +40,6 @@
             colmd = mmd.getKeyMetaData().getColumnMetaData()[0];
         }
         DatastoreField col = mmgr.createDatastoreField(this, getType(), colmd);
-        mmgr.createDatastoreMapping(this, mmd, 0, datastoreContainer.getStoreManager(), col);
+        mmgr.createDatastoreMapping(this, mmd, 0, col);
     }
 }
\ No newline at end of file

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/SerialisedValuePCMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/SerialisedValuePCMapping.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/SerialisedValuePCMapping.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -40,6 +40,6 @@
             colmd = mmd.getValueMetaData().getColumnMetaData()[0];
         }
         DatastoreField col = mmgr.createDatastoreField(this,getType(), colmd);
-        mmgr.createDatastoreMapping(this, mmd, 0, datastoreContainer.getStoreManager(), col);
+        mmgr.createDatastoreMapping(this, mmd, 0, col);
     }
 }
\ No newline at end of file

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/SingleFieldMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/SingleFieldMapping.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/SingleFieldMapping.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -55,7 +55,7 @@
     {
         MappingManager mmgr = datastoreContainer.getStoreManager().getMappingManager();
         DatastoreField col = mmgr.createDatastoreField(this, getJavaTypeForDatastoreMapping(0), 0);
-        mmgr.createDatastoreMapping(this, mmd, 0, datastoreContainer.getStoreManager(), col);
+        mmgr.createDatastoreMapping(this, mmd, 0, col);
     }
 
     /**

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/SingleFieldMultiMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/SingleFieldMultiMapping.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/SingleFieldMultiMapping.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -19,6 +19,7 @@
 package org.datanucleus.store.mapped.mapping;
 
 import org.datanucleus.store.mapped.DatastoreField;
+import org.datanucleus.store.mapped.MappedStoreManager;
 
 /**
  * Mapping to represent a field that is mapped to multiple datastore columns.
@@ -33,9 +34,10 @@
      */
     protected void addDatastoreField(String typeName)
     {
-        MappingManager mgr = dba.getMappingManager();
+        MappedStoreManager storeMgr = datastoreContainer.getStoreManager();
+        MappingManager mgr = storeMgr.getMappingManager();
         DatastoreField column = mgr.createDatastoreField(this, typeName, getNumberOfDatastoreFields());
-        mgr.createDatastoreMapping(this, datastoreContainer.getStoreManager(), column, typeName);
+        mgr.createDatastoreMapping(this, column, typeName);
     }
 
     /**

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/VersionMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/VersionMapping.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/VersionMapping.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -75,8 +75,8 @@
             id = idFactory.newDatastoreFieldIdentifier(colmd.getName());
         }
         DatastoreField column = datastoreContainer.addDatastoreField(getType(), id, this, colmd);
-        datastoreContainer.getStoreManager().getMappingManager().createDatastoreMapping(delegate, datastoreContainer.getStoreManager(), 
-            column, getType());
+        datastoreContainer.getStoreManager().getMappingManager().createDatastoreMapping(delegate, column, 
+            getType());
     }
 
     /**

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/adapter/DatabaseAdapter.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/adapter/DatabaseAdapter.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/adapter/DatabaseAdapter.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -52,6 +52,7 @@
 import org.datanucleus.store.mapped.DatastoreContainerObject;
 import org.datanucleus.store.mapped.DatastoreIdentifier;
 import org.datanucleus.store.mapped.IdentifierFactory;
+import org.datanucleus.store.mapped.MappedStoreManager;
 import org.datanucleus.store.mapped.expression.BooleanExpression;
 import org.datanucleus.store.mapped.expression.CharacterExpression;
 import org.datanucleus.store.mapped.expression.CharacterLiteral;
@@ -136,9 +137,6 @@
     /** The String used to quote identifiers. */
     protected String identifierQuoteString;
 
-    /** Manager for the mapping between Java and datastore types. */
-    protected MappingManager mappingManager;
-
     /** Supported option names. */
     protected Collection<String> supportedOptions = new HashSet();
 
@@ -455,7 +453,7 @@
         RDBMSManager storeMgr = (RDBMSManager)handler.getStoreManager();
         ClassLoaderResolver clr = storeMgr.getOMFContext().getClassLoaderResolver(null);
         PluginManager pluginMgr = storeMgr.getOMFContext().getPluginManager();
-        RDBMSMappingManager mapMgr = (RDBMSMappingManager)getMappingManager();
+        MappingManager mapMgr = storeMgr.getMappingManager();
         mapMgr.loadDatastoreMapping(pluginMgr, clr, getVendorID());
 
         // Load the types from plugin(s)
@@ -469,7 +467,8 @@
      */
     public void removeUnsupportedMappings(StoreSchemaHandler handler, ManagedConnection mconn)
     {
-        RDBMSMappingManager mapMgr = (RDBMSMappingManager)getMappingManager();
+        RDBMSManager storeMgr = (RDBMSManager)handler.getStoreManager();
+        RDBMSMappingManager mapMgr = (RDBMSMappingManager)storeMgr.getMappingManager();
         RDBMSTypesInfo types = (RDBMSTypesInfo)handler.getSchemaData(mconn.getConnection(), "types", null);
 
         int[] jdbcTypes = JDBCUtils.getJDBCTypes();
@@ -570,31 +569,15 @@
     }
 
     /**
-     * Acessor for the MappingManager
+     * Accessor for a MappingManager suitable for use with this datastore adapter.
+     * @param storeMgr The StoreManager
      * @return the MappingManager
      */
-    public MappingManager getMappingManager()
+    public MappingManager getMappingManager(MappedStoreManager storeMgr)
     {
-        if (mappingManager == null)
-        {
-            mappingManager = getNewMappingManager();
-        }
-        return mappingManager;
+        return new RDBMSMappingManager(storeMgr);
     }
 
-    /**
-     * Convenience accessor for the mapping for the specified class.
-     * Provides a wrapper to the method on the MappingManager.
-     * @param c Java type
-     * @param expr the ScalarExpression
-     * @return The mapping for the class.
-     */
-    protected final JavaTypeMapping getMapping(Class c, ScalarExpression expr)
-    {
-        return getMappingManager().getMapping(c, false, false, expr.getQueryExpression().getStoreManager(), 
-            expr.getQueryExpression().getClassLoaderResolver());
-    }
-
     /* (non-Javadoc)
      * @see org.datanucleus.store.DatastoreAdapter#getAdapterTime(java.sql.Timestamp)
      */
@@ -868,15 +851,6 @@
     }
 
     /**
-     * Accessor for a new Mapping Manager
-     * @return The mapping manager
-     */
-    protected MappingManager getNewMappingManager()
-    {
-        return new RDBMSMappingManager();
-    }
-
-    /**
      * Accessor for the transaction isolation level to use during schema creation.
      * @return The transaction isolation level for schema generation process
      */
@@ -1551,6 +1525,19 @@
     }
 
     /**
+     * Convenience accessor for the mapping for the specified class.
+     * Provides a wrapper to the method on the MappingManager.
+     * @param c Java type
+     * @param expr the ScalarExpression
+     * @return The mapping for the class.
+     */
+    protected final JavaTypeMapping getMapping(Class c, ScalarExpression expr)
+    {
+        return expr.getQueryExpression().getStoreManager().getMappingManager().getMapping(c, false, false, 
+            expr.getQueryExpression().getClassLoaderResolver());
+    }
+
+    /**
      * The pattern string for representing one character.
      * Most of databases will use the underscore character.
      * @param patternExpression The expression that represents one character for a matcher/parser in the database

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/adapter/OracleAdapter.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/adapter/OracleAdapter.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/adapter/OracleAdapter.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -38,6 +38,7 @@
 import org.datanucleus.exceptions.NucleusUserException;
 import org.datanucleus.store.mapped.DatastoreContainerObject;
 import org.datanucleus.store.mapped.DatastoreIdentifier;
+import org.datanucleus.store.mapped.MappedStoreManager;
 import org.datanucleus.store.mapped.expression.LogicSetExpression;
 import org.datanucleus.store.mapped.expression.NumericExpression;
 import org.datanucleus.store.mapped.expression.QueryExpression;
@@ -210,6 +211,16 @@
     }
 
     /**
+     * Accessor for a MappingManager suitable for use with this datastore adapter.
+     * @param storeMgr The StoreManager
+     * @return the MappingManager
+     */
+    public MappingManager getMappingManager(MappedStoreManager storeMgr)
+    {
+        return new OracleRDBMSMappingManager(storeMgr);
+    }
+
+    /**
      * Accessor for the vendor id
      * @return The Oracle vendor id
      */
@@ -658,15 +669,6 @@
     }
 
     /**
-     * Acessor for a new MappingManager
-     * @return the new MappingManager
-     */
-    public MappingManager getNewMappingManager()
-    {
-        return new OracleRDBMSMappingManager();
-    }
-
-    /**
      * Accessor for a statement that will return the statement to use to get the datastore date.
      * @return SQL statement to get the datastore date
      */

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/RDBMSMappingManager.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/RDBMSMappingManager.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/RDBMSMappingManager.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -61,8 +61,6 @@
  * Mapping manager for RDBMS datastores.
  * Provides mappings from standard Java types defined in org.datanucleus.store.mapped.mapping to
  * datastore mappings for JDBC types.
- * 
- * @version $Revision: 1.66 $
  */
 public class RDBMSMappingManager extends AbstractMappingManager
 {
@@ -74,11 +72,12 @@
     MultiMap datastoreMappingsBySQLType;
 
     /**
-     * Constructor.
+     * Constructor for a mapping manager for an ORM datastore.
+     * @param storeMgr The StoreManager
      */
-    public RDBMSMappingManager()
+    public RDBMSMappingManager(MappedStoreManager storeMgr)
     {
-        super();
+        super(storeMgr);
     }
 
     /**
@@ -444,12 +443,12 @@
      * @param mapping The java mapping
      * @param fmd MetaData for the field
      * @param index Index of the datastore field
-     * @param storeMgr Store Manager
      * @param column The column
+     * @param storeMgr Store Manager
      * @return The datastore mapping
      */
     public DatastoreMapping createDatastoreMapping(JavaTypeMapping mapping, AbstractMemberMetaData fmd, int index, 
-            MappedStoreManager storeMgr, DatastoreField column)
+            DatastoreField column)
     {
         Class datastoreMappingClass = null;
 
@@ -543,13 +542,12 @@
     /**
      * Method to create the datastore mapping for a particular column and java type.
      * @param mapping The java mapping
-     * @param storeMgr Store Manager
      * @param column The column
      * @param javaType The java type (isnt this stored in the java mapping ?)
      * @return The datastore mapping
      */
-    public DatastoreMapping createDatastoreMapping(JavaTypeMapping mapping, MappedStoreManager storeMgr, 
-            DatastoreField column, String javaType)
+    public DatastoreMapping createDatastoreMapping(JavaTypeMapping mapping, DatastoreField column, 
+            String javaType)
     {
         ClassLoaderResolver clr = storeMgr.getOMFContext().getClassLoaderResolver(null);
         Column col = (Column)column;
@@ -626,7 +624,6 @@
         }
 
         // Generate the column identifier
-        MappedStoreManager storeMgr = datastoreContainer.getStoreManager();
         IdentifierFactory idFactory = storeMgr.getIdentifierFactory();
         DatastoreIdentifier identifier = null;
         if (colmd.getName() == null)
@@ -738,7 +735,6 @@
     {
         AbstractMemberMetaData fmd = mapping.getFieldMetaData();
         DatastoreContainerObject datastoreContainer = mapping.getDatastoreContainer();
-        MappedStoreManager storeMgr = datastoreContainer.getStoreManager();
 
         Column col;
         if (colmd == null)
@@ -804,7 +800,6 @@
                                                DatastoreField reference,
                                                ClassLoaderResolver clr)
     {
-        MappedStoreManager storeMgr = datastoreContainer.getStoreManager();
         IdentifierFactory idFactory = storeMgr.getIdentifierFactory();
         DatastoreIdentifier identifier = null;
         if (colmd.getName() == null)

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleRDBMSMappingManager.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleRDBMSMappingManager.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleRDBMSMappingManager.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -26,6 +26,7 @@
 import org.datanucleus.metadata.ElementMetaData;
 import org.datanucleus.metadata.KeyMetaData;
 import org.datanucleus.metadata.ValueMetaData;
+import org.datanucleus.store.mapped.MappedStoreManager;
 import org.datanucleus.store.mapped.mapping.ArrayMapping;
 import org.datanucleus.store.mapped.mapping.BitSetMapping;
 import org.datanucleus.store.mapped.mapping.CollectionMapping;
@@ -44,10 +45,12 @@
 public class OracleRDBMSMappingManager extends RDBMSMappingManager
 {
     /**
-     * Constructor.
+     * Constructor for a mapping manager for an ORM datastore.
+     * @param storeMgr The StoreManager
      */
-    public OracleRDBMSMappingManager()
+    public OracleRDBMSMappingManager(MappedStoreManager storeMgr)
     {
+        super(storeMgr);
     }
 
     /**

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/AbstractClassTable.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/AbstractClassTable.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/AbstractClassTable.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -266,8 +266,7 @@
                 idColumn.setAsPrimaryKey();
 
                 // Set the column type based on the field.getType()
-                getStoreManager().getMappingManager().createDatastoreMapping(m, storeMgr, idColumn,
-                    refColumn.getJavaTypeMapping().getType());
+                getStoreManager().getMappingManager().createDatastoreMapping(m, idColumn, refColumn.getJavaTypeMapping().getType());
             }
 
             // Update highest field number if this is higher
@@ -366,8 +365,7 @@
             }
         }
 
-        dba.getMappingManager().createDatastoreMapping(datastoreIDMapping, storeMgr, idColumn, 
-            poidClass.getName());
+        storeMgr.getMappingManager().createDatastoreMapping(datastoreIDMapping, idColumn, poidClass.getName());
 
         // Handle any auto-increment requirement
         if (isObjectIDDatastoreAttributed())

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ArrayTable.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ArrayTable.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ArrayTable.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -78,7 +78,7 @@
         if (isSerialisedElementPC() || isEmbeddedElementPC() || (isEmbeddedElement() && !elementPC))
         {
             // Element = PC(embedded), PC(serialised), Non-PC(embedded)
-            elementMapping = dba.getMappingManager().getMapping(this, fmd, dba, clr, 
+            elementMapping = storeMgr.getMappingManager().getMapping(this, fmd, dba, clr, 
                 JavaTypeMapping.MAPPING_ARRAY_ELEMENT);
             if (NucleusLogger.DATASTORE.isDebugEnabled())
             {

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ClassTable.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ClassTable.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ClassTable.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -566,7 +566,7 @@
                         if (isPrimary)
                         {
                             // Add the field to this table
-                            addFieldMapping(dba.getMappingManager().getMapping(this, fmd, dba, clr, JavaTypeMapping.MAPPING_FIELD));
+                            addFieldMapping(storeMgr.getMappingManager().getMapping(this, fmd, dba, clr, JavaTypeMapping.MAPPING_FIELD));
                         }
                         else
                         {
@@ -618,7 +618,7 @@
                                 secTable.postInitialize(clr);
                                 secondaryTables.put(fmd.getTable(), secTable);
                             }
-                            secTable.addFieldMapping(dba.getMappingManager().getMapping(secTable, fmd, dba, clr, JavaTypeMapping.MAPPING_FIELD));
+                            secTable.addFieldMapping(storeMgr.getMappingManager().getMapping(secTable, fmd, dba, clr, JavaTypeMapping.MAPPING_FIELD));
                         }
                     }
                     else if (fmd.getPersistenceModifier() != FieldPersistenceModifier.TRANSACTIONAL)
@@ -1032,7 +1032,7 @@
                 {
                     //do nothing
                 }
-                JavaTypeMapping fieldMapping = dba.getMappingManager().getMapping(this, fieldsToAdd[i], dba, clr, JavaTypeMapping.MAPPING_FIELD);
+                JavaTypeMapping fieldMapping = storeMgr.getMappingManager().getMapping(this, fieldsToAdd[i], dba, clr, JavaTypeMapping.MAPPING_FIELD);
                 addFieldMapping(fieldMapping);
                 pkMappings[i] = fieldMapping;
             }
@@ -1244,7 +1244,7 @@
                                     refColumn.setNullable();
                                 }
 
-                                fkMapping.addDataStoreMapping(getStoreManager().getMappingManager().createDatastoreMapping(mapping, storeMgr, refColumn, refDatastoreMapping.getJavaTypeMapping().getJavaType().getName()));
+                                fkMapping.addDataStoreMapping(getStoreManager().getMappingManager().createDatastoreMapping(mapping, refColumn, refDatastoreMapping.getJavaTypeMapping().getJavaType().getName()));
                                 ((PersistenceCapableMapping)fkMapping).addJavaTypeMapping(mapping);
                             }
                         }
@@ -3018,7 +3018,7 @@
             column.setNullable();
         }
 
-        storeMgr.getMappingManager().createDatastoreMapping(indexMapping, storeMgr, column, indexType.getName());
+        storeMgr.getMappingManager().createDatastoreMapping(indexMapping, column, indexType.getName());
 
         return indexMapping;
     }

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ClassView.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ClassView.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ClassView.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -132,7 +132,7 @@
             AbstractMemberMetaData fmd = cmd.getMetaDataForManagedMemberAtPosition(fieldNumber);
             if (fmd.getPersistenceModifier() == FieldPersistenceModifier.PERSISTENT)
             {
-                fieldMappings[fieldNumber] = dba.getMappingManager().getMapping(this, fmd, dba, clr, JavaTypeMapping.MAPPING_FIELD);
+                fieldMappings[fieldNumber] = storeMgr.getMappingManager().getMapping(this, fmd, dba, clr, JavaTypeMapping.MAPPING_FIELD);
             }
             else if (fmd.getPersistenceModifier() != FieldPersistenceModifier.TRANSACTIONAL)
             {

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/CollectionTable.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/CollectionTable.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/CollectionTable.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -87,7 +87,7 @@
         {
             // Element = PC(embedded), PC(serialised), Non-PC(serialised), Non-PC(embedded)
             // Join table has : ownerMapping (PK), elementMapping, orderMapping (PK)
-            elementMapping = dba.getMappingManager().getMapping(this, fmd, dba, clr, 
+            elementMapping = storeMgr.getMappingManager().getMapping(this, fmd, dba, clr, 
                 JavaTypeMapping.MAPPING_COLLECTION_ELEMENT);
             if (NucleusLogger.DATASTORE.isDebugEnabled())
             {

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnCreator.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnCreator.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnCreator.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -62,8 +62,8 @@
 public final class ColumnCreator
 {
     /** Localiser for messages. */
-    protected static final Localiser LOCALISER = Localiser.getInstance("org.datanucleus.store.rdbms.Localisation",
-        RDBMSManager.class.getClassLoader());
+    protected static final Localiser LOCALISER = Localiser.getInstance(
+        "org.datanucleus.store.rdbms.Localisation", RDBMSManager.class.getClassLoader());
 
     /**
      * Private constructor to prevent instantiation.
@@ -103,7 +103,7 @@
         }
 
         DatastoreField column = table.addDatastoreField(mapping.getType(), identifier, mapping, colmd);
-        storeMgr.getMappingManager().createDatastoreMapping(mapping, storeMgr, column, mapping.getJavaType().getName());
+        storeMgr.getMappingManager().createDatastoreMapping(mapping, column, mapping.getJavaType().getName());
         if (pk)
         {
             column.setAsPrimaryKey();
@@ -581,8 +581,7 @@
                             column.setNullable();
                         }
 
-                        storeMgr.getMappingManager().createDatastoreMapping(refDatastoreMapping, storeMgr, column,
-                            m.getDataStoreMapping(i).getJavaTypeMapping().getJavaTypeForDatastoreMapping(i));
+                        storeMgr.getMappingManager().createDatastoreMapping(refDatastoreMapping, column, m.getDataStoreMapping(i).getJavaTypeMapping().getJavaTypeForDatastoreMapping(i));
                     }
                     catch (DuplicateColumnNameException ex)
                     {
@@ -616,8 +615,7 @@
                     storeMgr.getOMFContext().getTypeManager().isDefaultEmbeddedType(javaType), fieldRole);
             }
             column = table.addDatastoreField(javaType.getName(), identifier, mapping, colmd);
-            storeMgr.getMappingManager().createDatastoreMapping(mapping, storeMgr, column, 
-                mapping.getJavaTypeForDatastoreMapping(0));
+            storeMgr.getMappingManager().createDatastoreMapping(mapping, column, mapping.getJavaTypeForDatastoreMapping(0));
 
             if (isNullable)
             {

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/MapTable.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/MapTable.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/MapTable.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -150,7 +150,7 @@
         if (isSerialisedKey() || isEmbeddedKeyPC() || (isEmbeddedKey() && !keyPC))
         {
             // Key = PC(embedded), PC(serialised), Non-PC(serialised), Non-PC(embedded)
-            keyMapping = dba.getMappingManager().getMapping(this, fmd, dba, clr, JavaTypeMapping.MAPPING_MAP_KEY);
+            keyMapping = storeMgr.getMappingManager().getMapping(this, fmd, dba, clr, JavaTypeMapping.MAPPING_MAP_KEY);
             if (NucleusLogger.DATASTORE.isDebugEnabled())
             {
                 debugMapping(keyMapping);
@@ -181,7 +181,7 @@
         {
             // Value = PC(embedded), PC(serialised), Non-PC(serialised), Non-PC(embedded)
             // Add field(s) for value
-            valueMapping = dba.getMappingManager().getMapping(this, fmd, dba, clr, JavaTypeMapping.MAPPING_MAP_VALUE);
+            valueMapping = storeMgr.getMappingManager().getMapping(this, fmd, dba, clr, JavaTypeMapping.MAPPING_MAP_VALUE);
             if (NucleusLogger.DATASTORE.isDebugEnabled())
             {
                 debugMapping(valueMapping);

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ProbeTable.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ProbeTable.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ProbeTable.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -64,7 +64,7 @@
 		JavaTypeMapping mapping = storeMgr.getMapping(int.class);
 		DatastoreField column = addDatastoreField(int.class.getName(), 
             storeMgr.getIdentifierFactory().newDatastoreFieldIdentifier("UNUSED"), mapping, null);
-		getStoreManager().getMappingManager().createDatastoreMapping(mapping, storeMgr, column, int.class.getName());
+		getStoreManager().getMappingManager().createDatastoreMapping(mapping, column, int.class.getName());
 
         state = TABLE_STATE_INITIALIZED;
     }

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/SchemaTable.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/SchemaTable.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/SchemaTable.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -92,7 +92,7 @@
         classMapping = storeMgr.getMapping(String.class);
         Column class_column=(Column) addDatastoreField(String.class.getName(),
             idFactory.newDatastoreFieldIdentifier("CLASS_NAME"), classMapping, null);
-        mgr.createDatastoreMapping(classMapping, storeMgr, class_column, String.class.getName());
+        mgr.createDatastoreMapping(classMapping, class_column, String.class.getName());
         class_column.getColumnMetaData().setLength(128);
         class_column.getColumnMetaData().setJdbcType("VARCHAR");
         class_column.setAsPrimaryKey();
@@ -100,14 +100,14 @@
         tableMapping = storeMgr.getMapping(String.class);
         Column table_column=(Column) addDatastoreField(String.class.getName(),
             idFactory.newDatastoreFieldIdentifier("TABLE_NAME"), tableMapping, null);
-        mgr.createDatastoreMapping(tableMapping, storeMgr, table_column, String.class.getName());
+        mgr.createDatastoreMapping(tableMapping, table_column, String.class.getName());
         table_column.getColumnMetaData().setLength(128);
         table_column.getColumnMetaData().setJdbcType("VARCHAR");
 
         typeMapping = storeMgr.getMapping(String.class);
         Column type_column=(Column) addDatastoreField(String.class.getName(),
             idFactory.newDatastoreFieldIdentifier("TYPE"), typeMapping, null);
-        mgr.createDatastoreMapping(typeMapping, storeMgr, type_column, String.class.getName());
+        mgr.createDatastoreMapping(typeMapping, type_column, String.class.getName());
         type_column.getColumnMetaData().setLength(4);
         type_column.getColumnMetaData().setJdbcType("VARCHAR");
 
@@ -115,21 +115,21 @@
         ownerMapping = storeMgr.getMapping(String.class);
         Column owner_column=(Column) addDatastoreField(String.class.getName(),
             idFactory.newDatastoreFieldIdentifier("OWNER"), ownerMapping, null);
-        mgr.createDatastoreMapping(ownerMapping, storeMgr, owner_column, String.class.getName());
+        mgr.createDatastoreMapping(ownerMapping, owner_column, String.class.getName());
         owner_column.getColumnMetaData().setLength(2);
         owner_column.getColumnMetaData().setJdbcType("VARCHAR");
 
         versionMapping = storeMgr.getMapping(String.class);
         Column version_column=(Column) addDatastoreField(String.class.getName(),
             idFactory.newDatastoreFieldIdentifier("VERSION"), versionMapping, null);
-        mgr.createDatastoreMapping(versionMapping, storeMgr, version_column, String.class.getName());
+        mgr.createDatastoreMapping(versionMapping, version_column, String.class.getName());
         version_column.getColumnMetaData().setLength(20);
         version_column.getColumnMetaData().setJdbcType("VARCHAR");
 
         interfaceNameMapping = storeMgr.getMapping(String.class);
         Column interfaceName_column=(Column) addDatastoreField(String.class.getName(),
             idFactory.newDatastoreFieldIdentifier("INTERFACE_NAME"), interfaceNameMapping, null);
-        mgr.createDatastoreMapping(interfaceNameMapping, storeMgr, interfaceName_column, String.class.getName());
+        mgr.createDatastoreMapping(interfaceNameMapping, interfaceName_column, String.class.getName());
         interfaceName_column.getColumnMetaData().setLength(255);
         interfaceName_column.getColumnMetaData().setJdbcType("VARCHAR");
         interfaceName_column.setNullable();

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/SequenceTable.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/SequenceTable.java	2008-11-15 11:20:06 UTC (rev 3949)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/SequenceTable.java	2008-11-15 15:15:44 UTC (rev 3950)
@@ -93,14 +93,13 @@
         colSequenceName.setAsPrimaryKey();
         colSequenceName.getColumnMetaData().setLength(Integer.valueOf("255"));
         colSequenceName.getColumnMetaData().setJdbcType("VARCHAR");
-		getStoreManager().getMappingManager().createDatastoreMapping(sequenceNameMapping, storeMgr, colSequenceName, 
-            String.class.getName());
+		getStoreManager().getMappingManager().createDatastoreMapping(sequenceNameMapping, colSequenceName, String.class.getName());
 
         // "NEXT_VAL" column
         nextValMapping = storeMgr.getMapping(Long.class);
         DatastoreField colNextVal=addDatastoreField(Long.class.getName(),
             idFactory.newDatastoreFieldIdentifier(nextValColumnName), nextValMapping, null);
-		getStoreManager().getMappingManager().createDatastoreMapping(nextValMapping, storeMgr, colNextVal, Long.class.getName());
+		getStoreManager().getMappingManager().createDatastoreMapping(nextValMapping, colNextVal, Long.class.getName());
 
         // Set up JDBC statements for supported operations
         insertStmt = "INSERT INTO " + identifier.getFullyQualifiedName(false) + " (" + colSequenceName.getIdentifier() + "," + colNextVal.getIdentifier() + 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3955
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=3955&view=rev
Author:   andy_jefferson
Date:     2008-11-15 17:42:04 +0000 (Sat, 15 Nov 2008)

Log Message:
-----------
[NUCRDBMS-79] get rid of two more MappedStoreManager.getMapping(...) methods that were simply wrappers to a call to MappingManager.

Modified Paths:
--------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/AbstractMappingManager.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/MappingManager.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/JDOQLQueryCompiler.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnCreator.java

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java	2008-11-15 17:10:17 UTC (rev 3954)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java	2008-11-15 17:42:04 UTC (rev 3955)
@@ -236,19 +236,6 @@
     }
 
     /**
-     * Convenience accessor for the mapping for the specified class.
-     * @param c Java type
-     * @param serialised Whether the type is serialised
-     * @param embedded Whether the type is embedded
-     * @param fieldName Name of field (for logging only).
-     * @return The mapping for the class.
-     */
-    public JavaTypeMapping getMapping(Class c, boolean serialised, boolean embedded, String fieldName)
-    {
-        return getMappingManager().getMapping(c, serialised, embedded, fieldName);
-    }
-
-    /**
      * Convenience accessor for the mapping for the specified class when not serialised and not embedded.
      * @param c Java type
      * @return The mapping for the class.
@@ -270,19 +257,6 @@
     }
 
     /**
-     * Convenience accessor for the mapping for the specified class.
-     * @param c Java type
-     * @param clr ClassLoader resolver
-     * @param serialised Whether the type is serialised
-     * @param embedded Whether the type is embedded
-     * @return The mapping for the class.
-     */
-    public JavaTypeMapping getMapping(Class c, ClassLoaderResolver clr, boolean serialised, boolean embedded)
-    {
-        return getMappingManager().getMapping(c, serialised, embedded, clr);
-    }
-
-    /**
      * Method to create a new fetch statement for the passed table.
      * @param table The table to fetch from
      * @return The fetch statement

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/AbstractMappingManager.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/AbstractMappingManager.java	2008-11-15 17:10:17 UTC (rev 3954)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/AbstractMappingManager.java	2008-11-15 17:42:04 UTC (rev 3955)
@@ -80,8 +80,7 @@
      * @param fieldName Name of the field (for logging)
      * @return The mapping for the class.
      */
-    public JavaTypeMapping getMapping(Class c, boolean serialised, boolean embedded, 
-            String fieldName)
+    public JavaTypeMapping getMapping(Class c, boolean serialised, boolean embedded, String fieldName)
     {
         Class mc = getMappingClass(c, serialised, embedded, fieldName);
         mc = getOverrideMappingClass(mc, null, -1); // Allow for overriding in subclasses
@@ -111,13 +110,14 @@
         JavaTypeMapping m;
         try
         {
-            // TODO This doesnt take into account serialised/embedded
+            // TODO This doesn't take into account serialised/embedded
+            // If the type has its own table just take the id mapping of its table
             DatastoreClass datastoreClass = storeMgr.getDatastoreClass(c.getName(), clr);
             m = datastoreClass.getIDMapping();
         }
         catch (NoTableManagedException ex)
         {
-            // Note that this doesnt allow for whether a field is serialised or embedded so they get the default mapping only
+            // Doesn't allow for whether a field is serialised/embedded so they get the default mapping only
             Class mc = getMappingClass(c, serialised, embedded, null);
             mc = getOverrideMappingClass(mc, null, -1); // Allow for overriding in subclasses
             m = MappingFactory.createMapping(mc, storeMgr.getDatastoreAdapter(), c.getName());
@@ -149,10 +149,7 @@
      * @return The mapping for the field.
      */
     public JavaTypeMapping getMapping(DatastoreContainerObject datastoreContainer,
-            AbstractMemberMetaData fmd,
-            DatastoreAdapter dba,
-            ClassLoaderResolver clr,
-            int roleForField)
+            AbstractMemberMetaData fmd, DatastoreAdapter dba, ClassLoaderResolver clr, int roleForField)
     {
         Class mc = null;
 
@@ -256,8 +253,7 @@
 
     /**
      * Accessor for the mapping class for the specified class.
-     * Provides special handling for interface types and for classes that are
-     * being embedded in a field (detected using the FieldMetaData argument).
+     * Provides special handling for interface types and for classes that are being embedded in a field.
      * Refers others to its mapping manager lookup.
      * @param c Class to query
      * @param serialised Whether the field is serialised
@@ -298,11 +294,8 @@
             }
             else if (embedded)
             {
-                // Interface field
-                //return InterfaceMapping.class;
+                // Embedded interface field - just default to an embedded PCMapping!
                 return EmbeddedPCMapping.class;
-                // Embedded Interface field - anyone want to support these ? I don't ;-)
-                // throw new JPOXUserException(LOCALISER.msg("041041", fieldName));
             }
             else
             {
@@ -353,7 +346,7 @@
             // Other array types will be caught by the default mappings
         }
 
-        // Try the default mapping (doesnt allow for serialised setting)
+        // Try the default mapping (doesn't allow for serialised setting)
         Class mappingClass = getDefaultJavaTypeMapping(c);
         if (mappingClass == null)
         {
@@ -396,35 +389,34 @@
     }
 
     /**
-     * Convenience accessor for the mapping class of the element mapping for a collection/array of PC elements.
-     * Currently only used where the collection/array elements are either serialised or embedded into a join table.
+     * Convenience accessor for the mapping class of the element mapping for a collection/array of elements.
+     * Currently only used where the collection/array elements are either serialised or embedded into a 
+     * join table.
      * @param container The container
-     * @param fmd MetaData for the collection field containing the collection/array of PCs
+     * @param mmd MetaData for the collection field/property containing the collection/array of PCs
      * @param dba Database adapter
      * @param clr ClassLoader resolver
      * @return The mapping class
      */
     protected Class getElementMappingClass(DatastoreContainerObject container, 
-            AbstractMemberMetaData fmd,
-            DatastoreAdapter dba, 
-            ClassLoaderResolver clr)
+            AbstractMemberMetaData mmd, DatastoreAdapter dba, ClassLoaderResolver clr)
     {
-        if (!fmd.hasCollection() && !fmd.hasArray())
+        if (!mmd.hasCollection() && !mmd.hasArray())
         {
             // TODO Localise this message
-            throw new NucleusException("Attempt to get element mapping for field " + fmd.getFullFieldName() + 
+            throw new NucleusException("Attempt to get element mapping for field " + mmd.getFullFieldName() + 
                 " that has no collection/array!").setFatal();
         }
-        if (fmd.getJoinMetaData() == null)
+        if (mmd.getJoinMetaData() == null)
         {
-            throw new NucleusException("Attempt to get element mapping for field " + fmd.getFullFieldName() + 
+            throw new NucleusException("Attempt to get element mapping for field " + mmd.getFullFieldName() + 
                 " that has no join table defined for the collection/array").setFatal();
         }
 
         String userMappingClassName = null;
-        if (fmd.getElementMetaData() != null)
+        if (mmd.getElementMetaData() != null)
         {
-            userMappingClassName = fmd.getElementMetaData().getValueForExtension("mapping-class");
+            userMappingClassName = mmd.getElementMetaData().getValueForExtension("mapping-class");
         }
         if (userMappingClassName != null)
         {
@@ -439,29 +431,29 @@
             }
         }
 
-        boolean serialised = ((fmd.hasCollection() && fmd.getCollection().isSerializedElement()) ||
-            (fmd.hasArray() && fmd.getArray().isSerializedElement()));
-        boolean embeddedPC = (fmd.getElementMetaData() != null && fmd.getElementMetaData().getEmbeddedMetaData() != null);
-        boolean elementPC = ((fmd.hasCollection() && fmd.getCollection().getElementClassMetaData() != null) ||
-            (fmd.hasArray() && fmd.getArray().getElementClassMetaData() != null));
+        boolean serialised = ((mmd.hasCollection() && mmd.getCollection().isSerializedElement()) ||
+            (mmd.hasArray() && mmd.getArray().isSerializedElement()));
+        boolean embeddedPC = (mmd.getElementMetaData() != null && mmd.getElementMetaData().getEmbeddedMetaData() != null);
+        boolean elementPC = ((mmd.hasCollection() && mmd.getCollection().getElementClassMetaData() != null) ||
+            (mmd.hasArray() && mmd.getArray().getElementClassMetaData() != null));
         boolean embedded = true;
-        if (fmd.hasCollection())
+        if (mmd.hasCollection())
         {
-            embedded = fmd.getCollection().isEmbeddedElement();
+            embedded = mmd.getCollection().isEmbeddedElement();
         }
-        else if (fmd.hasArray())
+        else if (mmd.hasArray())
         {
-            embedded = fmd.getArray().isEmbeddedElement();
+            embedded = mmd.getArray().isEmbeddedElement();
         }
 
         Class elementCls = null;
-        if (fmd.hasCollection())
+        if (mmd.hasCollection())
         {
-            elementCls = clr.classForName(fmd.getCollection().getElementType());
+            elementCls = clr.classForName(mmd.getCollection().getElementType());
         }
-        else if (fmd.hasArray())
+        else if (mmd.hasArray())
         {
-            elementCls = clr.classForName(fmd.getArray().getElementType());
+            elementCls = clr.classForName(mmd.getArray().getElementType());
         }
         boolean elementReference = ClassUtils.isReferenceType(elementCls);
 
@@ -499,14 +491,15 @@
             else
             {
                 // Embedded Non-PC type
-                mc = getMappingClass(elementCls, serialised, embedded, fmd.getFullFieldName());
+                mc = getMappingClass(elementCls, serialised, embedded, mmd.getFullFieldName());
             }
         }
         else
         {
             // TODO Allow for other element mappings
-            throw new NucleusException("Attempt to get element mapping for field " + fmd.getFullFieldName() +
-            " when not embedded or serialised - please report this to JPOX developers").setFatal();
+            throw new NucleusException("Attempt to get element mapping for field " + mmd.getFullFieldName() +
+                " of element-type=" + elementCls.getName() + 
+                " when not embedded/serialised - please report this to the developers").setFatal();
         }
 
         return mc;
@@ -516,25 +509,26 @@
      * Convenience accessor for the mapping class of the key mapping for a map of PC keys.
      * Currently only used where the keys are either serialised or embedded into a join table.
      * @param container The container
-     * @param fmd MetaData for the field containing the map that this key is for
+     * @param mmd MetaData for the field containing the map that this key is for
      * @param dba Database adapter
      * @param clr ClassLoader resolver
      * @return The mapping class
      */
     protected Class getKeyMappingClass(DatastoreContainerObject container,
-            AbstractMemberMetaData fmd,
+            AbstractMemberMetaData mmd,
             DatastoreAdapter dba,
             ClassLoaderResolver clr)
     {
-        if (fmd.getMap() == null)
+        if (mmd.getMap() == null)
         {
-            throw new NucleusException("Attempt to get key mapping for field that has no map!").setFatal();
+            throw new NucleusException("Attempt to get key mapping for field " + mmd.getFullFieldName() + 
+                " that has no map!").setFatal();
         }
 
         String userMappingClassName = null;
-        if (fmd.getKeyMetaData() != null)
+        if (mmd.getKeyMetaData() != null)
         {
-            userMappingClassName = fmd.getKeyMetaData().getValueForExtension("mapping-class");
+            userMappingClassName = mmd.getKeyMetaData().getValueForExtension("mapping-class");
         }
         if (userMappingClassName != null)
         {
@@ -549,11 +543,11 @@
             }
         }
 
-        boolean serialised = (fmd.hasMap() && fmd.getMap().isSerializedKey());
-        boolean embedded = (fmd.hasMap() && fmd.getMap().isEmbeddedKey());
-        boolean embeddedPC = (fmd.getKeyMetaData() != null && fmd.getKeyMetaData().getEmbeddedMetaData() != null);
-        boolean keyPC = (fmd.hasMap() && fmd.getMap().getKeyClassMetaData() != null);
-        Class keyCls = clr.classForName(fmd.getMap().getKeyType());
+        boolean serialised = (mmd.hasMap() && mmd.getMap().isSerializedKey());
+        boolean embedded = (mmd.hasMap() && mmd.getMap().isEmbeddedKey());
+        boolean embeddedPC = (mmd.getKeyMetaData() != null && mmd.getKeyMetaData().getEmbeddedMetaData() != null);
+        boolean keyPC = (mmd.hasMap() && mmd.getMap().getKeyClassMetaData() != null);
+        Class keyCls = clr.classForName(mmd.getMap().getKeyType());
         boolean keyReference = ClassUtils.isReferenceType(keyCls);
 
         Class mc = null;
@@ -590,42 +584,41 @@
             else
             {
                 // Embedded Non-PC type
-                mc = getMappingClass(keyCls, serialised, embedded, fmd.getFullFieldName());
+                mc = getMappingClass(keyCls, serialised, embedded, mmd.getFullFieldName());
             }
         }
         else
         {
             // TODO Allow for other key mappings
-            throw new NucleusException("Attempt to get key mapping for field " + fmd.getFullFieldName() + 
-                " when not embedded or serialised - please report this to JPOX developers").setFatal();
+            throw new NucleusException("Attempt to get key mapping for field " + mmd.getFullFieldName() + 
+                " when not embedded or serialised - please report this to the developers").setFatal();
         }
 
         return mc;
     }
 
     /**
-     * Convenience accessor for the mapping class of the value mapping for a map of PC values.
+     * Convenience accessor for the mapping class of the value mapping for a map of values.
      * Currently only used where the value are either serialised or embedded into a join table.
      * @param container The container
-     * @param fmd MetaData for the field containing the map that this value is for
+     * @param mmd MetaData for the field/property containing the map that this value is for
      * @param dba Database adapter
      * @param clr ClassLoader resolver
      * @return The mapping class
      */
     protected Class getValueMappingClass(DatastoreContainerObject container,
-            AbstractMemberMetaData fmd,
-            DatastoreAdapter dba,
-            ClassLoaderResolver clr)
+            AbstractMemberMetaData mmd, DatastoreAdapter dba, ClassLoaderResolver clr)
     {
-        if (fmd.getMap() == null)
+        if (mmd.getMap() == null)
         {
-            throw new NucleusException("Attempt to get value mapping for field that has no map!").setFatal();
+            throw new NucleusException("Attempt to get value mapping for field " + mmd.getFullFieldName() + 
+                " that has no map!").setFatal();
         }
 
         String userMappingClassName = null;
-        if (fmd.getValueMetaData() != null)
+        if (mmd.getValueMetaData() != null)
         {
-            userMappingClassName = fmd.getValueMetaData().getValueForExtension("mapping-class");
+            userMappingClassName = mmd.getValueMetaData().getValueForExtension("mapping-class");
         }
         if (userMappingClassName != null)
         {
@@ -640,11 +633,11 @@
             }
         }
 
-        boolean serialised = (fmd.hasMap() && fmd.getMap().isSerializedValue());
-        boolean embedded = (fmd.hasMap() && fmd.getMap().isEmbeddedValue());
-        boolean embeddedPC = (fmd.getValueMetaData() != null && fmd.getValueMetaData().getEmbeddedMetaData() != null);
-        boolean valuePC = (fmd.hasMap() && fmd.getMap().getValueClassMetaData() != null);
-        Class valueCls = clr.classForName(fmd.getMap().getValueType());
+        boolean serialised = (mmd.hasMap() && mmd.getMap().isSerializedValue());
+        boolean embedded = (mmd.hasMap() && mmd.getMap().isEmbeddedValue());
+        boolean embeddedPC = (mmd.getValueMetaData() != null && mmd.getValueMetaData().getEmbeddedMetaData() != null);
+        boolean valuePC = (mmd.hasMap() && mmd.getMap().getValueClassMetaData() != null);
+        Class valueCls = clr.classForName(mmd.getMap().getValueType());
         boolean valueReference = ClassUtils.isReferenceType(valueCls);
 
         Class mc = null;
@@ -681,13 +674,13 @@
             else
             {
                 // Embedded Non-PC type
-                mc = getMappingClass(valueCls, serialised, embedded, fmd.getFullFieldName());
+                mc = getMappingClass(valueCls, serialised, embedded, mmd.getFullFieldName());
             }
         }
         else
         {
             // TODO Allow for other value mappings
-            throw new NucleusException("Attempt to get value mapping for field " + fmd.getFullFieldName() + 
+            throw new NucleusException("Attempt to get value mapping for field " + mmd.getFullFieldName() + 
                 " when not embedded or serialised - please report this to the developers").setFatal();
         }
 

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/MappingManager.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/MappingManager.java	2008-11-15 17:10:17 UTC (rev 3954)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/MappingManager.java	2008-11-15 17:42:04 UTC (rev 3955)
@@ -99,16 +99,19 @@
     JavaTypeMapping getMapping(Class c, boolean serialised, boolean embedded, ClassLoaderResolver clr);
 
     /**
-     * Accessor for a mapping for a field, mapped to a table
-     * @param table The table
-     * @param fmd MetaData for the field
+     * Accessor for the mapping for the field of the specified table.
+     * Can be used for fields of a class, elements of a collection of a class, elements of an array of
+     * a class, keys of a map of a class, values of a map of a class. This is controlled by the final
+     * argument "roleForField".
+     * @param datastoreContainer Table to add the mapping to
+     * @param mmd MetaData for the field/property to map
      * @param dba Datastore adapter
-     * @param clr ClassLoader resolver
-     * @param mappingFieldType Field type for the mapping
-     * @return The mapping
+     * @param clr The ClassLoaderResolver
+     * @param roleForField Role that this mapping plays for the field/property
+     * @return The mapping for the field.
      */
-    JavaTypeMapping getMapping(DatastoreContainerObject table, AbstractMemberMetaData fmd, 
-            DatastoreAdapter dba, ClassLoaderResolver clr, int mappingFieldType);
+    JavaTypeMapping getMapping(DatastoreContainerObject table, AbstractMemberMetaData mmd, 
+            DatastoreAdapter dba, ClassLoaderResolver clr, int roleForField);
 
     // ----------------------------------------- Datastore Types ---------------------------------------------
 

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/JDOQLQueryCompiler.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/JDOQLQueryCompiler.java	2008-11-15 17:10:17 UTC (rev 3954)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/JDOQLQueryCompiler.java	2008-11-15 17:42:04 UTC (rev 3955)
@@ -900,7 +900,7 @@
                 serialised = true; // Don't yet support Object as non-serialised. TODO Remove this when available
             }
 
-            JavaTypeMapping m = srm.getMapping(parameterClass, clr, serialised, false);
+            JavaTypeMapping m = srm.getMappingManager().getMapping(parameterClass, serialised, false, clr);
             if (!executionCompile)
             {
                 expr = m.newLiteral(qs, m.getSampleValue(clr));

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnCreator.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnCreator.java	2008-11-15 17:10:17 UTC (rev 3954)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnCreator.java	2008-11-15 17:42:04 UTC (rev 3955)
@@ -129,8 +129,10 @@
             ClassLoaderResolver clr)
     {
         // TODO Generate mapping using MappingManager passing in the metadata/fieldRole
-        JavaTypeMapping mapping = storeMgr.getMapping(javaType, serialised, embedded, 
-                mmd != null ? mmd.getFullFieldName() : null);
+//        JavaTypeMapping mapping = storeMgr.getMappingManager().getMapping(table, mmd, 
+//            storeMgr.getDatastoreAdapter(), clr, fieldRole);
+        JavaTypeMapping mapping = storeMgr.getMappingManager().getMapping(javaType, serialised, embedded, 
+                mmd.getFullFieldName());
         if (ClassUtils.isReferenceType(javaType) && !serialised && !embedded)
         {
             // Reference mapping
@@ -382,7 +384,8 @@
                 JavaTypeMapping m;
                 if (storeMgr.getMappedTypeManager().isSupportedMappedType(implClass.getName()))
                 {
-                    m = storeMgr.getMapping(implClass, serialised, embedded, mmd.getFullFieldName());
+                    m = storeMgr.getMappingManager().getMapping(implClass, serialised, embedded, 
+                        mmd.getFullFieldName());
                 }
                 else
                 {
@@ -458,7 +461,7 @@
             if (mapping instanceof ReferenceMapping)
             {
                 // Interface/Object has child mappings for each implementation
-                container = storeMgr.getMapping(javaType, serialised, embedded, 
+                container = storeMgr.getMappingManager().getMapping(javaType, serialised, embedded,
                     mmd != null ? mmd.getFullFieldName() : null);
                 ((ReferenceMapping) mapping).addJavaTypeMapping(container);
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3973
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=3973&view=rev
Author:   andy_jefferson
Date:     2008-11-16 15:11:24 +0000 (Sun, 16 Nov 2008)

Log Message:
-----------
[NUCRDBMS-79] Move bulk of column creation for PC "subclass-table" and reference "per-implementation" to the respective mapping with TODOs to remove link to "ColumnCreator"

Modified Paths:
--------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/ReferenceMapping.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/SubclassPCMapping.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnCreator.java

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/ReferenceMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/ReferenceMapping.java	2008-11-16 12:19:06 UTC (rev 3972)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/ReferenceMapping.java	2008-11-16 15:11:24 UTC (rev 3973)
@@ -18,6 +18,10 @@
 ***********************************************************************/
 package org.datanucleus.store.mapped.mapping;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
 import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.ObjectManager;
 import org.datanucleus.StateManager;
@@ -25,10 +29,13 @@
 import org.datanucleus.exceptions.NucleusUserException;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
+import org.datanucleus.metadata.ColumnMetaData;
 import org.datanucleus.metadata.FieldRole;
 import org.datanucleus.metadata.InheritanceStrategy;
 import org.datanucleus.metadata.MetaDataUtils;
+import org.datanucleus.store.exceptions.NoTableManagedException;
 import org.datanucleus.store.mapped.DatastoreAdapter;
+import org.datanucleus.store.mapped.DatastoreClass;
 import org.datanucleus.store.mapped.DatastoreContainerObject;
 import org.datanucleus.store.mapped.DatastoreField;
 import org.datanucleus.store.mapped.MappedStoreManager;
@@ -120,9 +127,9 @@
                 MappedStoreManager storeMgr = datastoreContainer.getStoreManager();
                 if (mmd.getMappedBy() == null)
                 {
-                    // TODO Move column creation here rather than refer to an RDBMS class
-                    ColumnCreator.createColumnsForFieldUsingReference(this, datastoreContainer, mmd, clr, 
-                        mmd.isEmbedded() || mmd.getElementMetaData() != null);
+                    createPerImplementationColumnsForReferenceField(this, datastoreContainer, mmd, 
+                        false, true, false, mmd.isEmbedded() || mmd.getElementMetaData() != null, 
+                        roleForField, mmd.getColumnMetaData(), clr);
                 }
                 else
                 {
@@ -178,6 +185,208 @@
     }
 
     /**
+     * Create columns for reference (Interface/Object) fields on a per-implementation basis.
+     * This call ColumnCreator.createColumnsForField for each implementation class of the reference.
+     * TODO Make this non-static as appropriate
+     */
+    public static void createPerImplementationColumnsForReferenceField(ReferenceMapping mapping,
+            DatastoreContainerObject table, AbstractMemberMetaData mmd, boolean isPrimaryKey,
+            boolean isNullable, boolean serialised, boolean embedded, int fieldRole,
+            ColumnMetaData[] columnMetaData, ClassLoaderResolver clr)
+    {
+        if (mapping instanceof InterfaceMapping && mmd != null && mmd.hasExtension("implementation-classes"))
+        {
+            // Store the implementation-classes with the mapping (persistent interfaces?)
+            ((InterfaceMapping) mapping).setImplementationClasses(mmd.getValueForExtension("implementation-classes"));
+        }
+
+        String[] implTypes = MetaDataUtils.getInstance().getImplementationNamesForReferenceField(mmd, 
+            fieldRole, clr);
+
+        // Extract the type of the interface/Object field
+        String fieldTypeName = mmd.getTypeName();
+        if (mmd.getFieldTypes() != null && mmd.getFieldTypes().length == 1)
+        {
+            // "field-type" specified
+            fieldTypeName = mmd.getFieldTypes()[0];
+        }
+        if (mmd.hasCollection())
+        {
+            fieldTypeName = mmd.getCollection().getElementType();
+        }
+        else if (mmd.hasArray())
+        {
+            fieldTypeName = mmd.getArray().getElementType();
+        }
+        else if (mmd.hasMap())
+        {
+            if (fieldRole == FieldRole.ROLE_MAP_KEY)
+            {
+                fieldTypeName = mmd.getMap().getKeyType();
+            }
+            else if (fieldRole == FieldRole.ROLE_MAP_VALUE)
+            {
+                fieldTypeName = mmd.getMap().getValueType();
+            }
+        }
+
+        MappedStoreManager storeMgr = table.getStoreManager();
+        boolean isPersistentInterfaceField = storeMgr.getOMFContext().getMetaDataManager().isPersistentInterface(fieldTypeName);
+
+        // Set the PK and nullability of column(s) for the implementations (based on the number of impls etc)
+        boolean pk = isPrimaryKey;
+        boolean nullable = isNullable;
+        if (implTypes.length > 1)
+        {
+            pk = false; // Cannot be part of PK if more than 1 implementation
+        }
+        if (implTypes.length > 1 && !pk)
+        {
+            nullable = true; // Must be nullable if more than 1 impl (since only 1 impl can have value at a time)
+        }
+
+        // Create list of classes that require columns.
+        // We only add columns for the implementation that is the root of a particular inheritance tree
+        // e.g if we have A implements I1, and B extends A then they both are valid implementations
+        // but we only want to create column(s) for A.
+        Collection implClasses = new ArrayList();
+        for (int i=0;i<implTypes.length;i++)
+        {
+            Class type = clr.classForName(implTypes[i]);
+            if (type == null)
+            {
+                throw new NucleusUserException(LOCALISER.msg("020189", mmd.getTypeName(), implTypes[i]));
+            }
+            else if (type.isInterface())
+            {
+                throw new NucleusUserException(LOCALISER.msg("020190", mmd.getFullFieldName(), 
+                    mmd.getTypeName(), implTypes[i]));
+            }
+
+            Iterator iter = implClasses.iterator();
+            boolean toBeAdded = true;
+            Class clsToSwap = null;
+            while (iter.hasNext())
+            {
+                Class cls = (Class)iter.next();
+                if (cls == type)
+                {
+                    // Implementation already present
+                    toBeAdded = false;
+                    break;
+                }
+                else
+                {
+                    if (type.isAssignableFrom(cls))
+                    {
+                        // "type" is superclass of "cls" so swap subclass for this class
+                        clsToSwap = cls;
+                        toBeAdded = false;
+                        break;
+                    }
+                    else if (cls.isAssignableFrom(type))
+                    {
+                        toBeAdded = false;
+                        break;
+                    }
+                }
+            }
+            if (toBeAdded)
+            {
+                implClasses.add(type);
+            }
+            else if (clsToSwap != null)
+            {
+                implClasses.remove(clsToSwap);
+                implClasses.add(type);
+            }
+        }
+
+        // Add columns for each of these implementations
+        int colPos = 0;
+        Iterator implClsIter = implClasses.iterator();
+        while (implClsIter.hasNext())
+        {
+            Class implClass = (Class)implClsIter.next();
+
+            boolean present = false;
+            int numJavaTypeMappings = mapping.getJavaTypeMapping().length;
+            for (int i=0;i<numJavaTypeMappings;i++)
+            {
+                JavaTypeMapping implMapping = mapping.getJavaTypeMapping()[i];
+                if (implClass.getName().equals(implMapping.getType()))
+                {
+                    present = true;
+                }
+            }
+            if (present)
+            {
+                // Implementation already present in mapping (e.g reinitialising) so skip this
+                continue;
+            }
+
+            boolean columnsNeeded = true;
+            if (isPersistentInterfaceField && 
+                !storeMgr.getOMFContext().getMetaDataManager().isPersistentInterfaceImplementation(fieldTypeName, implClass.getName()))
+            {
+                // We have a "persistent-interface" field yet this is not a generated implementation so ignore it
+                // It is arguable if we should allow the real implementations of this interface here, but the JDO2 TCK doesn't
+                // make that assumption so we don't either
+                columnsNeeded = false;
+            }
+
+            if (columnsNeeded)
+            {
+                // Get the mapping for this implementation
+                JavaTypeMapping m;
+                if (storeMgr.getMappedTypeManager().isSupportedMappedType(implClass.getName()))
+                {
+                    m = storeMgr.getMappingManager().getMapping(implClass, serialised, embedded, 
+                        mmd.getFullFieldName());
+                }
+                else
+                {
+                    try
+                    {
+                        DatastoreClass dc = storeMgr.getDatastoreClass(implClass.getName(), clr);
+                        m = dc.getIDMapping();
+                    }
+                    catch (NoTableManagedException ex)
+                    {
+                        // TODO Localise this message
+                        throw new NucleusUserException("Cannot define columns for " + mmd.getFullFieldName() + 
+                            " due to " + ex.getMessage(), ex);
+                    }
+                }
+
+                ColumnMetaData[] columnMetaDataForType = null;
+                if (columnMetaData != null && columnMetaData.length > 0)
+                {
+                    if (columnMetaData.length < colPos+m.getNumberOfDatastoreFields())
+                    {
+                        throw new NucleusUserException(LOCALISER.msg("020186", 
+                            mmd.getFullFieldName(), "" + columnMetaData.length, 
+                            "" + (colPos + m.getNumberOfDatastoreFields())));
+                    }
+                    columnMetaDataForType = new ColumnMetaData[m.getNumberOfDatastoreFields()];
+                    System.arraycopy(columnMetaData, colPos, columnMetaDataForType, 0, columnMetaDataForType.length);
+                    colPos += columnMetaDataForType.length;
+                }
+
+                // Create the FK column(s) for this implementation
+                // TODO Remove the call to an RDBMS class
+                ColumnCreator.createColumnsForField(implClass, mapping, table, storeMgr, mmd, pk, nullable, 
+                    serialised, embedded, fieldRole, columnMetaDataForType, clr, true);
+
+                if (NucleusLogger.DATASTORE.isInfoEnabled())
+                {
+                    NucleusLogger.DATASTORE.info(LOCALISER.msg("020188", implClass, mmd.getName()));
+                }
+            }
+        }
+    }
+
+    /**
      * Accessor for the java type represented by a particular datastore mapping.
      * This implementation relays to the superclass implementation except in the case of 
      * "identity" mapping strategy, in which case it returns "java.lang.String".

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/SubclassPCMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/SubclassPCMapping.java	2008-11-16 12:19:06 UTC (rev 3972)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/SubclassPCMapping.java	2008-11-16 15:11:24 UTC (rev 3973)
@@ -19,15 +19,23 @@
 package org.datanucleus.store.mapped.mapping;
 
 import org.datanucleus.ClassLoaderResolver;
+import org.datanucleus.exceptions.NucleusUserException;
+import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
+import org.datanucleus.metadata.ColumnMetaData;
+import org.datanucleus.metadata.FieldRole;
+import org.datanucleus.metadata.InheritanceStrategy;
 import org.datanucleus.store.mapped.DatastoreAdapter;
+import org.datanucleus.store.mapped.DatastoreClass;
 import org.datanucleus.store.mapped.DatastoreContainerObject;
+import org.datanucleus.store.mapped.MappedStoreManager;
 import org.datanucleus.store.mapped.expression.LogicSetExpression;
 import org.datanucleus.store.mapped.expression.ObjectExpression;
 import org.datanucleus.store.mapped.expression.ObjectLiteral;
 import org.datanucleus.store.mapped.expression.QueryExpression;
 import org.datanucleus.store.mapped.expression.ScalarExpression;
 import org.datanucleus.store.rdbms.table.ColumnCreator;
+import org.datanucleus.util.NucleusLogger;
 
 /**
  * Mapping for a field that stores a PC object that uses "subclass-table" inheritance
@@ -48,20 +56,89 @@
             ClassLoaderResolver clr)
     {
 		super.initialize(dba, fmd, container, clr);
-        createColumns(datastoreContainer, fmd, clr);
+
+		prepareDatastoreMapping(clr);
     }
 
     /**
      * Convenience method to create a column for each implementation type of this reference.
-     * @param datastoreContainer Table to use
-     * @param fmd MetaData for the field
      * @param clr The ClassLoaderResolver
      */
-    protected void createColumns(DatastoreContainerObject datastoreContainer, AbstractMemberMetaData fmd, 
-            ClassLoaderResolver clr)
+    protected void prepareDatastoreMapping(ClassLoaderResolver clr)
     {
-        // Create columns for each possible implementation type of the reference field
-        ColumnCreator.createColumnsForFieldUsingSubclassTable(this, datastoreContainer, fmd, clr);
+        if (roleForField == FieldRole.ROLE_ARRAY_ELEMENT)
+        {
+            // TODO Implement column creation for array[PC] with subclass-table
+        }
+        else if (roleForField == FieldRole.ROLE_COLLECTION_ELEMENT)
+        {
+            // TODO Implement column creation for collection<PC> with subclass-table
+        }
+        else if (roleForField == FieldRole.ROLE_MAP_KEY)
+        {
+            // TODO Implement column creation for map<PC, ..> with subclass-table
+        }
+        else if (roleForField == FieldRole.ROLE_MAP_VALUE)
+        {
+            // TODO Implement column creation for map<.., PC> with subclass-table
+        }
+        else
+        {
+            // Create columns for each possible implementation type of the reference field
+            MappedStoreManager storeMgr = datastoreContainer.getStoreManager();
+            AbstractClassMetaData refCmd = 
+                storeMgr.getOMFContext().getMetaDataManager().getMetaDataForClass(mmd.getType(), clr);
+            if (refCmd.getInheritanceMetaData().getStrategyValue() != InheritanceStrategy.SUBCLASS_TABLE)
+            {
+                throw new NucleusUserException(LOCALISER.msg("020185", mmd.getFullFieldName()));
+            }
+            AbstractClassMetaData[] subclassCmds = storeMgr.getClassesManagingTableForClass(refCmd, clr);
+
+            boolean pk = false;
+            if (subclassCmds.length > 1)
+            {
+                pk = false;
+            }
+            boolean nullable = true;
+            if (subclassCmds.length > 1)
+            {
+                nullable = true;
+            }
+
+            int colPos = 0;
+            for (int i=0; i<subclassCmds.length; i++)
+            {
+                Class type = clr.classForName(subclassCmds[i].getFullClassName());
+                DatastoreClass dc = storeMgr.getDatastoreClass(subclassCmds[i].getFullClassName(), clr);
+                JavaTypeMapping m = dc.getIDMapping();
+
+                // obtain the column names for this type
+                // TODO Fix this. The <column> elements have no way of being ordered to match the subclasses
+                ColumnMetaData[] columnMetaDataForType = null;
+                if (mmd.getColumnMetaData() != null && mmd.getColumnMetaData().length > 0)
+                {
+                    if (mmd.getColumnMetaData().length < colPos+m.getNumberOfDatastoreFields())
+                    {
+                        throw new NucleusUserException(LOCALISER.msg("020186", 
+                            mmd.getFullFieldName(), "" + mmd.getColumnMetaData().length, 
+                            "" + (colPos + m.getNumberOfDatastoreFields())));
+                    }
+                    columnMetaDataForType = new ColumnMetaData[m.getNumberOfDatastoreFields()];
+                    System.arraycopy(mmd.getColumnMetaData(), colPos, columnMetaDataForType, 0, columnMetaDataForType.length);
+                    colPos += columnMetaDataForType.length;
+                }
+
+                // Create the FK columns for this subclass
+                // TODO Remove the link to an RDBMS class
+                ColumnCreator.createColumnsForField(type, this, datastoreContainer, storeMgr, mmd, pk, nullable, 
+                    false, false, FieldRole.ROLE_FIELD, columnMetaDataForType, clr, true);
+
+                if (NucleusLogger.DATASTORE.isInfoEnabled())
+                {
+                    NucleusLogger.DATASTORE.info(LOCALISER.msg("020187", type, mmd.getName()));
+                }
+            }
+        }
     }
 
     /* (non-Javadoc)

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnCreator.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnCreator.java	2008-11-16 12:19:06 UTC (rev 3972)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnCreator.java	2008-11-16 15:11:24 UTC (rev 3973)
@@ -21,20 +21,12 @@
 **********************************************************************/
 package org.datanucleus.store.rdbms.table;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
 import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.exceptions.NucleusUserException;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.ColumnMetaData;
 import org.datanucleus.metadata.ColumnMetaDataContainer;
-import org.datanucleus.metadata.FieldRole;
-import org.datanucleus.metadata.InheritanceStrategy;
-import org.datanucleus.metadata.MetaDataUtils;
-import org.datanucleus.store.exceptions.NoTableManagedException;
 import org.datanucleus.store.mapped.DatastoreClass;
 import org.datanucleus.store.mapped.DatastoreContainerObject;
 import org.datanucleus.store.mapped.DatastoreField;
@@ -42,7 +34,6 @@
 import org.datanucleus.store.mapped.IdentifierFactory;
 import org.datanucleus.store.mapped.MappedStoreManager;
 import org.datanucleus.store.mapped.mapping.CorrespondentColumnsMapper;
-import org.datanucleus.store.mapped.mapping.InterfaceMapping;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
 import org.datanucleus.store.mapped.mapping.PersistenceCapableMapping;
 import org.datanucleus.store.mapped.mapping.ReferenceMapping;
@@ -52,7 +43,6 @@
 import org.datanucleus.store.rdbms.exceptions.DuplicateColumnNameException;
 import org.datanucleus.store.rdbms.sqlidentifier.RDBMSIdentifierFactory;
 import org.datanucleus.util.ClassUtils;
-import org.datanucleus.util.NucleusLogger;
 import org.datanucleus.util.Localiser;
 
 /**
@@ -135,8 +125,8 @@
         {
             // Reference mapping
             // Create column(s) for the reference field
-            createColumnsForReferenceField((ReferenceMapping)mapping, table, mmd, 
-                primaryKey, nullable, serialised, embedded, fieldRole, columnMetaData, clr);
+            ReferenceMapping.createPerImplementationColumnsForReferenceField((ReferenceMapping)mapping, 
+                table, mmd, primaryKey, nullable, serialised, embedded, fieldRole, columnMetaData, clr);
         }
         else
         {
@@ -147,286 +137,6 @@
     }
 
     /**
-     * Create columns for a field that uses subclass-table inheritance and where
-     * we want to have a FK for each subclass with its own table.
-     * @param mapping the mapping for the field
-     * @param table the Table which will hold the columns
-     * @param fmd MetaData for the field
-     * @param clr The ClassLoaderResolver
-     */
-    public static void createColumnsForFieldUsingSubclassTable(JavaTypeMapping mapping,
-            DatastoreContainerObject table, AbstractMemberMetaData fmd, ClassLoaderResolver clr)
-    {
-        MappedStoreManager storeMgr = table.getStoreManager();
-        AbstractClassMetaData refCmd = storeMgr.getOMFContext().getMetaDataManager().getMetaDataForClass(fmd.getType(), clr);
-        if (refCmd.getInheritanceMetaData().getStrategyValue() != InheritanceStrategy.SUBCLASS_TABLE)
-        {
-            throw new NucleusUserException(LOCALISER.msg("020185", fmd.getFullFieldName()));
-        }
-        AbstractClassMetaData[] subclassCmds = storeMgr.getClassesManagingTableForClass(refCmd, clr);
-
-        boolean pk = false;
-        if (subclassCmds.length > 1)
-        {
-            pk = false;
-        }
-        boolean nullable = true;
-        if (subclassCmds.length > 1)
-        {
-            nullable = true;
-        }
-
-        int colPos = 0;
-        for (int i=0; i<subclassCmds.length; i++)
-        {
-            Class type = clr.classForName(subclassCmds[i].getFullClassName());
-            DatastoreClass dc = storeMgr.getDatastoreClass(subclassCmds[i].getFullClassName(), clr);
-            JavaTypeMapping m = dc.getIDMapping();
-
-            // obtain the column names for this type
-            // TODO Fix this. The <column> elements have no way of being ordered to match the subclasses
-            ColumnMetaData[] columnMetaDataForType = null;
-            if (fmd.getColumnMetaData() != null && fmd.getColumnMetaData().length > 0)
-            {
-                if (fmd.getColumnMetaData().length < colPos+m.getNumberOfDatastoreFields())
-                {
-                    throw new NucleusUserException(LOCALISER.msg("020186", 
-                        fmd.getFullFieldName(), "" + fmd.getColumnMetaData().length, 
-                        "" + (colPos + m.getNumberOfDatastoreFields())));
-                }
-                columnMetaDataForType = new ColumnMetaData[m.getNumberOfDatastoreFields()];
-                System.arraycopy(fmd.getColumnMetaData(), colPos, columnMetaDataForType, 0, columnMetaDataForType.length);
-                colPos += columnMetaDataForType.length;
-            }
-
-            // Create the FK columns for this subclass
-            createColumnsForField(type, mapping, table, storeMgr, fmd, pk, nullable, false, false, FieldRole.ROLE_FIELD,
-                columnMetaDataForType, clr, true);
-
-            if (NucleusLogger.DATASTORE.isInfoEnabled())
-            {
-                NucleusLogger.DATASTORE.info(LOCALISER.msg("020187", type, fmd.getName()));
-            }
-        }
-    }
-
-    /**
-     * Create columns for reference (Object/interface) fields.
-     * @param mapping the mapping for the reference field
-     * @param table the Table which will hold the columns
-     * @param fmd MetaData for the field
-     * @param clr The ClassLoaderResolver
-     * @param embedded Whether the field is embedded
-     */
-    public static void createColumnsForFieldUsingReference(ReferenceMapping mapping,
-            DatastoreContainerObject table, AbstractMemberMetaData fmd, ClassLoaderResolver clr,
-            boolean embedded)
-    {
-        createColumnsForReferenceField(mapping, table, fmd, false, true, false, embedded, FieldRole.ROLE_FIELD,
-            fmd.getColumnMetaData(), clr);
-    }
-
-    /**
-     * Create columns for reference (Interface/Object) fields.
-     * This call createColumnsForField for each implementation class of the reference.
-     */
-    private static void createColumnsForReferenceField(ReferenceMapping mapping,
-            DatastoreContainerObject table, AbstractMemberMetaData mmd, boolean isPrimaryKey,
-            boolean isNullable, boolean serialised, boolean embedded, int fieldRole,
-            ColumnMetaData[] columnMetaData, ClassLoaderResolver clr)
-    {
-        if (mapping instanceof InterfaceMapping && mmd != null && mmd.hasExtension("implementation-classes"))
-        {
-            // Store the implementation-classes with the mapping (persistent interfaces?)
-            ((InterfaceMapping) mapping).setImplementationClasses(mmd.getValueForExtension("implementation-classes"));
-        }
-
-        String[] implTypes = MetaDataUtils.getInstance().getImplementationNamesForReferenceField(mmd, 
-            fieldRole, clr);
-
-        // Extract the type of the interface/Object field
-        String fieldTypeName = mmd.getTypeName();
-        if (mmd.getFieldTypes() != null && mmd.getFieldTypes().length == 1)
-        {
-            // "field-type" specified
-            fieldTypeName = mmd.getFieldTypes()[0];
-        }
-        if (mmd.hasCollection())
-        {
-            fieldTypeName = mmd.getCollection().getElementType();
-        }
-        else if (mmd.hasArray())
-        {
-            fieldTypeName = mmd.getArray().getElementType();
-        }
-        else if (mmd.hasMap())
-        {
-            if (fieldRole == FieldRole.ROLE_MAP_KEY)
-            {
-                fieldTypeName = mmd.getMap().getKeyType();
-            }
-            else if (fieldRole == FieldRole.ROLE_MAP_VALUE)
-            {
-                fieldTypeName = mmd.getMap().getValueType();
-            }
-        }
-
-        MappedStoreManager storeMgr = table.getStoreManager();
-        boolean isPersistentInterfaceField = storeMgr.getOMFContext().getMetaDataManager().isPersistentInterface(fieldTypeName);
-
-        // Set the PK and nullability of column(s) for the implementations (based on the number of impls etc)
-        boolean pk = isPrimaryKey;
-        boolean nullable = isNullable;
-        if (implTypes.length > 1)
-        {
-            pk = false; // Cannot be part of PK if more than 1 implementation
-        }
-        if (implTypes.length > 1 && !pk)
-        {
-            nullable = true; // Must be nullable if more than 1 impl (since only 1 impl can have value at a time)
-        }
-
-        // Create list of classes that require columns.
-        // We only add columns for the implementation that is the root of a particular inheritance tree
-        // e.g if we have A implements I1, and B extends A then they both are valid implementations
-        // but we only want to create column(s) for A.
-        Collection implClasses = new ArrayList();
-        for (int i=0;i<implTypes.length;i++)
-        {
-            Class type = clr.classForName(implTypes[i]);
-            if (type == null)
-            {
-                throw new NucleusUserException(LOCALISER.msg("020189", mmd.getTypeName(), implTypes[i]));
-            }
-            else if (type.isInterface())
-            {
-                throw new NucleusUserException(LOCALISER.msg("020190", mmd.getFullFieldName(), 
-                    mmd.getTypeName(), implTypes[i]));
-            }
-
-            Iterator iter = implClasses.iterator();
-            boolean toBeAdded = true;
-            Class clsToSwap = null;
-            while (iter.hasNext())
-            {
-                Class cls = (Class)iter.next();
-                if (cls == type)
-                {
-                    // Implementation already present
-                    toBeAdded = false;
-                    break;
-                }
-                else
-                {
-                    if (type.isAssignableFrom(cls))
-                    {
-                        // "type" is superclass of "cls" so swap subclass for this class
-                        clsToSwap = cls;
-                        toBeAdded = false;
-                        break;
-                    }
-                    else if (cls.isAssignableFrom(type))
-                    {
-                        toBeAdded = false;
-                        break;
-                    }
-                }
-            }
-            if (toBeAdded)
-            {
-                implClasses.add(type);
-            }
-            else if (clsToSwap != null)
-            {
-                implClasses.remove(clsToSwap);
-                implClasses.add(type);
-            }
-        }
-
-        // Add columns for each of these implementations
-        int colPos = 0;
-        Iterator implClsIter = implClasses.iterator();
-        while (implClsIter.hasNext())
-        {
-            Class implClass = (Class)implClsIter.next();
-
-            boolean present = false;
-            int numJavaTypeMappings = mapping.getJavaTypeMapping().length;
-            for (int i=0;i<numJavaTypeMappings;i++)
-            {
-                JavaTypeMapping implMapping = mapping.getJavaTypeMapping()[i];
-                if (implClass.getName().equals(implMapping.getType()))
-                {
-                    present = true;
-                }
-            }
-            if (present)
-            {
-                // Implementation already present in mapping (e.g reinitialising) so skip this
-                continue;
-            }
-
-            boolean columnsNeeded = true;
-            if (isPersistentInterfaceField && 
-                !storeMgr.getOMFContext().getMetaDataManager().isPersistentInterfaceImplementation(fieldTypeName, implClass.getName()))
-            {
-                // We have a "persistent-interface" field yet this is not a generated implementation so ignore it
-                // It is arguable if we should allow the real implementations of this interface here, but the JDO2 TCK doesn't
-                // make that assumption so we don't either
-                columnsNeeded = false;
-            }
-
-            if (columnsNeeded)
-            {
-                // Get the mapping for this implementation
-                JavaTypeMapping m;
-                if (storeMgr.getMappedTypeManager().isSupportedMappedType(implClass.getName()))
-                {
-                    m = storeMgr.getMappingManager().getMapping(implClass, serialised, embedded, 
-                        mmd.getFullFieldName());
-                }
-                else
-                {
-                    try
-                    {
-                        DatastoreClass dc = storeMgr.getDatastoreClass(implClass.getName(), clr);
-                        m = dc.getIDMapping();
-                    }
-                    catch (NoTableManagedException ex)
-                    {
-                        // TODO Localise this message
-                        throw new NucleusUserException("Cannot define columns for " + mmd.getFullFieldName() + 
-                            " due to " + ex.getMessage(), ex);
-                    }
-                }
-
-                ColumnMetaData[] columnMetaDataForType = null;
-                if (columnMetaData != null && columnMetaData.length > 0)
-                {
-                    if (columnMetaData.length < colPos+m.getNumberOfDatastoreFields())
-                    {
-                        throw new NucleusUserException(LOCALISER.msg("020186", 
-                            mmd.getFullFieldName(), "" + columnMetaData.length, 
-                            "" + (colPos + m.getNumberOfDatastoreFields())));
-                    }
-                    columnMetaDataForType = new ColumnMetaData[m.getNumberOfDatastoreFields()];
-                    System.arraycopy(columnMetaData, colPos, columnMetaDataForType, 0, columnMetaDataForType.length);
-                    colPos += columnMetaDataForType.length;
-                }
-
-                // Create the FK column(s) for this implementation
-                createColumnsForField(implClass, mapping, table, storeMgr, mmd, pk, nullable, serialised, 
-                    embedded, fieldRole, columnMetaDataForType, clr, true);
-
-                if (NucleusLogger.DATASTORE.isInfoEnabled())
-                {
-                    NucleusLogger.DATASTORE.info(LOCALISER.msg("020188", implClass, mmd.getName()));
-                }
-            }
-        }
-    }
-
-    /**
      * Method to create the column(s) for a field in either a join table or for a reference field.
      * @param javaType The java type of the field being stored
      * @param mapping The JavaTypeMapping (if existing, otherwise created and returned by this method)
@@ -443,7 +153,7 @@
      * @param isReferenceField Whether this field is part of a reference field
      * @return The JavaTypeMapping for the table
      */
-    private static JavaTypeMapping createColumnsForField(Class javaType, JavaTypeMapping mapping,
+    public static JavaTypeMapping createColumnsForField(Class javaType, JavaTypeMapping mapping,
             DatastoreContainerObject table, MappedStoreManager storeMgr, AbstractMemberMetaData mmd,
             boolean isPrimaryKey, boolean isNullable, boolean serialised, boolean embedded,
             int fieldRole, ColumnMetaData[] columnMetaData, ClassLoaderResolver clr, boolean isReferenceField)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3984
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=3984&view=rev
Author:   andy_jefferson
Date:     2008-11-17 13:45:12 +0000 (Mon, 17 Nov 2008)

Log Message:
-----------
[NUCRDBMS-79] Refactor DuplicateColumnNameException to store.mapped and generalised

Modified Paths:
--------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation.properties
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation_es.properties
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation.properties
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation_es.properties
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/AbstractTable.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ClassTable.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnCreator.java

Added Paths:
-----------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DuplicateDatastoreFieldException.java

Removed Paths:
-------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/exceptions/DuplicateColumnNameException.java

Added: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DuplicateDatastoreFieldException.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DuplicateDatastoreFieldException.java	                        (rev 0)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DuplicateDatastoreFieldException.java	2008-11-17 13:45:12 UTC (rev 3984)
@@ -0,0 +1,62 @@
+/**********************************************************************
+Copyright (c) 2008 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+    ...
+**********************************************************************/
+package org.datanucleus.store.mapped;
+
+import org.datanucleus.exceptions.NucleusException;
+import org.datanucleus.util.Localiser;
+
+/**
+ * A <tt>DuplicateDatastoreFieldException</tt> is thrown if an attempt is made to
+ * add a column to a table with a name already in-use by an existing column.
+ */
+public class DuplicateDatastoreFieldException extends NucleusException
+{
+    private static final Localiser LOCALISER=Localiser.getInstance(
+        "org.datanucleus.store.mapped.Localisation", MappedStoreManager.class.getClassLoader());
+
+    /** Column that cannot be created because it conflicts with existing column with same identifier. */
+    private DatastoreField conflictingColumn;
+
+    /**
+     * Constructs a duplicate column name exception.
+     * @param tableName Name of the table being initialized.
+     * @param col1 Column we already have
+     * @param col2 Column that we tried to create
+     */
+    public DuplicateDatastoreFieldException(String tableName, DatastoreField col1, DatastoreField col2)
+    {
+        super(LOCALISER.msg("020007", col1.getIdentifier(), tableName,
+            col1.getMemberMetaData() == null ?
+                LOCALISER.msg("020008") :
+                (col1.getMemberMetaData() != null ? col1.getMemberMetaData().getFullFieldName() : null),
+            col2.getMemberMetaData() == null ?
+                LOCALISER.msg("020008") :
+                (col2.getMemberMetaData() != null ? col2.getMemberMetaData().getFullFieldName() : null)));
+        this.conflictingColumn = col2;
+        setFatal();
+    }
+
+    /**
+     * Accessor for the column that could not be created because it conflicts with something already present.
+     * @return The column
+     */
+    public DatastoreField getConflictingColumn()
+    {
+        return conflictingColumn;
+    }
+}
\ No newline at end of file

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation.properties
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation.properties	2008-11-17 08:10:34 UTC (rev 3983)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation.properties	2008-11-17 13:45:12 UTC (rev 3984)
@@ -25,3 +25,5 @@
 020004=Columns "{0}" has a column "{1}" which has been defined to map to column "{2}" but this doesn't exist!
 020005=Columns "{0}" column number {1} has no remaining columns to map to!
 020006=Columns "{0}" has a column "{1}" that has been mapped twice!
+020007=Duplicate column name "{0}" defined for table "{1}". You cannot map multiple fields to the same column. The duplicated columns are specified by {2} and {3}.
+020008=? datastore-identity|index columns|other non mapped to any field ?

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation_es.properties
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation_es.properties	2008-11-17 08:10:34 UTC (rev 3983)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation_es.properties	2008-11-17 13:45:12 UTC (rev 3984)
@@ -25,3 +25,5 @@
 020004=Las columnas "{0}" tiene una columna "{1}" que ha sideo definido associar con "{2}" pero este no existe!
 020005=Las columnas "{0}" numero de columna {1} no tiene otras columnas para asociar!
 020006=Las columnas "{0}" tiene una columna "{1}" que ha sido asociado dos veces!
+020007=El nombre de la columna "{0}", de la tabla "{1}" esta duplicado. No se pueden mapear varios campos a una misma columna. El columnas utilizada {2} y {3}.
+020008=? datastore-identity|index columns|other non mapped to any field ?

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation.properties
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation.properties	2008-11-17 08:10:34 UTC (rev 3983)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation.properties	2008-11-17 13:45:12 UTC (rev 3984)
@@ -68,8 +68,6 @@
 #
 # Schema Mapping, columns etc
 #
-020007=Duplicate column name "{0}" defined for table "{1}". You cannot map multiple fields to the same column. The duplicated columns are specified by {2} and {3}.
-020008=? datastore-identity|index columns|other non mapped to any field ?
 020009=Incompatible data type for column {0} : was {1} (datastore), but type expected was {2} (metadata). Please check that the type in the datastore and the type specified in the MetaData are consistent.
 020010=Required columns missing from table "{0}" : {1}. Perhaps your MetaData is incorrect, or you haven't enabled "datanucleus.autoCreateColumns".
 020011=Required table missing : "{2}" in Catalog "{0}" Schema "{1}". DataNucleus requires this table to perform its persistence operations. Either your MetaData is incorrect, or you need to enable "datanucleus.autoCreateTables"

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation_es.properties
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation_es.properties	2008-11-17 08:10:34 UTC (rev 3983)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation_es.properties	2008-11-17 13:45:12 UTC (rev 3984)
@@ -68,8 +68,6 @@
 #
 # Schema mapping, columns etc
 #
-020007=El nombre de la columna "{0}", de la tabla "{1}" esta duplicado. No se pueden mapear varios campos a una misma columna. El columnas utilizada {2} y {3}.
-020008=? datastore-identity|index columns|other non mapped to any field ?
 020009=El tipo de dato de la columna "{0}" es incompatible : era {1} (datastore), pero debe ser {2} (metadata). Por favor compruebe que el tipo en la base de datos y el tipo en el MetaData son iguales.
 020010=Las columnas requeridas no existen en la tabla {0} : {1}. Quizas el MetaData sea correcto, o no tiene "datanucleus.autoCreateColumns" como "true".
 020011=La tabla no existe : {2} en Catalog {0} Schema {1}. El MetaData no es correcto, o necesita poner "datanucleus.autoCreateTables" como "true"

Deleted: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/exceptions/DuplicateColumnNameException.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/exceptions/DuplicateColumnNameException.java	2008-11-17 08:10:34 UTC (rev 3983)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/exceptions/DuplicateColumnNameException.java	2008-11-17 13:45:12 UTC (rev 3984)
@@ -1,65 +0,0 @@
-/**********************************************************************
-Copyright (c) 2003 Mike Martin and others. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Contributors:
-    Andy Jefferson - coding standards
-    ...
-**********************************************************************/
-package org.datanucleus.store.rdbms.exceptions;
-
-import org.datanucleus.exceptions.NucleusException;
-import org.datanucleus.store.rdbms.RDBMSManager;
-import org.datanucleus.store.rdbms.table.Column;
-import org.datanucleus.util.Localiser;
-
-/**
- * A <tt>DuplicateColumnNameException</tt> is thrown if an attempt is made to
- * add a column to a table with a name already in-use by an existing column.
- */
-public class DuplicateColumnNameException extends NucleusException
-{
-    private static final Localiser LOCALISER=Localiser.getInstance("org.datanucleus.store.rdbms.Localisation",
-        RDBMSManager.class.getClassLoader());
-
-    /** Column that cannot be created because it conflicts with an existing column with the same identifier. */
-    private Column conflictingColumn;
-
-    /**
-     * Constructs a duplicate column name exception.
-     * @param tableName Name of the table being initialized.
-     * @param column Column we already have
-     * @param otherColumn Column that we tried to create
-     */
-    public DuplicateColumnNameException(String tableName, Column column, Column otherColumn)
-    {
-        super(LOCALISER.msg("020007", column.getIdentifier(), tableName,
-            column.getMemberMetaData() == null ?
-                LOCALISER.msg("020008") :
-                (column.getMemberMetaData() != null ? column.getMemberMetaData().getFullFieldName() : null),
-            otherColumn.getMemberMetaData() == null ?
-                LOCALISER.msg("020008") :
-                (otherColumn.getMemberMetaData() != null ? otherColumn.getMemberMetaData().getFullFieldName() : null)));
-        this.conflictingColumn = otherColumn;
-        setFatal();
-    }
-
-    /**
-     * Accessor for the column that could not be created because it conflicts with something already present.
-     * @return The column
-     */
-    public Column getConflictingColumn()
-    {
-        return conflictingColumn;
-    }
-}
\ No newline at end of file

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/AbstractTable.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/AbstractTable.java	2008-11-17 08:10:34 UTC (rev 3983)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/AbstractTable.java	2008-11-17 13:45:12 UTC (rev 3984)
@@ -45,12 +45,12 @@
 import org.datanucleus.metadata.VersionMetaData;
 import org.datanucleus.store.mapped.DatastoreField;
 import org.datanucleus.store.mapped.DatastoreIdentifier;
+import org.datanucleus.store.mapped.DuplicateDatastoreFieldException;
 import org.datanucleus.store.mapped.MappedStoreManager;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
 import org.datanucleus.store.rdbms.RDBMSManager;
 import org.datanucleus.store.rdbms.SQLWarnings;
 import org.datanucleus.store.rdbms.adapter.RDBMSAdapter;
-import org.datanucleus.store.rdbms.exceptions.DuplicateColumnNameException;
 import org.datanucleus.store.rdbms.exceptions.MissingTableException;
 import org.datanucleus.store.rdbms.schema.RDBMSSchemaHandler;
 import org.datanucleus.store.rdbms.sqlidentifier.SQLIdentifier;
@@ -213,7 +213,7 @@
      * @param mapping the mapping for the column to be added
      * @param colmd ColumnMetaData for the column to be added to the table
      * @return the new Column
-     * @throws DuplicateColumnNameException if a column already exists with same name and not a supported situation.
+     * @throws DuplicateDatastoreFieldException if a column already exists with same name and not a supported situation.
      */
     public synchronized DatastoreField addDatastoreField(String storedJavaType, DatastoreIdentifier name, 
             JavaTypeMapping mapping, MetaData colmd)
@@ -267,7 +267,7 @@
                 // we raise an exception when within one class it is defined a column twice
                 // in some cases it could still be possible to have these duplicated columns, but does not make too
                 // much sense in most of the cases. (this whole block of duplicated column check, could be optional, like a pmf property)
-                throw new DuplicateColumnNameException(this.toString(), existingCol, col);
+                throw new DuplicateDatastoreFieldException(this.toString(), existingCol, col);
             }
 
             // Make sure the field JavaTypeMappings are compatible
@@ -276,7 +276,7 @@
                 !existingCol.getJavaTypeMapping().getClass().isAssignableFrom(mapping.getClass())) 
             {
                 // the mapping class must be the same (not really required, but to avoid user mistakes)
-                throw new DuplicateColumnNameException(this.toString(), existingCol, col);
+                throw new DuplicateDatastoreFieldException(this.toString(), existingCol, col);
             }
 
             // Make sure the field java types are compatible
@@ -297,7 +297,7 @@
                 !existingColStoredJavaTypeClass.isAssignableFrom(fieldStoredJavaTypeClass))
             {
                 // the stored java type must be the same (not really required, but to avoid user mistakes)
-                throw new DuplicateColumnNameException(this.toString(), existingCol, col);
+                throw new DuplicateDatastoreFieldException(this.toString(), existingCol, col);
             }
         }
 

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ClassTable.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ClassTable.java	2008-11-17 08:10:34 UTC (rev 3983)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ClassTable.java	2008-11-17 13:45:12 UTC (rev 3984)
@@ -82,6 +82,7 @@
 import org.datanucleus.store.mapped.DatastoreClass;
 import org.datanucleus.store.mapped.DatastoreField;
 import org.datanucleus.store.mapped.DatastoreIdentifier;
+import org.datanucleus.store.mapped.DuplicateDatastoreFieldException;
 import org.datanucleus.store.mapped.IdentifierFactory;
 import org.datanucleus.store.mapped.mapping.CorrespondentColumnsMapper;
 import org.datanucleus.store.mapped.mapping.DatastoreMapping;
@@ -101,7 +102,6 @@
 import org.datanucleus.store.rdbms.JDBCUtils;
 import org.datanucleus.store.rdbms.RDBMSManager;
 import org.datanucleus.store.rdbms.adapter.RDBMSAdapter;
-import org.datanucleus.store.rdbms.exceptions.DuplicateColumnNameException;
 import org.datanucleus.store.rdbms.key.CandidateKey;
 import org.datanucleus.store.rdbms.key.ForeignKey;
 import org.datanucleus.store.rdbms.key.Index;
@@ -1252,12 +1252,12 @@
                                 ((PersistenceCapableMapping)fkMapping).addJavaTypeMapping(mapping);
                             }
                         }
-                        catch (DuplicateColumnNameException dcne)
+                        catch (DuplicateDatastoreFieldException dce)
                         {
                             // If the user hasnt specified "relation-discriminator-column" here we dont allow the sharing of columns
                             if (!ownerFmd.hasExtension("relation-discriminator-column"))
                             {
-                                throw dcne;
+                                throw dce;
                             }
 
                             // Find the FK using this column and use it instead of creating a new one since we're sharing
@@ -1269,7 +1269,7 @@
                                 JavaTypeMapping existingFkMapping = (JavaTypeMapping)entry.getValue();
                                 for (int j=0;j<existingFkMapping.getNumberOfDatastoreFields();j++)
                                 {
-                                    if (existingFkMapping.getDataStoreMapping(j).getDatastoreField().getIdentifier().toString().equals(dcne.getConflictingColumn().getIdentifier().toString()))
+                                    if (existingFkMapping.getDataStoreMapping(j).getDatastoreField().getIdentifier().toString().equals(dce.getConflictingColumn().getIdentifier().toString()))
                                     {
                                         // The FK is shared (and so if it is a List we also share the index)
                                         fkMapping = existingFkMapping;
@@ -1282,7 +1282,7 @@
                             if (fkMapping == null)
                             {
                                 // Should never happen since we know there is a col duplicating ours
-                                throw dcne;
+                                throw dce;
                             }
                             duplicate = true;
                         }

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnCreator.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnCreator.java	2008-11-17 08:10:34 UTC (rev 3983)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnCreator.java	2008-11-17 13:45:12 UTC (rev 3984)
@@ -31,6 +31,7 @@
 import org.datanucleus.store.mapped.DatastoreContainerObject;
 import org.datanucleus.store.mapped.DatastoreField;
 import org.datanucleus.store.mapped.DatastoreIdentifier;
+import org.datanucleus.store.mapped.DuplicateDatastoreFieldException;
 import org.datanucleus.store.mapped.IdentifierFactory;
 import org.datanucleus.store.mapped.MappedStoreManager;
 import org.datanucleus.store.mapped.mapping.CorrespondentColumnsMapper;
@@ -40,7 +41,6 @@
 import org.datanucleus.store.mapped.mapping.SerialisedPCMapping;
 import org.datanucleus.store.mapped.mapping.SerialisedReferenceMapping;
 import org.datanucleus.store.rdbms.RDBMSManager;
-import org.datanucleus.store.rdbms.exceptions.DuplicateColumnNameException;
 import org.datanucleus.store.rdbms.sqlidentifier.RDBMSIdentifierFactory;
 import org.datanucleus.util.ClassUtils;
 import org.datanucleus.util.Localiser;
@@ -260,7 +260,7 @@
                         storeMgr.getMappingManager().createDatastoreMapping(refDatastoreMapping, column, 
                             m.getDataStoreMapping(i).getJavaTypeMapping().getJavaTypeForDatastoreMapping(i));
                     }
-                    catch (DuplicateColumnNameException ex)
+                    catch (DuplicateDatastoreFieldException ex)
                     {
                     	throw new NucleusUserException("Cannot create column for field "+mmd.getFullFieldName()+" column metadata "+colmd,ex);
                     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4128
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4128&view=rev
Author:   andy_jefferson
Date:     2008-11-30 11:57:42 +0000 (Sun, 30 Nov 2008)

Log Message:
-----------
[NUCRDBMS-64] Further cleanup for creating columns in join table for collection/map element/key/value. We now create the columns in ReferenceMapping. Added TODOs for different mapping-strategy when used in join table

Modified Paths:
--------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/ReferenceMapping.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnCreator.java

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/ReferenceMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/ReferenceMapping.java	2008-11-30 11:54:12 UTC (rev 4127)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/ReferenceMapping.java	2008-11-30 11:57:42 UTC (rev 4128)
@@ -33,10 +33,13 @@
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.ColumnMetaData;
 import org.datanucleus.metadata.DiscriminatorMetaData;
+import org.datanucleus.metadata.ElementMetaData;
 import org.datanucleus.metadata.FieldRole;
 import org.datanucleus.metadata.IdentityType;
 import org.datanucleus.metadata.InheritanceStrategy;
+import org.datanucleus.metadata.KeyMetaData;
 import org.datanucleus.metadata.MetaDataUtils;
+import org.datanucleus.metadata.ValueMetaData;
 import org.datanucleus.store.exceptions.NoTableManagedException;
 import org.datanucleus.store.mapped.DatastoreAdapter;
 import org.datanucleus.store.mapped.DatastoreClass;
@@ -121,19 +124,67 @@
     {
         if (roleForField == FieldRole.ROLE_ARRAY_ELEMENT)
         {
-            // TODO Handle creation of columns in join table for array of references
+            // TODO Implement join table column creation for array of references
+            // Creation of columns in join table for array of references
+            /*ColumnMetaData[] colmds = null;
+            ElementMetaData elemmd = mmd.getElementMetaData();
+            if (elemmd != null && elemmd.getColumnMetaData() != null && elemmd.getColumnMetaData().length > 0)
+            {
+                // Column mappings defined at this side (1-N, M-N)
+                colmds = elemmd.getColumnMetaData();
+            }
+            ReferenceMapping.createPerImplementationColumnsForReferenceField(this, 
+                datastoreContainer, mmd, false, false, false, false, roleForField, colmds, clr);*/
         }
         else if (roleForField == FieldRole.ROLE_COLLECTION_ELEMENT)
         {
-            // TODO Handle creation of columns in join table for collection of references
+            // Creation of columns in join table for collection of references
+            // TODO Cater for mappingStrategy of ID_MAPPING/XCALIA_MAPPING
+            ColumnMetaData[] colmds = null;
+            AbstractMemberMetaData[] relatedMmds = mmd.getRelatedMemberMetaData(clr);
+            ElementMetaData elemmd = mmd.getElementMetaData();
+            if (elemmd != null && elemmd.getColumnMetaData() != null && elemmd.getColumnMetaData().length > 0)
+            {
+                // Column mappings defined at this side (1-N, M-N)
+                colmds = elemmd.getColumnMetaData();
+            }
+            else if (relatedMmds != null && relatedMmds[0].getJoinMetaData() != null && 
+                relatedMmds[0].getJoinMetaData().getColumnMetaData() != null &&
+                relatedMmds[0].getJoinMetaData().getColumnMetaData().length > 0)
+            {
+                // Column mappings defined at other side (M-N) on <join>
+                colmds = relatedMmds[0].getJoinMetaData().getColumnMetaData();
+            }
+            ReferenceMapping.createPerImplementationColumnsForReferenceField(this, 
+                datastoreContainer, mmd, false, false, false, false, roleForField, colmds, clr);
         }
         else if (roleForField == FieldRole.ROLE_MAP_KEY)
         {
-            // TODO Handle creation of columns in join table for map of references as keys
+            // Creation of columns in join table for map of references as keys
+            // TODO Cater for mappingStrategy of ID_MAPPING/XCALIA_MAPPING
+            ColumnMetaData[] colmds = null;
+            KeyMetaData keymd = mmd.getKeyMetaData();
+            if (keymd != null && keymd.getColumnMetaData() != null && keymd.getColumnMetaData().length > 0)
+            {
+                // Column mappings defined at this side (1-N, M-N)
+                colmds = keymd.getColumnMetaData();
+            }
+            ReferenceMapping.createPerImplementationColumnsForReferenceField(this, 
+                datastoreContainer, mmd, false, false, false, false, roleForField, colmds, clr);
         }
         else if (roleForField == FieldRole.ROLE_MAP_VALUE)
         {
-            // TODO Handle creation of columns in join table for map of references as values
+            // Creation of columns in join table for map of references as values
+            // TODO Cater for mappingStrategy of ID_MAPPING/XCALIA_MAPPING
+            ColumnMetaData[] colmds = null;
+            ValueMetaData valuemd = mmd.getValueMetaData();
+            if (valuemd != null && valuemd.getColumnMetaData() != null && valuemd.getColumnMetaData().length > 0)
+            {
+                // Column mappings defined at this side (1-N, M-N)
+                colmds = valuemd.getColumnMetaData();
+            }
+            ReferenceMapping.createPerImplementationColumnsForReferenceField(this, 
+                datastoreContainer, mmd, false, false, false, false, roleForField, colmds, clr);
         }
         else
         {

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnCreator.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnCreator.java	2008-11-30 11:54:12 UTC (rev 4127)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnCreator.java	2008-11-30 11:57:42 UTC (rev 4128)
@@ -27,6 +27,7 @@
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.ColumnMetaData;
 import org.datanucleus.metadata.ColumnMetaDataContainer;
+import org.datanucleus.metadata.FieldRole;
 import org.datanucleus.store.mapped.DatastoreClass;
 import org.datanucleus.store.mapped.DatastoreContainerObject;
 import org.datanucleus.store.mapped.DatastoreField;
@@ -42,6 +43,7 @@
 import org.datanucleus.store.mapped.mapping.SerialisedReferenceMapping;
 import org.datanucleus.store.rdbms.RDBMSManager;
 import org.datanucleus.store.rdbms.sqlidentifier.RDBMSIdentifierFactory;
+import org.datanucleus.util.ClassUtils;
 import org.datanucleus.util.Localiser;
 
 /**
@@ -118,25 +120,38 @@
             boolean primaryKey, boolean nullable, boolean serialised, boolean embedded, int fieldRole,
             ClassLoaderResolver clr)
     {
-        JavaTypeMapping mapping = storeMgr.getMappingManager().getMapping(javaType, serialised, embedded,
-                mmd.getFullFieldName());
-        if (mapping instanceof SerialisedPCMapping || mapping instanceof SerialisedReferenceMapping)
+        JavaTypeMapping mapping = null;
+        if (ClassUtils.isReferenceType(javaType) && !serialised && !embedded)
         {
-            // Serialised column will be added by mapping constructor, so just return it
-            return mapping;
+            if (fieldRole == FieldRole.ROLE_COLLECTION_ELEMENT || fieldRole == FieldRole.ROLE_MAP_KEY ||
+                fieldRole == FieldRole.ROLE_MAP_VALUE)
+            {
+                mapping = storeMgr.getMappingManager().getMapping(table, mmd, storeMgr.getDatastoreAdapter(), 
+                    clr, fieldRole);
+            }
+            else
+            {
+                // TODO Do the same thing with array join table fields
+                mapping = storeMgr.getMappingManager().getMapping(javaType, serialised, embedded,
+                    mmd.getFullFieldName());
+                ReferenceMapping.createPerImplementationColumnsForReferenceField((ReferenceMapping)mapping, 
+                    table, mmd, primaryKey, nullable, serialised, embedded, fieldRole, columnMetaData, clr);
+            }
         }
-        else if (mapping instanceof ReferenceMapping)
-        {
-            // Reference mapping
-            // Create column(s) for the reference field
-            // TODO Change this to do the column creation in the ReferenceMapping
-            ReferenceMapping.createPerImplementationColumnsForReferenceField((ReferenceMapping)mapping, 
-                table, mmd, primaryKey, nullable, serialised, embedded, fieldRole, columnMetaData, clr);
-        }
         else
         {
-            createColumnsForField(javaType, mapping, table, storeMgr, mmd, primaryKey, nullable, 
-                serialised, embedded, fieldRole, columnMetaData, clr, false);
+            mapping = storeMgr.getMappingManager().getMapping(javaType, serialised, embedded,
+                mmd.getFullFieldName());
+            if (mapping instanceof SerialisedPCMapping || mapping instanceof SerialisedReferenceMapping)
+            {
+                // Serialised column will be added by mapping constructor, so just return it
+                return mapping;
+            }
+            else
+            {
+                createColumnsForField(javaType, mapping, table, storeMgr, mmd, primaryKey, nullable, 
+                    serialised, embedded, fieldRole, columnMetaData, clr, false);
+            }
         }
         return mapping;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4129
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4129&view=rev
Author:   andy_jefferson
Date:     2008-11-30 14:53:23 +0000 (Sun, 30 Nov 2008)

Log Message:
-----------
[NUCRDBMS-64] Migrate Array<Reference> to generate columns in mapping for join table case

Modified Paths:
--------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/AbstractMappingManager.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/ReferenceMapping.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnCreator.java

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/AbstractMappingManager.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/AbstractMappingManager.java	2008-11-30 11:57:42 UTC (rev 4128)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/AbstractMappingManager.java	2008-11-30 14:53:23 UTC (rev 4129)
@@ -482,7 +482,9 @@
         }
         else if (mmd.hasArray())
         {
-            elementCls = clr.classForName(mmd.getArray().getElementType());
+            // Use basic element type rather than any restricted type
+            elementCls = mmd.getType().getComponentType();
+//            elementCls = clr.classForName(mmd.getArray().getElementType());
         }
         boolean elementReference = ClassUtils.isReferenceType(elementCls);
 

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/ReferenceMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/ReferenceMapping.java	2008-11-30 11:57:42 UTC (rev 4128)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/ReferenceMapping.java	2008-11-30 14:53:23 UTC (rev 4129)
@@ -126,7 +126,7 @@
         {
             // TODO Implement join table column creation for array of references
             // Creation of columns in join table for array of references
-            /*ColumnMetaData[] colmds = null;
+            ColumnMetaData[] colmds = null;
             ElementMetaData elemmd = mmd.getElementMetaData();
             if (elemmd != null && elemmd.getColumnMetaData() != null && elemmd.getColumnMetaData().length > 0)
             {
@@ -134,7 +134,7 @@
                 colmds = elemmd.getColumnMetaData();
             }
             ReferenceMapping.createPerImplementationColumnsForReferenceField(this, 
-                datastoreContainer, mmd, false, false, false, false, roleForField, colmds, clr);*/
+                datastoreContainer, mmd, false, false, false, false, roleForField, colmds, clr);
         }
         else if (roleForField == FieldRole.ROLE_COLLECTION_ELEMENT)
         {

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnCreator.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnCreator.java	2008-11-30 11:57:42 UTC (rev 4128)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnCreator.java	2008-11-30 14:53:23 UTC (rev 4129)
@@ -27,7 +27,6 @@
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.ColumnMetaData;
 import org.datanucleus.metadata.ColumnMetaDataContainer;
-import org.datanucleus.metadata.FieldRole;
 import org.datanucleus.store.mapped.DatastoreClass;
 import org.datanucleus.store.mapped.DatastoreContainerObject;
 import org.datanucleus.store.mapped.DatastoreField;
@@ -123,20 +122,9 @@
         JavaTypeMapping mapping = null;
         if (ClassUtils.isReferenceType(javaType) && !serialised && !embedded)
         {
-            if (fieldRole == FieldRole.ROLE_COLLECTION_ELEMENT || fieldRole == FieldRole.ROLE_MAP_KEY ||
-                fieldRole == FieldRole.ROLE_MAP_VALUE)
-            {
-                mapping = storeMgr.getMappingManager().getMapping(table, mmd, storeMgr.getDatastoreAdapter(), 
-                    clr, fieldRole);
-            }
-            else
-            {
-                // TODO Do the same thing with array join table fields
-                mapping = storeMgr.getMappingManager().getMapping(javaType, serialised, embedded,
-                    mmd.getFullFieldName());
-                ReferenceMapping.createPerImplementationColumnsForReferenceField((ReferenceMapping)mapping, 
-                    table, mmd, primaryKey, nullable, serialised, embedded, fieldRole, columnMetaData, clr);
-            }
+            // ReferenceMapping creates its own columns
+            mapping = storeMgr.getMappingManager().getMapping(table, mmd, storeMgr.getDatastoreAdapter(), 
+                clr, fieldRole);
         }
         else
         {
@@ -149,6 +137,8 @@
             }
             else
             {
+                // Collection<PC>, Map<PC>, Collection<NonPC>, etc
+                // TODO Remove this when PCMapping creates its own columns
                 createColumnsForField(javaType, mapping, table, storeMgr, mmd, primaryKey, nullable, 
                     serialised, embedded, fieldRole, columnMetaData, clr, false);
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4275
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4275&view=rev
Author:   andy_jefferson
Date:     2008-12-14 08:01:48 +0000 (Sun, 14 Dec 2008)

Log Message:
-----------
[NUCRDBMS-79] Apply patch for making some scostore capabilities available for other RDBMS-like datastores

Modified Paths:
--------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/ColumnCreator.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSManager.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleClobRDBMSMapping.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractArrayStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractListStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractSetStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/FKArrayStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/FKListStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/FKMapStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/FKSetStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/JoinArrayStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/JoinListStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/JoinMapStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/JoinSetStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/MapEntrySetStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/MapKeySetStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/MapValueSetStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/AbstractTable.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ClassTable.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/Column.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ColumnImpl.java

Added Paths:
-----------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/exceptions/
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/exceptions/DatastoreFieldDefinitionException.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/exceptions/DuplicateDatastoreFieldException.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/exceptions/MappedDatastoreException.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/AbstractCollectionStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/AbstractCollectionStoreSpecialization.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/BaseContainerStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/BaseElementContainerStoreSpecialization.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStoreSpecialization.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSAbstractCollectionStoreSpecialization.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSElementContainerStoreSpecialization.java

Removed Paths:
-------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DatastoreFieldDefinitionException.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DuplicateDatastoreFieldException.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/AssociationStrategy.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractCollectionStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/BaseContainerStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/ElementContainerStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSAssociationStrategy.java

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/ColumnCreator.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/ColumnCreator.java	2008-12-13 22:22:18 UTC (rev 4274)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/ColumnCreator.java	2008-12-14 08:01:48 UTC (rev 4275)
@@ -27,6 +27,7 @@
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.ColumnMetaData;
 import org.datanucleus.metadata.ColumnMetaDataContainer;
+import org.datanucleus.store.mapped.exceptions.DuplicateDatastoreFieldException;
 import org.datanucleus.store.mapped.mapping.CorrespondentColumnsMapper;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
 import org.datanucleus.store.mapped.mapping.PersistenceCapableMapping;

Deleted: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DatastoreFieldDefinitionException.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DatastoreFieldDefinitionException.java	2008-12-13 22:22:18 UTC (rev 4274)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DatastoreFieldDefinitionException.java	2008-12-14 08:01:48 UTC (rev 4275)
@@ -1,50 +0,0 @@
-/**********************************************************************
-Copyright (c) 2002 Mike Martin and others. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Contributors:
-2004 Andy Jefferson - coding standards
-    ...
-**********************************************************************/
-package org.datanucleus.store.mapped;
-
-import org.datanucleus.exceptions.NucleusUserException;
-
-/**
- * A <tt>ColumnDefinitionException</tt> is thrown if the settings of a
- * database column are incompatible with the data type of the object field
- * to which it is mapped.
- *
- * @see org.datanucleus.store.mapped.DatastoreField
- */
-public class DatastoreFieldDefinitionException extends NucleusUserException
-{
-    /**
-     * Constructs a column definition exception with no specific detail message.
-     */
-    public DatastoreFieldDefinitionException()
-    {
-        super();
-        setFatal();
-    }
-
-    /**
-     * Constructs a column definition exception with the specified detail message.
-     * @param msg the detail message
-     */
-    public DatastoreFieldDefinitionException(String msg)
-    {
-        super(msg);
-        setFatal();
-    }
-}
\ No newline at end of file

Deleted: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DuplicateDatastoreFieldException.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DuplicateDatastoreFieldException.java	2008-12-13 22:22:18 UTC (rev 4274)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DuplicateDatastoreFieldException.java	2008-12-14 08:01:48 UTC (rev 4275)
@@ -1,62 +0,0 @@
-/**********************************************************************
-Copyright (c) 2008 Andy Jefferson and others. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Contributors:
-    ...
-**********************************************************************/
-package org.datanucleus.store.mapped;
-
-import org.datanucleus.exceptions.NucleusException;
-import org.datanucleus.util.Localiser;
-
-/**
- * A <tt>DuplicateDatastoreFieldException</tt> is thrown if an attempt is made to
- * add a column to a table with a name already in-use by an existing column.
- */
-public class DuplicateDatastoreFieldException extends NucleusException
-{
-    private static final Localiser LOCALISER=Localiser.getInstance(
-        "org.datanucleus.store.mapped.Localisation", MappedStoreManager.class.getClassLoader());
-
-    /** Column that cannot be created because it conflicts with existing column with same identifier. */
-    private DatastoreField conflictingColumn;
-
-    /**
-     * Constructs a duplicate column name exception.
-     * @param tableName Name of the table being initialized.
-     * @param col1 Column we already have
-     * @param col2 Column that we tried to create
-     */
-    public DuplicateDatastoreFieldException(String tableName, DatastoreField col1, DatastoreField col2)
-    {
-        super(LOCALISER.msg("020007", col1.getIdentifier(), tableName,
-            col1.getMemberMetaData() == null ?
-                LOCALISER.msg("020008") :
-                (col1.getMemberMetaData() != null ? col1.getMemberMetaData().getFullFieldName() : null),
-            col2.getMemberMetaData() == null ?
-                LOCALISER.msg("020008") :
-                (col2.getMemberMetaData() != null ? col2.getMemberMetaData().getFullFieldName() : null)));
-        this.conflictingColumn = col2;
-        setFatal();
-    }
-
-    /**
-     * Accessor for the column that could not be created because it conflicts with something already present.
-     * @return The column
-     */
-    public DatastoreField getConflictingColumn()
-    {
-        return conflictingColumn;
-    }
-}
\ No newline at end of file

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java	2008-12-13 22:22:18 UTC (rev 4274)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java	2008-12-14 08:01:48 UTC (rev 4275)
@@ -41,8 +41,6 @@
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
 import org.datanucleus.store.mapped.mapping.MappingManager;
 import org.datanucleus.store.query.ResultObjectFactory;
-import org.datanucleus.store.mapped.scostore.AssociationStrategy;
-import org.datanucleus.util.Localiser;
 import org.datanucleus.util.NucleusLogger;
 
 /**
@@ -652,15 +650,6 @@
     public abstract boolean allowsBatching();
 
     /**
-     * Factory method for allocating an {@link org.datanucleus.store.mapped.scostore.AssociationStrategy} 
-     * of the appropriate concrete type.
-     * @param localiser The localiser
-     * @param clr The ClassLoader resolver
-     * @return A {@link AssociationStrategy} of the appropriate concrete type.
-     */
-    public abstract AssociationStrategy newAssociationStrategy(Localiser localiser, ClassLoaderResolver clr);
-
-    /**
      * Factory method for allocating a {@link ResultObjectFactory} of the appropriate concrete type.
      * @param table Table being selected from
      * @param fieldNumbers Numbers of the fields in the select. May be null if no fields are retrieved
@@ -680,4 +669,4 @@
         StatementExpressionIndex[] statementExpressionIndex, int[] datastoreIdentityExpressionIndex,
         int[] versionIndex, boolean ignoreCache, boolean discriminator, boolean hasMetaDataInResults,
         FetchPlan fetchPlan, Class persistentClass);
-}
\ No newline at end of file
+}

Copied: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/exceptions/DatastoreFieldDefinitionException.java (from rev 4161, platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DatastoreFieldDefinitionException.java)
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/exceptions/DatastoreFieldDefinitionException.java	                        (rev 0)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/exceptions/DatastoreFieldDefinitionException.java	2008-12-14 08:01:48 UTC (rev 4275)
@@ -0,0 +1,50 @@
+/**********************************************************************
+Copyright (c) 2002 Mike Martin and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+2004 Andy Jefferson - coding standards
+    ...
+**********************************************************************/
+package org.datanucleus.store.mapped.exceptions;
+
+import org.datanucleus.exceptions.NucleusUserException;
+
+/**
+ * A <tt>ColumnDefinitionException</tt> is thrown if the settings of a
+ * database column are incompatible with the data type of the object field
+ * to which it is mapped.
+ *
+ * @see org.datanucleus.store.mapped.DatastoreField
+ */
+public class DatastoreFieldDefinitionException extends NucleusUserException
+{
+    /**
+     * Constructs a column definition exception with no specific detail message.
+     */
+    public DatastoreFieldDefinitionException()
+    {
+        super();
+        setFatal();
+    }
+
+    /**
+     * Constructs a column definition exception with the specified detail message.
+     * @param msg the detail message
+     */
+    public DatastoreFieldDefinitionException(String msg)
+    {
+        super(msg);
+        setFatal();
+    }
+}
\ No newline at end of file

Copied: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/exceptions/DuplicateDatastoreFieldException.java (from rev 4161, platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DuplicateDatastoreFieldException.java)
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/exceptions/DuplicateDatastoreFieldException.java	                        (rev 0)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/exceptions/DuplicateDatastoreFieldException.java	2008-12-14 08:01:48 UTC (rev 4275)
@@ -0,0 +1,64 @@
+/**********************************************************************
+Copyright (c) 2008 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+    ...
+**********************************************************************/
+package org.datanucleus.store.mapped.exceptions;
+
+import org.datanucleus.exceptions.NucleusException;
+import org.datanucleus.store.mapped.DatastoreField;
+import org.datanucleus.store.mapped.MappedStoreManager;
+import org.datanucleus.util.Localiser;
+
+/**
+ * A <tt>DuplicateDatastoreFieldException</tt> is thrown if an attempt is made to
+ * add a column to a table with a name already in-use by an existing column.
+ */
+public class DuplicateDatastoreFieldException extends NucleusException
+{
+    private static final Localiser LOCALISER=Localiser.getInstance(
+        "org.datanucleus.store.mapped.Localisation", MappedStoreManager.class.getClassLoader());
+
+    /** Column that cannot be created because it conflicts with existing column with same identifier. */
+    private DatastoreField conflictingColumn;
+
+    /**
+     * Constructs a duplicate column name exception.
+     * @param tableName Name of the table being initialized.
+     * @param col1 Column we already have
+     * @param col2 Column that we tried to create
+     */
+    public DuplicateDatastoreFieldException(String tableName, DatastoreField col1, DatastoreField col2)
+    {
+        super(LOCALISER.msg("020007", col1.getIdentifier(), tableName,
+            col1.getMemberMetaData() == null ?
+                LOCALISER.msg("020008") :
+                (col1.getMemberMetaData() != null ? col1.getMemberMetaData().getFullFieldName() : null),
+            col2.getMemberMetaData() == null ?
+                LOCALISER.msg("020008") :
+                (col2.getMemberMetaData() != null ? col2.getMemberMetaData().getFullFieldName() : null)));
+        this.conflictingColumn = col2;
+        setFatal();
+    }
+
+    /**
+     * Accessor for the column that could not be created because it conflicts with something already present.
+     * @return The column
+     */
+    public DatastoreField getConflictingColumn()
+    {
+        return conflictingColumn;
+    }
+}
\ No newline at end of file

Added: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/exceptions/MappedDatastoreException.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/exceptions/MappedDatastoreException.java	                        (rev 0)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/exceptions/MappedDatastoreException.java	2008-12-14 08:01:48 UTC (rev 4275)
@@ -0,0 +1,30 @@
+/**********************************************************************
+Copyright (c) 2007 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+    ...
+**********************************************************************/
+package org.datanucleus.store.mapped.exceptions;
+
+/**
+ *
+ */
+public class MappedDatastoreException extends Exception
+{
+
+    public MappedDatastoreException(String s, Throwable throwable)
+    {
+        super(s, throwable);
+    }
+}

Added: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/AbstractCollectionStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/AbstractCollectionStore.java	                        (rev 0)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/AbstractCollectionStore.java	2008-12-14 08:01:48 UTC (rev 4275)
@@ -0,0 +1,214 @@
+/**********************************************************************
+Copyright (c) 2005 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License. 
+
+
+Contributors:
+    ...
+**********************************************************************/
+package org.datanucleus.store.mapped.scostore;
+
+import java.util.Collection;
+
+import org.datanucleus.ClassLoaderResolver;
+import org.datanucleus.ManagedConnection;
+import org.datanucleus.StateManager;
+import org.datanucleus.store.StoreManager;
+import org.datanucleus.store.mapped.DatastoreIdentifier;
+import org.datanucleus.store.mapped.exceptions.MappedDatastoreException;
+import org.datanucleus.store.mapped.expression.CollectionStoreQueryable;
+import org.datanucleus.store.mapped.expression.LogicSetExpression;
+import org.datanucleus.store.mapped.expression.QueryExpression;
+import org.datanucleus.store.mapped.expression.ScalarExpression;
+import org.datanucleus.store.mapped.expression.StringLiteral;
+import org.datanucleus.store.mapped.mapping.EmbeddedElementPCMapping;
+import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
+import org.datanucleus.store.scostore.CollectionStore;
+
+/**
+ * Abstract representation of a store of a Collection.
+ * Contains all common parts of storing Sets and Lists.
+ */
+public abstract class AbstractCollectionStore extends ElementContainerStore
+    implements CollectionStore, CollectionStoreQueryable
+{
+    protected final AbstractCollectionStoreSpecialization abstractCollectionStoreSpecialization;
+
+    /**
+     * Constructor.
+     * @param storeMgr Manager for the store
+     * @param clr ClassLoader resolver
+     */
+    protected AbstractCollectionStore(StoreManager storeMgr, ClassLoaderResolver clr, 
+            AbstractCollectionStoreSpecialization abstractCollectionStoreSpecialization)
+    {
+        super(storeMgr, clr, abstractCollectionStoreSpecialization);
+        this.abstractCollectionStoreSpecialization = abstractCollectionStoreSpecialization;
+    }
+
+    /**
+     * Method to update a field of an embedded element.
+     * @param sm State Manager of the owner
+     * @param element The element to update
+     * @param fieldNumber The number of the field to update
+     * @param value The value
+     * @return true if the datastore was updated
+     */
+    public boolean updateEmbeddedElement(StateManager sm, Object element, int fieldNumber, Object value)
+    {
+        boolean modified = false;
+        if (elementMapping != null && elementMapping instanceof EmbeddedElementPCMapping)
+        {
+            String fieldName = emd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber).getName();
+            if (fieldName == null)
+            {
+                // We have no mapping for this field so presumably is the owner field or a PK field
+                return false;
+            }
+            JavaTypeMapping fieldMapping = ((EmbeddedElementPCMapping)elementMapping).getJavaTypeMapping(fieldName);
+            if (fieldMapping == null)
+            {
+                // We have no mapping for this field so presumably is the owner field or a PK field
+                return false;
+            }
+            modified = abstractCollectionStoreSpecialization.updateEmbeddedElement(sm, element,
+                fieldNumber, value, fieldMapping, storeMgr,
+                containerTable, ownerMapping, elementMapping, this);
+        }
+
+        return modified;
+    }
+
+    /**
+     * Method to update the collection to be the supplied collection of elements.
+     * @param sm StateManager of the object
+     * @param coll The collection to use
+     */
+    public void update(StateManager sm, Collection coll)
+    {
+        // Crude update - remove existing and add new!
+        clear(sm);
+        addAll(sm, coll, 0);
+    }
+
+    /**
+     * Method to verify if the association owner vs elements contains
+     * a specific element in the association 
+     * @param sm The StateManager
+     * @param element The element
+     * @return Whether it contains the element 
+     */
+    public boolean contains(StateManager sm, Object element)
+    {
+        if (!validateElementForReading(sm, element))
+        {
+            return false;
+        }
+        return abstractCollectionStoreSpecialization.contains(sm, element, storeMgr, ownerMapping, 
+            containerTable, elementMapping, elementInfo,
+            relationDiscriminatorMapping, elementsAreSerialised, this);
+    }
+
+    /**
+     * Method to process a "remove" statement
+     * @param ownerSM StateManager for the owner
+     * @param conn The connection
+     * @param batched Whether we are batching it
+     * @param element The element
+     * @param executeNow Whether to execute the statement rather than allow batching til later
+     * @return Number of records changed (0 if batch since nothing yet changed)
+     */
+    protected int[] internalRemove(StateManager ownerSM, ManagedConnection conn, boolean batched, 
+            Object element, boolean executeNow)
+        throws MappedDatastoreException
+    {
+        return abstractCollectionStoreSpecialization.internalRemove(ownerSM, conn, batched, element, 
+            executeNow, relationDiscriminatorMapping, this,
+            elementInfo, containerTable, ownerMapping, elementMapping, elementsAreSerialised);
+    }
+
+    protected String getRemoveStmt() 
+    {
+        return abstractCollectionStoreSpecialization.getRemoveStmt(elementInfo, containerTable, 
+            ownerMapping, elementMapping, elementsAreSerialised, relationDiscriminatorMapping);
+    }
+
+    // ----------------------------- Query Methods --------------------------------
+
+    /**
+     * Query utility to generate an exists() statement for an element.
+     * The generated query will be of the form
+     * <PRE>
+     * SELECT 1 FROM JOINTABLE THIS_JOIN WHERE THIS_JOIN.OWNER_ID_OID = THIS.OWNER_ID
+     * </PRE>
+     * @param qs The parent query statement that will use this as a subquery
+     * @param mapping mapping for the owner
+     * @param ownerTe Expression for the table that the subquery should join to
+     * @param collectionTableAlias alias for the main table of the subquery
+     * @return The query statement
+     */
+    public QueryExpression getExistsSubquery(QueryExpression qs, JavaTypeMapping mapping, 
+            LogicSetExpression ownerTe, DatastoreIdentifier collectionTableAlias)
+    {
+        QueryExpression stmt = dba.newQueryStatement(containerTable, collectionTableAlias,
+            qs.getClassLoaderResolver());
+        stmt.setParent(qs);
+
+        // Join for the owner
+        ScalarExpression ownerExpr = mapping.newScalarExpression(stmt, ownerTe);
+        ScalarExpression ownerInCollectionExpr = ownerMapping.newScalarExpression(stmt,
+            stmt.getTableExpression(collectionTableAlias));
+        stmt.andCondition(ownerExpr.eq(ownerInCollectionExpr));
+
+        // Select id mapping of element
+        stmt.select(collectionTableAlias, elementMapping);
+
+        return stmt;
+    }
+
+    /**
+     * Query utility to generate a subquery for the size() of the collection.
+     * The generated query will be of the form
+     * <PRE>
+     * SELECT COUNT(*) FROM JOINTABLE THIS_JOIN WHERE THIS_JOIN.OWNER_ID_OID = THIS.OWNER_ID
+     * </PRE>
+     * @param qs The parent query statement that will use this as a subquery
+     * @param mapping mapping of the field
+     * @param ownerTe Expression for the owner table that the subquery should join to
+     * @param collectionTableAlias alias for the main table of the subquery
+     * @return The query statement
+     */
+    public QueryExpression getSizeSubquery(QueryExpression qs, JavaTypeMapping mapping,
+            LogicSetExpression ownerTe, DatastoreIdentifier collectionTableAlias)
+    {
+        QueryExpression stmt = dba.newQueryStatement(containerTable, collectionTableAlias,
+            qs.getClassLoaderResolver());
+        stmt.setParent(qs);
+
+        // Join for the owner
+        ScalarExpression ownerExpr = mapping.newScalarExpression(stmt, ownerTe);
+        ScalarExpression ownerInCollectionExpr = ownerMapping.newScalarExpression(stmt,
+            stmt.getTableExpression(collectionTableAlias));
+        stmt.andCondition(ownerExpr.eq(ownerInCollectionExpr));
+
+        // Select COUNT(*)
+        JavaTypeMapping m = storeMgr.getMappingManager().getMapping(String.class);
+        StringLiteral lit = (StringLiteral)m.newLiteral(stmt, "COUNT(*)");
+        lit.generateStatementWithoutQuotes();
+        stmt.selectScalarExpression(lit);
+
+        // TODO This needs to restrict the discriminator also where it is present (see sizeStmt)
+
+        return stmt;
+    }
+}
\ No newline at end of file

Added: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/AbstractCollectionStoreSpecialization.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/AbstractCollectionStoreSpecialization.java	                        (rev 0)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/AbstractCollectionStoreSpecialization.java	2008-12-14 08:01:48 UTC (rev 4275)
@@ -0,0 +1,70 @@
+/**********************************************************************
+Copyright (c) 2007 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+    ...
+**********************************************************************/
+package org.datanucleus.store.mapped.scostore;
+
+import org.datanucleus.ManagedConnection;
+import org.datanucleus.StateManager;
+import org.datanucleus.store.StoreManager;
+import org.datanucleus.store.mapped.DatastoreContainerObject;
+import org.datanucleus.store.mapped.MappedStoreManager;
+import org.datanucleus.store.mapped.exceptions.MappedDatastoreException;
+import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
+
+/**
+ * Specialization interface for {@link AbstractCollectionStore}.
+ * {@link AbstractCollectionStore} delegates to instances of this interface for behavior
+ * that is tied to a specific datastore implementation.
+ */
+public interface AbstractCollectionStoreSpecialization extends ElementContainerStoreSpecialization
+{
+    /**
+     * @see AbstractCollectionStore#updateEmbeddedElement
+     */
+    boolean updateEmbeddedElement(StateManager sm, Object element, int fieldNumber, Object value, JavaTypeMapping fieldMapping,
+        MappedStoreManager storeMgr, DatastoreContainerObject containerTable, JavaTypeMapping ownerMapping, JavaTypeMapping elementMapping,
+        ElementContainerStore bcs);
+
+    /**
+     * @see AbstractCollectionStore#contains
+     */
+    boolean contains(StateManager sm, Object element, MappedStoreManager storeMgr, JavaTypeMapping ownerMapping,
+        DatastoreContainerObject containerTable, JavaTypeMapping elementMapping, ElementContainerStore.ElementInfo[] elementInfo,
+        JavaTypeMapping relationDiscriminatorMapping, boolean elementsAreSerialised, AbstractCollectionStore acs);
+
+    /**
+     * @see AbstractCollectionStore#internalRemove
+     */
+    int[] internalRemove(StateManager ownerSM, ManagedConnection conn, boolean batched, Object element, boolean executeNow,
+        JavaTypeMapping relationDiscriminatorMapping, AbstractCollectionStore acs, ElementContainerStore.ElementInfo[] elementInfo,
+        DatastoreContainerObject containerTable, JavaTypeMapping ownerMapping, JavaTypeMapping elementMapping,
+        boolean elementsAreSerialised) throws MappedDatastoreException;
+
+    /**
+     * @see AbstractCollectionStore#getRemoveStmt
+     */
+    String getRemoveStmt(ElementContainerStore.ElementInfo[] elementInfo,
+        DatastoreContainerObject containerTable, JavaTypeMapping ownerMapping, JavaTypeMapping elementMapping,
+        boolean elementsAreSerialised, JavaTypeMapping relationDiscriminatorMapping);
+
+    /**
+     * @see AbstractCollectionStore#getContainsStmt()  
+     */
+    String getContainsStmt(JavaTypeMapping ownerMapping, DatastoreContainerObject containerTable, JavaTypeMapping elementMapping,
+        StoreManager storeMgr, ElementContainerStore.ElementInfo[] elementInfo, JavaTypeMapping relationDiscriminatorMapping,
+        boolean elementsAreSerialised, AbstractCollectionStore acs);
+}

Deleted: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/AssociationStrategy.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/AssociationStrategy.java	2008-12-13 22:22:18 UTC (rev 4274)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/AssociationStrategy.java	2008-12-14 08:01:48 UTC (rev 4275)
@@ -1,45 +0,0 @@
-/**********************************************************************
-Copyright (c) 2007 Andy Jefferson and others. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Contributors:
-    ...
-**********************************************************************/
-package org.datanucleus.store.mapped.scostore;
-
-import org.datanucleus.ClassLoaderResolver;
-import org.datanucleus.StateManager;
-import org.datanucleus.store.rdbms.scostore.ElementContainerStore;
-import org.datanucleus.util.Localiser;
-
-/**
- * An association strategy.  Knows how to perform operations on an {@link ElementContainerStore}.
- */
-public abstract class AssociationStrategy
-{
-    /** Localiser. */
-    protected final Localiser localiser;
-
-    /** ClassLoader resolver. */
-    protected final ClassLoaderResolver clr;
-
-    protected AssociationStrategy(Localiser localiser, ClassLoaderResolver clr)
-    {
-        this.localiser = localiser;
-        this.clr = clr;
-    }
-
-    public abstract void executeClear(StateManager ownerSM, ElementContainerStore elementContainerStore);
-
-    public abstract int getSize(StateManager sm, ElementContainerStore elementContainerStore);
-}

Added: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/BaseContainerStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/BaseContainerStore.java	                        (rev 0)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/BaseContainerStore.java	2008-12-14 08:01:48 UTC (rev 4275)
@@ -0,0 +1,147 @@
+/**********************************************************************
+Copyright (c) 2005 Andy Jefferson and others. All rights reserved. 
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License. 
+ 
+
+Contributors:
+    ...
+**********************************************************************/
+package org.datanucleus.store.mapped.scostore;
+
+import org.datanucleus.ObjectManager;
+import org.datanucleus.StateManager;
+import org.datanucleus.metadata.AbstractMemberMetaData;
+import org.datanucleus.state.StateManagerFactory;
+import org.datanucleus.store.StoreManager;
+import org.datanucleus.store.mapped.DatastoreAdapter;
+import org.datanucleus.store.mapped.MappedStoreManager;
+import org.datanucleus.store.mapped.mapping.InterfaceMapping;
+import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
+import org.datanucleus.store.mapped.mapping.OIDMapping;
+import org.datanucleus.util.Localiser;
+
+/**
+ * Base class for all mapped container stores (collections, maps, arrays).
+ * Provides a series of helper methods for handling the store process.
+ */
+public abstract class BaseContainerStore
+{
+    /** Localiser for messages. */
+    protected static final Localiser LOCALISER = Localiser.getInstance(
+        "org.datanucleus.store.rdbms.Localisation", MappedStoreManager.class.getClassLoader());
+
+    /** Manager for the store. */
+    protected MappedStoreManager storeMgr;
+
+    /** Datastore adapter in use by this store. */
+    protected DatastoreAdapter dba;
+
+    /** Mapping to the owner of the container. */
+    protected JavaTypeMapping ownerMapping;
+
+    /** MetaData for the field/property in the owner with this container. */
+    protected AbstractMemberMetaData ownerMemberMetaData;
+
+    /** Whether the container allows null elements/values. */
+    protected boolean allowsNull = false;
+
+    /**
+     * Constructor.
+     * @param storeMgr Manager for the datastore being used
+     */
+    protected BaseContainerStore(StoreManager storeMgr)
+    {
+        this.storeMgr = (MappedStoreManager)storeMgr;
+        this.dba = this.storeMgr.getDatastoreAdapter();
+    }
+
+    /**
+     * Method to set the owner field/property MetaData and sets whether null elements/values are allowed.
+     * @param mmd MetaData for the field/property owning this backing store.
+     */
+    protected void setOwnerMemberMetaData(AbstractMemberMetaData mmd)
+    {
+        this.ownerMemberMetaData = mmd;
+        if (ownerMemberMetaData.hasExtension("allow-nulls") &&
+            ownerMemberMetaData.getValueForExtension("allow-nulls").equalsIgnoreCase("true"))
+        {
+            // User has requested allowing nulls in this field/property
+            allowsNull = true;
+        }
+    }
+
+    /**
+     * Accessor for the MappedStoreManager.
+     * @return The MappedStoreManager.
+     */
+    public MappedStoreManager getStoreManager()
+    {
+        return storeMgr;
+    }
+
+    /**
+     * Accessor for the owner mapping.
+     * @return Owner mapping.
+     */
+    public JavaTypeMapping getOwnerMapping()
+    {
+        return ownerMapping;
+    }
+
+    /**
+     * Check if the mapping correspond to a non pc object or embedded field
+     * @param mapping the mapping
+     * @return true if the field is embedded into one column
+     */
+    protected boolean isEmbeddedMapping(JavaTypeMapping mapping)
+    {
+        return !InterfaceMapping.class.isAssignableFrom(mapping.getClass()) &&
+               !OIDMapping.class.isAssignableFrom(mapping.getClass());
+    }
+
+    /**
+     * Method to return the StateManager for an embedded PC object (element, key, value).
+     * It creates one if the element is not currently managed.
+     * @param sm State Manager of the owner
+     * @param obj The embedded PC object
+     * @param ownerFmd The meta data for the owner field
+     * @return The state manager
+     */
+    protected StateManager getStateManagerForEmbeddedPCObject(StateManager sm, Object obj, 
+            AbstractMemberMetaData ownerFmd)
+    {
+        ObjectManager om = sm.getObjectManager();
+        StateManager objSM = om.findStateManager(obj);
+        if (objSM == null)
+        {
+            objSM = StateManagerFactory.newStateManagerForEmbedded(om, obj, false);
+
+            objSM.addEmbeddedOwner(sm, ownerFmd.getAbsoluteFieldNumber());
+        }
+        return objSM;
+    }
+
+    /**
+     * Convenience method to return if the datastore supports batching and the user wants batching.
+     * @return If batching of statements is permissible
+     */
+    protected boolean allowsBatching()
+    {
+        return storeMgr.allowsBatching();
+    }
+
+    public AbstractMemberMetaData getOwnerMemberMetaData()
+    {
+        return ownerMemberMetaData;
+    }
+}
\ No newline at end of file

Added: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/BaseElementContainerStoreSpecialization.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/BaseElementContainerStoreSpecialization.java	                        (rev 0)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/BaseElementContainerStoreSpecialization.java	2008-12-14 08:01:48 UTC (rev 4275)
@@ -0,0 +1,40 @@
+/**********************************************************************
+Copyright (c) 2005 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+
+Contributors:
+    ...
+**********************************************************************/
+package org.datanucleus.store.mapped.scostore;
+
+import org.datanucleus.ClassLoaderResolver;
+import org.datanucleus.util.Localiser;
+
+/**
+ * Base class for all {@link ElementContainerStoreSpecialization} implementations.
+ */
+public abstract class BaseElementContainerStoreSpecialization implements ElementContainerStoreSpecialization
+{
+    /** Localiser. */
+    protected final Localiser localiser;
+
+    /** ClassLoader resolver. */
+    protected final ClassLoaderResolver clr;
+
+    protected BaseElementContainerStoreSpecialization(Localiser localiser, ClassLoaderResolver clr)
+    {
+        this.localiser = localiser;
+        this.clr = clr;
+    }
+}
\ No newline at end of file

Added: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStore.java	                        (rev 0)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStore.java	2008-12-14 08:01:48 UTC (rev 4275)
@@ -0,0 +1,702 @@
+/**********************************************************************
+Copyright (c) 2005 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License. 
+
+
+Contributors:
+    ...
+**********************************************************************/
+package org.datanucleus.store.mapped.scostore;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.datanucleus.ClassLoaderResolver;
+import org.datanucleus.FetchPlan;
+import org.datanucleus.FetchPlan.FetchPlanForClass;
+import org.datanucleus.ObjectManager;
+import org.datanucleus.ObjectManagerHelper;
+import org.datanucleus.StateManager;
+import org.datanucleus.exceptions.NucleusUserException;
+import org.datanucleus.metadata.AbstractClassMetaData;
+import org.datanucleus.metadata.AbstractMemberMetaData;
+import org.datanucleus.metadata.CollectionMetaData;
+import org.datanucleus.metadata.DiscriminatorStrategy;
+import org.datanucleus.metadata.FieldPersistenceModifier;
+import org.datanucleus.metadata.IdentityType;
+import org.datanucleus.sco.SCOUtils;
+import org.datanucleus.store.FieldValues;
+import org.datanucleus.store.StoreManager;
+import org.datanucleus.store.fieldmanager.FieldManager;
+import org.datanucleus.store.mapped.DatastoreClass;
+import org.datanucleus.store.mapped.DatastoreContainerObject;
+import org.datanucleus.store.mapped.DatastoreIdentifier;
+import org.datanucleus.store.mapped.IdentifierFactory;
+import org.datanucleus.store.mapped.StatementExpressionIndex;
+import org.datanucleus.store.mapped.expression.QueryExpression;
+import org.datanucleus.store.mapped.mapping.AbstractContainerMapping;
+import org.datanucleus.store.mapped.mapping.EmbeddedElementPCMapping;
+import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
+import org.datanucleus.store.mapped.mapping.Mappings;
+import org.datanucleus.store.mapped.mapping.ReferenceMapping;
+import org.datanucleus.store.query.ResultObjectFactory;
+import org.datanucleus.util.ClassUtils;
+
+/**
+ * Representation of the store of an element-based container.
+ * This is used to represent either a collection or an array.
+ * There are 3 types of situation that we try to cater for with respect to elements.
+ * <UL>
+ * <LI><B>element-type</B> is PC with "new-table" or "superclass-table" inheritance. 
+ * In this case we will have
+ * <I>elementInfo</I> with 1 entry.</LI>
+ * <LI><B>element-type</B> is PC with "subclass-table" inheritance. In this case we will have <I>elementInfo</I>
+ * with "n" entries (1 for each subclass type with its own table). We also have <I>emd</I> being the MetaData
+ * for the element-type.</LI>
+ * <LI><B>element-type</B> is Reference type. In this case we will have <I>elementInfo</I> with "n" entries
+ * (1 for each implementation type).</LI>
+ * <LI><B>element-type</B> is non-PC. In this case we have no <I>elementInfo</I> and no <I>emd</I></LI>
+ * </UL>
+ */
+public abstract class ElementContainerStore extends BaseContainerStore
+{
+    /** Flag to set whether the iterator statement will use a discriminator or not. */
+    protected boolean iterateUsingDiscriminator = false;
+
+    /**
+     * Information for the elements of this container.
+     * When the "element-type" table is new-table, or superclass-table then there is 1 value here.
+     * When the "element-type" table uses subclass-table, or when it is a reference type then there can be multiple.
+     */
+    protected ElementInfo[] elementInfo;
+
+    /** Inner class wrapping the information required for a valid element type. */
+    public class ElementInfo
+    {
+        AbstractClassMetaData cmd; // MetaData for the element class
+        DatastoreClass table; // Table storing the element
+
+        /**
+         * Constructor
+         * @param cmd the AbstractClassMetaData
+         * @param table the DatastoreClass
+         */
+        public ElementInfo(AbstractClassMetaData cmd, DatastoreClass table)
+        {
+            this.cmd = cmd;
+            this.table = table;
+        }
+
+        /**
+         * Accessor for the class name
+         * @return the class name
+         */
+        public String getClassName()
+        {
+            return cmd.getFullClassName();
+        }
+
+        /**
+         * Accessor for the AbstractClassMetaData
+         * @return the AbstractClassMetaData
+         */
+        public AbstractClassMetaData getAbstractClassMetaData()
+        {
+            return cmd;
+        }
+
+        /**
+         * Accessor for the table of the element
+         * @return the DatastoreClass
+         */
+        public DatastoreClass getDatastoreClass()
+        {
+            return table;
+        }
+
+        /**
+         * Accessor the discriminator strategy of the element
+         * @return the strategy for the discriminator
+         */
+        public DiscriminatorStrategy getDiscriminatorStrategy()
+        {
+            return cmd.getDiscriminatorStrategy();
+        }
+
+        /**
+         * Accessor the discriminator mapping of the element (in its table)
+         * @return the JavaTypeMapping for the discriminator
+         */
+        public JavaTypeMapping getDiscriminatorMapping()
+        {
+            return table.getDiscriminatorMapping(false);
+        }
+    }
+
+    /** MetaData for the "element-type" class. Not used for reference types since no metadata is present for the declared type. */
+    protected AbstractClassMetaData emd;
+
+    /** Table containing the link between owner and element. Not set when using FK relations. */
+    protected DatastoreContainerObject containerTable;
+
+    /** Mapping for the element. */
+    protected JavaTypeMapping elementMapping;
+
+    /** Type of the element. */
+    protected String elementType;
+
+    /** Whether the elements are embedded. */
+    protected boolean elementsAreEmbedded;
+
+    /** Whether the elements are serialised. */
+    protected boolean elementsAreSerialised;
+
+    /** Whether the element is of a persistent-interface (defined using "<interface>") type. */
+    protected boolean elementIsPersistentInterface = false;
+
+    /**
+     * Mapping for an ordering column to allow for duplicates in the container.
+     * Can also be used for ordering elements in a List/array.
+     * Can also be used where we have an embedded object and so need to form the PK with something.
+     */
+    protected JavaTypeMapping orderMapping;
+
+    /** Optional mapping to distinguish elements of one collection from another when sharing the join table. */
+    protected JavaTypeMapping relationDiscriminatorMapping;
+
+    /** Value to use to discriminate between elements of this collection from others using the same join table. */
+    protected String relationDiscriminatorValue;
+
+    /** Identifier for elements in JDOQL queries. */
+    protected final DatastoreIdentifier elmIdentifier;
+
+    /** ClassLoader resolver. */
+    protected ClassLoaderResolver clr;
+
+    /** Association strategy. */
+    protected final ElementContainerStoreSpecialization elementContainerStoreSpecialization;
+
+    /**
+     * Constructor.
+     * @param storeMgr Manager for the store
+     * @param clr ClassLoader resolver
+     */
+    protected ElementContainerStore(StoreManager storeMgr, ClassLoaderResolver clr, ElementContainerStoreSpecialization elementContainerStoreSpecialization)
+    {
+        super(storeMgr);
+        this.clr = clr;
+
+        elmIdentifier = this.storeMgr.getIdentifierFactory().newIdentifier(IdentifierFactory.TABLE, "ELEMENT");
+
+        this.elementContainerStoreSpecialization = elementContainerStoreSpecialization;
+    }
+
+    /**
+     * Convenience method to find the element information relating to the element type.
+     * Used specifically for the "element-type" of a collection/array to find the elements
+     * which have table information. Not used for reference types.
+     * @return Element information relating to the element type
+     */
+    protected ElementInfo[] getElementInformationForClass()
+    {
+        ElementInfo[] info = null;
+        DatastoreClass tbl;
+        String[] clsNames;
+        if (!clr.classForName(elementType).isInterface())
+        {
+            tbl = storeMgr.getDatastoreClass(elementType, clr);
+            clsNames = new String[] {elementType};
+        }
+        else
+        {
+            clsNames = storeMgr.getOMFContext().getMetaDataManager().getClassesImplementingInterface(elementType, clr);
+            tbl = storeMgr.getDatastoreClass(clsNames[0], clr);
+        }
+        if (tbl == null)
+        {
+            AbstractClassMetaData[] subclassCmds = storeMgr.getClassesManagingTableForClass(emd, clr);
+            info = new ElementInfo[subclassCmds.length];
+            for (int i=0;i<subclassCmds.length;i++)
+            {
+                DatastoreClass table = storeMgr.getDatastoreClass(subclassCmds[i].getFullClassName(), clr);
+                info[i] = new ElementInfo(subclassCmds[i], table);
+            }
+        }
+        else
+        {
+            info = new ElementInfo[clsNames.length];
+            for (int i=0; i<clsNames.length; i++)
+            {
+                AbstractClassMetaData cmd = storeMgr.getOMFContext().getMetaDataManager().getMetaDataForClass(clsNames[i], clr);
+                DatastoreClass table = storeMgr.getDatastoreClass(cmd.getFullClassName(), clr);
+                info[i] = new ElementInfo(cmd, table);
+            }
+        }
+        return info;
+    }
+
+    /**
+     * Accessor for whether the store has an order mapping, to allow for duplicates or ordering.
+     * @return Whether an order mapping is present.
+     */
+    public boolean hasOrderMapping()
+    {
+        return (orderMapping != null);
+    }
+
+    /**
+     * Accessor for the element type stored in this container.
+     * @return The element type.
+     **/
+    public String getElementType()
+    {
+        return elementType;
+    }
+
+    /**
+     * Method to validate an element against the accepted type.
+     * @param clr The ClassLoaderResolver
+     * @param element The element to validate
+     * @return Whether it is valid.
+     **/ 
+    protected boolean validateElementType(ClassLoaderResolver clr, Object element)
+    {
+        if (element == null)
+        {
+            return true;
+        }
+
+        Class primitiveElementClass = ClassUtils.getPrimitiveTypeForType(element.getClass());
+        if (primitiveElementClass != null)
+        {
+            
+            // Allow for the element type being primitive, and the user wanting to store its wrapper
+            String elementTypeWrapper = elementType;
+            Class elementTypeClass = clr.classForName(elementType);
+            if (elementTypeClass.isPrimitive())
+            {
+                elementTypeWrapper = ClassUtils.getWrapperTypeForPrimitiveType(elementTypeClass).getName();
+            }
+            return clr.isAssignableFrom(elementTypeWrapper, element.getClass());
+        }
+        return clr.isAssignableFrom(elementType, element.getClass());
+    }
+
+    /**
+     * Method to check if an element is already persistent or is persistent but managed by 
+     * a different persistence manager.
+     * @param sm The state manager of this owner
+     * @param element The element
+     * @return Whether it is valid for reading.
+     */
+    protected boolean validateElementForReading(StateManager sm, Object element)
+    {
+        if (!validateElementType(sm.getObjectManager().getClassLoaderResolver(), element))
+        {
+            return false;
+        }
+
+        if (element != null && !elementsAreEmbedded && !elementsAreSerialised)
+        {
+            ObjectManager om = sm.getObjectManager();
+            if ((!om.getApiAdapter().isPersistent(element) ||
+                 om != ObjectManagerHelper.getObjectManager(element)) && !om.getApiAdapter().isDetached(element))
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Method to check if an element is already persistent, or is managed by a different
+     * Persistencemanager. If not persistent, this will persist it.
+     * @param sm The state manager of this owner
+     * @param element The element
+     * @param fieldValues any initial field values to use if persisting the element
+     * @return Whether the element was persisted during this call
+     */
+    protected boolean validateElementForWriting(StateManager sm, Object element, FieldValues fieldValues)
+    {
+        // Check the element type for this collection
+        if (!elementIsPersistentInterface &&
+            !validateElementType(sm.getObjectManager().getClassLoaderResolver(), element))
+        {
+            throw new ClassCastException(LOCALISER.msg("056033", element.getClass().getName(), 
+                ownerMemberMetaData.getFullFieldName(), elementType));
+        }
+
+        boolean persisted = false;
+        if (elementsAreEmbedded || elementsAreSerialised)
+        {
+            // Element is embedded/serialised so has no id
+        }
+        else
+        {
+            ObjectManager om = sm.getObjectManager();
+            StateManager elementSM = om.findStateManager(element);
+            if (elementSM != null && elementSM.isEmbedded())
+            {
+                // Element is already with StateManager and is embedded in another field!
+                throw new NucleusUserException(LOCALISER.msg("056028", 
+                    ownerMemberMetaData.getFullFieldName(), element));
+            }
+
+            persisted = SCOUtils.validateObjectForWriting(om, element, fieldValues);
+        }
+        return persisted;
+    }
+
+    /**
+     * Convenience method to populate the passed PreparedStatement with the value for the element.
+     * Not used with embedded PC elements.
+     * @param om Object Manager
+     * @param ps The PreparedStatement
+     * @param element The element
+     * @param jdbcPosition Position in JDBC statement to populate
+     * @return The next position in the JDBC statement
+     */
+    public int populateElementInStatement(ObjectManager om, Object ps, Object element, int jdbcPosition)
+    {
+        if (!storeMgr.insertValuesOnInsert(elementMapping.getDataStoreMapping(0)))
+        {
+            // Dont try to insert any mappings with insert parameter that isnt ? (e.g Oracle)
+            return jdbcPosition;
+        }
+        elementMapping.setObject(om, ps, Mappings.getParametersIndex(jdbcPosition, elementMapping), element);
+        return jdbcPosition + elementMapping.getNumberOfDatastoreFields();
+    }
+
+    /**
+     * Convenience method to populate the passed PreparedStatement with the value for the order index.
+     * @param om Object Manager
+     * @param ps The PreparedStatement
+     * @param idx The order value
+     * @param jdbcPosition Position in JDBC statement to populate
+     * @return The next position in the JDBC statement
+     */
+    protected int populateOrderInStatement(ObjectManager om, Object ps, int idx, int jdbcPosition)
+    {
+        orderMapping.setObject(om, ps, Mappings.getParametersIndex(jdbcPosition, orderMapping), new Integer(idx));
+        return jdbcPosition + orderMapping.getNumberOfDatastoreFields();
+    }
+
+
+    /**
+     * Convenience method to populate the passed PreparedStatement with the field values from
+     * the embedded element starting at the specified jdbc position.
+     * @param sm State Manager of the owning container
+     * @param element The embedded element
+     * @param ps The PreparedStatement
+     * @param jdbcPosition JDBC position in the statement to start at
+     * @param ownerFieldMetaData The meta data for the owner field
+     * @return The next JDBC position
+     */
+    public int populateEmbeddedElementFieldsInStatement(StateManager sm, Object element, Object ps,
+            int jdbcPosition, AbstractMemberMetaData ownerFieldMetaData)
+    {
+        EmbeddedElementPCMapping embeddedMapping = (EmbeddedElementPCMapping)elementMapping;
+        StatementExpressionIndex[] statementExpressionIndex = 
+            new StatementExpressionIndex[emd.getNoOfManagedMembers() + emd.getNoOfInheritedManagedMembers()];
+        int[] elementFieldNumbers = new int[embeddedMapping.getNumberOfJavaTypeMappings()];
+        for (int i=0;i<embeddedMapping.getNumberOfJavaTypeMappings();i++)
+        {
+            JavaTypeMapping fieldMapping = embeddedMapping.getJavaTypeMapping(i);
+            int absFieldNum = emd.getAbsolutePositionOfMember(fieldMapping.getFieldMetaData().getName());
+            elementFieldNumbers[i] = absFieldNum;
+            if (fieldMapping != null)
+            {
+                statementExpressionIndex[absFieldNum] = new StatementExpressionIndex();
+                statementExpressionIndex[absFieldNum].setMapping(fieldMapping);
+                int[] jdbcParamPositions = new int[fieldMapping.getNumberOfDatastoreFields()];
+                for (int j=0;j<fieldMapping.getNumberOfDatastoreFields();j++)
+                {
+                    jdbcParamPositions[j] = jdbcPosition++;
+                }
+                statementExpressionIndex[absFieldNum].setParameterIndex(jdbcParamPositions);
+            }
+        }
+
+        StateManager elementSM = getStateManagerForEmbeddedPCObject(sm, element, ownerFieldMetaData);
+        elementSM.setPcObjectType(StateManager.EMBEDDED_COLLECTION_ELEMENT_PC);
+        FieldManager fm = storeMgr.getFieldManagerForStatementGeneration(elementSM, ps, 
+            statementExpressionIndex, true);
+        elementSM.provideFields(elementFieldNumbers, fm);
+
+        return jdbcPosition;
+    }
+
+    /**
+     * Accessor for an iterator through the container elements.
+     * @param ownerSM State Manager for the container.
+     * @return The Iterator
+     */
+    public abstract Iterator iterator(StateManager ownerSM);
+
+    /**
+     * Clear the association from owner to all elements.
+     * Provides cascade-delete when the elements being deleted are PC types.
+     * @param ownerSM State Manager for the container. 
+     */
+    public void clear(StateManager ownerSM)
+    {
+        Collection dependentElements = null;
+        CollectionMetaData collmd = ownerMemberMetaData.getCollection();
+        if (collmd.isDependentElement() && !collmd.isEmbeddedElement() && !collmd.isSerializedElement())
+        {
+            // Retain the dependent elements that need deleting after clearing
+            dependentElements = new HashSet();
+            Iterator iter = iterator(ownerSM);
+            while (iter.hasNext())
+            {
+                dependentElements.add(iter.next());
+            }
+        }
+        elementContainerStoreSpecialization.executeClear(ownerSM, this);
+
+        // Cascade-delete
+        if (dependentElements != null && dependentElements.size() > 0)
+        {
+            Iterator iter = dependentElements.iterator();
+            while (iter.hasNext())
+            {
+                Object obj = iter.next();
+                if (ownerSM.getObjectManager().getApiAdapter().isDeleted(obj))
+                {
+                    // Element is tagged for deletion so will be deleted at flush(), and we dont need it immediately
+                }
+                else
+                {
+                    ownerSM.getObjectManager().deleteObjectInternal(obj);
+                }
+            }
+        }
+    }
+
+
+    /**
+     * Method to return the size of the container.
+     * @param sm The state manager.
+     * @return The size.
+     **/
+    public int size(StateManager sm)
+    {
+        return elementContainerStoreSpecialization.getSize(sm, this);
+    }
+
+    // ----------------------------- Query Methods --------------------------------
+
+    /**
+     * Method to generate a new result object factory from which to retrieve element objects.
+     * @param sm State Manager for owner
+     * @param stmt The query
+     * @param ignoreCache Whether to ignore the cache
+     * @param useFetchPlan Whether to use the current FetchPlan
+     * @return The Result object factory
+     */
+    public ResultObjectFactory newResultObjectFactory(StateManager sm,
+            QueryExpression stmt, boolean ignoreCache, boolean useFetchPlan)
+    {
+        ClassLoaderResolver clr = sm.getObjectManager().getClassLoaderResolver();
+        // TODO Allow for more than just the first elementTable (currently take the columns to select from the first element table only)
+        if (elementsAreEmbedded || elementsAreSerialised)
+        {
+            return storeMgr.newResultObjectFactory(null , null, emd, null, null, null, ignoreCache, false,
+                stmt.hasMetaDataExpression(), null, clr.classForName(elementType));
+        }
+        else if (elementMapping instanceof ReferenceMapping)
+        {
+            // Element = Reference (Interface/Object)
+            // TODO Respect any fetch plan for the implementation class
+            // This selects the id column(s) in the join table of all implementations of the reference type
+            // It is processed by ReferenceMapping where it decides which of the implementation types is stored in this row.
+            JavaTypeMapping[] implMappings = ((ReferenceMapping)elementMapping).getJavaTypeMapping();
+            for (int i=0;i<implMappings.length;i++)
+            {
+                stmt.select(implMappings[i]);
+            }
+            return storeMgr.newResultObjectFactory(elementInfo != null ? elementInfo[0].getDatastoreClass() : null, null, emd, 
+                    null, null, null, ignoreCache, false, 
+                    stmt.hasMetaDataExpression(), null, clr.classForName(elementType));
+        }
+        else
+        {
+            // Element = PC
+            int[] datastoreIndex = null;
+            int[] versionIndex = null;
+
+            // Select any datastore/version columns
+            if (stmt.getTableExpression(elmIdentifier) != null)
+            {
+                if (elementInfo[0].getDatastoreClass().getIdentityType() == IdentityType.DATASTORE)
+                {
+                    datastoreIndex = stmt.select(elmIdentifier, elementInfo[0].getDatastoreClass().getDataStoreObjectIdMapping(), true);
+                }
+                JavaTypeMapping verMapping = elementInfo[0].getDatastoreClass().getVersionMapping(true);
+                if (verMapping != null)
+                {
+                    versionIndex = stmt.select(elmIdentifier, verMapping, true);
+                }
+            }
+            else
+            {
+                if (elementInfo[0].getDatastoreClass().getIdentityType() == IdentityType.DATASTORE)
+                {
+                    datastoreIndex = stmt.select(stmt.getMainTableAlias(), 
+                        elementInfo[0].getDatastoreClass().getDataStoreObjectIdMapping(),true);
+                }
+                JavaTypeMapping verMapping = elementInfo[0].getDatastoreClass().getVersionMapping(true);
+                if (verMapping != null)
+                {
+                    versionIndex = stmt.select(stmt.getMainTableAlias(), verMapping, true);
+                }
+            }
+
+            StatementExpressionIndex[] statementExpressionIndex = null;
+
+            // Start with PK fields (if any)
+            int[] prefetchFieldNumbers = null;
+            int[] pkFieldNumbers = null;
+            if (emd.getIdentityType() == IdentityType.APPLICATION)
+            {
+                pkFieldNumbers = new int[emd.getPKMemberPositions().length];
+                for (int i=0;i<pkFieldNumbers.length;i++)
+                {
+                    pkFieldNumbers[i] = emd.getPKMemberPositions()[i];
+                }
+            }
+            if (useFetchPlan)
+            {
+                // Add on any FetchPlan fields
+                FetchPlan fp = sm.getObjectManager().getFetchPlan();
+                fp.manageFetchPlanForClass(emd);
+                FetchPlanForClass fpc = fp.getFetchPlanForClass(emd);
+                int fpFieldNumbers[] = fpc.getFieldsInActualFetchPlan();
+
+                if (pkFieldNumbers != null)
+                {
+                    // Merge FP and PK fields
+                    int totalFieldCount = pkFieldNumbers.length + fpFieldNumbers.length;
+                    for (int i=0;i<pkFieldNumbers.length;i++)
+                    {
+                        if (Arrays.binarySearch(fpFieldNumbers, pkFieldNumbers[i]) >= 0)
+                        {
+                            totalFieldCount--; // Already got this as a PK field
+                        }
+                    }
+
+                    int prefetchNum = 0;
+                    prefetchFieldNumbers = new int[totalFieldCount];
+                    for (int i=0;i<pkFieldNumbers.length;i++)
+                    {
+                        prefetchFieldNumbers[prefetchNum++] = pkFieldNumbers[i];
+                    }
+                    for (int i=0;i<fpFieldNumbers.length;i++)
+                    {
+                        if (Arrays.binarySearch(pkFieldNumbers, fpFieldNumbers[i]) < 0)
+                        {
+                            prefetchFieldNumbers[prefetchNum++] = fpFieldNumbers[i];
+                        }
+                    }
+                }
+                else
+                {
+                    prefetchFieldNumbers = fpFieldNumbers;
+                }
+            }
+            else
+            {
+                if (pkFieldNumbers != null)
+                {
+                    prefetchFieldNumbers = pkFieldNumbers;
+                }
+                else
+                {
+                    prefetchFieldNumbers = new int[0];
+                }
+            }
+
+            // Populate the StatementExpressionIndex for all fields to be fetched, 
+            // eliminating non-persistent and container fields
+            int fn[] = new int[prefetchFieldNumbers.length];
+            int prefetchFieldCount = 0;
+            statementExpressionIndex = new StatementExpressionIndex[
+                emd.getNoOfInheritedManagedMembers() + emd.getNoOfManagedMembers()];
+            for (int i=0; i<prefetchFieldNumbers.length; ++i)
+            {
+                AbstractMemberMetaData fmd = 
+                    emd.getMetaDataForManagedMemberAtAbsolutePosition(prefetchFieldNumbers[i]);
+                if (fmd.getPersistenceModifier() == FieldPersistenceModifier.PERSISTENT)
+                {
+                    JavaTypeMapping m = elementInfo[0].getDatastoreClass().getFieldMapping(fmd);
+                    if (m != null && m.includeInFetchStatement() && !(m instanceof AbstractContainerMapping))
+                    {
+                        // Field is not a container, and is to be fetched (eliminates fields as FKs in other class)
+                        statementExpressionIndex[prefetchFieldNumbers[i]] = new StatementExpressionIndex();
+                        statementExpressionIndex[prefetchFieldNumbers[i]].setMapping(m);
+                        fn[prefetchFieldCount++] = prefetchFieldNumbers[i];
+                    }
+                }
+            }
+
+            int[] fieldNumbers = new int[prefetchFieldCount];
+            System.arraycopy(fn, 0, fieldNumbers, 0, prefetchFieldCount);
+            if (stmt.getTableExpression(elmIdentifier) != null)
+            {
+                Mappings.selectMapping(stmt, elmIdentifier, statementExpressionIndex);
+            }
+            else
+            {
+                Mappings.selectMapping(stmt, statementExpressionIndex);
+            }
+
+            return storeMgr.newResultObjectFactory(elementInfo != null ? elementInfo[0].getDatastoreClass() : null,
+                fieldNumbers, emd, statementExpressionIndex, datastoreIndex, versionIndex,
+                ignoreCache, iterateUsingDiscriminator,
+                stmt.hasMetaDataExpression(), null, clr.classForName(elementType));
+        }
+    }
+
+    public ElementInfo[] getElementInfo()
+    {
+        return elementInfo;
+    }
+
+    public JavaTypeMapping getElementMapping()
+    {
+        return elementMapping;
+    }
+
+    public JavaTypeMapping getOrderMapping()
+    {
+        return orderMapping;
+    }
+
+    public JavaTypeMapping getRelationDiscriminatorMapping()
+    {
+        return relationDiscriminatorMapping;
+    }
+
+    public String getRelationDiscriminatorValue()
+    {
+        return relationDiscriminatorValue;
+    }
+
+    public DatastoreContainerObject getContainerTable()
+    {
+        return containerTable;
+    }
+}
\ No newline at end of file

Added: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStoreSpecialization.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStoreSpecialization.java	                        (rev 0)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStoreSpecialization.java	2008-12-14 08:01:48 UTC (rev 4275)
@@ -0,0 +1,32 @@
+/**********************************************************************
+Copyright (c) 2007 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+    ...
+**********************************************************************/
+package org.datanucleus.store.mapped.scostore;
+
+import org.datanucleus.StateManager;
+
+/**
+ * Specialization interface for {@link ElementContainerStore}.
+ * {@link ElementContainerStore} delegates to instances of this interface for behavior
+ * that is tied to a specific datastore implementation.
+ */
+public interface ElementContainerStoreSpecialization
+{
+    void executeClear(StateManager ownerSM, ElementContainerStore elementContainerStore);
+
+    int getSize(StateManager sm, ElementContainerStore elementContainerStore);
+}
\ No newline at end of file

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSManager.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSManager.java	2008-12-13 22:22:18 UTC (rev 4274)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSManager.java	2008-12-14 08:01:48 UTC (rev 4275)
@@ -37,6 +37,29 @@
 **********************************************************************/
 package org.datanucleus.store.rdbms;
 
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.Writer;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TreeSet;
+
 import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.ConnectionFactory;
 import org.datanucleus.ConnectionFactoryRegistry;
@@ -106,7 +129,6 @@
 import org.datanucleus.store.rdbms.schema.RDBMSTableInfo;
 import org.datanucleus.store.rdbms.schema.RDBMSTypesInfo;
 import org.datanucleus.store.rdbms.schema.SQLTypeInfo;
-import org.datanucleus.store.mapped.scostore.AssociationStrategy;
 import org.datanucleus.store.rdbms.scostore.FKArrayStore;
 import org.datanucleus.store.rdbms.scostore.FKListStore;
 import org.datanucleus.store.rdbms.scostore.FKMapStore;
@@ -115,7 +137,6 @@
 import org.datanucleus.store.rdbms.scostore.JoinListStore;
 import org.datanucleus.store.rdbms.scostore.JoinMapStore;
 import org.datanucleus.store.rdbms.scostore.JoinSetStore;
-import org.datanucleus.store.rdbms.scostore.RDBMSAssociationStrategy;
 import org.datanucleus.store.rdbms.sql.expression.SQLExpressionFactory;
 import org.datanucleus.store.rdbms.table.ArrayTable;
 import org.datanucleus.store.rdbms.table.ClassTable;
@@ -142,29 +163,6 @@
 import org.datanucleus.util.NucleusLogger;
 import org.datanucleus.util.StringUtils;
 
-import java.io.IOException;
-import java.io.PrintStream;
-import java.io.Writer;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.TreeSet;
-
 /**
  * StoreManager for RDBMS datastores. 
  * Provided by the "store-manager" extension key "rdbms" and accepts datastore URLs valid for JDBC.
@@ -3356,9 +3354,4 @@
         return new PersistentIDROF(table, fieldNumbers, acmd, statementExpressionIndex, datastoreIdentityExpressionIndex,
             versionIndex, ignoreCache, discriminator, hasMetaDataInResults, fetchPlan, persistentClass);
     }
-
-    public AssociationStrategy newAssociationStrategy(Localiser localiser, ClassLoaderResolver clr)
-    {
-        return new RDBMSAssociationStrategy(localiser, clr, this);
-    }
 }
\ No newline at end of file

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleClobRDBMSMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleClobRDBMSMapping.java	2008-12-13 22:22:18 UTC (rev 4274)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleClobRDBMSMapping.java	2008-12-14 08:01:48 UTC (rev 4275)
@@ -34,9 +34,9 @@
 import org.datanucleus.exceptions.NucleusObjectNotFoundException;
 import org.datanucleus.store.mapped.DatastoreContainerObject;
 import org.datanucleus.store.mapped.DatastoreField;
-import org.datanucleus.store.mapped.DatastoreFieldDefinitionException;
 import org.datanucleus.store.mapped.FetchStatement;
 import org.datanucleus.store.mapped.MappedStoreManager;
+import org.datanucleus.store.mapped.exceptions.DatastoreFieldDefinitionException;
 import org.datanucleus.store.mapped.mapping.DatastoreMapping;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
 import org.datanucleus.store.mapped.mapping.Mappings;

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractArrayStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractArrayStore.java	2008-12-13 22:22:18 UTC (rev 4274)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractArrayStore.java	2008-12-14 08:01:48 UTC (rev 4275)
@@ -48,6 +48,7 @@
 import org.datanucleus.store.mapped.mapping.ReferenceMapping;
 import org.datanucleus.store.mapped.mapping.SerialisedPCMapping;
 import org.datanucleus.store.mapped.mapping.SerialisedReferenceMapping;
+import org.datanucleus.store.mapped.scostore.ElementContainerStoreSpecialization;
 import org.datanucleus.store.query.ResultObjectFactory;
 import org.datanucleus.store.rdbms.SQLController;
 import org.datanucleus.store.rdbms.table.JoinTable;
@@ -57,16 +58,17 @@
 /**
  * Abstract representation of the backing store for an array.
  */
-public abstract class AbstractArrayStore extends ElementContainerStore implements ArrayStore, ArrayStoreQueryable
+public abstract class AbstractArrayStore extends org.datanucleus.store.mapped.scostore.ElementContainerStore
+    implements ArrayStore, ArrayStoreQueryable
 {
     /**
      * Constructor.
      * @param storeMgr Manager for the store
      * @param clr ClassLoader resolver
      */
-    protected AbstractArrayStore(StoreManager storeMgr, ClassLoaderResolver clr)
+    protected AbstractArrayStore(StoreManager storeMgr, ClassLoaderResolver clr, ElementContainerStoreSpecialization assocStrategy)
     {
-        super(storeMgr, clr);
+        super(storeMgr, clr, assocStrategy);
     }
 
     /**
@@ -557,8 +559,8 @@
         return stmt;
     }
 
-    protected RDBMSAssociationStrategy getRDBMSAssociationStrategy()
+    protected RDBMSElementContainerStoreSpecialization getRDBMSAssociationStrategy()
     {
-        return (RDBMSAssociationStrategy) associationStrategy;
+        return (RDBMSElementContainerStoreSpecialization) elementContainerStoreSpecialization;
     }
-}
\ No newline at end of file
+}

Deleted: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractCollectionStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractCollectionStore.java	2008-12-13 22:22:18 UTC (rev 4274)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractCollectionStore.java	2008-12-14 08:01:48 UTC (rev 4275)
@@ -1,609 +0,0 @@
-/**********************************************************************
-Copyright (c) 2005 Andy Jefferson and others. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License. 
-
-
-Contributors:
-    ...
-**********************************************************************/
-package org.datanucleus.store.rdbms.scostore;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Collection;
-import java.util.HashSet;
-
-import org.datanucleus.ClassLoaderResolver;
-import org.datanucleus.ManagedConnection;
-import org.datanucleus.ObjectManager;
-import org.datanucleus.StateManager;
-import org.datanucleus.exceptions.NucleusDataStoreException;
-import org.datanucleus.store.StoreManager;
-import org.datanucleus.store.mapped.DatastoreIdentifier;
-import org.datanucleus.store.mapped.expression.CollectionStoreQueryable;
-import org.datanucleus.store.mapped.expression.LogicSetExpression;
-import org.datanucleus.store.mapped.expression.QueryExpression;
-import org.datanucleus.store.mapped.expression.ScalarExpression;
-import org.datanucleus.store.mapped.expression.StringLiteral;
-import org.datanucleus.store.mapped.mapping.EmbeddedElementPCMapping;
-import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
-import org.datanucleus.store.mapped.mapping.Mappings;
-import org.datanucleus.store.rdbms.SQLController;
-import org.datanucleus.store.rdbms.SQLWarnings;
-import org.datanucleus.store.rdbms.mapping.RDBMSMapping;
-import org.datanucleus.store.rdbms.table.JoinTable;
-import org.datanucleus.store.scostore.CollectionStore;
-
-/**
- * Abstract representation of a store of a Collection.
- * Contains all common parts of storing Sets and Lists.
- */
-public abstract class AbstractCollectionStore extends ElementContainerStore implements CollectionStore, CollectionStoreQueryable
-{
-    /** Statement for getting whether an element is contained in the collection. */
-    protected String containsStmt;
-
-    /**
-     * Constructor.
-     * @param storeMgr Manager for the store
-     * @param clr ClassLoader resolver
-     */
-    protected AbstractCollectionStore(StoreManager storeMgr, ClassLoaderResolver clr)
-    {
-        super(storeMgr, clr);
-    }
-
-    /**
-     * Generate statement for update the field of an embedded element.
-     * <PRE>
-     * UPDATE SETTABLE
-     * SET EMBEDDEDFIELD1 = ?
-     * WHERE OWNERCOL=?
-     * AND ELEMENTCOL = ?
-     * </PRE>
-     * @param fieldMapping The mapping for the field within the embedded object to be updated
-     * @return Statement for updating an embedded element in the Set
-     */
-    protected String getUpdateEmbeddedElementStmt(JavaTypeMapping fieldMapping)
-    {
-        StringBuffer stmt = new StringBuffer();
-        stmt.append("UPDATE ");
-        stmt.append(containerTable.toString());
-        stmt.append(" SET ");
-        for (int i=0; i<fieldMapping.getNumberOfDatastoreFields(); i++)
-        {
-            if (i > 0)
-            {
-                stmt.append(",");
-            }
-            stmt.append(fieldMapping.getDataStoreMapping(i).getDatastoreField().getIdentifier().toString());
-            stmt.append(" = ");
-            stmt.append(((RDBMSMapping)fieldMapping.getDataStoreMapping(i)).getUpdateInputParameter());
-        }
-
-        stmt.append(" WHERE ");
-        for (int i=0; i<ownerMapping.getNumberOfDatastoreFields(); i++)
-        {
-            if (i > 0)
-            {
-                stmt.append(" AND ");
-            }
-            stmt.append(ownerMapping.getDataStoreMapping(i).getDatastoreField().getIdentifier().toString());
-            stmt.append(" = ");
-            stmt.append(((RDBMSMapping)ownerMapping.getDataStoreMapping(i)).getUpdateInputParameter());
-        }
-
-        EmbeddedElementPCMapping embeddedMapping = (EmbeddedElementPCMapping)elementMapping;
-        for (int i=0;i<embeddedMapping.getNumberOfJavaTypeMappings();i++)
-        {
-            JavaTypeMapping m = embeddedMapping.getJavaTypeMapping(i);
-            if (m != null)
-            {
-                for (int j=0;j<m.getNumberOfDatastoreFields();j++)
-                {
-                    stmt.append(" AND ");
-                    stmt.append(m.getDataStoreMapping(j).getDatastoreField().getIdentifier().toString());
-                    stmt.append(" = ");
-                    stmt.append(((RDBMSMapping)m.getDataStoreMapping(j)).getUpdateInputParameter());
-                }
-            }
-        }
-        return stmt.toString();
-    }
-
-    /**
-     * Method to update a field of an embedded element.
-     * @param sm State Manager of the owner
-     * @param element The element to update
-     * @param fieldNumber The number of the field to update
-     * @param value The value
-     * @return true if the datastore was updated
-     */
-    public boolean updateEmbeddedElement(StateManager sm, Object element, int fieldNumber, Object value)
-    {
-        boolean modified = false;
-        if (elementMapping != null && elementMapping instanceof EmbeddedElementPCMapping)
-        {
-            String fieldName = emd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber).getName();
-            if (fieldName == null)
-            {
-                // We have no mapping for this field so presumably is the owner field or a PK field
-                return false;
-            }
-            JavaTypeMapping fieldMapping = ((EmbeddedElementPCMapping)elementMapping).getJavaTypeMapping(fieldName);
-            if (fieldMapping == null)
-            {
-                // We have no mapping for this field so presumably is the owner field or a PK field
-                return false;
-            }
-
-            String stmt = getUpdateEmbeddedElementStmt(fieldMapping);
-            try
-            {
-                ObjectManager om = sm.getObjectManager();
-                ManagedConnection mconn = storeMgr.getConnection(om);
-                SQLController sqlControl = getRDBMSAssociationStrategy().getSQLController();
-
-                try
-                {
-                    PreparedStatement ps = sqlControl.getStatementForUpdate(mconn, stmt, false);
-                    try
-                    {
-                        int jdbcPosition = 1;
-                        fieldMapping.setObject(om, ps, Mappings.getParametersIndex(jdbcPosition, fieldMapping), value);
-                        jdbcPosition += fieldMapping.getNumberOfDatastoreFields();
-                        jdbcPosition = getRDBMSAssociationStrategy().populateOwnerInStatement(sm, om, ps, jdbcPosition, this);
-                        jdbcPosition = populateEmbeddedElementFieldsInStatement(sm, element, ps, jdbcPosition, ((JoinTable)containerTable).getOwnerFieldMetaData());
-
-                        sqlControl.executeStatementUpdate(mconn, stmt, ps, true);
-                        modified = true;
-                    }
-                    finally
-                    {
-                        sqlControl.closeStatement(mconn, ps);
-                    }
-                }
-                finally
-                {
-                    mconn.release();
-                }
-            }
-            catch (SQLException e)
-            {
-                e.printStackTrace();
-                // TODO Update this localised message to reflect that it is the update of an embedded element
-                throw new NucleusDataStoreException(LOCALISER.msg("056009", stmt), e);
-            }
-        }
-
-        return modified;
-    }
-
-    /**
-     * Generate statement for retrieving the contents of the Collection.
-     * The discriminator part is only present when the element type has
-     * inheritance strategy of "superclass-table" and is Inverse.
-     * <PRE>
-     * SELECT OWNERCOL FROM COLLECTIONTABLE 
-     * WHERE OWNERCOL=?
-     * AND ELEMENTCOL=?
-     * [AND DISCRIMINATOR=?]
-     * [AND RELATION_DISCRIM=?]
-     * </PRE>
-     * @return Statement for retrieving the contents of the Collection. 
-     */
-    protected String getContainsStmt()
-    {
-        if (containsStmt == null)
-        {
-            StringBuffer stmt = new StringBuffer();
-            String containerAlias = "THIS";
-            String joinedElementAlias = "ELEM";
-            stmt.append("SELECT ");
-            for (int i=0; i<ownerMapping.getNumberOfDatastoreFields(); i++)
-            {
-                if (i > 0)
-                {
-                    stmt.append(",");
-                }
-                stmt.append(ownerMapping.getDataStoreMapping(i).getDatastoreField().getIdentifier().toString());
-            }
-            stmt.append(" FROM ");
-            stmt.append(containerTable.toString()).append(" ").append(containerAlias);
-
-            // Add join to element table if required (only allows for 1 element table currently)
-            boolean joinedDiscrim = false;
-            // TODO Enable this code applying the discrim restriction to JoinTable cases
-            /*if (elementInfo != null && elementInfo[0].getTable() != containerTable && elementInfo[0].getDiscriminatorMapping() != null)
-        {
-            // Need join to the element table to restrict the discriminator
-            joinedDiscrim = true;
-            JavaTypeMapping elemIdMapping = elementInfo[0].getTable().getIDMapping();
-            stmt.append(" INNER JOIN ");
-            stmt.append(elementInfo[0].getTable().toString()).append(" ").append(joinedElementAlias).append(" ON ");
-            for (int i=0;i<elementMapping.getNumberOfDatastoreFields();i++)
-            {
-                if (i > 0)
-                {
-                    stmt.append(" AND ");
-                }
-                stmt.append(containerAlias).append(".").append(elementMapping.getDataStoreMapping(i).getDatastoreField().getIdentifier());
-                stmt.append("=");
-                stmt.append(joinedElementAlias).append(".").append(elemIdMapping.getDataStoreMapping(0).getDatastoreField().getIdentifier());
-            }
-        }*/
-
-            stmt.append(" WHERE ");
-
-            for (int i=0; i<ownerMapping.getNumberOfDatastoreFields(); i++)
-            {
-                if (i > 0)
-                {
-                    stmt.append(" AND ");
-                }
-                stmt.append(containerAlias).append(".").append(ownerMapping.getDataStoreMapping(i).getDatastoreField().getIdentifier().toString());
-                stmt.append(" = ");
-                stmt.append(((RDBMSMapping)ownerMapping.getDataStoreMapping(i)).getUpdateInputParameter());
-            }
-
-            for (int i=0; i<elementMapping.getNumberOfDatastoreFields(); i++)
-            {
-                // TODO Need to allow for the element datastore mapping being a BLOB field in which case this should
-                // be "AND ELEMENTCOLX LIKE ?"
-                stmt.append(" AND ");
-                stmt.append(containerAlias).append(".").append(elementMapping.getDataStoreMapping(i).getDatastoreField().getIdentifier().toString());
-                if (elementsAreSerialised)
-                {
-                    // Can't directly compare serialised element fields
-                    stmt.append(" LIKE ");
-                }
-                else
-                {
-                    stmt.append(" = ");
-                }
-                stmt.append(((RDBMSMapping)elementMapping.getDataStoreMapping(i)).getUpdateInputParameter());
-            }
-
-            // TODO Remove the "containerTable == " clause and make discriminator restriction part of the JoinTable statement too
-            // Needs to pass TCK M-M relationship test. see contains(StateManager, Object) method also
-
-            if (elementInfo != null && containerTable == elementInfo[0].getDatastoreClass() && 
-                elementInfo[0].getDiscriminatorMapping() != null)
-            {
-                // Element table has discriminator so restrict to the element-type and subclasses
-                stmt.append(" AND (");
-
-                // Add WHERE for the element and each subclass type so we restrict to valid element types
-                HashSet subclasses = storeMgr.getSubClassesForClass(elementInfo[0].getClassName(), true, clr);
-                for (int i=0;i<subclasses.size()+1;i++)
-                {
-                    JavaTypeMapping discrimMapping = elementInfo[0].getDiscriminatorMapping();
-                    for (int j=0;j<discrimMapping.getNumberOfDatastoreFields();j++)
-                    {
-                        if (joinedDiscrim)
-                        {
-                            stmt.append(joinedElementAlias);
-                        }
-                        else
-                        {
-                            stmt.append(containerAlias);
-                        }
-                        stmt.append(".").append(discrimMapping.getDataStoreMapping(j).getDatastoreField().getIdentifier().toString());
-                        stmt.append(" = ");
-                        stmt.append(((RDBMSMapping)discrimMapping.getDataStoreMapping(j)).getUpdateInputParameter());
-
-                        if (j != discrimMapping.getNumberOfDatastoreFields()-1 || i != subclasses.size())
-                        {
-                            stmt.append(" OR ");
-                        }
-                    }
-                }
-                stmt.append(")");
-            }
-
-            if (relationDiscriminatorMapping != null)
-            {
-                // Relation uses shared resource (FK, JoinTable) so restrict to this particular relation
-                for (int i=0; i<relationDiscriminatorMapping.getNumberOfDatastoreFields(); i++)
-                {
-                    stmt.append(" AND ");
-                    stmt.append(containerAlias).append(".").append(relationDiscriminatorMapping.getDataStoreMapping(i).getDatastoreField().getIdentifier().toString());
-                    stmt.append(" = ");
-                    stmt.append(((RDBMSMapping)relationDiscriminatorMapping.getDataStoreMapping(i)).getUpdateInputParameter());
-                }
-            }
-
-            containsStmt = stmt.toString();
-        }
-
-        return containsStmt;
-    }
-
-    /**
-     * Method to update the collection to be the supplied collection of elements.
-     * @param sm StateManager of the object
-     * @param coll The collection to use
-     */
-    public void update(StateManager sm, Collection coll)
-    {
-        // Crude update - remove existing and add new!
-        clear(sm);
-        addAll(sm, coll, 0);
-    }
-
-    /**
-     * Method to verify if the association owner vs elements contains
-     * a specific element in the association 
-     * @param sm The StateManager
-     * @param element The element
-     * @return Whether it contains the element 
-     */
-    public boolean contains(StateManager sm, Object element)
-    {
-        if (!validateElementForReading(sm, element))
-        {
-            return false;
-        }
-
-        boolean retval;
-
-        String stmt = getContainsStmt();
-        try
-        {
-            ObjectManager om = sm.getObjectManager();
-            ManagedConnection mconn = storeMgr.getConnection(om);
-            SQLController sqlControl = getRDBMSAssociationStrategy().getSQLController();
-            try
-            {
-                PreparedStatement ps = sqlControl.getStatementForQuery(mconn, stmt);
-                try
-                {
-                    int jdbcPosition = 1;
-                    jdbcPosition = getRDBMSAssociationStrategy().populateOwnerInStatement(sm, om, ps, jdbcPosition, this);
-                    jdbcPosition = populateElementInStatement(om, ps, element, jdbcPosition);
-                    // TODO Remove the containerTable == part of this so that the discrim restriction applies to JoinTable case too
-                    // Needs to pass TCK M-M relation test
-                    if (elementInfo != null && elementInfo[0].getDiscriminatorMapping() != null && elementInfo[0].getDatastoreClass() == containerTable)
-                    {
-                        jdbcPosition = getRDBMSAssociationStrategy().populateElementDiscriminatorInStatement(om, ps, jdbcPosition, true, elementInfo[0]);
-                    }
-                    if (relationDiscriminatorMapping != null)
-                    {
-                        jdbcPosition = getRDBMSAssociationStrategy().populateRelationDiscriminatorInStatement(om, ps, jdbcPosition, this);
-                    }
-
-                    ResultSet rs = sqlControl.executeStatementQuery(mconn, stmt, ps);
-                    try
-                    {
-                        retval = rs.next();
-
-                        SQLWarnings.log(rs);
-                    }
-                    finally
-                    {
-                        rs.close();
-                    }
-                }
-                finally
-                {
-                    sqlControl.closeStatement(mconn, ps);
-                }
-            }
-            finally
-            {
-                mconn.release();
-            }
-        }
-        catch (SQLException e)
-        {
-            throw new NucleusDataStoreException(LOCALISER.msg("056008", stmt), e);
-        }
-        return retval;
-    }
-
-    /**
-     * Method to process a "remove" statement
-     * @param ownerSM StateManager for the owner
-     * @param conn The connection
-     * @param batched Whether we are batching it
-     * @param element The element
-     * @param executeNow Whether to execute the statement rather than allow batching til later
-     * @return Number of records changed (0 if batch since nothing yet changed)
-     * @throws SQLException Thrown if an error occurs
-     */
-    protected int[] internalRemove(StateManager ownerSM, ManagedConnection conn, boolean batched, Object element, boolean executeNow)
-    throws SQLException
-    {
-        ObjectManager om = ownerSM.getObjectManager();
-        SQLController sqlControl = getRDBMSAssociationStrategy().getSQLController();
-        String removeStmt = getRemoveStmt();
-        PreparedStatement ps = sqlControl.getStatementForUpdate(conn, removeStmt, batched);
-        try
-        {
-            int jdbcPosition = 1;
-            jdbcPosition = getRDBMSAssociationStrategy().populateOwnerInStatement(ownerSM, om, ps, jdbcPosition, this);
-            jdbcPosition = populateElementInStatement(om, ps, element, jdbcPosition);
-            if (relationDiscriminatorMapping != null)
-            {
-                jdbcPosition = getRDBMSAssociationStrategy().populateRelationDiscriminatorInStatement(om, ps, jdbcPosition, this);
-            }
-
-            // Execute the statement
-            return sqlControl.executeStatementUpdate(conn, removeStmt, ps, executeNow);
-        }
-        finally
-        {
-            sqlControl.closeStatement(conn, ps);
-        }
-    }
-
-    /**
-     * Generate statement for removing an element from the Collection.
-     * <PRE>
-     * DELETE FROM COLLTABLE WHERE OWNERCOL=? AND ELEMENTCOL = ? [AND DISCRIM = ?]
-     * </PRE>
-     * @return Statement for deleting an item from the Collection.
-     */
-    protected String getRemoveStmt()
-    {
-        if (removeStmt == null)
-        {
-            // Generate the statement
-            StringBuffer stmt = new StringBuffer();
-            stmt.append("DELETE FROM ");
-            stmt.append(containerTable.toString());
-
-            // Add join to element table if required (only allows for 1 element table currently)
-            boolean joinedDiscrim = false;
-            if (elementInfo != null && elementInfo[0].getDatastoreClass() != containerTable &&
-                elementInfo[0].getDiscriminatorMapping() != null)
-            {
-                joinedDiscrim = true;
-                stmt.append(" USING ");
-                stmt.append(elementInfo[0].getDatastoreClass().toString());
-            }
-
-            stmt.append(" WHERE ");
-            for (int i=0; i<ownerMapping.getNumberOfDatastoreFields(); i++)
-            {
-                if (i > 0)
-                {
-                    stmt.append(" AND ");
-                }
-                stmt.append(containerTable.toString()).append(".");
-                stmt.append(ownerMapping.getDataStoreMapping(i).getDatastoreField().getIdentifier().toString());
-                stmt.append(" = ");
-                stmt.append(((RDBMSMapping)ownerMapping.getDataStoreMapping(i)).getUpdateInputParameter());
-            }
-            for (int i=0; i<elementMapping.getNumberOfDatastoreFields(); i++)
-            {
-                stmt.append(" AND ");
-                stmt.append(containerTable.toString()).append(".");
-                stmt.append(elementMapping.getDataStoreMapping(i).getDatastoreField().getIdentifier().toString());
-                if (elementsAreSerialised)
-                {
-                    // Can't directly compare serialised element fields
-                    stmt.append(" LIKE ");
-                }
-                else
-                {
-                    stmt.append(" = ");
-                }
-                stmt.append(((RDBMSMapping)elementMapping.getDataStoreMapping(i)).getUpdateInputParameter());
-            }
-
-            if (elementInfo != null && elementInfo[0].getDiscriminatorMapping() != null)
-            {
-                // TODO Does this need to allow for subclasses too ?
-                JavaTypeMapping discrimMapping = elementInfo[0].getDiscriminatorMapping();
-                for (int i=0;i<discrimMapping.getNumberOfDatastoreFields();i++)
-                {
-                    stmt.append(" AND ");
-                    if (joinedDiscrim)
-                    {
-                        stmt.append(elementInfo[0].getDatastoreClass().toString());
-                    }
-                    else
-                    {
-                        stmt.append(containerTable.toString());
-                    }
-                    stmt.append(".");
-                    stmt.append(discrimMapping.getDataStoreMapping(i).getDatastoreField().getIdentifier().toString());
-                    stmt.append(" = ");
-                    stmt.append(((RDBMSMapping)discrimMapping.getDataStoreMapping(i)).getUpdateInputParameter());
-                }
-            }
-            removeStmt = stmt.toString();
-        }
-        return removeStmt;
-    }
-
-    // ----------------------------- Query Methods --------------------------------
-
-    /**
-     * Query utility to generate an exists() statement for an element.
-     * The generated query will be of the form
-     * <PRE>
-     * SELECT 1 FROM JOINTABLE THIS_JOIN WHERE THIS_JOIN.OWNER_ID_OID = THIS.OWNER_ID
-     * </PRE>
-     * @param qs The parent query statement that will use this as a subquery
-     * @param mapping mapping for the owner
-     * @param ownerTe Expression for the table that the subquery should join to
-     * @param collectionTableAlias alias for the main table of the subquery
-     * @return The query statement
-     */
-    public QueryExpression getExistsSubquery(QueryExpression qs,
-            JavaTypeMapping mapping,
-            LogicSetExpression ownerTe,
-            DatastoreIdentifier collectionTableAlias)
-    {
-        QueryExpression stmt = dba.newQueryStatement(containerTable, collectionTableAlias,
-            qs.getClassLoaderResolver());
-        stmt.setParent(qs);
-
-        // Join for the owner
-        ScalarExpression ownerExpr = mapping.newScalarExpression(stmt, ownerTe);

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4407
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4407&view=rev
Author:   andy_jefferson
Date:     2008-12-23 15:39:33 +0000 (Tue, 23 Dec 2008)

Log Message:
-----------
[NUCRDBMS-79] More RDBMS refactoring - this time around "StatementExpressionIndex" renamed to StatementMappingIndex since is for a mapping, and renamed its methods to match what they really mean

Modified Paths:
--------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/Mappings.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/PersistenceCapableMapping.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSManager.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassTableExtent.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassViewExtent.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ParameterSetter.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ResultSetGetter.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/PersistentIDROF.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultClassROF.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultExpressionsQueryable.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultMetaDataROF.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/SQLQuery.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/TransientIDROF.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/DeleteRequest.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/FetchRequest.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/InsertRequest.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/LocateRequest.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/UpdateRequest.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/VersionCheckRequest.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSElementContainerStoreSpecialization.java

Added Paths:
-----------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/StatementMappingIndex.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/StatementMappingDefinition.java

Removed Paths:
-------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/StatementExpressionIndex.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/MappingStatementIndex.java

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java	2008-12-23 11:52:50 UTC (rev 4406)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java	2008-12-23 15:39:33 UTC (rev 4407)
@@ -610,22 +610,22 @@
      * Method to return a FieldManager for extracting information from the supplied results.
      * @param sm StateManager for the object
      * @param resultSet The results
-     * @param stmtExprIndex Indices of the expressions in these results
+     * @param stmtMappings Mappings of the results
      * @return FieldManager to use
      */
     public abstract FieldManager getFieldManagerForResultProcessing(StateManager sm, Object resultSet, 
-            StatementExpressionIndex[] stmtExprIndex);
+            StatementMappingIndex[] stmtMappings);
 
     /**
      * Method to return a FieldManager for populating information in statements.
      * @param sm The state manager for the object.
      * @param stmt The input Statement to set values on.
-     * @param stmtExprIndex the index of parameters/mappings
+     * @param stmtMappings Mappings of the input parameters
      * @param checkNonNullable Whether to check for nullability
      * @return The FieldManager to use
      */
     public abstract FieldManager getFieldManagerForStatementGeneration(StateManager elementSM, Object stmt,
-            StatementExpressionIndex[] stmtExprIndex, boolean checkNonNullable);
+            StatementMappingIndex[] stmtMappings, boolean checkNonNullable);
 
     /**
      * Method to return the value from the results at the specified position.
@@ -666,7 +666,7 @@
      */
     public abstract ResultObjectFactory newResultObjectFactory(
         DatastoreClass table, int[] fieldNumbers, AbstractClassMetaData acmd,
-        StatementExpressionIndex[] statementExpressionIndex, int[] datastoreIdentityExpressionIndex,
+        StatementMappingIndex[] statementExpressionIndex, int[] datastoreIdentityExpressionIndex,
         int[] versionIndex, boolean ignoreCache, boolean discriminator, boolean hasMetaDataInResults,
         FetchPlan fetchPlan, Class persistentClass);
 }

Deleted: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/StatementExpressionIndex.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/StatementExpressionIndex.java	2008-12-23 11:52:50 UTC (rev 4406)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/StatementExpressionIndex.java	2008-12-23 15:39:33 UTC (rev 4407)
@@ -1,150 +0,0 @@
-/**********************************************************************
-Copyright (c) 2003 Erik Bengtson and others. All rights reserved. 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License. 
- 
-
-Contributors:
-    ...
-**********************************************************************/
-package org.datanucleus.store.mapped;
-
-import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
-
-/**
- * Maintain an index for the mapping field vs columns in a JDBC statement.
- * Each field for a Request (in a Statement) must have one instance of this
- * containing the field Number + Mapping + the columns
- * <PRE> 
- * e.g.
- * CLASS                 FIELDNUMBER     MAPPING            TABLE                EXPRESSION INDEX (JDBC)
- * -----------------     -----------     --------------     ----------------     ----------------
- * class A           -->             -->                --> TABLE_A            
- * {
- *    int fieldA;    --> 1           --> IntegerMapping --> COL_FIELDA       --> 1
- *    String fieldB; --> 2           --> StringMapping  --> COL_FIELDB_PART1 --> 2
- *                   -->             -->                --> COL_FIELDB_PART2 --> 3
- *    ...
- * }
- * </PRE> 
- */
-public class StatementExpressionIndex
-{
-    /** the mapping to the field **/
-    JavaTypeMapping mapping;
-
-    /** the index for a column in the statement **/
-    int[] expressionIndex;
-
-    /** the index for a parameter in the statement **/
-    int[] parameterIndex;
-
-    /** Any name applied in the field selection (SELECT xxx AS yyy). Only applies for cases with 1 column. */
-    String columnName;
-
-    /**
-     * Accessor for the expression index(es).
-     * @return The expression index
-     */
-    public int[] getExpressionIndex()
-    {
-        return expressionIndex;
-    }
-
-    /**
-     * Accessor for the mapping for the field.
-     * @return The mapping
-     */
-    public JavaTypeMapping getMapping()
-    {
-        return mapping;
-    }
-
-    /**
-     * Accessor for the column name (if any).
-     * @return The column name.
-     */
-    public String getColumnName()
-    {
-        if (columnName != null)
-        {
-            return columnName;
-        }
-        else if (mapping != null && mapping.getFieldMetaData() != null)
-        {
-            return mapping.getFieldMetaData().getName();
-        }
-        return null;
-    }
-
-    /**
-     * Mutator for the JDBC expression index(es).
-     * This is the position in the JDBC result set.
-     * @param is The expression index
-     */
-    public void setExpressionIndex(int[] is)
-    {
-        expressionIndex = is;
-    }
-
-    /**
-     * Mutator for the mapping for the field.
-     * @param mapping The mapping
-     */
-    public void setMapping(JavaTypeMapping mapping)
-    {
-        this.mapping = mapping;
-    }
-
-    /**
-     * Mutator for the column name (alias).
-     * Overrides the name of the field that the mapping refers to.
-     * @param colName The name of the column (alias).
-     */
-    public void setColumnName(String colName)
-    {
-        this.columnName = colName;
-    }
-
-    /**
-     * Accessor for the parameter index(es).
-     * @return The parameter index
-     */
-    public int[] getParameterIndex()
-    {
-        return parameterIndex;
-    }
-
-    /**
-     * @param is The parameter index
-     */
-    public void setParameterIndex(int[] is)
-    {
-        parameterIndex = is;
-    }
-
-    /**
-     * Method to return a string version of this object.
-     * @return String version
-     **/
-    public String toString()
-    {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append("mapping: "+mapping);
-        buffer.append("\n");
-        buffer.append("parameterIndex: "+parameterIndex);
-        buffer.append("\n");
-        buffer.append("expressionIndex: "+expressionIndex);
-        buffer.append("\n");
-        return buffer.toString();
-    }
-}
\ No newline at end of file

Copied: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/StatementMappingIndex.java (from rev 4341, platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/StatementExpressionIndex.java)
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/StatementMappingIndex.java	                        (rev 0)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/StatementMappingIndex.java	2008-12-23 15:39:33 UTC (rev 4407)
@@ -0,0 +1,154 @@
+/**********************************************************************
+Copyright (c) 2003 Erik Bengtson and others. All rights reserved. 
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+2008 Andy Jefferson - Cleaned up and documented.
+    ...
+**********************************************************************/
+package org.datanucleus.store.mapped;
+
+import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
+
+/**
+ * Representation of a mapping in a statement (such as JDBC), and its mapping to the associated column(s)
+ * or parameters that the mapping relates to. The mapping may be for a field of a class (whether it is a real
+ * field or a surrogate), or for a parameter.
+ * <ul>
+ * <li>Provides index positions of the column(s) of this field in the result clause of the statement</li>
+ * <li>Provides parameter position(s) if any of the column(s) are statement parameters, for input</li>
+ * </ul>
+ * For example, fields of a class in the result clause of a statement.
+ * <PRE>
+ * CLASS                 FIELDNUM     MAPPING            TABLE                COLUMN POSITIONS
+ * -----------------     --------     --------------     ----------------     ----------------
+ * class A           -->          -->                --> TABLE_A              
+ * {
+ *    short fieldA;  --> 1        --> ShortMapping   --> COL_FIELDA       --> 1
+ *    String fieldB; --> 2        --> StringMapping  --> COL_FIELDB_PART1 --> 2
+ *                   -->          -->                --> COL_FIELDB_PART2 --> 3
+ *    ...
+ * }
+ * </PRE>
+ */
+public class StatementMappingIndex
+{
+    /** Mapping being represented. */
+    JavaTypeMapping mapping;
+
+    /** Positions for the column(s) for this field in the result clause of a statement. **/
+    int[] columnPositions;
+
+    /** Parameter positions for the column(s) for this field in the statement (when input for the stmt). **/
+    int[] parameterPositions;
+
+    /** Any name applied in the field selection (SELECT xxx AS yyy). Only applies for cases with 1 column. */
+    String columnName;
+
+    /**
+     * Accessor for the mapping.
+     * @return The mapping
+     */
+    public JavaTypeMapping getMapping()
+    {
+        return mapping;
+    }
+
+    /**
+     * Mutator for the mapping.
+     * @param mapping The mapping
+     */
+    public void setMapping(JavaTypeMapping mapping)
+    {
+        this.mapping = mapping;
+    }
+
+    /**
+     * Accessor for the column name alias (if any).
+     * Only applies to the first column for this field.
+     * @return The column alias.
+     */
+    public String getColumnAlias()
+    {
+        if (columnName != null)
+        {
+            return columnName;
+        }
+        else if (mapping != null && mapping.getFieldMetaData() != null)
+        {
+            return mapping.getFieldMetaData().getName();
+        }
+        return null;
+    }
+
+    /**
+     * Mutator for the column name (alias).
+     * Overrides the name of the field that the mapping refers to.
+     * @param colName The name of the column (alias).
+     */
+    public void setColumnName(String colName)
+    {
+        this.columnName = colName;
+    }
+
+    /**
+     * Accessor for the column position(s).
+     * @return The column position(s) in the result clause of the statement.
+     */
+    public int[] getColumnPositions()
+    {
+        return columnPositions;
+    }
+
+    /**
+     * Mutator for the column positions in the result clause of a statement.
+     * @param pos The column position(s)
+     */
+    public void setColumnPositions(int[] pos)
+    {
+        columnPositions = pos;
+    }
+
+    /**
+     * Accessor for the parameter position(s).
+     * @return The parameter position(s)
+     */
+    public int[] getParameterPositions()
+    {
+        return parameterPositions;
+    }
+
+    /**
+     * @param nums The parameter positions for the column(s) defined here.
+     */
+    public void setParameterPositions(int[] nums)
+    {
+        parameterPositions = nums;
+    }
+
+    /**
+     * Method to return a string version of this object.
+     * @return String version
+     **/
+    public String toString()
+    {
+        StringBuffer buffer = new StringBuffer();
+        buffer.append("mapping: "+mapping);
+        buffer.append("\n");
+        buffer.append("parameterIndex: "+parameterPositions);
+        buffer.append("\n");
+        buffer.append("expressionIndex: "+columnPositions);
+        buffer.append("\n");
+        return buffer.toString();
+    }
+}
\ No newline at end of file

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/Mappings.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/Mappings.java	2008-12-23 11:52:50 UTC (rev 4406)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/Mappings.java	2008-12-23 15:39:33 UTC (rev 4407)
@@ -30,7 +30,7 @@
 import org.datanucleus.store.mapped.DatastoreIdentifier;
 import org.datanucleus.store.mapped.IdentifierFactory;
 import org.datanucleus.store.mapped.MappedStoreManager;
-import org.datanucleus.store.mapped.StatementExpressionIndex;
+import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.expression.LogicSetExpression;
 import org.datanucleus.store.mapped.expression.QueryExpression;
 import org.datanucleus.store.mapped.expression.ScalarExpression;
@@ -50,7 +50,7 @@
      *                                 included in the query
      */
     public static void selectMapping(QueryExpression qs,
-                                     StatementExpressionIndex[] statementExpressionIndex)
+                                     StatementMappingIndex[] statementExpressionIndex)
     {
         selectMapping(qs, null, statementExpressionIndex);
     }
@@ -67,7 +67,7 @@
      */
     public static void selectMapping(QueryExpression qs,
                                      DatastoreIdentifier tableIdentifier,
-                                     StatementExpressionIndex[] statementExpressionIndex)
+                                     StatementMappingIndex[] statementExpressionIndex)
     {
         if (statementExpressionIndex == null)
         {
@@ -83,7 +83,7 @@
                     if (m.getNumberOfDatastoreFields() > 0)
                     {
                         int[] columnNumbersByField = (tableIdentifier != null) ? qs.select(tableIdentifier, m, true) : qs.select(m, true);
-                        statementExpressionIndex[i].setExpressionIndex(columnNumbersByField);
+                        statementExpressionIndex[i].setColumnPositions(columnNumbersByField);
                     }
                     else
                     {
@@ -104,7 +104,7 @@
     private static void setStatementExpressionForFieldWithNoDatastoreColumns(QueryExpression qs,
                                                                              DatastoreIdentifier tableIdentifier,
                                                                              JavaTypeMapping m, 
-                                                                             StatementExpressionIndex statementExpressionIndex)
+                                                                             StatementMappingIndex statementExpressionIndex)
     {
         AbstractMemberMetaData fmd = m.getFieldMetaData();
         ClassLoaderResolver clr = qs.getClassLoaderResolver();
@@ -224,7 +224,7 @@
                     }
                 }
 
-                statementExpressionIndex.setExpressionIndex(colNums);
+                statementExpressionIndex.setColumnPositions(colNums);
             }
         }
         else if (relationType == Relation.MANY_TO_ONE_BI)
@@ -280,14 +280,14 @@
 
                     // Select the Id column(s) of the other class (via the Left Outer Join)
                     int[] columnNumbersByField = qs.select(joinTableIdentifier, selectMapping, true);
-                    statementExpressionIndex.setExpressionIndex(columnNumbersByField);
+                    statementExpressionIndex.setColumnPositions(columnNumbersByField);
                 }
                 else
                 {
                     // The statement selects the join table, and joins to the element, and the owner column should be selected
                     // Select the owner mapping of the join table directly (no join needed)
                     int[] columnNumbersByField = qs.select(selectMapping, true);
-                    statementExpressionIndex.setExpressionIndex(columnNumbersByField);
+                    statementExpressionIndex.setColumnPositions(columnNumbersByField);
                 }
             }
         }

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/PersistenceCapableMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/PersistenceCapableMapping.java	2008-12-23 11:52:50 UTC (rev 4406)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/PersistenceCapableMapping.java	2008-12-23 15:39:33 UTC (rev 4407)
@@ -64,7 +64,7 @@
 import org.datanucleus.store.mapped.DatastoreIdentifier;
 import org.datanucleus.store.mapped.IdentifierFactory;
 import org.datanucleus.store.mapped.MappedStoreManager;
-import org.datanucleus.store.mapped.StatementExpressionIndex;
+import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.expression.LogicSetExpression;
 import org.datanucleus.store.mapped.expression.ObjectExpression;
 import org.datanucleus.store.mapped.expression.ObjectLiteral;
@@ -931,7 +931,7 @@
         
         // Concrete class
         int totalFieldCount = cmd.getNoOfManagedMembers() + cmd.getNoOfInheritedManagedMembers();
-        final StatementExpressionIndex[] statementExpressionIndex = new StatementExpressionIndex[totalFieldCount];
+        final StatementMappingIndex[] statementExpressionIndex = new StatementMappingIndex[totalFieldCount];
         int paramIndex = 0;
 
         final MappedStoreManager storeMgr = (MappedStoreManager)om.getStoreManager();
@@ -942,14 +942,14 @@
         {
             AbstractMemberMetaData fmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(pkFieldNumbers[i]);
             JavaTypeMapping m = datastoreClass.getFieldMapping(fmd);
-            statementExpressionIndex[fmd.getAbsoluteFieldNumber()] = new StatementExpressionIndex();
+            statementExpressionIndex[fmd.getAbsoluteFieldNumber()] = new StatementMappingIndex();
             statementExpressionIndex[fmd.getAbsoluteFieldNumber()].setMapping(m);
             int expressionsIndex[] = new int[m.getNumberOfDatastoreFields()];
             for (int j = 0; j < expressionsIndex.length; j++)
             {
                 expressionsIndex[j] = param[paramIndex++];
             }
-            statementExpressionIndex[fmd.getAbsoluteFieldNumber()].setExpressionIndex(expressionsIndex);
+            statementExpressionIndex[fmd.getAbsoluteFieldNumber()].setColumnPositions(expressionsIndex);
         }
 
         return om.findObjectUsingAID(clr.classForName(cmd.getFullClassName()),

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStore.java	2008-12-23 11:52:50 UTC (rev 4406)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStore.java	2008-12-23 15:39:33 UTC (rev 4407)
@@ -42,7 +42,7 @@
 import org.datanucleus.store.mapped.DatastoreContainerObject;
 import org.datanucleus.store.mapped.DatastoreIdentifier;
 import org.datanucleus.store.mapped.IdentifierFactory;
-import org.datanucleus.store.mapped.StatementExpressionIndex;
+import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.expression.QueryExpression;
 import org.datanucleus.store.mapped.mapping.AbstractContainerMapping;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
@@ -483,7 +483,7 @@
                 }
             }
 
-            StatementExpressionIndex[] statementExpressionIndex = null;
+            StatementMappingIndex[] stmtMappings = null;
 
             // Start with PK fields (if any)
             int[] prefetchFieldNumbers = null;
@@ -551,7 +551,7 @@
             // eliminating non-persistent and container fields
             int fn[] = new int[prefetchFieldNumbers.length];
             int prefetchFieldCount = 0;
-            statementExpressionIndex = new StatementExpressionIndex[
+            stmtMappings = new StatementMappingIndex[
                 emd.getNoOfInheritedManagedMembers() + emd.getNoOfManagedMembers()];
             for (int i=0; i<prefetchFieldNumbers.length; ++i)
             {
@@ -563,8 +563,8 @@
                     if (m != null && m.includeInFetchStatement() && !(m instanceof AbstractContainerMapping))
                     {
                         // Field is not a container, and is to be fetched (eliminates fields as FKs in other class)
-                        statementExpressionIndex[prefetchFieldNumbers[i]] = new StatementExpressionIndex();
-                        statementExpressionIndex[prefetchFieldNumbers[i]].setMapping(m);
+                        stmtMappings[prefetchFieldNumbers[i]] = new StatementMappingIndex();
+                        stmtMappings[prefetchFieldNumbers[i]].setMapping(m);
                         fn[prefetchFieldCount++] = prefetchFieldNumbers[i];
                     }
                 }
@@ -574,15 +574,15 @@
             System.arraycopy(fn, 0, fieldNumbers, 0, prefetchFieldCount);
             if (stmt.getTableExpression(elmIdentifier) != null)
             {
-                Mappings.selectMapping(stmt, elmIdentifier, statementExpressionIndex);
+                Mappings.selectMapping(stmt, elmIdentifier, stmtMappings);
             }
             else
             {
-                Mappings.selectMapping(stmt, statementExpressionIndex);
+                Mappings.selectMapping(stmt, stmtMappings);
             }
 
             return storeMgr.newResultObjectFactory(elementInfo != null ? elementInfo[0].getDatastoreClass() : null,
-                fieldNumbers, emd, statementExpressionIndex, datastoreIndex, versionIndex,
+                fieldNumbers, emd, stmtMappings, datastoreIndex, versionIndex,
                 ignoreCache, iterateUsingDiscriminator,
                 stmt.hasMetaDataExpression(), null, clr.classForName(elementType));
         }
@@ -632,4 +632,4 @@
     {
         return elementsAreEmbedded;
     }
-}
+}
\ No newline at end of file

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSManager.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSManager.java	2008-12-23 11:52:50 UTC (rev 4406)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSManager.java	2008-12-23 15:39:33 UTC (rev 4407)
@@ -105,7 +105,7 @@
 import org.datanucleus.store.mapped.FetchStatement;
 import org.datanucleus.store.mapped.IdentifierFactory;
 import org.datanucleus.store.mapped.MappedStoreManager;
-import org.datanucleus.store.mapped.StatementExpressionIndex;
+import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.scostore.FKListStore;
 import org.datanucleus.store.mapped.scostore.JoinListStore;
 import org.datanucleus.store.mapped.scostore.FKArrayStore;
@@ -1442,27 +1442,27 @@
      * Method to return a FieldManager for extracting information from the supplied results.
      * @param sm StateManager for the object
      * @param resultSet The results
-     * @param stmtExprIndex Indices of the expressions in these results
+     * @param stmtMappings Indices of the expressions in these results
      * @return FieldManager to use
      */
     public FieldManager getFieldManagerForResultProcessing(StateManager sm, Object resultSet, 
-            StatementExpressionIndex[] stmtExprIndex)
+            StatementMappingIndex[] stmtMappings)
     {
-        return new ResultSetGetter(sm, (ResultSet)resultSet, stmtExprIndex);
+        return new ResultSetGetter(sm, (ResultSet)resultSet, stmtMappings);
     }
 
     /**
      * Method to return a FieldManager for populating information in statements.
      * @param sm The state manager for the object.
      * @param stmt The Prepared Statement to set values on.
-     * @param statementExpressionIndex the index of parameters/mappings
+     * @param stmtMappings the index of parameters/mappings
      * @param checkNonNullable Whether to check for nullability
      * @return The FieldManager to use
      */
     public FieldManager getFieldManagerForStatementGeneration(StateManager sm, Object stmt,
-        StatementExpressionIndex[] statementExpressionIndex, boolean checkNonNullable)
+        StatementMappingIndex[] stmtMappings, boolean checkNonNullable)
     {
-        return new ParameterSetter(sm, (PreparedStatement) stmt, statementExpressionIndex, true);
+        return new ParameterSetter(sm, (PreparedStatement) stmt, stmtMappings, true);
     }
 
     /**
@@ -3352,7 +3352,7 @@
     }
 
     public ResultObjectFactory newResultObjectFactory(DatastoreClass table, int[] fieldNumbers,
-        AbstractClassMetaData acmd, StatementExpressionIndex[] statementExpressionIndex,
+        AbstractClassMetaData acmd, StatementMappingIndex[] statementExpressionIndex,
         int[] datastoreIdentityExpressionIndex, int[] versionIndex, boolean ignoreCache,
         boolean discriminator, boolean hasMetaDataInResults, FetchPlan fetchPlan,
         Class persistentClass)

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassTableExtent.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassTableExtent.java	2008-12-23 11:52:50 UTC (rev 4406)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassTableExtent.java	2008-12-23 15:39:33 UTC (rev 4407)
@@ -39,7 +39,7 @@
 import org.datanucleus.store.mapped.DatastoreIdentifier;
 import org.datanucleus.store.mapped.IdentifierFactory;
 import org.datanucleus.store.mapped.MappedStoreManager;
-import org.datanucleus.store.mapped.StatementExpressionIndex;
+import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.expression.QueryExpression;
 import org.datanucleus.store.mapped.expression.Queryable;
 import org.datanucleus.store.mapped.mapping.AbstractContainerMapping;
@@ -234,7 +234,7 @@
             Class resultClass, boolean useFetchPlan)
     {
         int[] prefetchFieldNumbers = null;
-        StatementExpressionIndex[] statementExpressionIndex = null;
+        StatementMappingIndex[] stmtMappings = null;
         int[] datastoreIndex = null;
         int[] versionIndex = null;
 
@@ -281,7 +281,7 @@
             {
                 prefetchFieldNumbers = new int[cmd.getPKMemberPositions().length];
                 int fieldCount = cmd.getNoOfInheritedManagedMembers() + cmd.getNoOfManagedMembers();
-                statementExpressionIndex = new StatementExpressionIndex[fieldCount];
+                stmtMappings = new StatementMappingIndex[fieldCount];
                 for (int i = 0; i < prefetchFieldNumbers.length; ++i)
                 {
                     prefetchFieldNumbers[i] = cmd.getPKMemberPositions()[i];
@@ -293,9 +293,9 @@
                     {
                         if (m.includeInFetchStatement() && !(m instanceof AbstractContainerMapping))
                         {
-                            statementExpressionIndex[prefetchFieldNumbers[i]] = new StatementExpressionIndex();
-                            statementExpressionIndex[prefetchFieldNumbers[i]].setMapping(m);
-                            statementExpressionIndex[prefetchFieldNumbers[i]].setExpressionIndex(stmt.selectField(fieldName, "APP_ID", true));
+                            stmtMappings[prefetchFieldNumbers[i]] = new StatementMappingIndex();
+                            stmtMappings[prefetchFieldNumbers[i]].setMapping(m);
+                            stmtMappings[prefetchFieldNumbers[i]].setColumnPositions(stmt.selectField(fieldName, "APP_ID", true));
                         }
                     }
                 }
@@ -320,7 +320,7 @@
                 int fieldCount = cmd.getNoOfInheritedManagedMembers() + cmd.getNoOfManagedMembers();
                 
                 int fn[] = new int[fieldNumbers.length];
-                statementExpressionIndex = new StatementExpressionIndex[fieldCount];
+                stmtMappings = new StatementMappingIndex[fieldCount];
                 for (int i = 0; i < fieldNumbers.length; ++i)
                 {
                     JavaTypeMapping m = tables[0].getFieldMapping(cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumbers[i]));
@@ -329,8 +329,8 @@
                         // omit fields not stored in the table, e.g. List, Set, etc or transactional
                         if (m.includeInFetchStatement() && !(m instanceof AbstractContainerMapping))
                         {
-                            statementExpressionIndex[fieldNumbers[i]] = new StatementExpressionIndex();
-                            statementExpressionIndex[fieldNumbers[i]].setMapping(m);
+                            stmtMappings[fieldNumbers[i]] = new StatementMappingIndex();
+                            stmtMappings[fieldNumbers[i]].setMapping(m);
                             fn[prefetchFieldCount++] = fieldNumbers[i];
                         }
                     }
@@ -342,11 +342,11 @@
                 // select the fetch-plan fields to be fetched from the database
                 if (stmt.getTableExpression(elmIdentifier) != null)
                 {
-                    Mappings.selectMapping(stmt, elmIdentifier, statementExpressionIndex);
+                    Mappings.selectMapping(stmt, elmIdentifier, stmtMappings);
                 }
                 else
                 {
-                    Mappings.selectMapping(stmt, statementExpressionIndex);
+                    Mappings.selectMapping(stmt, stmtMappings);
                 }
             }
             else
@@ -357,7 +357,7 @@
                 {
                     prefetchFieldNumbers = new int[cmd.getPKMemberPositions().length];
                     int fieldCount = cmd.getNoOfInheritedManagedMembers() + cmd.getNoOfManagedMembers();
-                    statementExpressionIndex = new StatementExpressionIndex[fieldCount];
+                    stmtMappings = new StatementMappingIndex[fieldCount];
                     for (int i = 0; i < prefetchFieldNumbers.length; ++i)
                     {
                         prefetchFieldNumbers[i] = cmd.getPKMemberPositions()[i];
@@ -366,19 +366,19 @@
                         {
                             if (m.includeInFetchStatement() && !(m instanceof AbstractContainerMapping))
                             {
-                                statementExpressionIndex[prefetchFieldNumbers[i]] = new StatementExpressionIndex();
-                                statementExpressionIndex[prefetchFieldNumbers[i]].setMapping(m);
+                                stmtMappings[prefetchFieldNumbers[i]] = new StatementMappingIndex();
+                                stmtMappings[prefetchFieldNumbers[i]].setMapping(m);
                             }
                         }
                     }
                     // following the actual fetch plan, we select the fields to be fetched from the database
                     if (stmt.getTableExpression(elmIdentifier) != null)
                     {
-                        Mappings.selectMapping(stmt, elmIdentifier, statementExpressionIndex);
+                        Mappings.selectMapping(stmt, elmIdentifier, stmtMappings);
                     }
                     else
                     {
-                        Mappings.selectMapping(stmt, statementExpressionIndex);
+                        Mappings.selectMapping(stmt, stmtMappings);
                     }
                 }
             }
@@ -386,13 +386,13 @@
 
         if (resultClass == null)
         {
-            return new PersistentIDROF(tables[0], prefetchFieldNumbers, cmd, statementExpressionIndex, datastoreIndex, 
+            return new PersistentIDROF(tables[0], prefetchFieldNumbers, cmd, stmtMappings, datastoreIndex, 
                 versionIndex, ignoreCache, queryUsingDiscriminator(), stmt.hasMetaDataExpression(), 
                 getFetchPlan(), query.getCandidateClass());
         }
         else
         {
-            return new ResultClassROF(resultClass, statementExpressionIndex);
+            return new ResultClassROF(resultClass, stmtMappings);
         }
     }
 

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassViewExtent.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassViewExtent.java	2008-12-23 11:52:50 UTC (rev 4406)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassViewExtent.java	2008-12-23 15:39:33 UTC (rev 4407)
@@ -27,7 +27,7 @@
 import org.datanucleus.store.mapped.DatastoreClass;
 import org.datanucleus.store.mapped.DatastoreIdentifier;
 import org.datanucleus.store.mapped.MappedStoreManager;
-import org.datanucleus.store.mapped.StatementExpressionIndex;
+import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.query.IncompatibleQueryElementTypeException;
 import org.datanucleus.store.mapped.expression.QueryExpression;
 import org.datanucleus.store.mapped.expression.Queryable;
@@ -52,7 +52,7 @@
 
     private final int fieldCount;
     private final int[] prefetchFieldNumbers;
-	private final StatementExpressionIndex[] statementExpressionIndex;
+	private final StatementMappingIndex[] stmtMappings;
 
     /**
      * Constructor.
@@ -72,7 +72,7 @@
         // Set up list of fields required for the candidate class
         fieldCount = cmd.getNoOfManagedMembers();
         int[] fn = new int[fieldCount];
-		statementExpressionIndex = new StatementExpressionIndex[fieldCount];
+		stmtMappings = new StatementMappingIndex[fieldCount];
         int prefetchFieldCount = 0;
 
         for (int i=0; i<fieldCount; ++i)
@@ -86,8 +86,8 @@
                         m, candidateClass.getName())).setFatal();
                 }
                 
-				statementExpressionIndex[i] = new StatementExpressionIndex();
-				statementExpressionIndex[i].setMapping(m);
+				stmtMappings[i] = new StatementMappingIndex();
+				stmtMappings[i].setMapping(m);
                 fn[prefetchFieldCount++] = i;
             }
         }
@@ -140,9 +140,9 @@
     public ResultObjectFactory newResultObjectFactory(QueryExpression stmt, boolean ignoreCache, 
             Class resultClass, boolean useFetchPlan)
     {
-        Mappings.selectMapping(stmt,statementExpressionIndex);
+        Mappings.selectMapping(stmt,stmtMappings);
 
-        return new TransientIDROF(getCandidateClass(), prefetchFieldNumbers, statementExpressionIndex);
+        return new TransientIDROF(getCandidateClass(), prefetchFieldNumbers, stmtMappings);
     }
 
     /**

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ParameterSetter.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ParameterSetter.java	2008-12-23 11:52:50 UTC (rev 4406)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ParameterSetter.java	2008-12-23 15:39:33 UTC (rev 4407)
@@ -27,7 +27,7 @@
 import org.datanucleus.metadata.NullValue;
 import org.datanucleus.store.exceptions.NotYetFlushedException;
 import org.datanucleus.store.fieldmanager.AbstractFieldManager;
-import org.datanucleus.store.mapped.StatementExpressionIndex;
+import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.mapping.EmbeddedPCMapping;
 import org.datanucleus.store.mapped.mapping.InterfaceMapping;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
@@ -48,7 +48,7 @@
     private final StateManager sm;
     private final ObjectManager om;
     private final PreparedStatement ps;
-    private final StatementExpressionIndex[] statementExpressionIndex;
+    private final StatementMappingIndex[] stmtMappings;
     private final boolean checkNonNullable;
 
     /**
@@ -59,77 +59,87 @@
      * @param checkNonNullable Whether to check for nullability
      */
     public ParameterSetter(StateManager sm, PreparedStatement ps,
-            StatementExpressionIndex[] statementExpressionIndex, boolean checkNonNullable)
+            StatementMappingIndex[] statementExpressionIndex, boolean checkNonNullable)
     {
         this.sm = sm;
         this.om = sm.getObjectManager();
         this.ps = ps;
-        this.statementExpressionIndex = statementExpressionIndex;
+        this.stmtMappings = statementExpressionIndex;
         this.checkNonNullable = checkNonNullable;
     }
 
     public void storeBooleanField(int fieldNumber, boolean value)
     {
-        statementExpressionIndex[fieldNumber].getMapping().setBoolean(om, ps, statementExpressionIndex[fieldNumber].getParameterIndex(), value);
+        stmtMappings[fieldNumber].getMapping().setBoolean(om, ps, 
+            stmtMappings[fieldNumber].getParameterPositions(), value);
     }
 
     public void storeCharField(int fieldNumber, char value)
     {
-        statementExpressionIndex[fieldNumber].getMapping().setChar(om, ps, statementExpressionIndex[fieldNumber].getParameterIndex(), value);
+        stmtMappings[fieldNumber].getMapping().setChar(om, ps, 
+            stmtMappings[fieldNumber].getParameterPositions(), value);
     }
 
     public void storeByteField(int fieldNumber, byte value)
     {
-        statementExpressionIndex[fieldNumber].getMapping().setByte(om, ps, statementExpressionIndex[fieldNumber].getParameterIndex(), value);
+        stmtMappings[fieldNumber].getMapping().setByte(om, ps,
+            stmtMappings[fieldNumber].getParameterPositions(), value);
     }
 
     public void storeShortField(int fieldNumber, short value)
     {
-        statementExpressionIndex[fieldNumber].getMapping().setShort(om, ps, statementExpressionIndex[fieldNumber].getParameterIndex(), value);
+        stmtMappings[fieldNumber].getMapping().setShort(om, ps,
+            stmtMappings[fieldNumber].getParameterPositions(), value);
     }
 
     public void storeIntField(int fieldNumber, int value)
     {
-        statementExpressionIndex[fieldNumber].getMapping().setInt(om, ps, statementExpressionIndex[fieldNumber].getParameterIndex(), value);
+        stmtMappings[fieldNumber].getMapping().setInt(om, ps,
+            stmtMappings[fieldNumber].getParameterPositions(), value);
     }
 
     public void storeLongField(int fieldNumber, long value)
     {
-        statementExpressionIndex[fieldNumber].getMapping().setLong(om, ps, statementExpressionIndex[fieldNumber].getParameterIndex(), value);
+        stmtMappings[fieldNumber].getMapping().setLong(om, ps,
+            stmtMappings[fieldNumber].getParameterPositions(), value);
     }
 
     public void storeFloatField(int fieldNumber, float value)
     {
-        statementExpressionIndex[fieldNumber].getMapping().setFloat(om, ps, statementExpressionIndex[fieldNumber].getParameterIndex(), value);
+        stmtMappings[fieldNumber].getMapping().setFloat(om, ps,
+            stmtMappings[fieldNumber].getParameterPositions(), value);
     }
 
     public void storeDoubleField(int fieldNumber, double value)
     {
-        statementExpressionIndex[fieldNumber].getMapping().setDouble(om, ps, statementExpressionIndex[fieldNumber].getParameterIndex(), value);
+        stmtMappings[fieldNumber].getMapping().setDouble(om, ps,
+            stmtMappings[fieldNumber].getParameterPositions(), value);
     }
 
     public void storeStringField(int fieldNumber, String value)
     {
-        if (checkNonNullable &&
-            value == null &&
-            statementExpressionIndex[fieldNumber].getMapping().getFieldMetaData().getNullValue() == NullValue.EXCEPTION)
+        if (checkNonNullable && value == null &&
+            stmtMappings[fieldNumber].getMapping().getFieldMetaData().getNullValue() == NullValue.EXCEPTION)
         {
-            throw new NucleusUserException(LOCALISER.msg("052400",statementExpressionIndex[fieldNumber].getMapping().getFieldMetaData().getFullFieldName()));
+            throw new NucleusUserException(LOCALISER.msg("052400",
+                stmtMappings[fieldNumber].getMapping().getFieldMetaData().getFullFieldName()));
         }
-        statementExpressionIndex[fieldNumber].getMapping().setString(om, ps, statementExpressionIndex[fieldNumber].getParameterIndex(), value);
+        stmtMappings[fieldNumber].getMapping().setString(om, ps, 
+            stmtMappings[fieldNumber].getParameterPositions(), value);
     }
 
     public void storeObjectField(int fieldNumber, Object value)
     {
         if (checkNonNullable && value == null &&
-            statementExpressionIndex[fieldNumber].getMapping().getFieldMetaData().getNullValue() == NullValue.EXCEPTION)
+            stmtMappings[fieldNumber].getMapping().getFieldMetaData().getNullValue() == NullValue.EXCEPTION)
         {
-            throw new NucleusUserException(LOCALISER.msg("052400",statementExpressionIndex[fieldNumber].getMapping().getFieldMetaData().getFullFieldName()));
+            throw new NucleusUserException(LOCALISER.msg("052400",
+                stmtMappings[fieldNumber].getMapping().getFieldMetaData().getFullFieldName()));
         }
 
         try
         {
-            JavaTypeMapping mapping = statementExpressionIndex[fieldNumber].getMapping();
+            JavaTypeMapping mapping = stmtMappings[fieldNumber].getMapping();
             if (mapping instanceof EmbeddedPCMapping ||
                 mapping instanceof SerialisedPCMapping ||
                 mapping instanceof SerialisedReferenceMapping ||
@@ -137,11 +147,11 @@
                 mapping instanceof InterfaceMapping)
             {
                 // Pass in the owner StateManager/field for any mappings that need to perform management of the relation
-                mapping.setObject(om, ps, statementExpressionIndex[fieldNumber].getParameterIndex(), value, sm, fieldNumber);
+                mapping.setObject(om, ps, stmtMappings[fieldNumber].getParameterPositions(), value, sm, fieldNumber);
             }
             else
             {
-                mapping.setObject(om, ps, statementExpressionIndex[fieldNumber].getParameterIndex(), value);
+                mapping.setObject(om, ps, stmtMappings[fieldNumber].getParameterPositions(), value);
             }
 
             // Make sure the field is wrapped where appropriate

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ResultSetGetter.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ResultSetGetter.java	2008-12-23 11:52:50 UTC (rev 4406)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ResultSetGetter.java	2008-12-23 15:39:33 UTC (rev 4407)
@@ -23,7 +23,7 @@
 import org.datanucleus.ObjectManager;
 import org.datanucleus.StateManager;
 import org.datanucleus.store.fieldmanager.AbstractFieldManager;
-import org.datanucleus.store.mapped.StatementExpressionIndex;
+import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.mapping.EmbeddedPCMapping;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
 import org.datanucleus.store.mapped.mapping.SerialisedPCMapping;
@@ -37,7 +37,7 @@
     private final StateManager sm;
     private final ObjectManager om;
     private final ResultSet rs;
-    private final StatementExpressionIndex[] statementExpressionIndex;
+    private final StatementMappingIndex[] stmtMappings;
 
     /**
      * Constructor
@@ -45,72 +45,81 @@
      * @param rs the ResultSet
      * @param statementExpressionIndex the StatementExpressionIndex
      */
-    public ResultSetGetter(StateManager sm, ResultSet rs, StatementExpressionIndex[] statementExpressionIndex)
+    public ResultSetGetter(StateManager sm, ResultSet rs, StatementMappingIndex[] statementExpressionIndex)
     {
         this.sm = sm;
         this.om = sm.getObjectManager();
         this.rs = rs;
-        this.statementExpressionIndex = statementExpressionIndex;
+        this.stmtMappings = statementExpressionIndex;
     }
 
     public boolean fetchBooleanField(int fieldNumber)
     {
-        return statementExpressionIndex[fieldNumber].getMapping().getBoolean(om, rs, statementExpressionIndex[fieldNumber].getExpressionIndex());
+        return stmtMappings[fieldNumber].getMapping().getBoolean(om, rs, 
+            stmtMappings[fieldNumber].getColumnPositions());
     }
 
     public char fetchCharField(int fieldNumber)
     {
-        return statementExpressionIndex[fieldNumber].getMapping().getChar(om, rs, statementExpressionIndex[fieldNumber].getExpressionIndex());
+        return stmtMappings[fieldNumber].getMapping().getChar(om, rs, 
+            stmtMappings[fieldNumber].getColumnPositions());
     }
 
     public byte fetchByteField(int fieldNumber)
     {
-        return statementExpressionIndex[fieldNumber].getMapping().getByte(om, rs, statementExpressionIndex[fieldNumber].getExpressionIndex());
+        return stmtMappings[fieldNumber].getMapping().getByte(om, rs, 
+            stmtMappings[fieldNumber].getColumnPositions());
     }
 
     public short fetchShortField(int fieldNumber)
     {
-        return statementExpressionIndex[fieldNumber].getMapping().getShort(om, rs, statementExpressionIndex[fieldNumber].getExpressionIndex());
+        return stmtMappings[fieldNumber].getMapping().getShort(om, rs, 
+            stmtMappings[fieldNumber].getColumnPositions());
     }
 
     public int fetchIntField(int fieldNumber)
     {
-        return statementExpressionIndex[fieldNumber].getMapping().getInt(om, rs, statementExpressionIndex[fieldNumber].getExpressionIndex());
+        return stmtMappings[fieldNumber].getMapping().getInt(om, rs, 
+            stmtMappings[fieldNumber].getColumnPositions());
     }
 
     public long fetchLongField(int fieldNumber)
     {
-        return statementExpressionIndex[fieldNumber].getMapping().getLong(om, rs, statementExpressionIndex[fieldNumber].getExpressionIndex());
+        return stmtMappings[fieldNumber].getMapping().getLong(om, rs, 
+            stmtMappings[fieldNumber].getColumnPositions());
     }
 
     public float fetchFloatField(int fieldNumber)
     {
-        return statementExpressionIndex[fieldNumber].getMapping().getFloat(om, rs, statementExpressionIndex[fieldNumber].getExpressionIndex());
+        return stmtMappings[fieldNumber].getMapping().getFloat(om, rs,
+            stmtMappings[fieldNumber].getColumnPositions());
     }
 
     public double fetchDoubleField(int fieldNumber)
     {
-        return statementExpressionIndex[fieldNumber].getMapping().getDouble(om, rs, statementExpressionIndex[fieldNumber].getExpressionIndex());
+        return stmtMappings[fieldNumber].getMapping().getDouble(om, rs,
+            stmtMappings[fieldNumber].getColumnPositions());
     }
 
     public String fetchStringField(int fieldNumber)
     {
-        return statementExpressionIndex[fieldNumber].getMapping().getString(om, rs, statementExpressionIndex[fieldNumber].getExpressionIndex());
+        return stmtMappings[fieldNumber].getMapping().getString(om, rs,
+            stmtMappings[fieldNumber].getColumnPositions());
     }
 
     public Object fetchObjectField(int fieldNumber)
     {
-        JavaTypeMapping mapping = statementExpressionIndex[fieldNumber].getMapping();
+        JavaTypeMapping mapping = stmtMappings[fieldNumber].getMapping();
         Object value;
         if (mapping instanceof EmbeddedPCMapping ||
             mapping instanceof SerialisedPCMapping ||
             mapping instanceof SerialisedReferenceMapping)
         {
-            value = mapping.getObject(om, rs, statementExpressionIndex[fieldNumber].getExpressionIndex(), sm, fieldNumber);
+            value = mapping.getObject(om, rs, stmtMappings[fieldNumber].getColumnPositions(), sm, fieldNumber);
         }
         else
         {
-            value = mapping.getObject(om, rs, statementExpressionIndex[fieldNumber].getExpressionIndex());
+            value = mapping.getObject(om, rs, stmtMappings[fieldNumber].getColumnPositions());
         }
 
         // Return the field value (as a wrapper if wrappable)

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/PersistentIDROF.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/PersistentIDROF.java	2008-12-23 11:52:50 UTC (rev 4406)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/PersistentIDROF.java	2008-12-23 15:39:33 UTC (rev 4407)
@@ -41,7 +41,7 @@
 import org.datanucleus.metadata.VersionMetaData;
 import org.datanucleus.store.FieldValues;
 import org.datanucleus.store.mapped.DatastoreClass;
-import org.datanucleus.store.mapped.StatementExpressionIndex;
+import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
 import org.datanucleus.store.mapped.mapping.OIDMapping;
 import org.datanucleus.store.query.ResultObjectFactory;
@@ -58,17 +58,15 @@
  * <LI><B>discriminator</B> - when the candidate class and all possible subclasses in the query
  * are stored in the same table they are distinguished using a "discriminator" column that will
  * either store the class name, or a value representing that type.</LI>
- * <LI><B>JPOXMETADATA</B> - in all other cases JPOX adds an extra column to the SELECT that contains
+ * <LI><B>NUCMETADATA</B> - in all other cases we add an extra column to the SELECT that contains
  * the class name of the object.</LI>
  * </UL>
- *
- * @version $Revision: 1.19 $
  */
 public final class PersistentIDROF implements ResultObjectFactory
 {
     /** Localiser for messages. */
-    protected static final Localiser LOCALISER = Localiser.getInstance("org.datanucleus.store.rdbms.Localisation",
-        RDBMSManager.class.getClassLoader());
+    protected static final Localiser LOCALISER = Localiser.getInstance(
+        "org.datanucleus.store.rdbms.Localisation", RDBMSManager.class.getClassLoader());
 
     /**
      * Table where the objects of the candidate class are stored.
@@ -83,7 +81,7 @@
     protected int[] fieldNumbers;
 
     /** Mapping from ResultSet to field numbers and mappings. */
-    protected StatementExpressionIndex[] statementExpressionIndex;
+    protected StatementMappingIndex[] stmtMappings;
 
     /** Indices of datastore identity columns */
     protected final int[] datastoreIdentityExpressionIndex;
@@ -91,7 +89,7 @@
     /** Index of version column(s). */
     protected final int[] versionIndex;
 
-    /** Flag whether we should use a discriminator column to distinguish object types (otherwise use JPOXMETADATA). */
+    /** Flag whether we should use a discriminator column to distinguish object types (otherwise use NUCMETADATA). */
     protected boolean discriminator;
     
     /** if the results have included a meta data column with the class name. */
@@ -107,7 +105,7 @@
     private Map resolvedClasses = new SoftValueMap();
 
     /** StatementExpressionIndex keyed by full class name. */
-    private Map stmtExprIndexes = new SoftValueMap();
+    private Map stmtMappingByClassName = new SoftValueMap();
 
     /** Persistent class that this factory will generate (may be the base class). */
     private Class persistentClass;
@@ -130,7 +128,7 @@
     public PersistentIDROF(DatastoreClass table,
                            int[] fieldNumbers,
                            AbstractClassMetaData acmd,
-                           StatementExpressionIndex[] statementExpressionIndex,
+                           StatementMappingIndex[] statementExpressionIndex,
                            int[] datastoreIdentityExpressionIndex,
                            int[] versionIndex,
                            boolean ignoreCache,
@@ -139,7 +137,7 @@
                            FetchPlan fetchPlan,
                            Class persistentClass)
     {
-        this.statementExpressionIndex = statementExpressionIndex;
+        this.stmtMappings = statementExpressionIndex;
         if (fieldNumbers == null)
         {
             this.fieldNumbers = new int[0];
@@ -189,7 +187,7 @@
         }
         else if (hasMetaDataInResults)
         {
-            // Extract the object type using the JPOXMETADATA column (if available)
+            // Extract the object type using the NUCMETADATA column (if available)
             try
             {
                 className = RDBMSQueryUtils.getClassNameFromMetaDataResultSetRow((ResultSet)rs);
@@ -227,8 +225,9 @@
         if (Modifier.isAbstract(pcClassForObject.getModifiers()))
         {
             // Persistent class is abstract so we can't create instances of that type!
-            // This can happen if the user is using subclass-table and hasn't provided a discriminator in the table
-            // Try going out one level and find a concrete subclass TODO make this more ribust and go out further
+            // This can happen if the user is using subclass-table and hasn't provided a discriminator in 
+            // the table. Try going out one level and find a concrete subclass 
+            // TODO make this more robust and go out further
             String[] subclasses = om.getMetaDataManager().getSubclassesForClass(pcClassForObject.getName(), false);
             if (subclasses != null)
             {
@@ -352,17 +351,17 @@
     private Object getObjectByAID(final ObjectManager om, final ResultSet rs, final int[] fieldNumbers, 
             AbstractClassMetaData cmd, Class pcClass, boolean requiresInheritanceCheck)
     {
-        StatementExpressionIndex[] indexes = (StatementExpressionIndex[]) stmtExprIndexes.get(cmd.getFullClassName());
+        StatementMappingIndex[] indexes = (StatementMappingIndex[]) stmtMappingByClassName.get(cmd.getFullClassName());
         if (indexes == null)
         {
-            indexes = new StatementExpressionIndex[cmd.getNoOfManagedMembers() + cmd.getNoOfInheritedManagedMembers()];
+            indexes = new StatementMappingIndex[cmd.getNoOfManagedMembers() + cmd.getNoOfInheritedManagedMembers()];
             for (int i = 0; i < fieldNumbers.length; i++)
             {
-            	indexes[fieldNumbers[i]] = statementExpressionIndex[this.fieldNumbers[i]]; 
+            	indexes[fieldNumbers[i]] = stmtMappings[this.fieldNumbers[i]]; 
             }
-            stmtExprIndexes.put(cmd.getFullClassName(), indexes);
+            stmtMappingByClassName.put(cmd.getFullClassName(), indexes);
         }
-        final StatementExpressionIndex[] stmtExprIndex = indexes;            
+        final StatementMappingIndex[] stmtExprIndex = indexes;            
         return om.findObjectUsingAID(pcClass, new FieldValues()
         {
             public void fetchFields(StateManager sm)
@@ -398,17 +397,17 @@
             return null;
         }
 
-        StatementExpressionIndex[] indexes = (StatementExpressionIndex[]) stmtExprIndexes.get(cmd.getFullClassName());
+        StatementMappingIndex[] indexes = (StatementMappingIndex[]) stmtMappingByClassName.get(cmd.getFullClassName());
         if (indexes == null)
         {
-            indexes = new StatementExpressionIndex[cmd.getNoOfManagedMembers() + cmd.getNoOfInheritedManagedMembers()];
+            indexes = new StatementMappingIndex[cmd.getNoOfManagedMembers() + cmd.getNoOfInheritedManagedMembers()];
             for (int i = 0; i < fieldNumbers.length; i++)
             {
-                indexes[fieldNumbers[i]] = statementExpressionIndex[this.fieldNumbers[i]];
+                indexes[fieldNumbers[i]] = stmtMappings[this.fieldNumbers[i]];
             }
-            stmtExprIndexes.put(cmd.getFullClassName(), indexes);
+            stmtMappingByClassName.put(cmd.getFullClassName(), indexes);
         }
-        final StatementExpressionIndex[] stmtExprIndex = indexes;
+        final StatementMappingIndex[] stmtExprIndex = indexes;
         if (pcClass == null)
         {
             return om.findObject(oid, new FieldValues()

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultClassROF.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultClassROF.java	2008-12-23 11:52:50 UTC (rev 4406)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultClassROF.java	2008-12-23 15:39:33 UTC (rev 4407)
@@ -30,7 +30,7 @@
 import org.datanucleus.ObjectManagerFactoryImpl;
 import org.datanucleus.exceptions.NucleusUserException;
 import org.datanucleus.query.QueryUtils;
-import org.datanucleus.store.mapped.StatementExpressionIndex;
+import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.expression.NewObjectExpression;
 import org.datanucleus.store.mapped.expression.ScalarExpression;
 import org.datanucleus.store.query.ResultObjectFactory;
@@ -70,7 +70,7 @@
     private final Class resultClass;
 
     /** The index of fields position to mapping type. */
-    private final StatementExpressionIndex[] statementExpressionIndex;
+    private final StatementMappingIndex[] stmtMappings;
 
     /** The result expressions. */
     private final ScalarExpression[] expressions;
@@ -87,7 +87,7 @@
      * @param resultClass The result class to use
      * @param statementExpressionIndex The mapping information for field positions etc
      */
-    public ResultClassROF(Class resultClass, StatementExpressionIndex[] statementExpressionIndex)
+    public ResultClassROF(Class resultClass, StatementMappingIndex[] statementExpressionIndex)
     {
         this(resultClass, statementExpressionIndex, null);
     }
@@ -99,7 +99,7 @@
      * @param statementExpressionIndex The mapping information for field positions etc
      * @param expressions The result expressions (if known)
      */
-    public ResultClassROF(Class cls, StatementExpressionIndex[] statementExpressionIndex,
+    public ResultClassROF(Class cls, StatementMappingIndex[] statementExpressionIndex,
             ScalarExpression[] expressions)
     {
         Class tmpClass = null;
@@ -126,14 +126,14 @@
             });
         }
 
-        this.statementExpressionIndex = statementExpressionIndex;
+        this.stmtMappings = statementExpressionIndex;
         this.expressions = expressions;
         this.resultFieldNames = new String[statementExpressionIndex.length];
         for (int i=0;i<statementExpressionIndex.length;i++)
         {
             if (statementExpressionIndex[i] != null)
             {
-                resultFieldNames[i] = statementExpressionIndex[i].getColumnName();
+                resultFieldNames[i] = statementExpressionIndex[i].getColumnAlias();
             }
             else
             {
@@ -187,7 +187,7 @@
             });
         }
 
-        this.statementExpressionIndex = null;
+        this.stmtMappings = null;
         this.expressions = null;
         if (resultFieldNames == null)
         {
@@ -212,7 +212,7 @@
     {
         // Retrieve the field values from the ResultSet
         Object[] fieldValues = null;
-        if (statementExpressionIndex != null)
+        if (stmtMappings != null)
         {
             // Field mapping information available so use it to allocate our results
             if (expressions != null)
@@ -227,13 +227,13 @@
             }
             else
             {
-                fieldValues = new Object[statementExpressionIndex.length];
-                for (int i=0; i<statementExpressionIndex.length; i++)
+                fieldValues = new Object[stmtMappings.length];
+                for (int i=0; i<stmtMappings.length; i++)
                 {
-                    if (statementExpressionIndex[i] != null)
+                    if (stmtMappings[i] != null)
                     {
-                        fieldValues[i] = statementExpressionIndex[i].getMapping().getObject(om, rs,
-                            statementExpressionIndex[i].getExpressionIndex());
+                        fieldValues[i] = stmtMappings[i].getMapping().getObject(om, rs,
+                            stmtMappings[i].getColumnPositions());
                     }
                     else
                     {
@@ -373,7 +373,7 @@
             try
             {
                 // Extract the field value
-                return stmtExprIterator.current().getMapping().getObject(om, rs, stmtExprIterator.current().getExpressionIndex());
+                return stmtExprIterator.current().getMapping().getObject(om, rs, stmtExprIterator.current().getColumnPositions());
             }
             finally
             {
@@ -393,18 +393,18 @@
         int index = 0;
         boolean hasNext()
         {
-            return( index < statementExpressionIndex.length-1 );
+            return( index < stmtMappings.length-1 );
         }
 
-        StatementExpressionIndex next()
+        StatementMappingIndex next()
         {
             index++;
-            return statementExpressionIndex[index];
+            return stmtMappings[index];
         }
         
-        StatementExpressionIndex current()
+        StatementMappingIndex current()
         {
-            return statementExpressionIndex[index];
+            return stmtMappings[index];
         }
     }
 

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultExpressionsQueryable.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultExpressionsQueryable.java	2008-12-23 11:52:50 UTC (rev 4406)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultExpressionsQueryable.java	2008-12-23 15:39:33 UTC (rev 4407)
@@ -37,7 +37,7 @@
 import org.datanucleus.store.mapped.DatastoreContainerObject;
 import org.datanucleus.store.mapped.DatastoreIdentifier;
 import org.datanucleus.store.mapped.MappedStoreManager;
-import org.datanucleus.store.mapped.StatementExpressionIndex;
+import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.expression.AggregateExpression;
 import org.datanucleus.store.mapped.expression.BooleanExpression;
 import org.datanucleus.store.mapped.expression.Literal;
@@ -307,7 +307,7 @@
      */
     private void selectLiteralExpression(QueryExpression stmt, List stmtExprIndexList, ScalarExpression expr1)
     {
-        StatementExpressionIndex stmtExprIndex = new StatementExpressionIndex();
+        StatementMappingIndex stmtExprIndex = new StatementMappingIndex();
         //when we have literal values, we don't put the literal in the SQL, but we put the identity columns, so it returns the correct
         //we IGNORE the literal values in the query, and use the literal mapping when the result set is returned
         //here, we just make sure that some columns are added to the SELECT by adding the ID mapping
@@ -364,7 +364,7 @@
         }
         else
         {
-            StatementExpressionIndex stmtExprIndex = new StatementExpressionIndex();
+            StatementMappingIndex stmtExprIndex = new StatementMappingIndex();
             int[] exprIndex = null;
 
             ScalarExpression[] expr = expr1.getExpressionList().toArray();
@@ -382,7 +382,7 @@
                 exprIndex = new int[1];
                 exprIndex[0] = stmt.selectScalarExpression(expr1, true);
             }
-            stmtExprIndex.setExpressionIndex(exprIndex);
+            stmtExprIndex.setColumnPositions(exprIndex);
             stmtExprIndex.setMapping(expr1.getMapping());
             if (expr1.getAlias() != null)
             {
@@ -416,7 +416,7 @@
             // Catch the situation where we have no selected columns, and hence the SELECT has no content
             //throw new JDOUserException("The query has resulted in SQL that has no columns in the SELECT clause. This may be due to a feature not yet supported by JPOX.");
         }
-        StatementExpressionIndex[] statementExpressionIndex = (StatementExpressionIndex[]) stmtExprIndex.toArray(new StatementExpressionIndex[stmtExprIndex.size()]);
+        StatementMappingIndex[] statementExpressionIndex = (StatementMappingIndex[]) stmtExprIndex.toArray(new StatementMappingIndex[stmtExprIndex.size()]);
         // Provide a ResultObjectFactory to convert to the required type
         if (resultClass != null)
         {

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultMetaDataROF.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultMetaDataROF.java	2008-12-23 11:52:50 UTC (rev 4406)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultMetaDataROF.java	2008-12-23 15:39:33 UTC (rev 4407)
@@ -42,7 +42,7 @@
 import org.datanucleus.store.mapped.DatastoreClass;
 import org.datanucleus.store.mapped.DatastoreField;
 import org.datanucleus.store.mapped.MappedStoreManager;
-import org.datanucleus.store.mapped.StatementExpressionIndex;
+import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
 import org.datanucleus.store.query.ResultObjectFactory;
 import org.datanucleus.store.rdbms.RDBMSManager;
@@ -79,14 +79,12 @@
  * Object[2] = simple object, Object[3] = simple object. 
  * When creating the instance of PC1 we take the ResultSet columns (COL1, COL2, COL8).
  * When creating the instance of PC2 we take the ResultSet columns (COL5, COL6, COL4).
- *
- * @version $Revision: 1.9 $
  */
 public class ResultMetaDataROF implements ResultObjectFactory
 {
     /** Localisation of messages. */
-    protected static final Localiser LOCALISER = Localiser.getInstance("org.datanucleus.store.rdbms.Localisation",
-        RDBMSManager.class.getClassLoader());
+    protected static final Localiser LOCALISER = Localiser.getInstance(
+        "org.datanucleus.store.rdbms.Localisation", RDBMSManager.class.getClassLoader());
 
     /** MetaData defining the result from the Query. */
     QueryResultMetaData queryResultMetaData = null;
@@ -140,7 +138,7 @@
             for (int i=0;i<persistentTypes.length;i++)
             {
                 int[] fieldNumbers;    
-                StatementExpressionIndex[] statementExpressionIndex;
+                StatementMappingIndex[] statementExpressionIndex;
                 Set columnsInThisType = new HashSet();
                 AbstractMemberMetaData[] fmds = new AbstractMemberMetaData[columnNames.length];
                 Map fieldColumns = new HashMap();
@@ -213,7 +211,7 @@
                 //build StatementExpressionIndex
                 Set fields = new HashSet();
                 fields.addAll(fieldColumns.values());
-                statementExpressionIndex = new StatementExpressionIndex[acmd.getNoOfManagedMembers() + acmd.getNoOfInheritedManagedMembers()];
+                statementExpressionIndex = new StatementMappingIndex[acmd.getNoOfManagedMembers() + acmd.getNoOfInheritedManagedMembers()];
                 fieldNumbers = new int[fields.size()];
                 Iterator it = fields.iterator();
                 int j=0;
@@ -221,7 +219,7 @@
                 {
                     AbstractMemberMetaData apmd = (AbstractMemberMetaData)it.next();
                     fieldNumbers[j] = apmd.getAbsoluteFieldNumber();
-                    statementExpressionIndex[fieldNumbers[j]] = new StatementExpressionIndex();
+                    statementExpressionIndex[fieldNumbers[j]] = new StatementMappingIndex();
                     List indexes = new ArrayList();
                     for( int k=0; k<fmds.length; k++)
                     {
@@ -237,7 +235,7 @@
                         indxs[k] = ((Integer)indexes.get(k)).intValue()+1;
                     }
                     
-                    statementExpressionIndex[fieldNumbers[j]].setExpressionIndex(indxs);
+                    statementExpressionIndex[fieldNumbers[j]].setColumnPositions(indxs);
                     statementExpressionIndex[fieldNumbers[j]].setMapping(dc.getFieldMapping(apmd));
                     j++;
                     
@@ -320,9 +318,9 @@
      * @return The object with this application identity
      */
     private Object getObjectByAID(final ObjectManager om, final ResultSet rs, final int[] fieldNumbers, 
-            AbstractClassMetaData cmd, Class pcClass, boolean requiresInheritanceCheck, StatementExpressionIndex[] statementExpressionIndex)
+            AbstractClassMetaData cmd, Class pcClass, boolean requiresInheritanceCheck, StatementMappingIndex[] statementExpressionIndex)
     {
-        final StatementExpressionIndex[] stmtExprIndex = statementExpressionIndex;            
+        final StatementMappingIndex[] stmtExprIndex = statementExpressionIndex;            
         return om.findObjectUsingAID(pcClass, new FieldValues()
         {
             public void fetchFields(StateManager sm)
@@ -351,9 +349,9 @@
      * @return The Object
      */
     private Object getObjectById(final ObjectManager om, final ResultSet rs, final int[] fieldNumbers,
-            AbstractClassMetaData cmd, Object oid, Class pcClass, StatementExpressionIndex[] statementExpressionIndex)
+            AbstractClassMetaData cmd, Object oid, Class pcClass, StatementMappingIndex[] statementExpressionIndex)
     {
-        final StatementExpressionIndex[] stmtExprIndex = statementExpressionIndex;
+        final StatementMappingIndex[] stmtExprIndex = statementExpressionIndex;
         if (pcClass == null)
         {
             return om.findObject(oid, new FieldValues()

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/SQLQuery.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/SQLQuery.java	2008-12-23 11:52:50 UTC (rev 4406)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/SQLQuery.java	2008-12-23 15:39:33 UTC (rev 4407)
@@ -48,7 +48,7 @@
 import org.datanucleus.store.mapped.DatastoreAdapter;
 import org.datanucleus.store.mapped.DatastoreClass;
 import org.datanucleus.store.mapped.MappedStoreManager;
-import org.datanucleus.store.mapped.StatementExpressionIndex;
+import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.expression.QueryExpression;
 import org.datanucleus.store.mapped.mapping.DatastoreMapping;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
@@ -290,7 +290,7 @@
     class SQLQueryEvaluator extends SQLEvaluator
     {
         Map parameters;
-        StatementExpressionIndex[] statementExpressionIndex;
+        StatementMappingIndex[] statementExpressionIndex;
 
         public SQLQueryEvaluator(Query query, Map parameters)
         {
@@ -421,11 +421,11 @@
             final AbstractClassMetaData candidateCmd = om.getMetaDataManager().getMetaDataForClass(candidateClass, clr);
             int fieldCount = candidateCmd.getNoOfManagedMembers() + candidateCmd.getNoOfInheritedManagedMembers();
             Map columnFieldNumberMap = new HashMap(); // Map of field numbers keyed by the column name
-            statementExpressionIndex = new StatementExpressionIndex[fieldCount];
+            statementExpressionIndex = new StatementMappingIndex[fieldCount];
             DatastoreClass tbl = storeMgr.getDatastoreClass(candidateClass.getName(), clr);
             for (int fieldNumber = 0; fieldNumber < fieldCount; ++fieldNumber)
             {
-                statementExpressionIndex[fieldNumber] = new StatementExpressionIndex();
+                statementExpressionIndex[fieldNumber] = new StatementMappingIndex();
                 AbstractMemberMetaData fmd = candidateCmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
                 String fieldName = fmd.getName();
                 Class fieldType = fmd.getType();
@@ -531,12 +531,12 @@
                 if (fieldNumber >= 0)
                 {
                     int[] exprIndices = null;
-                    if (statementExpressionIndex[fieldNumber].getExpressionIndex() != null)
+                    if (statementExpressionIndex[fieldNumber].getColumnPositions() != null)
                     {
-                        exprIndices = new int[statementExpressionIndex[fieldNumber].getExpressionIndex().length+1];
-                        for (int i=0;i<statementExpressionIndex[fieldNumber].getExpressionIndex().length;i++)
+                        exprIndices = new int[statementExpressionIndex[fieldNumber].getColumnPositions().length+1];
+                        for (int i=0;i<statementExpressionIndex[fieldNumber].getColumnPositions().length;i++)
                         {
-                            exprIndices[i] = statementExpressionIndex[fieldNumber].getExpressionIndex()[i];
+                            exprIndices[i] = statementExpressionIndex[fieldNumber].getColumnPositions()[i];
                         }
                         exprIndices[exprIndices.length-1] = colNum;
                     }
@@ -544,7 +544,7 @@
                     {
                         exprIndices = new int[] {colNum};
                     }
-                    statementExpressionIndex[fieldNumber].setExpressionIndex(exprIndices);
+                    statementExpressionIndex[fieldNumber].setColumnPositions(exprIndices);
                     remainingColumnNames.remove(colName);
                     matchedFieldNumbers[fieldNumberPosition++] = fieldNumber;
                 }

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/TransientIDROF.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/TransientIDROF.java	2008-12-23 11:52:50 UTC (rev 4406)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/TransientIDROF.java	2008-12-23 15:39:33 UTC (rev 4407)
@@ -27,7 +27,7 @@
 import org.datanucleus.ObjectManager;
 import org.datanucleus.StateManager;
 import org.datanucleus.store.FieldValues;
-import org.datanucleus.store.mapped.StatementExpressionIndex;
+import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.query.ResultObjectFactory;
 import org.datanucleus.store.rdbms.fieldmanager.ResultSetGetter;
 
@@ -39,7 +39,7 @@
 {
     private final Class candidateClass;
     protected final int[] fieldNumbers;
-	protected final StatementExpressionIndex[] statementExpressionIndex;
+	protected final StatementMappingIndex[] stmtMappings;
 
 	/**
      * Constructor 
@@ -47,11 +47,11 @@
      * @param fieldNumbers the absolute field numbers with the retrieved fields
      * @param statementExpressionIndex the StatementExpressionIndex
 	 */
-    public TransientIDROF(Class candidateClass, int[] fieldNumbers, StatementExpressionIndex[] statementExpressionIndex)
+    public TransientIDROF(Class candidateClass, int[] fieldNumbers, StatementMappingIndex[] statementExpressionIndex)
     {
         this.candidateClass = candidateClass;
         this.fieldNumbers = fieldNumbers;
-        this.statementExpressionIndex = statementExpressionIndex;
+        this.stmtMappings = statementExpressionIndex;
     }
 
 	/**
@@ -67,11 +67,11 @@
             {
                 public void fetchFields(StateManager sm)
                 {
-                    sm.replaceFields(fieldNumbers, new ResultSetGetter(sm, (ResultSet)rs, statementExpressionIndex), false);
+                    sm.replaceFields(fieldNumbers, new ResultSetGetter(sm, (ResultSet)rs, stmtMappings), false);
                 }
                 public void fetchNonLoadedFields(StateManager sm)
                 {
-                    sm.replaceNonLoadedFields(fieldNumbers, new ResultSetGetter(sm, (ResultSet)rs, statementExpressionIndex));
+                    sm.replaceNonLoadedFields(fieldNumbers, new ResultSetGetter(sm, (ResultSet)rs, stmtMappings));
                 }
                 public FetchPlan getFetchPlanForLoading()
                 {

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/DeleteRequest.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/DeleteRequest.java	2008-12-23 11:52:50 UTC (rev 4406)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/DeleteRequest.java	2008-12-23 15:39:33 UTC (rev 4407)
@@ -44,7 +44,7 @@
 import org.datanucleus.metadata.Relation;
 import org.datanucleus.store.mapped.DatastoreClass;
 import org.datanucleus.store.mapped.DatastoreField;
-import org.datanucleus.store.mapped.StatementExpressionIndex;
+import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
 import org.datanucleus.store.mapped.mapping.MappingCallbacks;
 import org.datanucleus.store.mapped.mapping.MappingConsumer;
@@ -74,7 +74,7 @@
     private final String deleteStmtOptimistic;
 
     /** the index for the expression(s) in the delete statement. */
-    private MappingStatementIndex mappingStatementIndex;
+    private StatementMappingDefinition mappingStatementIndex;
 
     /** PK fields to be provided in defining the record to be deleted (app identity cases). */
     private final int[] pkFieldNumbers;
@@ -92,7 +92,7 @@
     {
         super(table, cls, clr);
 
-        mappingStatementIndex = new MappingStatementIndex(); // Populated using the subsequent lines
+        mappingStatementIndex = new StatementMappingDefinition(); // Populated using the subsequent lines
         DeleteMappingConsumer consumer = new DeleteMappingConsumer(clr, cmd);
         table.provideNonPrimaryKeyMappings(consumer); // to compute callbacks
 
@@ -202,7 +202,7 @@
                     if (cmd.getIdentityType() == IdentityType.DATASTORE)
                     {
                         table.getDataStoreObjectIdMapping().setObject(om, ps,
-                            mappingStatementIndex.getDatastoreId().getParameterIndex(), sm.getInternalObjectId());
+                            mappingStatementIndex.getDatastoreId().getParameterPositions(), sm.getInternalObjectId());
                     }
                     else if (cmd.getIdentityType() == IdentityType.APPLICATION)
                     {
@@ -224,7 +224,7 @@
                             throw new NucleusException(msg);
                         }
                         verMapping.setObject(om, ps,
-                            mappingStatementIndex.getVersion2().getParameterIndex(), currentVersion);
+                            mappingStatementIndex.getVersion2().getParameterPositions(), currentVersion);
                     }
 
                     int[] rcs = sqlControl.executeStatementUpdate(mconn, stmt, ps, !batch);
@@ -429,8 +429,8 @@
         {
             if (!initialized)
             {
-                mappingStatementIndex.setPrimaryKeys(new StatementExpressionIndex[highest]);
-                mappingStatementIndex.setFields(new StatementExpressionIndex[highest]);
+                mappingStatementIndex.setPrimaryKeys(new StatementMappingIndex[highest]);
+                mappingStatementIndex.setFields(new StatementMappingIndex[highest]);
                 initialized = true;
             }
         }
@@ -447,9 +447,9 @@
                 {
                     Integer abs_field_num = new Integer(fmd.getAbsoluteFieldNumber());
                     int parametersIndex[] = new int[m.getNumberOfDatastoreFields()];
-                    StatementExpressionIndex sei = new StatementExpressionIndex();
+                    StatementMappingIndex sei = new StatementMappingIndex();
                     sei.setMapping(m);
-                    sei.setParameterIndex(parametersIndex);
+                    sei.setParameterPositions(parametersIndex);
 
                     mappingStatementIndex.getPrimaryKeys()[fmd.getAbsoluteFieldNumber()] = sei; 
                     for (int j=0; j<parametersIndex.length; j++)
@@ -501,9 +501,9 @@
                         // Must be version field since nothing else should come through here
                         int parametersIndex[] = new int[m.getNumberOfDatastoreFields()];
                         parametersIndex[0] = paramIndex++;
-                        StatementExpressionIndex sei = new StatementExpressionIndex();
+                        StatementMappingIndex sei = new StatementMappingIndex();
                         sei.setMapping(m);
-                        sei.setParameterIndex(parametersIndex);
+                        sei.setParameterPositions(parametersIndex);
                         mappingStatementIndex.setVersion2(sei);
                         String inputParam = ((RDBMSMapping)m.getDataStoreMapping(0)).getUpdateInputParameter();
                         String condition = " AND " + m.getDataStoreMapping(0).getDatastoreField().getIdentifier() + "=" + inputParam;
@@ -534,16 +534,16 @@
                 where.append(((RDBMSMapping)m.getDataStoreMapping(0)).getUpdateInputParameter());
 
                 int[] param = { paramIndex++ };
-                mappingStatementIndex.getDatastoreId().setParameterIndex(param);
+                mappingStatementIndex.getDatastoreId().setParameterPositions(param);
             }
             else if (mappingType == MappingConsumer.MAPPING_TYPE_VERSION)
             {
                 if (whereClauseConsumption)
                 {
-                    StatementExpressionIndex versStmtIdx = mappingStatementIndex.getVersion2();
+                    StatementMappingIndex versStmtIdx = mappingStatementIndex.getVersion2();
                     int[] param = { paramIndex++ };
                     versStmtIdx.setMapping(m);
-                    versStmtIdx.setParameterIndex(param);
+                    versStmtIdx.setParameterPositions(param);
                     String inputParam = ((RDBMSMapping)m.getDataStoreMapping(0)).getUpdateInputParameter();
                     String condition = " AND " + m.getDataStoreMapping(0).getDatastoreField().getIdentifier() + "=" + inputParam;
                     where.append(condition);

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/FetchRequest.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/FetchRequest.java	2008-12-23 11:52:50 UTC (rev 4406)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/FetchRequest.java	2008-12-23 15:39:33 UTC (rev 4407)
@@ -54,7 +54,7 @@
 import org.datanucleus.store.mapped.FetchStatement;
 import org.datanucleus.store.mapped.MappedStoreManager;
 import org.datanucleus.store.mapped.SecondaryDatastoreClass;
-import org.datanucleus.store.mapped.StatementExpressionIndex;
+import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.mapping.InterfaceMapping;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
 import org.datanucleus.store.mapped.mapping.MappingCallbacks;
@@ -87,7 +87,7 @@
 
     private FetchMappingConsumer consumer;
 
-    private MappingStatementIndex mappingStatementIndex;
+    private StatementMappingDefinition mappingStatementIndex;
 
     /** Convenience string listing the fields to be fetched by this request. */
     private final String fieldsToFetch;
@@ -149,7 +149,7 @@
         this.table = candidateTable;
         this.key = ((AbstractClassTable)table).getPrimaryKey();
 
-        mappingStatementIndex = new MappingStatementIndex();
+        mappingStatementIndex = new StatementMappingDefinition();
         FetchStatement fetchStatement = new RDBMSFetchStatement(table);
 
         // Extract the fields to be retrieved
@@ -294,7 +294,7 @@
                         if (sm.getInternalObjectId() instanceof OID)
                         {
                             table.getDataStoreObjectIdMapping().setObject(om, ps, 
-                                mappingStatementIndex.getDatastoreId().getParameterIndex(), sm.getInternalObjectId());
+                                mappingStatementIndex.getDatastoreId().getParameterPositions(), sm.getInternalObjectId());
                         }
                         else
                         {
@@ -324,7 +324,7 @@
                                 {
                                     // Surrogate version column - get from the result set using the version mapping
                                     datastoreVersion = table.getVersionMapping(true).getObject(om, rs,  
-                                        mappingStatementIndex.getVersion().getExpressionIndex());
+                                        mappingStatementIndex.getVersion().getColumnPositions());
                                 }
                                 else if (versionFieldName != null)
                                 {
@@ -444,8 +444,8 @@
         {
             if (!initialized)
             {
-                mappingStatementIndex.setPrimaryKeys(new StatementExpressionIndex[highestFieldNumber]);
-                mappingStatementIndex.setFields(new StatementExpressionIndex[highestFieldNumber]);
+                mappingStatementIndex.setPrimaryKeys(new StatementMappingIndex[highestFieldNumber]);
+                mappingStatementIndex.setFields(new StatementMappingIndex[highestFieldNumber]);
                 initialized = true;
             }
         }
@@ -458,7 +458,7 @@
             }
             if (m.includeInFetchStatement())
             {
-                mappingStatementIndex.getFields()[fmd.getAbsoluteFieldNumber()] = new StatementExpressionIndex();
+                mappingStatementIndex.getFields()[fmd.getAbsoluteFieldNumber()] = new StatementMappingIndex();
                 mappingStatementIndex.getFields()[fmd.getAbsoluteFieldNumber()].setMapping(m);
 
                 // create the expressions index (columns index)
@@ -637,7 +637,7 @@
                         }
                     }
                 }
-                mappingStatementIndex.getFields()[fmd.getAbsoluteFieldNumber()].setExpressionIndex(expressionsIndex);
+                mappingStatementIndex.getFields()[fmd.getAbsoluteFieldNumber()].setColumnPositions(expressionsIndex);
 
                 /*
                  * check if the our column is primary key. if the
@@ -657,7 +657,7 @@
                         }
                         parametersIndex[j] = paramIndex++;
                     }
-                    mappingStatementIndex.getFields()[fmd.getAbsoluteFieldNumber()].setParameterIndex(parametersIndex);
+                    mappingStatementIndex.getFields()[fmd.getAbsoluteFieldNumber()].setParameterPositions(parametersIndex);
                 }
                 else
                 {
@@ -689,12 +689,12 @@
                 {
                     expressionsIndex[j] = fetchStmt.select(m.getDataStoreMapping(j).getDatastoreField());
                 }
-                mappingStatementIndex.getVersion().setExpressionIndex(expressionsIndex);
+                mappingStatementIndex.getVersion().setColumnPositions(expressionsIndex);
             }
             else if (mappingType == MappingConsumer.MAPPING_TYPE_DATASTORE_ID)
             {
                 fetchStmt.andCondition(fetchStmt.referenceDatastoreField((DatastoreField) key.getColumns().get(0)) + "=?");
-                mappingStatementIndex.getDatastoreId().setParameterIndex(new int[]{paramIndex});
+                mappingStatementIndex.getDatastoreId().setParameterPositions(new int[]{paramIndex});
                 paramIndex++;
             }
         }

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/InsertRequest.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/InsertRequest.java	2008-12-23 11:52:50 UTC (rev 4406)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/InsertRequest.java	2008-12-23 15:39:33 UTC (rev 4407)
@@ -55,7 +55,7 @@
 import org.datanucleus.store.mapped.DatastoreField;
 import org.datanucleus.store.mapped.DatastoreIdentifier;
 import org.datanucleus.store.mapped.MappedStoreManager;
-import org.datanucleus.store.mapped.StatementExpressionIndex;
+import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
 import org.datanucleus.store.mapped.mapping.MappingCallbacks;
 import org.datanucleus.store.mapped.mapping.MappingConsumer;
@@ -112,25 +112,25 @@
     private boolean hasIdentityColumn = false;
 
     /** one StatementExpressionIndex for each field **/
-    private StatementExpressionIndex[] statementExpressionIndex;
+    private StatementMappingIndex[] stmtMappings;
 
     /** StatementExpressionIndex for fields to be "retrieved" **/
-    private StatementExpressionIndex[] retrievedStatementExpressionIndex;
+    private StatementMappingIndex[] retrievedStmtMappings;
 
     /** StatementExpressionIndex for version **/
-    private StatementExpressionIndex versionStatementExpressionIndex;
+    private StatementMappingIndex versionStmtMapping;
 
     /** StatementExpressionIndex for discriminator **/
-    private StatementExpressionIndex discriminatorStatementExpressionIndex;
+    private StatementMappingIndex discriminatorStmtMapping;
 
     /** StatementExpressionIndex for external FKs */
-    private StatementExpressionIndex[] externalFKStatementExpressionIndex;
+    private StatementMappingIndex[] externalFKStmtMappings;
 
     /** StatementExpressionIndex for external FK discriminators (shared FKs) */
-    private StatementExpressionIndex[] externalFKDiscrimStatementExpressionIndex;
+    private StatementMappingIndex[] externalFKDiscrimStmtMappings;
 
     /** StatementExpressionIndex for external indices */
-    private StatementExpressionIndex[] externalOrderStatementExpressionIndex;
+    private StatementMappingIndex[] externalOrderStmtMappings;
 
     /** Whether to batch the INSERT SQL. */
     private boolean batch = false;
@@ -159,19 +159,19 @@
         table.provideUnmappedDatastoreFields(consumer);
         callbacks = (MappingCallbacks[])consumer.getMappingCallbacks().toArray(new MappingCallbacks[consumer.getMappingCallbacks().size()]);
 
-        statementExpressionIndex = consumer.getStatementExpressionIndex();
-        versionStatementExpressionIndex = consumer.getVersionStatementExpressionIndex();
-        discriminatorStatementExpressionIndex = consumer.getDiscriminatorStatementExpressionIndex();
-        externalFKStatementExpressionIndex = consumer.getExternalFKStatementExpressionIndex();
-        externalFKDiscrimStatementExpressionIndex = consumer.getExternalFKDiscrimStatementExpressionIndex();
-        externalOrderStatementExpressionIndex = consumer.getExternalOrderStatementExpressionIndex();
+        stmtMappings = consumer.getStatementExpressionIndex();
+        versionStmtMapping = consumer.getVersionStatementExpressionIndex();
+        discriminatorStmtMapping = consumer.getDiscriminatorStatementExpressionIndex();
+        externalFKStmtMappings = consumer.getExternalFKStatementExpressionIndex();
+        externalFKDiscrimStmtMappings = consumer.getExternalFKDiscrimStatementExpressionIndex();
+        externalOrderStmtMappings = consumer.getExternalOrderStatementExpressionIndex();
         pkFieldNumbers = consumer.getPrimaryKeyFieldNumbers();
         if (table.getIdentityType() == IdentityType.APPLICATION && pkFieldNumbers.length < 1 && !hasIdentityColumn)
         {
 	        throw new NucleusException(LOCALISER.msg("052200", cmd.getFullClassName())).setFatal();
         }
         insertFieldNumbers = consumer.getInsertFieldNumbers();
-        retrievedStatementExpressionIndex = consumer.getReachableStatementIndex();
+        retrievedStmtMappings = consumer.getReachableStatementIndex();
         reachableFieldNumbers = consumer.getReachableFieldNumbers();
         relationFieldNumbers = consumer.getRelationFieldNumbers();
 
@@ -245,7 +245,7 @@
                     }
                     else if (table.getIdentityType() == IdentityType.APPLICATION)
                     {
-                        sm.provideFields(pkFieldNumbers, new ParameterSetter(sm, ps, statementExpressionIndex, true));
+                        sm.provideFields(pkFieldNumbers, new ParameterSetter(sm, ps, stmtMappings, true));
                     }
 
                     // Provide all non-key fields needed for the insert.
@@ -271,19 +271,19 @@
                             // Any fields out of range for the class, we default or null.
                             // This happens when we insert a base class object
                             // and the sub-class is persisted to the same table ("superclass-table").
-                            StatementExpressionIndex stmtExprIndex = statementExpressionIndex[insertFieldNumbers[i]];
-                            stmtExprIndex.getMapping().setDefault(om, ps, stmtExprIndex.getParameterIndex());
+                            StatementMappingIndex stmtExprIndex = stmtMappings[insertFieldNumbers[i]];
+                            stmtExprIndex.getMapping().setDefault(om, ps, stmtExprIndex.getParameterPositions());
                         }
                     }
 
-                    sm.provideFields(classFieldNumbers, new ParameterSetter(sm, ps, statementExpressionIndex, true));
+                    sm.provideFields(classFieldNumbers, new ParameterSetter(sm, ps, stmtMappings, true));
 
                     if (table.getVersionMapping(false) != null)
                     {
                         // Surrogate version - set the new version for the object
                         Object currentVersion = om.getApiAdapter().getVersion(sm);
                         Object nextOptimisticVersion = table.getVersionMetaData().getNextVersion(currentVersion);
-                        table.getVersionMapping(false).setObject(om, ps, versionStatementExpressionIndex.getParameterIndex(), nextOptimisticVersion);
+                        table.getVersionMapping(false).setObject(om, ps, versionStmtMapping.getParameterPositions(), nextOptimisticVersion);
                         sm.setTransactionalVersion(nextOptimisticVersion);
                     }
                     else if (vermd != null && vermd.getFieldName() != null)
@@ -300,65 +300,65 @@
                         DiscriminatorMetaData dismd = table.getDiscriminatorMetaData();
                         if (dismd.getStrategy() == DiscriminatorStrategy.CLASS_NAME)
                         {
-                            table.getDiscriminatorMapping(false).setObject(om, ps, discriminatorStatementExpressionIndex.getParameterIndex(),
+                            table.getDiscriminatorMapping(false).setObject(om, ps, discriminatorStmtMapping.getParameterPositions(),
                                 sm.getObject().getClass().getName());
                         }
                         else if (dismd.getStrategy() == DiscriminatorStrategy.VALUE_MAP)
                         {
                             // Use Discriminator info for the actual class
                             dismd = sm.getClassMetaData().getInheritanceMetaData().getDiscriminatorMetaData();
-                            table.getDiscriminatorMapping(false).setObject(om, ps, discriminatorStatementExpressionIndex.getParameterIndex(), dismd.getValue());
+                            table.getDiscriminatorMapping(false).setObject(om, ps, discriminatorStmtMapping.getParameterPositions(), dismd.getValue());
                         }
                     }
 
                     // External FK columns (optional)
-                    if (externalFKStatementExpressionIndex != null)
+                    if (externalFKStmtMappings != null)
                     {
-                        for (int i=0;i<externalFKStatementExpressionIndex.length;i++)
+                        for (int i=0;i<externalFKStmtMappings.length;i++)
                         {
-                            Object fkValue = sm.getAssociatedValue(externalFKStatementExpressionIndex[i].getMapping());
+                            Object fkValue = sm.getAssociatedValue(externalFKStmtMappings[i].getMapping());
                             if (fkValue != null)
                             {
                                 // Need to provide the owner field number so PCMapping can work out if it is inserted yet
                                 AbstractMemberMetaData ownerFmd = 
-                                    table.getMetaDataForExternalMapping(externalFKStatementExpressionIndex[i].getMapping(), 
+                                    table.getMetaDataForExternalMapping(externalFKStmtMappings[i].getMapping(), 
                                         MappingConsumer.MAPPING_TYPE_EXTERNAL_FK);
-                                externalFKStatementExpressionIndex[i].getMapping().setObject(om, ps,
-                                    externalFKStatementExpressionIndex[i].getParameterIndex(), fkValue, null, ownerFmd.getAbsoluteFieldNumber());
+                                externalFKStmtMappings[i].getMapping().setObject(om, ps,
+                                    externalFKStmtMappings[i].getParameterPositions(), fkValue, null, ownerFmd.getAbsoluteFieldNumber());
                             }
                             else
                             {
                                 // We're inserting a null so dont need the owner field
-                                externalFKStatementExpressionIndex[i].getMapping().setObject(om, ps,
-                                    externalFKStatementExpressionIndex[i].getParameterIndex(), null);
+                                externalFKStmtMappings[i].getMapping().setObject(om, ps,
+                                    externalFKStmtMappings[i].getParameterPositions(), null);
                             }
                         }
                     }
 
                     // External FK discriminator columns (optional)
-                    if (externalFKDiscrimStatementExpressionIndex != null)
+                    if (externalFKDiscrimStmtMappings != null)
                     {
-                        for (int i=0;i<externalFKDiscrimStatementExpressionIndex.length;i++)
+                        for (int i=0;i<externalFKDiscrimStmtMappings.length;i++)
                         {
-                            Object discrimValue = sm.getAssociatedValue(externalFKDiscrimStatementExpressionIndex[i].getMapping());
-                            externalFKDiscrimStatementExpressionIndex[i].getMapping().setObject(om, ps, 
-                                externalFKDiscrimStatementExpressionIndex[i].getParameterIndex(), discrimValue);
+                            Object discrimValue = sm.getAssociatedValue(externalFKDiscrimStmtMappings[i].getMapping());
+                            externalFKDiscrimStmtMappings[i].getMapping().setObject(om, ps, 
+                                externalFKDiscrimStmtMappings[i].getParameterPositions(), discrimValue);
                         }
                     }
 
                     // External order columns (optional)
-                    if (externalOrderStatementExpressionIndex != null)
+                    if (externalOrderStmtMappings != null)
                     {
-                        for (int i=0;i<externalOrderStatementExpressionIndex.length;i++)
+                        for (int i=0;i<externalOrderStmtMappings.length;i++)
                         {
-                            Object orderValue = sm.getAssociatedValue(externalOrderStatementExpressionIndex[i].getMapping());
+                            Object orderValue = sm.getAssociatedValue(externalOrderStmtMappings[i].getMapping());
                             if (orderValue == null)
                             {
                                 // No order value so use -1
                                 orderValue = new Integer(-1);
                             }
-                            externalOrderStatementExpressionIndex[i].getMapping().setObject(om, ps, 
-                                externalOrderStatementExpressionIndex[i].getParameterIndex(), orderValue);

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4408
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4408&view=rev
Author:   andy_jefferson
Date:     2008-12-23 17:49:12 +0000 (Tue, 23 Dec 2008)

Log Message:
-----------
javadocs

Modified Paths:
--------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSManager.java

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java	2008-12-23 15:39:33 UTC (rev 4407)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java	2008-12-23 17:49:12 UTC (rev 4408)
@@ -654,19 +654,18 @@
      * @param table Table being selected from
      * @param fieldNumbers Numbers of the fields in the select. May be null if no fields are retrieved
      * @param acmd MetaData for the class
-     * @param statementExpressionIndex Index of columns to statement columns
-     * @param datastoreIdentityExpressionIndex index for datastore identity
-     * @param versionIndex Indices of the version column(s)
+     * @param stmtMappings Mapping indices for the fields in the result set
+     * @param datastoreIdStmt Mapping index for the datastore id column in the result set
+     * @param versionStmtIndex Mapping index for the version column in the result set
      * @param ignoreCache Whether to ignore the cache
-     * @param discriminator Whether we use a discriminator column to distinguish object
-     *                      types, or whether we use a NUCMETADATA column
-     * @param hasMetaDataInResults whether we use NUCMETADATA column
+     * @param discriminator Whether we use a discriminator column to distinguish object types
+     * @param hasMetaDataInResults Whether we use NUCMETADATA column to distinguish object types
      * @param fetchPlan the Fetch Plan
      * @param persistentClass Class that this factory will create instances of (or subclasses)
      */
     public abstract ResultObjectFactory newResultObjectFactory(
         DatastoreClass table, int[] fieldNumbers, AbstractClassMetaData acmd,
-        StatementMappingIndex[] statementExpressionIndex, int[] datastoreIdentityExpressionIndex,
-        int[] versionIndex, boolean ignoreCache, boolean discriminator, boolean hasMetaDataInResults,
-        FetchPlan fetchPlan, Class persistentClass);
-}
+        StatementMappingIndex[] stmtMappings, int[] datastoreIdIndex, int[] versionStmtIndex, 
+        boolean ignoreCache, boolean discriminator, boolean hasMetaDataInResults, FetchPlan fetchPlan, 
+        Class persistentClass);
+}
\ No newline at end of file

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSManager.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSManager.java	2008-12-23 15:39:33 UTC (rev 4407)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSManager.java	2008-12-23 17:49:12 UTC (rev 4408)
@@ -3352,12 +3352,12 @@
     }
 
     public ResultObjectFactory newResultObjectFactory(DatastoreClass table, int[] fieldNumbers,
-        AbstractClassMetaData acmd, StatementMappingIndex[] statementExpressionIndex,
-        int[] datastoreIdentityExpressionIndex, int[] versionIndex, boolean ignoreCache,
-        boolean discriminator, boolean hasMetaDataInResults, FetchPlan fetchPlan,
+        AbstractClassMetaData acmd, 
+        StatementMappingIndex[] stmtMappings, int[] datastoreIdIndex, int[] versionIndex, 
+        boolean ignoreCache, boolean discriminator, boolean hasMetaDataInResults, FetchPlan fetchPlan,
         Class persistentClass)
     {
-        return new PersistentIDROF(table, fieldNumbers, acmd, statementExpressionIndex, datastoreIdentityExpressionIndex,
+        return new PersistentIDROF(table, fieldNumbers, acmd, stmtMappings, datastoreIdIndex,
             versionIndex, ignoreCache, discriminator, hasMetaDataInResults, fetchPlan, persistentClass);
     }
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4409
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4409&view=rev
Author:   andy_jefferson
Date:     2008-12-23 20:29:54 +0000 (Tue, 23 Dec 2008)

Log Message:
-----------
refactor method name

Modified Paths:
--------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/StatementMappingIndex.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultExpressionsQueryable.java

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/StatementMappingIndex.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/StatementMappingIndex.java	2008-12-23 17:49:12 UTC (rev 4408)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/StatementMappingIndex.java	2008-12-23 20:29:54 UTC (rev 4409)
@@ -94,11 +94,11 @@
     /**
      * Mutator for the column name (alias).
      * Overrides the name of the field that the mapping refers to.
-     * @param colName The name of the column (alias).
+     * @param alias The name of the column (alias).
      */
-    public void setColumnName(String colName)
+    public void setColumnAlias(String alias)
     {
-        this.columnName = colName;
+        this.columnName = alias;
     }
 
     /**

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultExpressionsQueryable.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultExpressionsQueryable.java	2008-12-23 17:49:12 UTC (rev 4408)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultExpressionsQueryable.java	2008-12-23 20:29:54 UTC (rev 4409)
@@ -364,7 +364,7 @@
         }
         else
         {
-            StatementMappingIndex stmtExprIndex = new StatementMappingIndex();
+            StatementMappingIndex stmtMapping = new StatementMappingIndex();
             int[] exprIndex = null;
 
             ScalarExpression[] expr = expr1.getExpressionList().toArray();
@@ -382,13 +382,13 @@
                 exprIndex = new int[1];
                 exprIndex[0] = stmt.selectScalarExpression(expr1, true);
             }
-            stmtExprIndex.setColumnPositions(exprIndex);
-            stmtExprIndex.setMapping(expr1.getMapping());
+            stmtMapping.setColumnPositions(exprIndex);
+            stmtMapping.setMapping(expr1.getMapping());
             if (expr1.getAlias() != null)
             {
-                stmtExprIndex.setColumnName(expr1.getAlias());
+                stmtMapping.setColumnAlias(expr1.getAlias());
             }
-            stmtExprIndexList.add(stmtExprIndex);
+            stmtExprIndexList.add(stmtMapping);
         }
     }
     


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4417
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4417&view=rev
Author:   andy_jefferson
Date:     2008-12-26 15:32:09 +0000 (Fri, 26 Dec 2008)

Log Message:
-----------
Move "mapping" into constructor of StatementMappingIndex since can't exist without one. Clean up MappingStatementDefinition to not create indices at creation since maybe not needed

Modified Paths:
--------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/StatementMappingIndex.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/PersistenceCapableMapping.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassTableExtent.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassViewExtent.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultClassROF.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultExpressionsQueryable.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultMetaDataROF.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/SQLQuery.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/DeleteRequest.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/FetchRequest.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/InsertRequest.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/LocateRequest.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/StatementMappingDefinition.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/UpdateRequest.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/VersionCheckRequest.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSElementContainerStoreSpecialization.java

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/StatementMappingIndex.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/StatementMappingIndex.java	2008-12-26 11:39:08 UTC (rev 4416)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/StatementMappingIndex.java	2008-12-26 15:32:09 UTC (rev 4417)
@@ -55,6 +55,11 @@
     /** Any name applied in the field selection (SELECT xxx AS yyy). Only applies for cases with 1 column. */
     String columnName;
 
+    public StatementMappingIndex(JavaTypeMapping mapping)
+    {
+        this.mapping = mapping;
+    }
+
     /**
      * Accessor for the mapping.
      * @return The mapping
@@ -65,15 +70,6 @@
     }
 
     /**
-     * Mutator for the mapping.
-     * @param mapping The mapping
-     */
-    public void setMapping(JavaTypeMapping mapping)
-    {
-        this.mapping = mapping;
-    }
-
-    /**
      * Accessor for the column name alias (if any).
      * Only applies to the first column for this field.
      * @return The column alias.

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/PersistenceCapableMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/PersistenceCapableMapping.java	2008-12-26 11:39:08 UTC (rev 4416)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/PersistenceCapableMapping.java	2008-12-26 15:32:09 UTC (rev 4417)
@@ -942,8 +942,7 @@
         {
             AbstractMemberMetaData fmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(pkFieldNumbers[i]);
             JavaTypeMapping m = datastoreClass.getFieldMapping(fmd);
-            statementExpressionIndex[fmd.getAbsoluteFieldNumber()] = new StatementMappingIndex();
-            statementExpressionIndex[fmd.getAbsoluteFieldNumber()].setMapping(m);
+            statementExpressionIndex[fmd.getAbsoluteFieldNumber()] = new StatementMappingIndex(m);
             int expressionsIndex[] = new int[m.getNumberOfDatastoreFields()];
             for (int j = 0; j < expressionsIndex.length; j++)
             {

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStore.java	2008-12-26 11:39:08 UTC (rev 4416)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStore.java	2008-12-26 15:32:09 UTC (rev 4417)
@@ -563,8 +563,7 @@
                     if (m != null && m.includeInFetchStatement() && !(m instanceof AbstractContainerMapping))
                     {
                         // Field is not a container, and is to be fetched (eliminates fields as FKs in other class)
-                        stmtMappings[prefetchFieldNumbers[i]] = new StatementMappingIndex();
-                        stmtMappings[prefetchFieldNumbers[i]].setMapping(m);
+                        stmtMappings[prefetchFieldNumbers[i]] = new StatementMappingIndex(m);
                         fn[prefetchFieldCount++] = prefetchFieldNumbers[i];
                     }
                 }

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassTableExtent.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassTableExtent.java	2008-12-26 11:39:08 UTC (rev 4416)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassTableExtent.java	2008-12-26 15:32:09 UTC (rev 4417)
@@ -293,8 +293,7 @@
                     {
                         if (m.includeInFetchStatement() && !(m instanceof AbstractContainerMapping))
                         {
-                            stmtMappings[prefetchFieldNumbers[i]] = new StatementMappingIndex();
-                            stmtMappings[prefetchFieldNumbers[i]].setMapping(m);
+                            stmtMappings[prefetchFieldNumbers[i]] = new StatementMappingIndex(m);
                             stmtMappings[prefetchFieldNumbers[i]].setColumnPositions(stmt.selectField(fieldName, "APP_ID", true));
                         }
                     }
@@ -329,8 +328,7 @@
                         // omit fields not stored in the table, e.g. List, Set, etc or transactional
                         if (m.includeInFetchStatement() && !(m instanceof AbstractContainerMapping))
                         {
-                            stmtMappings[fieldNumbers[i]] = new StatementMappingIndex();
-                            stmtMappings[fieldNumbers[i]].setMapping(m);
+                            stmtMappings[fieldNumbers[i]] = new StatementMappingIndex(m);
                             fn[prefetchFieldCount++] = fieldNumbers[i];
                         }
                     }
@@ -366,8 +364,7 @@
                         {
                             if (m.includeInFetchStatement() && !(m instanceof AbstractContainerMapping))
                             {
-                                stmtMappings[prefetchFieldNumbers[i]] = new StatementMappingIndex();
-                                stmtMappings[prefetchFieldNumbers[i]].setMapping(m);
+                                stmtMappings[prefetchFieldNumbers[i]] = new StatementMappingIndex(m);
                             }
                         }
                     }

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassViewExtent.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassViewExtent.java	2008-12-26 11:39:08 UTC (rev 4416)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassViewExtent.java	2008-12-26 15:32:09 UTC (rev 4417)
@@ -86,8 +86,7 @@
                         m, candidateClass.getName())).setFatal();
                 }
                 
-				stmtMappings[i] = new StatementMappingIndex();
-				stmtMappings[i].setMapping(m);
+				stmtMappings[i] = new StatementMappingIndex(m);
                 fn[prefetchFieldCount++] = i;
             }
         }

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultClassROF.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultClassROF.java	2008-12-26 11:39:08 UTC (rev 4416)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultClassROF.java	2008-12-26 15:32:09 UTC (rev 4417)
@@ -114,6 +114,19 @@
         }
         this.resultClass = tmpClass;
 
+        if (expressions == null && QueryUtils.resultClassIsSimple(resultClass.getName()) && statementExpressionIndex.length != 1)
+        {
+            String msg = LOCALISER.msg("021201", resultClass.getName());
+            NucleusLogger.QUERY.error(msg);
+            throw new NucleusUserException(msg);
+        }
+        else if (expressions != null && QueryUtils.resultClassIsSimple(resultClass.getName()) && expressions.length != 1)
+        {
+            String msg = LOCALISER.msg("021201", resultClass.getName());
+            NucleusLogger.QUERY.error(msg);
+            throw new NucleusUserException(msg);
+        }
+
         if (QueryUtils.resultClassIsUserType(resultClass.getName()))
         {
             AccessController.doPrivileged(new PrivilegedAction()
@@ -128,31 +141,18 @@
 
         this.stmtMappings = statementExpressionIndex;
         this.expressions = expressions;
-        this.resultFieldNames = new String[statementExpressionIndex.length];
-        for (int i=0;i<statementExpressionIndex.length;i++)
+        this.resultFieldNames = new String[stmtMappings.length];
+        for (int i=0;i<stmtMappings.length;i++)
         {
-            if (statementExpressionIndex[i] != null)
+            if (stmtMappings[i] != null)
             {
-                resultFieldNames[i] = statementExpressionIndex[i].getColumnAlias();
+                resultFieldNames[i] = stmtMappings[i].getColumnAlias();
             }
             else
             {
                 resultFieldNames[i] = null;
             }
         }
-
-        if (expressions == null && QueryUtils.resultClassIsSimple(resultClass.getName()) && statementExpressionIndex.length != 1)
-        {
-            String msg = LOCALISER.msg("021201", resultClass.getName());
-            NucleusLogger.QUERY.error(msg);
-            throw new NucleusUserException(msg);
-        }
-        else if (expressions != null && QueryUtils.resultClassIsSimple(resultClass.getName()) && expressions.length != 1)
-        {
-            String msg = LOCALISER.msg("021201", resultClass.getName());
-            NucleusLogger.QUERY.error(msg);
-            throw new NucleusUserException(msg);
-        }
     }
 
     /**

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultExpressionsQueryable.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultExpressionsQueryable.java	2008-12-26 11:39:08 UTC (rev 4416)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultExpressionsQueryable.java	2008-12-26 15:32:09 UTC (rev 4417)
@@ -307,15 +307,15 @@
      */
     private void selectLiteralExpression(QueryExpression stmt, List stmtExprIndexList, ScalarExpression expr1)
     {
-        StatementMappingIndex stmtExprIndex = new StatementMappingIndex();
         //when we have literal values, we don't put the literal in the SQL, but we put the identity columns, so it returns the correct
         //we IGNORE the literal values in the query, and use the literal mapping when the result set is returned
         //here, we just make sure that some columns are added to the SELECT by adding the ID mapping
         AbstractClassMetaData cmd = storeMgr.getOMFContext().getMetaDataManager().getMetaDataForClass(candidateClass, stmt.getClassLoaderResolver());
+        JavaTypeMapping mapping = null;
         if (cmd.getIdentityType() == IdentityType.DATASTORE)
         {
+            mapping = expr1.getMapping();
             stmt.select(storeMgr.getDatastoreClass(candidateClass.getName(), clr).getDataStoreObjectIdMapping(), true);
-            stmtExprIndex.setMapping(expr1.getMapping());
         }
         else if (cmd.getIdentityType() == IdentityType.APPLICATION)
         {
@@ -333,15 +333,17 @@
                     }
                 }
             }
-            stmtExprIndex.setMapping(expr1.getMapping());
+            mapping = expr1.getMapping();
         }
         if (expr1.getMapping() instanceof SingleFieldMapping)
         {
             if (expr1 instanceof Literal)
             {
-                stmtExprIndex.setMapping(new ResultLiteralJavaTypeMapping(expr1.getMapping(), ((Literal) expr1).getValue()));
+                mapping = new ResultLiteralJavaTypeMapping(expr1.getMapping(), ((Literal) expr1).getValue());
             }
         }
+
+        StatementMappingIndex stmtExprIndex = new StatementMappingIndex(mapping);
         stmtExprIndexList.add(stmtExprIndex);
     }
 
@@ -364,9 +366,9 @@
         }
         else
         {
-            StatementMappingIndex stmtMapping = new StatementMappingIndex();
+            StatementMappingIndex stmtMapping = new StatementMappingIndex(expr1.getMapping());
+
             int[] exprIndex = null;
-
             ScalarExpression[] expr = expr1.getExpressionList().toArray();
             if (expr.length > 0)
             {
@@ -383,7 +385,7 @@
                 exprIndex[0] = stmt.selectScalarExpression(expr1, true);
             }
             stmtMapping.setColumnPositions(exprIndex);
-            stmtMapping.setMapping(expr1.getMapping());
+
             if (expr1.getAlias() != null)
             {
                 stmtMapping.setColumnAlias(expr1.getAlias());

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultMetaDataROF.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultMetaDataROF.java	2008-12-26 11:39:08 UTC (rev 4416)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultMetaDataROF.java	2008-12-26 15:32:09 UTC (rev 4417)
@@ -218,10 +218,11 @@
                 while (it.hasNext())
                 {
                     AbstractMemberMetaData apmd = (AbstractMemberMetaData)it.next();
+                    statementExpressionIndex[fieldNumbers[j]] = new StatementMappingIndex(dc.getFieldMapping(apmd));
+
                     fieldNumbers[j] = apmd.getAbsoluteFieldNumber();
-                    statementExpressionIndex[fieldNumbers[j]] = new StatementMappingIndex();
                     List indexes = new ArrayList();
-                    for( int k=0; k<fmds.length; k++)
+                    for (int k=0; k<fmds.length; k++)
                     {
                         if( fmds != null && fmds[k] == apmd)
                         {
@@ -233,10 +234,8 @@
                     {
                         //add +1 because result sets in jdbc starts with 1
                         indxs[k] = ((Integer)indexes.get(k)).intValue()+1;
-                    }
-                    
+                    }                    
                     statementExpressionIndex[fieldNumbers[j]].setColumnPositions(indxs);
-                    statementExpressionIndex[fieldNumbers[j]].setMapping(dc.getFieldMapping(apmd));
                     j++;
                     
                 }

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/SQLQuery.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/SQLQuery.java	2008-12-26 11:39:08 UTC (rev 4416)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/SQLQuery.java	2008-12-26 15:32:09 UTC (rev 4417)
@@ -425,14 +425,13 @@
             DatastoreClass tbl = storeMgr.getDatastoreClass(candidateClass.getName(), clr);
             for (int fieldNumber = 0; fieldNumber < fieldCount; ++fieldNumber)
             {
-                statementExpressionIndex[fieldNumber] = new StatementMappingIndex();
                 AbstractMemberMetaData fmd = candidateCmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
                 String fieldName = fmd.getName();
                 Class fieldType = fmd.getType();
 
+                JavaTypeMapping m = null;
                 if (fmd.getPersistenceModifier() != FieldPersistenceModifier.NONE)
                 {
-                    JavaTypeMapping m = null;
                     if (tbl != null)
                     {
                         // Get the field mapping from the candidate table
@@ -447,8 +446,6 @@
                     if (m.includeInFetchStatement())
                     {
                         // Set mapping for this field since it can potentially be returned from a fetch
-                        statementExpressionIndex[fieldNumber].setMapping(m);
-
                         String columnName = null;
                         if (fmd.getColumnMetaData() != null && fmd.getColumnMetaData().length > 0)
                         {
@@ -468,13 +465,14 @@
                     }
                     else
                     {
-                        // Dont put anything in this position (field has no col in the result set)
+                        // Don't put anything in this position (field has no col in the result set)
                     }
                 }
                 else
                 {
-                    // Dont put anything in this position (field has no col in the result set)
+                    // Don't put anything in this position (field has no col in the result set)
                 }
+                statementExpressionIndex[fieldNumber] = new StatementMappingIndex(m);
             }
             if (columnFieldNumberMap.size() == 0)
             {

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/DeleteRequest.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/DeleteRequest.java	2008-12-26 11:39:08 UTC (rev 4416)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/DeleteRequest.java	2008-12-26 15:32:09 UTC (rev 4417)
@@ -447,8 +447,7 @@
                 {
                     Integer abs_field_num = new Integer(fmd.getAbsoluteFieldNumber());
                     int parametersIndex[] = new int[m.getNumberOfDatastoreFields()];
-                    StatementMappingIndex sei = new StatementMappingIndex();
-                    sei.setMapping(m);
+                    StatementMappingIndex sei = new StatementMappingIndex(m);
                     sei.setParameterPositions(parametersIndex);
 
                     mappingStatementIndex.getPrimaryKeys()[fmd.getAbsoluteFieldNumber()] = sei; 
@@ -501,8 +500,7 @@
                         // Must be version field since nothing else should come through here
                         int parametersIndex[] = new int[m.getNumberOfDatastoreFields()];
                         parametersIndex[0] = paramIndex++;
-                        StatementMappingIndex sei = new StatementMappingIndex();
-                        sei.setMapping(m);
+                        StatementMappingIndex sei = new StatementMappingIndex(m);
                         sei.setParameterPositions(parametersIndex);
                         mappingStatementIndex.setVersion2(sei);
                         String inputParam = ((RDBMSMapping)m.getDataStoreMapping(0)).getUpdateInputParameter();
@@ -529,20 +527,22 @@
         {
             if (mappingType == MappingConsumer.MAPPING_TYPE_DATASTORE_ID)
             {
+                StatementMappingIndex datastoreMappingIdx = new StatementMappingIndex(m);
+                mappingStatementIndex.setDatastoreId(datastoreMappingIdx);
                 where.append(m.getDataStoreMapping(0).getDatastoreField().getIdentifier().toString());
                 where.append("=");
                 where.append(((RDBMSMapping)m.getDataStoreMapping(0)).getUpdateInputParameter());
 
                 int[] param = { paramIndex++ };
-                mappingStatementIndex.getDatastoreId().setParameterPositions(param);
+                datastoreMappingIdx.setParameterPositions(param);
             }
             else if (mappingType == MappingConsumer.MAPPING_TYPE_VERSION)
             {
                 if (whereClauseConsumption)
                 {
-                    StatementMappingIndex versStmtIdx = mappingStatementIndex.getVersion2();
+                    StatementMappingIndex versStmtIdx = new StatementMappingIndex(m);
+                    mappingStatementIndex.setVersion2(versStmtIdx);
                     int[] param = { paramIndex++ };
-                    versStmtIdx.setMapping(m);
                     versStmtIdx.setParameterPositions(param);
                     String inputParam = ((RDBMSMapping)m.getDataStoreMapping(0)).getUpdateInputParameter();
                     String condition = " AND " + m.getDataStoreMapping(0).getDatastoreField().getIdentifier() + "=" + inputParam;

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/FetchRequest.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/FetchRequest.java	2008-12-26 11:39:08 UTC (rev 4416)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/FetchRequest.java	2008-12-26 15:32:09 UTC (rev 4417)
@@ -458,8 +458,7 @@
             }
             if (m.includeInFetchStatement())
             {
-                mappingStatementIndex.getFields()[fmd.getAbsoluteFieldNumber()] = new StatementMappingIndex();
-                mappingStatementIndex.getFields()[fmd.getAbsoluteFieldNumber()].setMapping(m);
+                mappingStatementIndex.getFields()[fmd.getAbsoluteFieldNumber()] = new StatementMappingIndex(m);
 
                 // create the expressions index (columns index)
                 int expressionsIndex[] = null;
@@ -683,18 +682,21 @@
         {
             if (mappingType == MappingConsumer.MAPPING_TYPE_VERSION)
             {
-                mappingStatementIndex.getVersion().setMapping(m);
+                StatementMappingIndex verIdx = new StatementMappingIndex(m);
                 int expressionsIndex[] = new int[m.getNumberOfDatastoreFields()];
                 for (int j = 0; j < expressionsIndex.length; j++)
                 {
                     expressionsIndex[j] = fetchStmt.select(m.getDataStoreMapping(j).getDatastoreField());
                 }
-                mappingStatementIndex.getVersion().setColumnPositions(expressionsIndex);
+                verIdx.setColumnPositions(expressionsIndex);
+                mappingStatementIndex.setVersion(verIdx);
             }
             else if (mappingType == MappingConsumer.MAPPING_TYPE_DATASTORE_ID)
             {
+                StatementMappingIndex datastoreIdIdx = new StatementMappingIndex(m);
                 fetchStmt.andCondition(fetchStmt.referenceDatastoreField((DatastoreField) key.getColumns().get(0)) + "=?");
-                mappingStatementIndex.getDatastoreId().setParameterPositions(new int[]{paramIndex});
+                datastoreIdIdx.setParameterPositions(new int[]{paramIndex});
+                mappingStatementIndex.setDatastoreId(datastoreIdIdx);
                 paramIndex++;
             }
         }

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/InsertRequest.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/InsertRequest.java	2008-12-26 11:39:08 UTC (rev 4416)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/InsertRequest.java	2008-12-26 15:32:09 UTC (rev 4417)
@@ -650,8 +650,7 @@
                     (m instanceof PersistenceCapableMapping || m instanceof ReferenceMapping))
                 {
                     // Reachable Fields (that relate to this object but have no column in the table)
-                    retrievedStatementExpressionIndex[fmd.getAbsoluteFieldNumber()] = new StatementMappingIndex();
-                    retrievedStatementExpressionIndex[fmd.getAbsoluteFieldNumber()].setMapping(m);
+                    retrievedStatementExpressionIndex[fmd.getAbsoluteFieldNumber()] = new StatementMappingIndex(m);
                     int relationType = fmd.getRelationType(clr);
                     if (relationType == Relation.ONE_TO_ONE_BI)
                     {
@@ -711,8 +710,7 @@
                         }
                     }
 
-                    statementExpressionIndex[fmd.getAbsoluteFieldNumber()] = new StatementMappingIndex();
-                    statementExpressionIndex[fmd.getAbsoluteFieldNumber()].setMapping(m);
+                    statementExpressionIndex[fmd.getAbsoluteFieldNumber()] = new StatementMappingIndex(m);
 
                     // create the expressions index (columns index)
                     int parametersIndex[] = new int[m.getNumberOfDatastoreFields()];
@@ -801,8 +799,7 @@
                     columnNames.append(((Column)table.getVersionMapping(false).getDataStoreMapping(0).getDatastoreField()).getIdentifier());
                     columnValues.append(val);
 
-                    versionStatementExpressionIndex = new StatementMappingIndex();
-                    versionStatementExpressionIndex.setMapping(table.getVersionMapping(false));
+                    versionStatementExpressionIndex = new StatementMappingIndex(table.getVersionMapping(false));
                     int[] param = { paramIndex++ };
                     versionStatementExpressionIndex.setParameterPositions(param);
                 }
@@ -825,8 +822,7 @@
                     }
                     columnNames.append(((Column)table.getDiscriminatorMapping(false).getDataStoreMapping(0).getDatastoreField()).getIdentifier());
                     columnValues.append(val);
-                    discriminatorStatementExpressionIndex = new StatementMappingIndex();
-                    discriminatorStatementExpressionIndex.setMapping(table.getDiscriminatorMapping(false));
+                    discriminatorStatementExpressionIndex = new StatementMappingIndex(table.getDiscriminatorMapping(false));
                     int[] param = { paramIndex++ };
                     discriminatorStatementExpressionIndex.setParameterPositions(param);
                 }
@@ -945,8 +941,7 @@
                 }
                 pos = tmpStmtExprIndex.length;
             }
-            stmtExprIndex[pos] = new StatementMappingIndex();
-            stmtExprIndex[pos].setMapping(mapping);
+            stmtExprIndex[pos] = new StatementMappingIndex(mapping);
             int[] param = new int[mapping.getNumberOfDatastoreFields()];
             for (int i=0;i<mapping.getNumberOfDatastoreFields();i++)
             {

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/LocateRequest.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/LocateRequest.java	2008-12-26 11:39:08 UTC (rev 4416)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/LocateRequest.java	2008-12-26 15:32:09 UTC (rev 4417)
@@ -197,8 +197,7 @@
         {
             if (m.includeInFetchStatement())
             {
-                stmtMappingDefinition.getFields()[fmd.getAbsoluteFieldNumber()] = new StatementMappingIndex();
-                stmtMappingDefinition.getFields()[fmd.getAbsoluteFieldNumber()].setMapping(m);
+                stmtMappingDefinition.getFields()[fmd.getAbsoluteFieldNumber()] = new StatementMappingIndex(m);
 
                 /*
                  * check if the our column is primary key. if the
@@ -232,7 +231,10 @@
 	        if (mappingType == MappingConsumer.MAPPING_TYPE_DATASTORE_ID)
 	        {            
 	            fetchStmt.andCondition(fetchStmt.referenceDatastoreField((DatastoreField) key.getColumns().get(0)) + " = ?");
-	            stmtMappingDefinition.getDatastoreId().setParameterPositions(new int[] {paramIndex} );   
+
+	            StatementMappingIndex datastoreIdIdx = new StatementMappingIndex(m);
+	            datastoreIdIdx.setParameterPositions(new int[] {paramIndex} );
+	            stmtMappingDefinition.setDatastoreId(datastoreIdIdx);
 	            paramIndex++;
 	        }
         }
@@ -243,7 +245,7 @@
          */
         public void consumeUnmappedDatastoreField(DatastoreField fld)
         {
-            // Do nothing since we dont handle unmapped columns
+            // Do nothing since we don't handle unmapped columns
         }
 
         /**

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/StatementMappingDefinition.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/StatementMappingDefinition.java	2008-12-26 11:39:08 UTC (rev 4416)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/StatementMappingDefinition.java	2008-12-26 15:32:09 UTC (rev 4417)
@@ -27,13 +27,13 @@
  */
 class StatementMappingDefinition
 {
-    private StatementMappingIndex datastoreId = new StatementMappingIndex();
+    private StatementMappingIndex datastoreId;
     private StatementMappingIndex[] primaryKeys;
 
     private StatementMappingIndex[] fields;
 
-    private StatementMappingIndex version = new StatementMappingIndex();
-    private StatementMappingIndex version2 = new StatementMappingIndex();
+    private StatementMappingIndex version;
+    private StatementMappingIndex version2;
     
     /**
      * Accessor for the datastore id mapping index.
@@ -64,11 +64,11 @@
 
     /**
      * Mutator for the version mapping index.
-     * @param optimistic The version to set.
+     * @param ver The version to set.
      */
-    public void setVersion(StatementMappingIndex optimistic)
+    public void setVersion(StatementMappingIndex ver)
     {
-        this.version = optimistic;
+        this.version = ver;
     }
 
     /**
@@ -82,11 +82,11 @@
 
     /**
      * Accessor for the second version mapping index.
-     * @param optimistic The version to set.
+     * @param ver The version to set.
      */
-    public void setVersion2(StatementMappingIndex optimistic)
+    public void setVersion2(StatementMappingIndex ver)
     {
-        this.version2 = optimistic;
+        this.version2 = ver;
     }
 
     /**

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/UpdateRequest.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/UpdateRequest.java	2008-12-26 11:39:08 UTC (rev 4416)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/UpdateRequest.java	2008-12-26 15:32:09 UTC (rev 4417)
@@ -468,8 +468,7 @@
 
                 Integer abs_field_num = new Integer(fmd.getAbsoluteFieldNumber());
                 int parametersIndex[] = new int[m.getNumberOfDatastoreFields()];
-                StatementMappingIndex sei = new StatementMappingIndex();
-                sei.setMapping(m);
+                StatementMappingIndex sei = new StatementMappingIndex(m);
                 sei.setParameterPositions(parametersIndex);
 
                 if (fmd.isPrimaryKey())
@@ -560,35 +559,37 @@
                 // Surrogate version column
                 String inputParam = ((RDBMSMapping)m.getDataStoreMapping(0)).getUpdateInputParameter();
 
-                int[] param = { paramIndex++ };
-                StatementMappingIndex versStmtIdx = null;
                 if (whereClauseConsumption)
                 {
-                    versStmtIdx = stmtMappingDefinition.getVersion2();
-                    String condition = " AND " + m.getDataStoreMapping(0).getDatastoreField().getIdentifier() + "=" + inputParam;
-                    where.append(condition);
+                    where.append(" AND " + m.getDataStoreMapping(0).getDatastoreField().getIdentifier() + 
+                        "=" + inputParam);
+
+                    StatementMappingIndex versStmtIdx = new StatementMappingIndex(m);
+                    versStmtIdx.setParameterPositions(new int[]{paramIndex++});
+                    stmtMappingDefinition.setVersion2(versStmtIdx);
                 }
                 else
                 {
-                    versStmtIdx = stmtMappingDefinition.getVersion();
                     String condition = m.getDataStoreMapping(0).getDatastoreField().getIdentifier() + "=" + inputParam;
                     if (columnAssignments.length() > 0)
                     {
                         columnAssignments.append(", ");
                     }
                     columnAssignments.append(condition);
+
+                    StatementMappingIndex versStmtIdx = new StatementMappingIndex(m);
+                    versStmtIdx.setParameterPositions(new int[]{paramIndex++});
+                    stmtMappingDefinition.setVersion(versStmtIdx);
                 }
-                versStmtIdx.setMapping(m);
-                versStmtIdx.setParameterPositions(param);
             }
             else if (mappingType == MappingConsumer.MAPPING_TYPE_DATASTORE_ID)
             {
-                // Surrogate datastore id column
-                String condition = ((DatastoreField)key.getColumns().get(0)).getIdentifier() + "=?";
-                where.append(condition);
+                // Surrogate datastore-id column
+                where.append(((DatastoreField)key.getColumns().get(0)).getIdentifier() + "=?");
 
-                int[] param = { paramIndex++ };
-                stmtMappingDefinition.getDatastoreId().setParameterPositions(param);
+                StatementMappingIndex datastoreIdIdx = new StatementMappingIndex(m);
+                datastoreIdIdx.setParameterPositions(new int[]{paramIndex++});
+                stmtMappingDefinition.setDatastoreId(datastoreIdIdx);
             }
         }
 
@@ -598,7 +599,7 @@
          */
         public void consumeUnmappedDatastoreField(DatastoreField fld)
         {
-            // Do nothing since we dont handle unmapped columns
+            // Do nothing since we don't handle unmapped columns
         }
 
         /**

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/VersionCheckRequest.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/VersionCheckRequest.java	2008-12-26 11:39:08 UTC (rev 4416)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/VersionCheckRequest.java	2008-12-26 15:32:09 UTC (rev 4417)
@@ -259,8 +259,7 @@
             {
                 int parametersIndex[] = new int[m.getNumberOfDatastoreFields()];
 
-                StatementMappingIndex sei = new StatementMappingIndex();
-                sei.setMapping(m);
+                StatementMappingIndex sei = new StatementMappingIndex(m);
                 sei.setParameterPositions(parametersIndex);
 
                 if (fmd.isPrimaryKey())
@@ -284,8 +283,9 @@
                         // Version field - for SELECT
                         hasVersionMapping = true;
                         fetchStmt.select(m.getDataStoreMapping(0).getDatastoreField());
-                        versionMappingStatementIndex.getVersion().setMapping(m);
-                        versionMappingStatementIndex.getVersion().setColumnPositions(new int[]{ exprIndex++ });
+                        StatementMappingIndex verIdx = new StatementMappingIndex(m);
+                        verIdx.setColumnPositions(new int[]{ exprIndex++ });
+                        versionMappingStatementIndex.setVersion(verIdx);
                     }
                 }
             }
@@ -303,16 +303,18 @@
                 // Surrogate version column - for SELECT
                 hasVersionMapping = true;
                 fetchStmt.select(m.getDataStoreMapping(0).getDatastoreField());
-                versionMappingStatementIndex.getVersion().setMapping(m);
-                versionMappingStatementIndex.getVersion().setColumnPositions(new int[]{ exprIndex++ });
+                StatementMappingIndex verIdx = new StatementMappingIndex(m);
+                verIdx.setColumnPositions(new int[]{ exprIndex++ });
+                versionMappingStatementIndex.setVersion(verIdx);
             }             
             else if (mappingType == MappingConsumer.MAPPING_TYPE_DATASTORE_ID)
             {
                 // Datastore id - for WHERE
                 String condition = ((DatastoreField)key.getColumns().get(0)).getIdentifier() + "=? ";
                 fetchStmt.andCondition(condition);
-                int[] param = { paramIndex++ };
-                versionMappingStatementIndex.getDatastoreId().setParameterPositions(param);
+                StatementMappingIndex datastoreIdIdx = new StatementMappingIndex(m);
+                datastoreIdIdx.setParameterPositions(new int[] {paramIndex++});
+                versionMappingStatementIndex.setDatastoreId(datastoreIdIdx);
             }
         }
 

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java	2008-12-26 11:39:08 UTC (rev 4416)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java	2008-12-26 15:32:09 UTC (rev 4417)
@@ -689,8 +689,7 @@
             elementFieldNumbers[i] = absFieldNum;
             if (fieldMapping != null)
             {
-                statementExpressionIndex[absFieldNum] = new StatementMappingIndex();
-                statementExpressionIndex[absFieldNum].setMapping(fieldMapping);
+                statementExpressionIndex[absFieldNum] = new StatementMappingIndex(fieldMapping);
                 int[] jdbcParamPositions = new int[fieldMapping.getNumberOfDatastoreFields()];
                 for (int j=0;j<fieldMapping.getNumberOfDatastoreFields();j++)
                 {
@@ -734,8 +733,7 @@
             elementFieldNumbers[i] = absFieldNum;
             if (fieldMapping != null)
             {
-                statementExpressionIndex[absFieldNum] = new StatementMappingIndex();
-                statementExpressionIndex[absFieldNum].setMapping(fieldMapping);
+                statementExpressionIndex[absFieldNum] = new StatementMappingIndex(fieldMapping);
                 int[] jdbcParamPositions = new int[fieldMapping.getNumberOfDatastoreFields()];
                 for (int j=0;j<fieldMapping.getNumberOfDatastoreFields();j++)
                 {
@@ -1076,8 +1074,7 @@
                     {
                         if (m.includeInFetchStatement() && !(m instanceof AbstractContainerMapping))
                         {
-                            statementExpressionIndex[fieldNumbers[i]] = new StatementMappingIndex();
-                            statementExpressionIndex[fieldNumbers[i]].setMapping(m);
+                            statementExpressionIndex[fieldNumbers[i]] = new StatementMappingIndex(m);
                             fn[prefetchFieldCount++] = fieldNumbers[i];
                         }
                     }
@@ -1102,8 +1099,7 @@
                         {
                             if (m.includeInFetchStatement() && !(m instanceof AbstractContainerMapping))
                             {
-                                statementExpressionIndex[prefetchFieldNumbers[i]] = new StatementMappingIndex();
-                                statementExpressionIndex[prefetchFieldNumbers[i]].setMapping(m);
+                                statementExpressionIndex[prefetchFieldNumbers[i]] = new StatementMappingIndex(m);
                             }
                         }
                     }

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSElementContainerStoreSpecialization.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSElementContainerStoreSpecialization.java	2008-12-26 11:39:08 UTC (rev 4416)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSElementContainerStoreSpecialization.java	2008-12-26 15:32:09 UTC (rev 4417)
@@ -693,8 +693,7 @@
             elementFieldNumbers[i] = absFieldNum;
             if (fieldMapping != null)
             {
-                stmtMappings[absFieldNum] = new StatementMappingIndex();
-                stmtMappings[absFieldNum].setMapping(fieldMapping);
+                stmtMappings[absFieldNum] = new StatementMappingIndex(fieldMapping);
                 int[] jdbcParamPositions = new int[fieldMapping.getNumberOfDatastoreFields()];
                 for (int j = 0; j < fieldMapping.getNumberOfDatastoreFields(); j++)
                 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4418
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4418&view=rev
Author:   andy_jefferson
Date:     2008-12-26 16:25:36 +0000 (Fri, 26 Dec 2008)

Log Message:
-----------
more statement mapping clean up

Modified Paths:
--------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/StatementMappingIndex.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassTableExtent.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ParameterSetter.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ResultSetGetter.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultClassROF.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/StatementMappingIndex.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/StatementMappingIndex.java	2008-12-26 15:32:09 UTC (rev 4417)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/StatementMappingIndex.java	2008-12-26 16:25:36 UTC (rev 4418)
@@ -135,7 +135,7 @@
     /**
      * Method to return a string version of this object.
      * @return String version
-     **/
+     */
     public String toString()
     {
         StringBuffer buffer = new StringBuffer();

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassTableExtent.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassTableExtent.java	2008-12-26 15:32:09 UTC (rev 4417)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassTableExtent.java	2008-12-26 16:25:36 UTC (rev 4418)
@@ -389,7 +389,7 @@
         }
         else
         {
-            return new ResultClassROF(resultClass, stmtMappings);
+            return new ResultClassROF(resultClass, stmtMappings, null);
         }
     }
 

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ParameterSetter.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ParameterSetter.java	2008-12-26 15:32:09 UTC (rev 4417)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ParameterSetter.java	2008-12-26 16:25:36 UTC (rev 4418)
@@ -19,8 +19,6 @@
 **********************************************************************/
 package org.datanucleus.store.rdbms.fieldmanager;
 
-import java.sql.PreparedStatement;
-
 import org.datanucleus.ObjectManager;
 import org.datanucleus.StateManager;
 import org.datanucleus.exceptions.NucleusUserException;
@@ -47,72 +45,72 @@
 
     private final StateManager sm;
     private final ObjectManager om;
-    private final PreparedStatement ps;
+    private final Object statement;
     private final StatementMappingIndex[] stmtMappings;
     private final boolean checkNonNullable;
 
     /**
      * Constructor.
      * @param sm The state manager for the object.
-     * @param ps The Prepared Statement to set values on.
-     * @param statementExpressionIndex the index of parameters/mappings
+     * @param stmt The Statement to set values on.
+     * @param stmtMappings mappings for parameters in the statement.
      * @param checkNonNullable Whether to check for nullability
      */
-    public ParameterSetter(StateManager sm, PreparedStatement ps,
-            StatementMappingIndex[] statementExpressionIndex, boolean checkNonNullable)
+    public ParameterSetter(StateManager sm, Object stmt,
+            StatementMappingIndex[] stmtMappings, boolean checkNonNullable)
     {
         this.sm = sm;
         this.om = sm.getObjectManager();
-        this.ps = ps;
-        this.stmtMappings = statementExpressionIndex;
+        this.statement = stmt;
+        this.stmtMappings = stmtMappings;
         this.checkNonNullable = checkNonNullable;
     }
 
     public void storeBooleanField(int fieldNumber, boolean value)
     {
-        stmtMappings[fieldNumber].getMapping().setBoolean(om, ps, 
+        stmtMappings[fieldNumber].getMapping().setBoolean(om, statement, 
             stmtMappings[fieldNumber].getParameterPositions(), value);
     }
 
     public void storeCharField(int fieldNumber, char value)
     {
-        stmtMappings[fieldNumber].getMapping().setChar(om, ps, 
+        stmtMappings[fieldNumber].getMapping().setChar(om, statement, 
             stmtMappings[fieldNumber].getParameterPositions(), value);
     }
 
     public void storeByteField(int fieldNumber, byte value)
     {
-        stmtMappings[fieldNumber].getMapping().setByte(om, ps,
+        stmtMappings[fieldNumber].getMapping().setByte(om, statement,
             stmtMappings[fieldNumber].getParameterPositions(), value);
     }
 
     public void storeShortField(int fieldNumber, short value)
     {
-        stmtMappings[fieldNumber].getMapping().setShort(om, ps,
+        stmtMappings[fieldNumber].getMapping().setShort(om, statement,
             stmtMappings[fieldNumber].getParameterPositions(), value);
     }
 
     public void storeIntField(int fieldNumber, int value)
     {
-        stmtMappings[fieldNumber].getMapping().setInt(om, ps,
+        stmtMappings[fieldNumber].getMapping().setInt(om, statement,
             stmtMappings[fieldNumber].getParameterPositions(), value);
     }
 
     public void storeLongField(int fieldNumber, long value)
     {
-        stmtMappings[fieldNumber].getMapping().setLong(om, ps,
+        stmtMappings[fieldNumber].getMapping().setLong(om, statement,
             stmtMappings[fieldNumber].getParameterPositions(), value);
     }
 
     public void storeFloatField(int fieldNumber, float value)
     {
-        stmtMappings[fieldNumber].getMapping().setFloat(om, ps,
+        stmtMappings[fieldNumber].getMapping().setFloat(om, statement,
             stmtMappings[fieldNumber].getParameterPositions(), value);
     }
 
     public void storeDoubleField(int fieldNumber, double value)
     {
-        stmtMappings[fieldNumber].getMapping().setDouble(om, ps,
+        stmtMappings[fieldNumber].getMapping().setDouble(om, statement,
             stmtMappings[fieldNumber].getParameterPositions(), value);
     }
 
@@ -124,7 +122,7 @@
             throw new NucleusUserException(LOCALISER.msg("052400",
                 stmtMappings[fieldNumber].getMapping().getFieldMetaData().getFullFieldName()));
         }
-        stmtMappings[fieldNumber].getMapping().setString(om, ps, 
+        stmtMappings[fieldNumber].getMapping().setString(om, statement, 
             stmtMappings[fieldNumber].getParameterPositions(), value);
     }
 
@@ -147,11 +145,11 @@
                 mapping instanceof InterfaceMapping)
             {
                 // Pass in the owner StateManager/field for any mappings that need to perform management of the relation
-                mapping.setObject(om, ps, stmtMappings[fieldNumber].getParameterPositions(), value, sm, fieldNumber);
+                mapping.setObject(om, statement, stmtMappings[fieldNumber].getParameterPositions(), value, sm, fieldNumber);
             }
             else
             {
-                mapping.setObject(om, ps, stmtMappings[fieldNumber].getParameterPositions(), value);
+                mapping.setObject(om, statement, stmtMappings[fieldNumber].getParameterPositions(), value);
             }
 
             // Make sure the field is wrapped where appropriate

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ResultSetGetter.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ResultSetGetter.java	2008-12-26 15:32:09 UTC (rev 4417)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ResultSetGetter.java	2008-12-26 16:25:36 UTC (rev 4418)
@@ -18,8 +18,6 @@
 **********************************************************************/
 package org.datanucleus.store.rdbms.fieldmanager;
 
-import java.sql.ResultSet;
-
 import org.datanucleus.ObjectManager;
 import org.datanucleus.StateManager;
 import org.datanucleus.store.fieldmanager.AbstractFieldManager;
@@ -36,74 +34,74 @@
 {
     private final StateManager sm;
     private final ObjectManager om;
-    private final ResultSet rs;
+    private final Object resultSet;
     private final StatementMappingIndex[] stmtMappings;
 
     /**
      * Constructor
      * @param sm the StateManager
-     * @param rs the ResultSet
+     * @param resultSet the ResultSet
      * @param statementExpressionIndex the StatementExpressionIndex
      */
-    public ResultSetGetter(StateManager sm, ResultSet rs, StatementMappingIndex[] statementExpressionIndex)
+    public ResultSetGetter(StateManager sm, Object results, StatementMappingIndex[] statementExpressionIndex)
     {
         this.sm = sm;
         this.om = sm.getObjectManager();
-        this.rs = rs;
+        this.resultSet = results;
         this.stmtMappings = statementExpressionIndex;
     }
 
     public boolean fetchBooleanField(int fieldNumber)
     {
-        return stmtMappings[fieldNumber].getMapping().getBoolean(om, rs, 
+        return stmtMappings[fieldNumber].getMapping().getBoolean(om, resultSet, 
             stmtMappings[fieldNumber].getColumnPositions());
     }
 
     public char fetchCharField(int fieldNumber)
     {
-        return stmtMappings[fieldNumber].getMapping().getChar(om, rs, 
+        return stmtMappings[fieldNumber].getMapping().getChar(om, resultSet, 
             stmtMappings[fieldNumber].getColumnPositions());
     }
 
     public byte fetchByteField(int fieldNumber)
     {
-        return stmtMappings[fieldNumber].getMapping().getByte(om, rs, 
+        return stmtMappings[fieldNumber].getMapping().getByte(om, resultSet, 
             stmtMappings[fieldNumber].getColumnPositions());
     }
 
     public short fetchShortField(int fieldNumber)
     {
-        return stmtMappings[fieldNumber].getMapping().getShort(om, rs, 
+        return stmtMappings[fieldNumber].getMapping().getShort(om, resultSet, 
             stmtMappings[fieldNumber].getColumnPositions());
     }
 
     public int fetchIntField(int fieldNumber)
     {
-        return stmtMappings[fieldNumber].getMapping().getInt(om, rs, 
+        return stmtMappings[fieldNumber].getMapping().getInt(om, resultSet, 
             stmtMappings[fieldNumber].getColumnPositions());
     }
 
     public long fetchLongField(int fieldNumber)
     {
-        return stmtMappings[fieldNumber].getMapping().getLong(om, rs, 
+        return stmtMappings[fieldNumber].getMapping().getLong(om, resultSet, 
             stmtMappings[fieldNumber].getColumnPositions());
     }
 
     public float fetchFloatField(int fieldNumber)
     {
-        return stmtMappings[fieldNumber].getMapping().getFloat(om, rs,
+        return stmtMappings[fieldNumber].getMapping().getFloat(om, resultSet,
             stmtMappings[fieldNumber].getColumnPositions());
     }
 
     public double fetchDoubleField(int fieldNumber)
     {
-        return stmtMappings[fieldNumber].getMapping().getDouble(om, rs,
+        return stmtMappings[fieldNumber].getMapping().getDouble(om, resultSet,
             stmtMappings[fieldNumber].getColumnPositions());
     }
 
     public String fetchStringField(int fieldNumber)
     {
-        return stmtMappings[fieldNumber].getMapping().getString(om, rs,
+        return stmtMappings[fieldNumber].getMapping().getString(om, resultSet,
             stmtMappings[fieldNumber].getColumnPositions());
     }
 
@@ -115,11 +113,11 @@
             mapping instanceof SerialisedPCMapping ||
             mapping instanceof SerialisedReferenceMapping)
         {
-            value = mapping.getObject(om, rs, stmtMappings[fieldNumber].getColumnPositions(), sm, fieldNumber);
+            value = mapping.getObject(om, resultSet, stmtMappings[fieldNumber].getColumnPositions(), sm, fieldNumber);
         }
         else
         {
-            value = mapping.getObject(om, rs, stmtMappings[fieldNumber].getColumnPositions());
+            value = mapping.getObject(om, resultSet, stmtMappings[fieldNumber].getColumnPositions());
         }
 
         // Return the field value (as a wrapper if wrappable)

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultClassROF.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultClassROF.java	2008-12-26 15:32:09 UTC (rev 4417)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultClassROF.java	2008-12-26 16:25:36 UTC (rev 4418)
@@ -84,23 +84,11 @@
     /**
      * Constructor for cases where we have a candidate class and so have mapping
      * information to base field positions on.
-     * @param resultClass The result class to use
-     * @param statementExpressionIndex The mapping information for field positions etc
-     */
-    public ResultClassROF(Class resultClass, StatementMappingIndex[] statementExpressionIndex)
-    {
-        this(resultClass, statementExpressionIndex, null);
-    }
-
-    /**
-     * Constructor for cases where we have a candidate class and so have mapping
-     * information to base field positions on.
      * @param cls The result class to use
-     * @param statementExpressionIndex The mapping information for field positions etc
+     * @param resultMappings The mapping information for field positions etc
      * @param expressions The result expressions (if known)
      */
-    public ResultClassROF(Class cls, StatementMappingIndex[] statementExpressionIndex,
-            ScalarExpression[] expressions)
+    public ResultClassROF(Class cls, StatementMappingIndex[] resultMappings, ScalarExpression[] expressions)
     {
         Class tmpClass = null;
         if (cls != null && cls.getName().equals("java.util.Map"))
@@ -114,7 +102,7 @@
         }
         this.resultClass = tmpClass;
 
-        if (expressions == null && QueryUtils.resultClassIsSimple(resultClass.getName()) && statementExpressionIndex.length != 1)
+        if (expressions == null && QueryUtils.resultClassIsSimple(resultClass.getName()) && resultMappings.length != 1)
         {
             String msg = LOCALISER.msg("021201", resultClass.getName());
             NucleusLogger.QUERY.error(msg);
@@ -139,7 +127,7 @@
             });
         }
 
-        this.stmtMappings = statementExpressionIndex;
+        this.stmtMappings = resultMappings;
         this.expressions = expressions;
         this.resultFieldNames = new String[stmtMappings.length];
         for (int i=0;i<stmtMappings.length;i++)

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java	2008-12-26 15:32:09 UTC (rev 4417)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java	2008-12-26 16:25:36 UTC (rev 4418)
@@ -67,7 +67,6 @@
 import org.datanucleus.store.rdbms.RDBMSManager;
 import org.datanucleus.store.rdbms.SQLController;
 import org.datanucleus.store.rdbms.SQLWarnings;
-import org.datanucleus.store.rdbms.fieldmanager.ParameterSetter;
 import org.datanucleus.store.rdbms.mapping.RDBMSMapping;
 import org.datanucleus.store.rdbms.table.JoinTable;
 import org.datanucleus.store.scostore.MapStore;
@@ -701,7 +700,8 @@
 
         StateManager elementSM = getStateManagerForEmbeddedPCObject(sm, key, joinTable.getOwnerFieldMetaData());
         elementSM.setPcObjectType(StateManager.EMBEDDED_MAP_KEY_PC);
-        elementSM.provideFields(elementFieldNumbers, new ParameterSetter(elementSM, ps, statementExpressionIndex, true));
+        elementSM.provideFields(elementFieldNumbers,
+            storeMgr.getFieldManagerForStatementGeneration(elementSM, ps, statementExpressionIndex, true));
 
         return jdbcPosition;
     }
@@ -745,7 +745,8 @@
 
         StateManager elementSM = getStateManagerForEmbeddedPCObject(sm, value, joinTable.getOwnerFieldMetaData());
         elementSM.setPcObjectType(StateManager.EMBEDDED_MAP_VALUE_PC);
-        elementSM.provideFields(elementFieldNumbers, new ParameterSetter(elementSM, ps, statementExpressionIndex, true));
+        elementSM.provideFields(elementFieldNumbers, 
+            storeMgr.getFieldManagerForStatementGeneration(elementSM, ps, statementExpressionIndex, true));
 
         return jdbcPosition;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4435
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4435&view=rev
Author:   andy_jefferson
Date:     2008-12-28 16:09:15 +0000 (Sun, 28 Dec 2008)

Log Message:
-----------
Migrate some usages of PersistentIDROF to use new constructor. Convert internals of PersistentIDROF to use StatementMappingForClass. Add TODO to handle child objects

Modified Paths:
--------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/StatementMappingForClass.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassTableExtent.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/PersistentIDROF.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/SQLQuery.java

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/StatementMappingForClass.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/StatementMappingForClass.java	2008-12-28 14:36:47 UTC (rev 4434)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/StatementMappingForClass.java	2008-12-28 16:09:15 UTC (rev 4435)
@@ -32,6 +32,10 @@
  */
 public class StatementMappingForClass
 {
+    public static int MEMBER_DATASTORE_ID = -1;
+    public static int MEMBER_VERSION = -2;
+    public static int MEMBER_DISCRIMINATOR = -3;
+
     /** Name of the field/property in the parent class (null implies parent class). */
     String memberName;
 
@@ -87,6 +91,11 @@
         return null;
     }
 
+    /**
+     * Accessor for the numbers of the members present.
+     * Doesn't include any surrogate numbers since not real members.
+     * @return The member positions
+     */
     public int[] getMemberNumbers()
     {
         if (memberNumbers != null)
@@ -95,12 +104,29 @@
             return memberNumbers;
         }
 
-        int[] positions = new int[mappings.size()];
+        int length = mappings.size();
+        if (mappings.containsKey(-1))
+        {
+            length--; // Ignore datastore id
+        }
+        if (mappings.containsKey(-2))
+        {
+            length--; // Ignore version
+        }
+        if (mappings.containsKey(-3))
+        {
+            length--; // Ignore discriminator
+        }
+        int[] positions = new int[length];
         Iterator<Integer> iter = mappings.keySet().iterator();
         int i = 0;
         while (iter.hasNext())
         {
-            positions[i++] = iter.next();
+            Integer val = iter.next();
+            if (val >= 0)
+            {
+                positions[i++] = val;
+            }
         }
         memberNumbers = positions;
         return positions;

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassTableExtent.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassTableExtent.java	2008-12-28 14:36:47 UTC (rev 4434)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassTableExtent.java	2008-12-28 16:09:15 UTC (rev 4435)
@@ -39,6 +39,7 @@
 import org.datanucleus.store.mapped.DatastoreIdentifier;
 import org.datanucleus.store.mapped.IdentifierFactory;
 import org.datanucleus.store.mapped.MappedStoreManager;
+import org.datanucleus.store.mapped.StatementMappingForClass;
 import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.expression.QueryExpression;
 import org.datanucleus.store.mapped.expression.Queryable;
@@ -235,44 +236,7 @@
     {
         int[] prefetchFieldNumbers = null;
         StatementMappingIndex[] stmtMappings = null;
-        int[] datastoreIndex = null;
-        int[] versionIndex = null;
 
-        if (tables[0].getIdentityType() == IdentityType.DATASTORE)
-        {
-            // Select the datastore identity column (if present)
-            if (multipleTableCase)
-            {
-                datastoreIndex = stmt.selectDatastoreIdentity("DATASTORE_ID", true);
-            }
-            else if (stmt.getTableExpression(elmIdentifier) != null)
-            {
-                datastoreIndex = stmt.select(elmIdentifier, tables[0].getDataStoreObjectIdMapping(), true);
-            }
-            else
-            {
-                datastoreIndex = stmt.select(stmt.getMainTableAlias(), tables[0].getDataStoreObjectIdMapping(), true);
-            }
-        }
-
-        JavaTypeMapping versionMapping = tables[0].getVersionMapping(true);
-        if (versionMapping != null)
-        {
-            // Select the version column (if present)
-            if (multipleTableCase)
-            {
-                versionIndex = stmt.selectVersion("VERSION", true);
-            }
-            else if (stmt.getTableExpression(elmIdentifier) != null)
-            {
-                versionIndex = stmt.select(elmIdentifier, versionMapping, true);
-            }
-            else
-            {
-                versionIndex = stmt.select(stmt.getMainTableAlias(), versionMapping, true);
-            }
-        }
-
         if (multipleTableCase)
         {
             // Select application identity columns for the tables involved in the union.
@@ -383,9 +347,57 @@
 
         if (resultClass == null)
         {
-            return new PersistentIDROF(tables[0], prefetchFieldNumbers, cmd, stmtMappings, datastoreIndex, 
-                versionIndex, ignoreCache, queryUsingDiscriminator(), stmt.hasMetaDataExpression(), 
-                getFetchPlan(), query.getCandidateClass());
+            StatementMappingForClass mappingDefinition = new StatementMappingForClass(null);
+            if (prefetchFieldNumbers != null)
+            {
+                for (int i=0;i<prefetchFieldNumbers.length;i++)
+                {
+                    mappingDefinition.addMappingForMember(prefetchFieldNumbers[i], stmtMappings[prefetchFieldNumbers[i]]);
+                }
+            }
+            if (tables[0].getIdentityType() == IdentityType.DATASTORE)
+            {
+                // Select the datastore identity column (if present)
+                int[] datastoreIndex = null;
+                if (multipleTableCase)
+                {
+                    datastoreIndex = stmt.selectDatastoreIdentity("DATASTORE_ID", true);
+                }
+                else if (stmt.getTableExpression(elmIdentifier) != null)
+                {
+                    datastoreIndex = stmt.select(elmIdentifier, tables[0].getDataStoreObjectIdMapping(), true);
+                }
+                else
+                {
+                    datastoreIndex = stmt.select(stmt.getMainTableAlias(), tables[0].getDataStoreObjectIdMapping(), true);
+                }
+                StatementMappingIndex datastoreMappingIdx = new StatementMappingIndex(tables[0].getDataStoreObjectIdMapping());
+                datastoreMappingIdx.setColumnPositions(datastoreIndex);
+                mappingDefinition.addMappingForMember(StatementMappingForClass.MEMBER_DATASTORE_ID, datastoreMappingIdx);
+            }
+            JavaTypeMapping versionMapping = tables[0].getVersionMapping(true);
+            if (versionMapping != null)
+            {
+                // Select the version column (if present)
+                int[] versionIndex = null;
+                if (multipleTableCase)
+                {
+                    versionIndex = stmt.selectVersion("VERSION", true);
+                }
+                else if (stmt.getTableExpression(elmIdentifier) != null)
+                {
+                    versionIndex = stmt.select(elmIdentifier, versionMapping, true);
+                }
+                else
+                {
+                    versionIndex = stmt.select(stmt.getMainTableAlias(), versionMapping, true);
+                }
+                StatementMappingIndex versionMappingIdx = new StatementMappingIndex(versionMapping);
+                versionMappingIdx.setColumnPositions(versionIndex);
+                mappingDefinition.addMappingForMember(StatementMappingForClass.MEMBER_VERSION, versionMappingIdx);
+            }
+            return new PersistentIDROF(tables[0], cmd, mappingDefinition, ignoreCache, 
+                queryUsingDiscriminator(), stmt.hasMetaDataExpression(), getFetchPlan(), query.getCandidateClass());
         }
         else
         {

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/PersistentIDROF.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/PersistentIDROF.java	2008-12-28 14:36:47 UTC (rev 4434)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/PersistentIDROF.java	2008-12-28 16:09:15 UTC (rev 4435)
@@ -36,16 +36,14 @@
 import org.datanucleus.StateManager;
 import org.datanucleus.exceptions.NucleusUserException;
 import org.datanucleus.metadata.AbstractClassMetaData;
-import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.IdentityType;
-import org.datanucleus.metadata.InterfaceMetaData;
 import org.datanucleus.metadata.VersionMetaData;
 import org.datanucleus.store.FieldValues;
 import org.datanucleus.store.fieldmanager.FieldManager;
 import org.datanucleus.store.mapped.DatastoreClass;
+import org.datanucleus.store.mapped.StatementMappingForClass;
 import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
-import org.datanucleus.store.mapped.mapping.OIDMapping;
 import org.datanucleus.store.query.ResultObjectFactory;
 import org.datanucleus.store.rdbms.RDBMSManager;
 import org.datanucleus.util.NucleusLogger;
@@ -78,26 +76,17 @@
     /** Metadata for the candidate class. */
     protected final AbstractClassMetaData acmd;
 
-    /** Field numbers of candidate class to populate from the result set. */
-    protected int[] fieldNumbers;
-
     /** Persistent class that this factory will generate (may be the base class). */
     private Class persistentClass;
 
-    /** Mapping from ResultSet to field numbers and mappings. */
-    protected StatementMappingIndex[] stmtMappings;
+    /** Mapping for the statement to members of this class (and sub-objects). */
+    protected StatementMappingForClass stmtMapping = null;
 
-    /** Index of datastore identity column in the result set (if any). */
-    protected final int[] datastoreIdIndex;
-
-    /** Index of version column in the result set. */
-    protected final int[] versionIndex;
-
     /** Flag whether we should use a discriminator column to distinguish object types (otherwise use NUCMETADATA). */
     protected boolean discriminator;
-    
+
     /** if the results have included a meta data column with the class name. */
-    protected final boolean hasMetaDataInResults;
+    protected boolean hasMetaDataInResults;
 
     /** Fetch Plan to use when loading fields (if any). */
     protected final FetchPlan fetchPlan;
@@ -125,30 +114,78 @@
      * @param hasMetaDataInResults whether we use NUCMETADATA column    
      * @param fetchPlan the Fetch Plan
      * @param persistentClass Class that this factory will create instances of (or subclasses)
+     * TODO Remove this and develop the other constructor
      */
     public PersistentIDROF(DatastoreClass table, int[] fieldNumbers, AbstractClassMetaData acmd,
                            StatementMappingIndex[] stmtMappings, int[] datastoreIdIndex, int[] versionIndex,
                            boolean ignoreCache, boolean discriminator, boolean hasMetaDataInResults,
                            FetchPlan fetchPlan, Class persistentClass)
     {
-        this.stmtMappings = stmtMappings;
-        if (fieldNumbers == null)
+        // Generate the stmtMapping that we should be taking as input
+        this.stmtMapping = new StatementMappingForClass(null);
+        if (stmtMappings != null)
         {
-            this.fieldNumbers = new int[0];
+            for (int i=0;i<fieldNumbers.length;i++)
+            {
+                if (stmtMappings[fieldNumbers[i]] != null)
+                {
+                    stmtMapping.addMappingForMember(fieldNumbers[i], stmtMappings[fieldNumbers[i]]);
+                }
+            }
         }
-        else
+        if (datastoreIdIndex != null)
         {
-            this.fieldNumbers = fieldNumbers;
+            StatementMappingIndex datastoreIdMapping = new StatementMappingIndex(table.getDataStoreObjectIdMapping());
+            datastoreIdMapping.setColumnPositions(datastoreIdIndex);
+            stmtMapping.addMappingForMember(StatementMappingForClass.MEMBER_DATASTORE_ID, datastoreIdMapping);
         }
+        if (versionIndex != null)
+        {
+            StatementMappingIndex versionMapping = new StatementMappingIndex(table.getVersionMapping(true));
+            versionMapping.setColumnPositions(versionIndex);
+            stmtMapping.addMappingForMember(StatementMappingForClass.MEMBER_VERSION, versionMapping);
+        }
+
         this.acmd = acmd;
         this.table = table;
-        this.datastoreIdIndex = datastoreIdIndex;
-        this.versionIndex = versionIndex;
         this.ignoreCache = ignoreCache;
+        this.fetchPlan = fetchPlan;
+        this.persistentClass = persistentClass;
+
+        // TODO Merge discriminator/hasMetaDataInResults into an enum
         this.discriminator = discriminator;
         this.hasMetaDataInResults = hasMetaDataInResults;
+    }
+
+    /**
+     * Constructor.
+     * @param table Table being selected from
+     * @param fieldNumbers Numbers of the fields in the select. May be null if no fields are retrieved
+     * @param acmd MetaData for the class (base class)
+     * @param stmtMappings Index of mappings to statement columns
+     * @param datastoreIdIndex index for datastore identity
+     * @param versionIndex Indices of the version column(s)
+     * @param ignoreCache Whether to ignore the cache
+     * @param discriminator Whether we use a discriminator column to distinguish object types
+     * @param hasMetaDataInResults whether we use NUCMETADATA column    
+     * @param fetchPlan the Fetch Plan
+     * @param persistentClass Class that this factory will create instances of (or subclasses)
+     */
+    public PersistentIDROF(DatastoreClass table, AbstractClassMetaData acmd,
+                           StatementMappingForClass mappingDefinition,
+                           boolean ignoreCache, boolean discriminator, boolean hasMetaDataInResults,
+                           FetchPlan fetchPlan, Class persistentClass)
+    {
+        this.stmtMapping = mappingDefinition;
+        this.acmd = acmd;
+        this.table = table;
+
+        this.ignoreCache = ignoreCache;
         this.fetchPlan = fetchPlan;
         this.persistentClass = persistentClass;
+        // TODO Merge discriminator/hasMetaDataInResults into an enum
+        this.discriminator = discriminator;
+        this.hasMetaDataInResults = hasMetaDataInResults;
     }
 
     /**
@@ -244,26 +281,9 @@
             }
         }
 
-        int[] fieldNumbers = new int[this.fieldNumbers.length];
+        // Extract the object from the ResultSet
+        int[] fieldNumbers = this.stmtMapping.getMemberNumbers();
         AbstractClassMetaData cmd = om.getMetaDataManager().getMetaDataForClass(pcClassForObject, clr);
-        for (int i = 0; i < this.fieldNumbers.length; i++)
-        {
-            AbstractMemberMetaData mmd = acmd.getMetaDataForManagedMemberAtAbsolutePosition(this.fieldNumbers[i]);
-            if (acmd instanceof InterfaceMetaData)
-            {
-                fieldNumbers[i] = cmd.getAbsolutePositionOfMember(mmd.getName());
-            }
-            else
-            {
-                fieldNumbers[i] = cmd.getAbsolutePositionOfMember(mmd.getClassName(), mmd.getName());
-                if (fieldNumbers[i] == -1)
-                {
-                    fieldNumbers[i] = cmd.getAbsolutePositionOfMember(mmd.getName());
-                }
-            }
-        }
-
-        // Extract the object from the ResultSet
         Object obj = null;
         if (cmd.getIdentityType() == IdentityType.APPLICATION)
         {
@@ -271,10 +291,9 @@
         }
         else if (cmd.getIdentityType() == IdentityType.DATASTORE)
         {
-            JavaTypeMapping mapping = new OIDMapping();
-            mapping.initialize(table.getStoreManager().getDatastoreAdapter(), pcClassForObject.getName());
-            mapping.addDataStoreMapping(table.getDataStoreObjectIdMapping().getDataStoreMapping(0));
-            Object id = mapping.getObject(om, rs, datastoreIdIndex);
+            StatementMappingIndex datastoreIdMapping = stmtMapping.getMappingForMemberPosition(-1);
+            JavaTypeMapping mapping = datastoreIdMapping.getMapping();
+            Object id = mapping.getObject(om, rs, datastoreIdMapping.getColumnPositions());
             if (fieldNumbers == null)
             {
                 obj = om.findObject(id, false, requiresInheritanceCheck, null);
@@ -303,6 +322,7 @@
                 obj = getObjectById(om, (ResultSet)rs, fieldNumbers, cmd, id, pcClassForObject);
             }
         }
+        // TODO Process any child classes
 
         // Set the version of the object where possible
         int versionFieldNumber = -1;
@@ -320,11 +340,13 @@
             }
         }
 
-        if (versionIndex != null)
+        StatementMappingIndex versionMapping = 
+            stmtMapping.getMappingForMemberPosition(StatementMappingForClass.MEMBER_VERSION);
+        if (versionMapping != null)
         {
             // Surrogate version column returned by query
-            JavaTypeMapping mapping = table.getVersionMapping(true);
-            Object version = mapping.getObject(om, rs, versionIndex);
+            JavaTypeMapping mapping = versionMapping.getMapping();
+            Object version = mapping.getObject(om, rs, versionMapping.getColumnPositions());
             StateManager objSM = om.findStateManager(obj);
             objSM.setVersion(version);
         }
@@ -351,7 +373,7 @@
             indexes = new StatementMappingIndex[cmd.getNoOfManagedMembers() + cmd.getNoOfInheritedManagedMembers()];
             for (int i = 0; i < fieldNumbers.length; i++)
             {
-            	indexes[fieldNumbers[i]] = stmtMappings[this.fieldNumbers[i]]; 
+                indexes[fieldNumbers[i]] = stmtMapping.getMappingForMemberPosition(stmtMapping.getMemberNumbers()[i]);
             }
             stmtMappingByClassName.put(cmd.getFullClassName(), indexes);
         }
@@ -399,7 +421,7 @@
             indexes = new StatementMappingIndex[cmd.getNoOfManagedMembers() + cmd.getNoOfInheritedManagedMembers()];
             for (int i = 0; i < fieldNumbers.length; i++)
             {
-                indexes[fieldNumbers[i]] = stmtMappings[this.fieldNumbers[i]];
+                indexes[fieldNumbers[i]] = stmtMapping.getMappingForMemberPosition(fieldNumbers[i]);
             }
             stmtMappingByClassName.put(cmd.getFullClassName(), indexes);
         }

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/SQLQuery.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/SQLQuery.java	2008-12-28 14:36:47 UTC (rev 4434)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/SQLQuery.java	2008-12-28 16:09:15 UTC (rev 4435)
@@ -48,6 +48,7 @@
 import org.datanucleus.store.mapped.DatastoreAdapter;
 import org.datanucleus.store.mapped.DatastoreClass;
 import org.datanucleus.store.mapped.MappedStoreManager;
+import org.datanucleus.store.mapped.StatementMappingForClass;
 import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.expression.QueryExpression;
 import org.datanucleus.store.mapped.mapping.DatastoreMapping;
@@ -612,8 +613,25 @@
                 }
             }
 
-            return new PersistentIDROF(table, fieldNumbers, candidateCmd, 
-                stmtMappings, datastoreIndex, versionIndex, ignoreCache, 
+            StatementMappingForClass mappingDefinition = new StatementMappingForClass(null);
+            for (int i=0;i<fieldNumbers.length;i++)
+            {
+                mappingDefinition.addMappingForMember(fieldNumbers[i], stmtMappings[fieldNumbers[i]]);
+            }
+            if (datastoreIndex != null)
+            {
+                StatementMappingIndex datastoreMappingIdx = new StatementMappingIndex(table.getDataStoreObjectIdMapping());
+                datastoreMappingIdx.setColumnPositions(datastoreIndex);
+                mappingDefinition.addMappingForMember(StatementMappingForClass.MEMBER_DATASTORE_ID, datastoreMappingIdx);
+            }
+            if (versionIndex != null)
+            {
+                StatementMappingIndex versionMappingIdx = new StatementMappingIndex(table.getVersionMapping(true));
+                versionMappingIdx.setColumnPositions(versionIndex);
+                mappingDefinition.addMappingForMember(StatementMappingForClass.MEMBER_VERSION, versionMappingIdx);
+            }
+
+            return new PersistentIDROF(table, candidateCmd, mappingDefinition, ignoreCache,
                 false, false, getFetchPlan(), query.getCandidateClass());
         }
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4436
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4436&view=rev
Author:   andy_jefferson
Date:     2008-12-28 18:58:10 +0000 (Sun, 28 Dec 2008)

Log Message:
-----------
Complete migration of constructor for PersistentIDROF

Modified Paths:
--------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSManager.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/PersistentIDROF.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java	2008-12-28 16:09:15 UTC (rev 4435)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java	2008-12-28 18:58:10 UTC (rev 4436)
@@ -652,11 +652,8 @@
     /**
      * Factory method for allocating a {@link ResultObjectFactory} of the appropriate concrete type.
      * @param table Table being selected from
-     * @param fieldNumbers Numbers of the fields in the select. May be null if no fields are retrieved
      * @param acmd MetaData for the class
-     * @param stmtMappings Mapping indices for the fields in the result set
-     * @param datastoreIdStmt Mapping index for the datastore id column in the result set
-     * @param versionStmtIndex Mapping index for the version column in the result set
+     * @param mappingDefinition Mapping of the class from the result set
      * @param ignoreCache Whether to ignore the cache
      * @param discriminator Whether we use a discriminator column to distinguish object types
      * @param hasMetaDataInResults Whether we use NUCMETADATA column to distinguish object types
@@ -664,8 +661,7 @@
      * @param persistentClass Class that this factory will create instances of (or subclasses)
      */
     public abstract ResultObjectFactory newResultObjectFactory(
-        DatastoreClass table, int[] fieldNumbers, AbstractClassMetaData acmd,
-        StatementMappingIndex[] stmtMappings, int[] datastoreIdIndex, int[] versionStmtIndex, 
+        DatastoreClass table, AbstractClassMetaData acmd, StatementMappingForClass mappingDefinition, 
         boolean ignoreCache, boolean discriminator, boolean hasMetaDataInResults, FetchPlan fetchPlan, 
         Class persistentClass);
 }
\ No newline at end of file

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStore.java	2008-12-28 16:09:15 UTC (rev 4435)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStore.java	2008-12-28 18:58:10 UTC (rev 4436)
@@ -42,6 +42,7 @@
 import org.datanucleus.store.mapped.DatastoreContainerObject;
 import org.datanucleus.store.mapped.DatastoreIdentifier;
 import org.datanucleus.store.mapped.IdentifierFactory;
+import org.datanucleus.store.mapped.StatementMappingForClass;
 import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.expression.QueryExpression;
 import org.datanucleus.store.mapped.mapping.AbstractContainerMapping;
@@ -432,7 +433,7 @@
         // TODO Allow for more than just the first elementTable (currently take the columns to select from the first element table only)
         if (elementsAreEmbedded || elementsAreSerialised)
         {
-            return storeMgr.newResultObjectFactory(null , null, emd, null, null, null, ignoreCache, false,
+            return storeMgr.newResultObjectFactory(null , emd, null, ignoreCache, false,
                 stmt.hasMetaDataExpression(), null, clr.classForName(elementType));
         }
         else if (elementMapping instanceof ReferenceMapping)
@@ -446,9 +447,8 @@
             {
                 stmt.select(implMappings[i]);
             }
-            return storeMgr.newResultObjectFactory(elementInfo != null ? elementInfo[0].getDatastoreClass() : null, null, emd, 
-                    null, null, null, ignoreCache, false, 
-                    stmt.hasMetaDataExpression(), null, clr.classForName(elementType));
+            return storeMgr.newResultObjectFactory(elementInfo != null ? elementInfo[0].getDatastoreClass() : null, emd, 
+                    null, ignoreCache, false, stmt.hasMetaDataExpression(), null, clr.classForName(elementType));
         }
         else
         {
@@ -580,9 +580,28 @@
                 Mappings.selectMapping(stmt, stmtMappings);
             }
 
+            StatementMappingForClass mappingDefinition = new StatementMappingForClass(null);
+            for (int i=0;i<fieldNumbers.length;i++)
+            {
+                mappingDefinition.addMappingForMember(fieldNumbers[i], stmtMappings[fieldNumbers[i]]);
+            }
+            if (datastoreIndex != null)
+            {
+                JavaTypeMapping datastoreMapping = elementInfo[0].getDatastoreClass().getDataStoreObjectIdMapping();
+                StatementMappingIndex datastoreMappingIdx = new StatementMappingIndex(datastoreMapping);
+                datastoreMappingIdx.setColumnPositions(datastoreIndex);
+                mappingDefinition.addMappingForMember(StatementMappingForClass.MEMBER_DATASTORE_ID, datastoreMappingIdx);
+            }
+            if (versionIndex != null)
+            {
+                JavaTypeMapping verMapping = elementInfo[0].getDatastoreClass().getVersionMapping(true);
+                StatementMappingIndex versionMappingIdx = new StatementMappingIndex(verMapping);
+                versionMappingIdx.setColumnPositions(versionIndex);
+                mappingDefinition.addMappingForMember(StatementMappingForClass.MEMBER_DATASTORE_ID, versionMappingIdx);
+            }
+
             return storeMgr.newResultObjectFactory(elementInfo != null ? elementInfo[0].getDatastoreClass() : null,
-                fieldNumbers, emd, stmtMappings, datastoreIndex, versionIndex,
-                ignoreCache, iterateUsingDiscriminator,
+                emd, mappingDefinition, ignoreCache, iterateUsingDiscriminator,
                 stmt.hasMetaDataExpression(), null, clr.classForName(elementType));
         }
     }

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSManager.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSManager.java	2008-12-28 16:09:15 UTC (rev 4435)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSManager.java	2008-12-28 18:58:10 UTC (rev 4436)
@@ -105,6 +105,7 @@
 import org.datanucleus.store.mapped.FetchStatement;
 import org.datanucleus.store.mapped.IdentifierFactory;
 import org.datanucleus.store.mapped.MappedStoreManager;
+import org.datanucleus.store.mapped.StatementMappingForClass;
 import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.scostore.FKListStore;
 import org.datanucleus.store.mapped.scostore.JoinListStore;
@@ -3351,13 +3352,11 @@
         return false;
     }
 
-    public ResultObjectFactory newResultObjectFactory(DatastoreClass table, int[] fieldNumbers,
-        AbstractClassMetaData acmd, 
-        StatementMappingIndex[] stmtMappings, int[] datastoreIdIndex, int[] versionIndex, 
-        boolean ignoreCache, boolean discriminator, boolean hasMetaDataInResults, FetchPlan fetchPlan,
-        Class persistentClass)
+    public ResultObjectFactory newResultObjectFactory(DatastoreClass table, AbstractClassMetaData acmd, 
+        StatementMappingForClass mappingDefinition, boolean ignoreCache, boolean discriminator, 
+        boolean hasMetaDataInResults, FetchPlan fetchPlan, Class persistentClass)
     {
-        return new PersistentIDROF(table, fieldNumbers, acmd, stmtMappings, datastoreIdIndex,
-            versionIndex, ignoreCache, discriminator, hasMetaDataInResults, fetchPlan, persistentClass);
+        return new PersistentIDROF(table, acmd, mappingDefinition, ignoreCache, discriminator, hasMetaDataInResults, 
+            fetchPlan, persistentClass);
     }
 }
\ No newline at end of file

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/PersistentIDROF.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/PersistentIDROF.java	2008-12-28 16:09:15 UTC (rev 4435)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/PersistentIDROF.java	2008-12-28 18:58:10 UTC (rev 4436)
@@ -103,68 +103,8 @@
     /**
      * Constructor.
      * @param table Table being selected from
-     * @param fieldNumbers Numbers of the fields in the select. May be null if no fields are retrieved
-     * @param acmd MetaData for the class
-     * @param stmtMappings Index of mappings to statement columns
-     * @param datastoreIdIndex index for datastore identity
-     * @param versionIndex Indices of the version column(s)
-     * @param ignoreCache Whether to ignore the cache
-     * @param discriminator Whether we use a discriminator column to distinguish object 
-     *                      types, or whether we use a NUCMETADATA column
-     * @param hasMetaDataInResults whether we use NUCMETADATA column    
-     * @param fetchPlan the Fetch Plan
-     * @param persistentClass Class that this factory will create instances of (or subclasses)
-     * TODO Remove this and develop the other constructor
-     */
-    public PersistentIDROF(DatastoreClass table, int[] fieldNumbers, AbstractClassMetaData acmd,
-                           StatementMappingIndex[] stmtMappings, int[] datastoreIdIndex, int[] versionIndex,
-                           boolean ignoreCache, boolean discriminator, boolean hasMetaDataInResults,
-                           FetchPlan fetchPlan, Class persistentClass)
-    {
-        // Generate the stmtMapping that we should be taking as input
-        this.stmtMapping = new StatementMappingForClass(null);
-        if (stmtMappings != null)
-        {
-            for (int i=0;i<fieldNumbers.length;i++)
-            {
-                if (stmtMappings[fieldNumbers[i]] != null)
-                {
-                    stmtMapping.addMappingForMember(fieldNumbers[i], stmtMappings[fieldNumbers[i]]);
-                }
-            }
-        }
-        if (datastoreIdIndex != null)
-        {
-            StatementMappingIndex datastoreIdMapping = new StatementMappingIndex(table.getDataStoreObjectIdMapping());
-            datastoreIdMapping.setColumnPositions(datastoreIdIndex);
-            stmtMapping.addMappingForMember(StatementMappingForClass.MEMBER_DATASTORE_ID, datastoreIdMapping);
-        }
-        if (versionIndex != null)
-        {
-            StatementMappingIndex versionMapping = new StatementMappingIndex(table.getVersionMapping(true));
-            versionMapping.setColumnPositions(versionIndex);
-            stmtMapping.addMappingForMember(StatementMappingForClass.MEMBER_VERSION, versionMapping);
-        }
-
-        this.acmd = acmd;
-        this.table = table;
-        this.ignoreCache = ignoreCache;
-        this.fetchPlan = fetchPlan;
-        this.persistentClass = persistentClass;
-
-        // TODO Merge discriminator/hasMetaDataInResults into an enum
-        this.discriminator = discriminator;
-        this.hasMetaDataInResults = hasMetaDataInResults;
-    }
-
-    /**
-     * Constructor.
-     * @param table Table being selected from
-     * @param fieldNumbers Numbers of the fields in the select. May be null if no fields are retrieved
      * @param acmd MetaData for the class (base class)
-     * @param stmtMappings Index of mappings to statement columns
-     * @param datastoreIdIndex index for datastore identity
-     * @param versionIndex Indices of the version column(s)
+     * @param mappingDefinition Mapping information for the result set and how it maps to the class
      * @param ignoreCache Whether to ignore the cache
      * @param discriminator Whether we use a discriminator column to distinguish object types
      * @param hasMetaDataInResults whether we use NUCMETADATA column    

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java	2008-12-28 16:09:15 UTC (rev 4435)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java	2008-12-28 18:58:10 UTC (rev 4436)
@@ -48,6 +48,7 @@
 import org.datanucleus.store.mapped.DatastoreIdentifier;
 import org.datanucleus.store.mapped.IdentifierFactory;
 import org.datanucleus.store.mapped.MappedStoreManager;
+import org.datanucleus.store.mapped.StatementMappingForClass;
 import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.expression.LogicSetExpression;
 import org.datanucleus.store.mapped.expression.MapStoreQueryable;
@@ -1022,9 +1023,8 @@
         ClassLoaderResolver clr = sm.getObjectManager().getClassLoaderResolver();
         if (valuesAreEmbedded || valuesAreSerialised)
         {
-            // Value = Embedded, Serialised
-            // valueTable is null here so why return this ?
-            return storeMgr.newResultObjectFactory(this.valueTable, null, vmd, null, null, null, ignoreCache, 
+            // Value = Embedded, Serialised : valueTable is null here so why return this ?
+            return storeMgr.newResultObjectFactory(this.valueTable, vmd, null, ignoreCache, 
                 false, stmt.hasMetaDataExpression(), null, clr.classForName(valueType));
         }
         else
@@ -1123,10 +1123,28 @@
                 Mappings.selectMapping(stmt, stmtMappings);
             }
 
+            StatementMappingForClass mappingDefinition = new StatementMappingForClass(null);
+            for (int i=0;i<prefetchFieldNumbers.length;i++)
+            {
+                mappingDefinition.addMappingForMember(prefetchFieldNumbers[i], stmtMappings[prefetchFieldNumbers[i]]);
+            }
+            if (datastoreIndex != null)
+            {
+                StatementMappingIndex datastoreMappingIdx = 
+                    new StatementMappingIndex(valueTable.getDataStoreObjectIdMapping());
+                datastoreMappingIdx.setColumnPositions(datastoreIndex);
+                mappingDefinition.addMappingForMember(StatementMappingForClass.MEMBER_DATASTORE_ID, datastoreMappingIdx);
+            }
+            if (versionIndex != null)
+            {
+                StatementMappingIndex versionMappingIdx = new StatementMappingIndex(valueTable.getVersionMapping(true));
+                versionMappingIdx.setColumnPositions(versionIndex);
+                mappingDefinition.addMappingForMember(StatementMappingForClass.MEMBER_DATASTORE_ID, versionMappingIdx);
+            }
+
             return storeMgr.newResultObjectFactory(storeMgr.getDatastoreClass(getValueType(), clr),
-                prefetchFieldNumbers, vmd, stmtMappings, datastoreIndex, versionIndex,
-                ignoreCache, iterateUsingDiscriminator, stmt.hasMetaDataExpression(), null, 
-                clr.classForName(valueType));
+                vmd, mappingDefinition, ignoreCache, iterateUsingDiscriminator, stmt.hasMetaDataExpression(), 
+                null, clr.classForName(valueType));
         }
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4440
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4440&view=rev
Author:   andy_jefferson
Date:     2008-12-29 15:13:19 +0000 (Mon, 29 Dec 2008)

Log Message:
-----------
Add whether the RDBMS supports VIEWs as an option

Modified Paths:
--------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DatastoreAdapter.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/adapter/DatabaseAdapter.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/adapter/RDBMSAdapter.java

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DatastoreAdapter.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DatastoreAdapter.java	2008-12-28 19:39:53 UTC (rev 4439)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/DatastoreAdapter.java	2008-12-29 15:13:19 UTC (rev 4440)
@@ -66,6 +66,7 @@
 
     /**
      * Accessor for whether the SQL extensions CUBE, ROLLUP are supported.
+     * TODO Move this to a plugin extension as cube and rollup options (separate)
      */
     public static final String ANALYSIS_METHODS = "AnalysisMethods";
 

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/adapter/DatabaseAdapter.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/adapter/DatabaseAdapter.java	2008-12-28 19:39:53 UTC (rev 4439)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/adapter/DatabaseAdapter.java	2008-12-29 15:13:19 UTC (rev 4440)
@@ -397,6 +397,7 @@
             throw new NucleusDataStoreException(LOCALISER.msg("051004"), e);
         }
 
+        supportedOptions.add(VIEWS);
         supportedOptions.add(DATETIME_STORES_MILLISECS);
         supportedOptions.add(ESCAPE_EXPRESSION_IN_LIKE_PREDICATE);
         supportedOptions.add(UNION_SYNTAX);

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/adapter/RDBMSAdapter.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/adapter/RDBMSAdapter.java	2008-12-28 19:39:53 UTC (rev 4439)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/adapter/RDBMSAdapter.java	2008-12-29 15:13:19 UTC (rev 4440)
@@ -50,9 +50,10 @@
  */
 public interface RDBMSAdapter extends DatastoreAdapter
 {
-    /**
-     * Whether the RDBMS supports use of UNION syntax.
-     */
+    /** Whether the RDBMS supports SQL VIEWs. */
+    public static final String VIEWS = "Views";
+
+    /** Whether the RDBMS supports UNION syntax. */
     public static final String UNION_SYNTAX = "Union_Syntax";
 
     /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4442
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4442&view=rev
Author:   andy_jefferson
Date:     2008-12-29 16:37:26 +0000 (Mon, 29 Dec 2008)

Log Message:
-----------
Change signature of ResultSetGetter constructor to take in StatementMappingForClass so we have the ability to read in results for sub-objects

Modified Paths:
--------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/PersistenceCapableMapping.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSManager.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ResultSetGetter.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/PersistentIDROF.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultMetaDataROF.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/TransientIDROF.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/FetchRequest.java

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java	2008-12-29 15:32:10 UTC (rev 4441)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/MappedStoreManager.java	2008-12-29 16:37:26 UTC (rev 4442)
@@ -610,11 +610,11 @@
      * Method to return a FieldManager for extracting information from the supplied results.
      * @param sm StateManager for the object
      * @param resultSet The results
-     * @param stmtMappings Mappings of the results
+     * @param resultMappings Mappings of the results for this class
      * @return FieldManager to use
      */
     public abstract FieldManager getFieldManagerForResultProcessing(StateManager sm, Object resultSet, 
-            StatementMappingIndex[] stmtMappings);
+            StatementMappingForClass resultMappings);
 
     /**
      * Method to return a FieldManager for populating information in statements.

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/PersistenceCapableMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/PersistenceCapableMapping.java	2008-12-29 15:32:10 UTC (rev 4441)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/PersistenceCapableMapping.java	2008-12-29 16:37:26 UTC (rev 4442)
@@ -64,6 +64,7 @@
 import org.datanucleus.store.mapped.DatastoreIdentifier;
 import org.datanucleus.store.mapped.IdentifierFactory;
 import org.datanucleus.store.mapped.MappedStoreManager;
+import org.datanucleus.store.mapped.StatementMappingForClass;
 import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.expression.LogicSetExpression;
 import org.datanucleus.store.mapped.expression.ObjectExpression;
@@ -951,6 +952,11 @@
             statementExpressionIndex[fmd.getAbsoluteFieldNumber()].setColumnPositions(expressionsIndex);
         }
 
+        final StatementMappingForClass resultMappings = new StatementMappingForClass(null);
+        for (int i=0;i<pkFieldNumbers.length;i++)
+        {
+            resultMappings.addMappingForMember(pkFieldNumbers[i], statementExpressionIndex[pkFieldNumbers[i]]);
+        }
         return om.findObjectUsingAID(clr.classForName(cmd.getFullClassName()),
             new FieldValues()
             {
@@ -958,12 +964,12 @@
                 public void fetchFields(StateManager sm)
                 {
                     sm.replaceFields(pkFieldNumbers, 
-                        storeMgr.getFieldManagerForResultProcessing(sm, rs, statementExpressionIndex));
+                        storeMgr.getFieldManagerForResultProcessing(sm, rs, resultMappings));
                 }
                 public void fetchNonLoadedFields(StateManager sm)
                 {
                     sm.replaceNonLoadedFields(pkFieldNumbers, 
-                        storeMgr.getFieldManagerForResultProcessing(sm, rs, statementExpressionIndex));
+                        storeMgr.getFieldManagerForResultProcessing(sm, rs, resultMappings));
                 }
                 public FetchPlan getFetchPlanForLoading()
                 {

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSManager.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSManager.java	2008-12-29 15:32:10 UTC (rev 4441)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSManager.java	2008-12-29 16:37:26 UTC (rev 4442)
@@ -1443,13 +1443,13 @@
      * Method to return a FieldManager for extracting information from the supplied results.
      * @param sm StateManager for the object
      * @param resultSet The results
-     * @param stmtMappings Indices of the expressions in these results
+     * @param resultMappings Mappings for the results for this class
      * @return FieldManager to use
      */
     public FieldManager getFieldManagerForResultProcessing(StateManager sm, Object resultSet, 
-            StatementMappingIndex[] stmtMappings)
+            StatementMappingForClass resultMappings)
     {
-        return new ResultSetGetter(sm, resultSet, stmtMappings);
+        return new ResultSetGetter(sm, resultSet, resultMappings);
     }
 
     /**

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ResultSetGetter.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ResultSetGetter.java	2008-12-29 15:32:10 UTC (rev 4441)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ResultSetGetter.java	2008-12-29 16:37:26 UTC (rev 4442)
@@ -21,6 +21,7 @@
 import org.datanucleus.ObjectManager;
 import org.datanucleus.StateManager;
 import org.datanucleus.store.fieldmanager.AbstractFieldManager;
+import org.datanucleus.store.mapped.StatementMappingForClass;
 import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.mapping.EmbeddedPCMapping;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
@@ -35,89 +36,90 @@
     private final StateManager sm;
     private final ObjectManager om;
     private final Object resultSet;
-    private final StatementMappingIndex[] stmtMappings;
+    private final StatementMappingForClass resultMappings;
 
     /**
      * Constructor
      * @param sm the StateManager
      * @param resultSet the ResultSet
-     * @param statementExpressionIndex the StatementExpressionIndex
+     * @param resultMappings Mappings for the results for this class
      */
-    public ResultSetGetter(StateManager sm, Object results, StatementMappingIndex[] statementExpressionIndex)
+    public ResultSetGetter(StateManager sm, Object results, StatementMappingForClass resultMappings)
     {
         this.sm = sm;
         this.om = sm.getObjectManager();
         this.resultSet = results;
-        this.stmtMappings = statementExpressionIndex;
+        this.resultMappings = resultMappings;
     }
 
     public boolean fetchBooleanField(int fieldNumber)
     {
-        return stmtMappings[fieldNumber].getMapping().getBoolean(om, resultSet, 
-            stmtMappings[fieldNumber].getColumnPositions());
+        StatementMappingIndex mapIdx = resultMappings.getMappingForMemberPosition(fieldNumber);
+        return mapIdx.getMapping().getBoolean(om, resultSet, mapIdx.getColumnPositions());
     }
 
     public char fetchCharField(int fieldNumber)
     {
-        return stmtMappings[fieldNumber].getMapping().getChar(om, resultSet, 
-            stmtMappings[fieldNumber].getColumnPositions());
+        StatementMappingIndex mapIdx = resultMappings.getMappingForMemberPosition(fieldNumber);
+        return mapIdx.getMapping().getChar(om, resultSet, mapIdx.getColumnPositions());
     }
 
     public byte fetchByteField(int fieldNumber)
     {
-        return stmtMappings[fieldNumber].getMapping().getByte(om, resultSet, 
-            stmtMappings[fieldNumber].getColumnPositions());
+        StatementMappingIndex mapIdx = resultMappings.getMappingForMemberPosition(fieldNumber);
+        return mapIdx.getMapping().getByte(om, resultSet, mapIdx.getColumnPositions());
     }
 
     public short fetchShortField(int fieldNumber)
     {
-        return stmtMappings[fieldNumber].getMapping().getShort(om, resultSet, 
-            stmtMappings[fieldNumber].getColumnPositions());
+        StatementMappingIndex mapIdx = resultMappings.getMappingForMemberPosition(fieldNumber);
+        return mapIdx.getMapping().getShort(om, resultSet, mapIdx.getColumnPositions());
     }
 
     public int fetchIntField(int fieldNumber)
     {
-        return stmtMappings[fieldNumber].getMapping().getInt(om, resultSet, 
-            stmtMappings[fieldNumber].getColumnPositions());
+        StatementMappingIndex mapIdx = resultMappings.getMappingForMemberPosition(fieldNumber);
+        return mapIdx.getMapping().getInt(om, resultSet, mapIdx.getColumnPositions());
     }
 
     public long fetchLongField(int fieldNumber)
     {
-        return stmtMappings[fieldNumber].getMapping().getLong(om, resultSet, 
-            stmtMappings[fieldNumber].getColumnPositions());
+        StatementMappingIndex mapIdx = resultMappings.getMappingForMemberPosition(fieldNumber);
+        return mapIdx.getMapping().getLong(om, resultSet, mapIdx.getColumnPositions());
     }
 
     public float fetchFloatField(int fieldNumber)
     {
-        return stmtMappings[fieldNumber].getMapping().getFloat(om, resultSet,
-            stmtMappings[fieldNumber].getColumnPositions());
+        StatementMappingIndex mapIdx = resultMappings.getMappingForMemberPosition(fieldNumber);
+        return mapIdx.getMapping().getFloat(om, resultSet, mapIdx.getColumnPositions());
     }
 
     public double fetchDoubleField(int fieldNumber)
     {
-        return stmtMappings[fieldNumber].getMapping().getDouble(om, resultSet,
-            stmtMappings[fieldNumber].getColumnPositions());
+        StatementMappingIndex mapIdx = resultMappings.getMappingForMemberPosition(fieldNumber);
+        return mapIdx.getMapping().getDouble(om, resultSet, mapIdx.getColumnPositions());
     }
 
     public String fetchStringField(int fieldNumber)
     {
-        return stmtMappings[fieldNumber].getMapping().getString(om, resultSet,
-            stmtMappings[fieldNumber].getColumnPositions());
+        StatementMappingIndex mapIdx = resultMappings.getMappingForMemberPosition(fieldNumber);
+        return mapIdx.getMapping().getString(om, resultSet, mapIdx.getColumnPositions());
     }
 
     public Object fetchObjectField(int fieldNumber)
     {
-        JavaTypeMapping mapping = stmtMappings[fieldNumber].getMapping();
+        StatementMappingIndex mapIdx = resultMappings.getMappingForMemberPosition(fieldNumber);
+        JavaTypeMapping mapping = mapIdx.getMapping();
         Object value;
         if (mapping instanceof EmbeddedPCMapping ||
             mapping instanceof SerialisedPCMapping ||
             mapping instanceof SerialisedReferenceMapping)
         {
-            value = mapping.getObject(om, resultSet, stmtMappings[fieldNumber].getColumnPositions(), sm, fieldNumber);
+            value = mapping.getObject(om, resultSet, mapIdx.getColumnPositions(), sm, fieldNumber);
         }
         else
         {
-            value = mapping.getObject(om, resultSet, stmtMappings[fieldNumber].getColumnPositions());
+            value = mapping.getObject(om, resultSet, mapIdx.getColumnPositions());
         }
 
         // Return the field value (as a wrapper if wrappable)

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/PersistentIDROF.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/PersistentIDROF.java	2008-12-29 15:32:10 UTC (rev 4441)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/PersistentIDROF.java	2008-12-29 16:37:26 UTC (rev 4442)
@@ -97,9 +97,6 @@
     /** Resolved classes for metadata / discriminator keyed by class names. */
     private Map resolvedClasses = new SoftValueMap();
 
-    /** StatementExpressionIndex keyed by full class name. */
-    private Map stmtMappingByClassName = new SoftValueMap();
-
     /**
      * Constructor.
      * @param table Table being selected from
@@ -149,6 +146,7 @@
     public Object getObject(final ObjectManager om, final Object rs)
     {
         // Find the class of the returned object in this row of the ResultSet
+        // TODO Determine type of class based on whether there is a discriminator mapping, or NUCMETADATA column
         boolean requiresInheritanceCheck = true;
         String className = null;
         if (discriminator)
@@ -307,27 +305,16 @@
     private Object getObjectByAID(final ObjectManager om, final ResultSet rs, final int[] fieldNumbers, 
             AbstractClassMetaData cmd, Class pcClass, boolean requiresInheritanceCheck)
     {
-        StatementMappingIndex[] indexes = (StatementMappingIndex[]) stmtMappingByClassName.get(cmd.getFullClassName());
-        if (indexes == null)
-        {
-            indexes = new StatementMappingIndex[cmd.getNoOfManagedMembers() + cmd.getNoOfInheritedManagedMembers()];
-            for (int i = 0; i < fieldNumbers.length; i++)
-            {
-                indexes[fieldNumbers[i]] = stmtMapping.getMappingForMemberPosition(stmtMapping.getMemberNumbers()[i]);
-            }
-            stmtMappingByClassName.put(cmd.getFullClassName(), indexes);
-        }
-        final StatementMappingIndex[] stmtMappings = indexes;            
         return om.findObjectUsingAID(pcClass, new FieldValues()
         {
             public void fetchFields(StateManager sm)
             {
-                FieldManager fm = table.getStoreManager().getFieldManagerForResultProcessing(sm, rs, stmtMappings);
+                FieldManager fm = table.getStoreManager().getFieldManagerForResultProcessing(sm, rs, stmtMapping);
                 sm.replaceFields(fieldNumbers, fm, false);
             }
             public void fetchNonLoadedFields(StateManager sm)
             {
-                FieldManager fm = table.getStoreManager().getFieldManagerForResultProcessing(sm, rs, stmtMappings);
+                FieldManager fm = table.getStoreManager().getFieldManagerForResultProcessing(sm, rs, stmtMapping);
                 sm.replaceNonLoadedFields(fieldNumbers, fm);
             }
             public FetchPlan getFetchPlanForLoading()
@@ -355,29 +342,18 @@
             return null;
         }
 
-        StatementMappingIndex[] indexes = (StatementMappingIndex[]) stmtMappingByClassName.get(cmd.getFullClassName());
-        if (indexes == null)
-        {
-            indexes = new StatementMappingIndex[cmd.getNoOfManagedMembers() + cmd.getNoOfInheritedManagedMembers()];
-            for (int i = 0; i < fieldNumbers.length; i++)
-            {
-                indexes[fieldNumbers[i]] = stmtMapping.getMappingForMemberPosition(fieldNumbers[i]);
-            }
-            stmtMappingByClassName.put(cmd.getFullClassName(), indexes);
-        }
-        final StatementMappingIndex[] stmtMappings = indexes;
         if (pcClass == null)
         {
             return om.findObject(oid, new FieldValues()
             {
                 public void fetchFields(StateManager sm)
                 {
-                    FieldManager fm = table.getStoreManager().getFieldManagerForResultProcessing(sm, rs, stmtMappings);
+                    FieldManager fm = table.getStoreManager().getFieldManagerForResultProcessing(sm, rs, stmtMapping);
                     sm.replaceFields(fieldNumbers, fm, false);
                 }
                 public void fetchNonLoadedFields(StateManager sm)
                 {
-                    FieldManager fm = table.getStoreManager().getFieldManagerForResultProcessing(sm, rs, stmtMappings);
+                    FieldManager fm = table.getStoreManager().getFieldManagerForResultProcessing(sm, rs, stmtMapping);
                     sm.replaceNonLoadedFields(fieldNumbers, fm);
                 }
                 public FetchPlan getFetchPlanForLoading()
@@ -392,12 +368,12 @@
             {
                 public void fetchFields(StateManager sm)
                 {
-                    FieldManager fm = table.getStoreManager().getFieldManagerForResultProcessing(sm, rs, stmtMappings);
+                    FieldManager fm = table.getStoreManager().getFieldManagerForResultProcessing(sm, rs, stmtMapping);
                     sm.replaceFields(fieldNumbers, fm, false);
                 }
                 public void fetchNonLoadedFields(StateManager sm)
                 {
-                    FieldManager fm = table.getStoreManager().getFieldManagerForResultProcessing(sm, rs, stmtMappings);
+                    FieldManager fm = table.getStoreManager().getFieldManagerForResultProcessing(sm, rs, stmtMapping);
                     sm.replaceNonLoadedFields(fieldNumbers, fm);
                 }
                 public FetchPlan getFetchPlanForLoading()

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultMetaDataROF.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultMetaDataROF.java	2008-12-29 15:32:10 UTC (rev 4441)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultMetaDataROF.java	2008-12-29 16:37:26 UTC (rev 4442)
@@ -42,6 +42,7 @@
 import org.datanucleus.store.mapped.DatastoreClass;
 import org.datanucleus.store.mapped.DatastoreField;
 import org.datanucleus.store.mapped.MappedStoreManager;
+import org.datanucleus.store.mapped.StatementMappingForClass;
 import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
 import org.datanucleus.store.query.ResultObjectFactory;
@@ -318,16 +319,21 @@
             AbstractClassMetaData cmd, Class pcClass, boolean requiresInheritanceCheck, 
             StatementMappingIndex[] stmtMappings)
     {
-        final StatementMappingIndex[] stmtExprIndex = stmtMappings;            
+        final StatementMappingForClass resultMappings = new StatementMappingForClass(null);
+        for (int i=0;i<fieldNumbers.length;i++)
+        {
+            resultMappings.addMappingForMember(fieldNumbers[i], stmtMappings[fieldNumbers[i]]);
+        }
+
         return om.findObjectUsingAID(pcClass, new FieldValues()
         {
             public void fetchFields(StateManager sm)
             {
-                sm.replaceFields(fieldNumbers, new ResultSetGetter(sm, rs, stmtExprIndex), false);
+                sm.replaceFields(fieldNumbers, new ResultSetGetter(sm, rs, resultMappings), false);
             }
             public void fetchNonLoadedFields(StateManager sm)
             {
-                sm.replaceNonLoadedFields(fieldNumbers, new ResultSetGetter(sm, rs, stmtExprIndex));
+                sm.replaceNonLoadedFields(fieldNumbers, new ResultSetGetter(sm, rs, resultMappings));
             }
             public FetchPlan getFetchPlanForLoading()
             {
@@ -350,18 +356,23 @@
     private Object getObjectById(final ObjectManager om, final ResultSet rs, final int[] fieldNumbers,
             AbstractClassMetaData cmd, Object oid, Class pcClass, StatementMappingIndex[] stmtMappings)
     {
-        final StatementMappingIndex[] stmtExprIndex = stmtMappings;
+        final StatementMappingForClass resultMappings = new StatementMappingForClass(null);
+        for (int i=0;i<fieldNumbers.length;i++)
+        {
+            resultMappings.addMappingForMember(fieldNumbers[i], stmtMappings[fieldNumbers[i]]);
+        }
+
         if (pcClass == null)
         {
             return om.findObject(oid, new FieldValues()
             {
                 public void fetchFields(StateManager sm)
                 {
-                    sm.replaceFields(fieldNumbers, new ResultSetGetter(sm, rs, stmtExprIndex), false);
+                    sm.replaceFields(fieldNumbers, new ResultSetGetter(sm, rs, resultMappings), false);
                 }
                 public void fetchNonLoadedFields(StateManager sm)
                 {
-                    sm.replaceNonLoadedFields(fieldNumbers, new ResultSetGetter(sm, rs, stmtExprIndex));
+                    sm.replaceNonLoadedFields(fieldNumbers, new ResultSetGetter(sm, rs, resultMappings));
                 }
                 public FetchPlan getFetchPlanForLoading()
                 {
@@ -375,11 +386,11 @@
             {
                 public void fetchFields(StateManager sm)
                 {
-                    sm.replaceFields(fieldNumbers, new ResultSetGetter(sm, rs, stmtExprIndex), false);
+                    sm.replaceFields(fieldNumbers, new ResultSetGetter(sm, rs, resultMappings), false);
                 }
                 public void fetchNonLoadedFields(StateManager sm)
                 {
-                    sm.replaceNonLoadedFields(fieldNumbers, new ResultSetGetter(sm, rs, stmtExprIndex));
+                    sm.replaceNonLoadedFields(fieldNumbers, new ResultSetGetter(sm, rs, resultMappings));
                 }
                 public FetchPlan getFetchPlanForLoading()
                 {

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/TransientIDROF.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/TransientIDROF.java	2008-12-29 15:32:10 UTC (rev 4441)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/TransientIDROF.java	2008-12-29 16:37:26 UTC (rev 4442)
@@ -25,6 +25,7 @@
 import org.datanucleus.ObjectManager;
 import org.datanucleus.StateManager;
 import org.datanucleus.store.FieldValues;
+import org.datanucleus.store.mapped.StatementMappingForClass;
 import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.query.ResultObjectFactory;
 import org.datanucleus.store.rdbms.fieldmanager.ResultSetGetter;
@@ -60,16 +61,22 @@
 	 */
 	public Object getObject(final ObjectManager om, final Object rs)
     {
+        final StatementMappingForClass resultMappings = new StatementMappingForClass(null);
+        for (int i=0;i<fieldNumbers.length;i++)
+        {
+            resultMappings.addMappingForMember(fieldNumbers[i], stmtMappings[fieldNumbers[i]]);
+        }
+
         return om.findObject(om.newObjectId(candidateClass.getName(), null),
             new FieldValues()
             {
                 public void fetchFields(StateManager sm)
                 {
-                    sm.replaceFields(fieldNumbers, new ResultSetGetter(sm, rs, stmtMappings), false);
+                    sm.replaceFields(fieldNumbers, new ResultSetGetter(sm, rs, resultMappings), false);
                 }
                 public void fetchNonLoadedFields(StateManager sm)
                 {
-                    sm.replaceNonLoadedFields(fieldNumbers, new ResultSetGetter(sm, rs, stmtMappings));
+                    sm.replaceNonLoadedFields(fieldNumbers, new ResultSetGetter(sm, rs, resultMappings));
                 }
                 public FetchPlan getFetchPlanForLoading()
                 {

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/FetchRequest.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/FetchRequest.java	2008-12-29 15:32:10 UTC (rev 4441)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/FetchRequest.java	2008-12-29 16:37:26 UTC (rev 4442)
@@ -54,6 +54,7 @@
 import org.datanucleus.store.mapped.FetchStatement;
 import org.datanucleus.store.mapped.MappedStoreManager;
 import org.datanucleus.store.mapped.SecondaryDatastoreClass;
+import org.datanucleus.store.mapped.StatementMappingForClass;
 import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.mapping.InterfaceMapping;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
@@ -313,8 +314,18 @@
                                 }
                                 throw new NucleusObjectNotFoundException("No such database row", sm.getInternalObjectId());
                             }
+
+                            // Copy the results into the object
+                            StatementMappingForClass resultMappings = new StatementMappingForClass(null);
+                            int[] resultFields = consumer.getNumbersOfFieldsToBeFetched();
+                            StatementMappingIndex[] resultMappingIdxs = mappingStatementIndex.getFields();
+                            for (int i=0;i<resultFields.length;i++)
+                            {
+                                resultMappings.addMappingForMember(resultFields[i], 
+                                    resultMappingIdxs[resultFields[i]]);
+                            }
                             sm.replaceFields(consumer.getNumbersOfFieldsToBeFetched(), 
-                                new ResultSetGetter(sm, rs, mappingStatementIndex.getFields()));
+                                new ResultSetGetter(sm, rs, resultMappings));
 
                             if (sm.getTransactionalVersion(sm.getObject()) == null)
                             {
@@ -397,8 +408,6 @@
      * <PRE>
      * SELECT col1, col2, col3, col4 FROM TABLE WHERE ID = ?
      * </PRE>
-     * 
-     * @version $Revision: 1.85 $
      */
     private class FetchMappingConsumer implements MappingConsumer
     {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4481
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4481&view=rev
Author:   andy_jefferson
Date:     2009-01-01 14:54:53 +0000 (Thu, 01 Jan 2009)

Log Message:
-----------
[NUCRDBMS-66] Add simple code around generation of an SQLStatement to retrieve all candidate objects so we can think about doing in-memory queries "with RDBMS".
Refactor store.mapped.mapping.Mappings to store.mapped.expression.ExpressionHelper since it is related to QueryExpression and will be removed with those expression classes in time, and add much simplification

Modified Paths:
--------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/expression/StatementText.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassTableExtent.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassViewExtent.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleBlobRDBMSMapping.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleClobRDBMSMapping.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query2/JDOQLQuery2.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query2/QueryToSQLMapper.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/DeleteRequest.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/FKMapStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/FKSetStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/JoinMapStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/MapEntrySetStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/MapValueSetStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSAbstractCollectionStoreSpecialization.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSElementContainerStoreSpecialization.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSFKArrayStoreSpecialization.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSFKListStoreSpecialization.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/SQLText.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/SchemaTable.java

Added Paths:
-----------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/expression/ExpressionHelper.java

Removed Paths:
-------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/Mappings.java

Added: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/expression/ExpressionHelper.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/expression/ExpressionHelper.java	                        (rev 0)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/expression/ExpressionHelper.java	2009-01-01 14:54:53 UTC (rev 4481)
@@ -0,0 +1,276 @@
+/**********************************************************************
+Copyright (c) 2003 Erik Bengtson and others. All rights reserved. 
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ 
+
+Contributors:
+2003 Andy Jefferson - coding standards
+2005 Andy Jefferson - added handling for left outer join of related fields when in fetch group
+2006 Andy Jefferson - added support for primary join table and select of owner object
+    ...
+**********************************************************************/
+package org.datanucleus.store.mapped.expression;
+
+import org.datanucleus.ClassLoaderResolver;
+import org.datanucleus.metadata.AbstractMemberMetaData;
+import org.datanucleus.metadata.Relation;
+import org.datanucleus.store.mapped.DatastoreClass;
+import org.datanucleus.store.mapped.DatastoreContainerObject;
+import org.datanucleus.store.mapped.DatastoreElementContainer;
+import org.datanucleus.store.mapped.DatastoreIdentifier;
+import org.datanucleus.store.mapped.IdentifierType;
+import org.datanucleus.store.mapped.MappedStoreManager;
+import org.datanucleus.store.mapped.StatementMappingIndex;
+import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
+import org.datanucleus.store.mapped.mapping.ReferenceMapping;
+
+/**
+ * Helper class for doing tasks relating to expressions and handling mappings in query statements.
+ */
+public class ExpressionHelper
+{
+    /**
+     * Convenience method to select the specified mapping in the specified query.
+     * The supplied stmtMapping has its column positions updated to the position in this
+     * query.
+     * @param stmtMapping The statement mapping to select
+     * @param qs The query
+     * @param tableIdentifier Identifier for the table in which to select the mapping (if known)
+     * @param clr ClassLoader resolver
+     */
+    public static void selectMapping(StatementMappingIndex stmtMapping, QueryExpression qs, 
+            DatastoreIdentifier tableIdentifier, ClassLoaderResolver clr)
+    {
+        if (stmtMapping == null)
+        {
+            return;
+        }
+        JavaTypeMapping m = stmtMapping.getMapping();
+        if (m == null)
+        {
+            return;
+        }
+
+        AbstractMemberMetaData fmd = m.getFieldMetaData();
+        if (m.getNumberOfDatastoreFields() > 0)
+        {
+            int[] columnNumbersByField = 
+                (tableIdentifier != null) ? qs.select(tableIdentifier, m, true) : qs.select(m, true);
+            stmtMapping.setColumnPositions(columnNumbersByField);
+        }
+        else
+        {
+            int relationType = fmd.getRelationType(clr);
+            if (relationType == Relation.ONE_TO_ONE_BI && fmd.getMappedBy() != null)
+            {
+                // 1-1 bi with "mapped-by" at this side (hence no column(s)).
+                // This field is not stored, but instead a foreign is set in the source table which stores 
+                // a reference to this (target table). A FK is set in the source table referring to the 
+                // target table. Do a LEFT OUTER JOIN to the related (source) table(s) to pick up the 
+                // identifier value of this.
+                /*
+                 * For example :-
+                 * TABLE A (TARGET)               TABLE B (SOURCE)
+                 * ID                             ID  A_ID (FK)
+                 * --                             --  ----
+                 * 18                             21  18
+                 * 
+                 * Class A                        Class B
+                 * {                              {
+                 *    B b;                            A a;
+                 * }                              }
+                 */
+                int[] colNums = null;
+                MappedStoreManager storeMgr = qs.getStoreManager();
+                JavaTypeMapping[] sourceMappings = null;
+                DatastoreClass[] sourceTables = null;
+                if (m instanceof ReferenceMapping)
+                {
+                    // Reference field (with "n" implementations)
+                    JavaTypeMapping[] refMappings = ((ReferenceMapping)m).getJavaTypeMapping();
+                    sourceTables = new DatastoreClass[refMappings.length];
+                    sourceMappings = new JavaTypeMapping[refMappings.length];
+                    for (int j=0;j<refMappings.length;j++)
+                    {
+                        sourceTables[j] = storeMgr.getDatastoreClass(refMappings[j].getType(), clr);
+                        sourceMappings[j] = sourceTables[j].getFieldMapping(fmd.getMappedBy());
+                    }
+                }
+                else
+                {
+                    // PC field
+                    sourceTables = new DatastoreClass[1];
+                    sourceMappings = new JavaTypeMapping[1];
+                    sourceTables[0] = storeMgr.getDatastoreClass(fmd.getTypeName(), clr);
+                    sourceMappings[0] = sourceTables[0].getFieldMapping(fmd.getMappedBy());
+                }
+
+                for (int j=0;j<sourceMappings.length;j++)
+                {
+                    // Do a LEFT OUTER JOIN for this sourceMapping back to the target id column(s)
+
+                    // TODO Move this hardcoded table name out into the calling class so it controls the names of all table aliases
+                    DatastoreIdentifier sourceTableIdentifier =
+                        storeMgr.getIdentifierFactory().newIdentifier(IdentifierType.TABLE,
+                            "SOURCECLASS" + fmd.getAbsoluteFieldNumber() + "_" + j);
+                    LogicSetExpression sourceTableExpr = qs.newTableExpression(sourceTables[j], sourceTableIdentifier, true)[0];
+
+                    // Left outer join from target ID to the mapped-by field on the source class
+                    ScalarExpression sourceExpr = sourceMappings[j].newScalarExpression(qs, sourceTableExpr);
+                    ScalarExpression targetExpr;
+                    if (tableIdentifier != null)
+                    {
+                        LogicSetExpression targetTableExpr;
+                        if (qs.getTableExpression(tableIdentifier) == null)
+                        {
+                            targetTableExpr = qs.newTableExpression(m.getDatastoreContainer(), tableIdentifier);
+                        }
+                        else
+                        {
+                            targetTableExpr = qs.getTableExpression(tableIdentifier);
+                        }
+                        targetExpr = m.getDatastoreContainer().getIDMapping().newScalarExpression(qs, targetTableExpr);
+                    }
+                    else
+                    {
+                        targetExpr = m.getDatastoreContainer().getIDMapping().newScalarExpression(qs, 
+                            qs.getMainTableExpression());
+                    }
+                    qs.leftOuterJoin(sourceExpr, targetExpr, sourceTableExpr, true, true);
+
+                    // Select the Id column(s) of the source class (via the Left Outer Join)
+                    int[] columnNumbersByField = qs.select(sourceTableIdentifier, sourceTables[j].getIDMapping(), true);
+
+                    // Copy these column numbers into our overall column numbers set
+                    if (sourceMappings.length == 1)
+                    {
+                        // We only have one source so just reference these
+                        colNums = columnNumbersByField;
+                    }
+                    else if (colNums != null)
+                    {
+                        // Append to the end of where we have got to
+                        int[] tmpColNums = colNums;
+                        colNums = new int[tmpColNums.length + columnNumbersByField.length];
+                        for (int k=0;k<tmpColNums.length;k++)
+                        {
+                            colNums[k] = tmpColNums[k];
+                        }
+                        for (int k=0;k<columnNumbersByField.length;k++)
+                        {
+                            colNums[tmpColNums.length+k] = columnNumbersByField[k];
+                        }
+                        tmpColNums = null;
+                    }
+                    else
+                    {
+                        // Add to the start of our column numbers
+                        colNums = new int[columnNumbersByField.length];
+                        for (int k=0;k<columnNumbersByField.length;k++)
+                        {
+                            colNums[k] = columnNumbersByField[k];
+                        }
+                    }
+                }
+
+                stmtMapping.setColumnPositions(colNums);
+            }
+            else if (relationType == Relation.MANY_TO_ONE_BI)
+            {
+                AbstractMemberMetaData[] relatedMmds = fmd.getRelatedMemberMetaData(clr);
+                // TODO Cater for more than 1 related field
+                if (fmd.getJoinMetaData() != null || relatedMmds[0].getJoinMetaData() != null)
+                {
+                    // 1-N bidirectional join table relation
+                    // Do a LEFT OUTER JOIN to the join table to pick up the value.
+                    MappedStoreManager storeMgr = qs.getStoreManager();
+                    DatastoreContainerObject joinTable = storeMgr.getDatastoreContainerObject(relatedMmds[0]);
+                    JavaTypeMapping referenceMapping = null;
+                    JavaTypeMapping selectMapping = null;
+
+                    DatastoreElementContainer collTable = (DatastoreElementContainer)joinTable;
+                    referenceMapping = collTable.getElementMapping();
+                    selectMapping = collTable.getOwnerMapping();
+
+                    DatastoreContainerObject mainTable = qs.getMainTableExpression().getMainTable();
+                    if (!mainTable.equals(joinTable))
+                    {
+                        // Statement selects the element table and the owner column should be selected
+                        // Join across to the join table, and select the owner mapping of the join table
+
+                        // TODO Move this hardcoded table name out into the calling class so it controls the names of all table aliases
+                        DatastoreIdentifier joinTableIdentifier =
+                            storeMgr.getIdentifierFactory().newIdentifier(IdentifierType.TABLE, 
+                                "JOINTABLE" + fmd.getAbsoluteFieldNumber());
+                        LogicSetExpression table_expr_sub = qs.newTableExpression(joinTable, joinTableIdentifier, true)[0];
+
+                        // Left outer join from our Id to the mapped-by field on the other class
+                        ScalarExpression subExpr = referenceMapping.newScalarExpression(qs, table_expr_sub);
+                        ScalarExpression schExpr = null;
+                        if (tableIdentifier != null)
+                        {
+                            LogicSetExpression targetTableExpr;
+                            if (qs.getTableExpression(tableIdentifier) == null)
+                            {
+                                targetTableExpr = qs.newTableExpression(m.getDatastoreContainer(), tableIdentifier);
+                            }
+                            else
+                            {
+                                targetTableExpr = qs.getTableExpression(tableIdentifier);
+                            }
+                            schExpr = m.getDatastoreContainer().getIDMapping().newScalarExpression(qs, targetTableExpr);
+                        }
+                        else
+                        {
+                            schExpr = m.getDatastoreContainer().getIDMapping().newScalarExpression(qs, qs.getMainTableExpression());
+                        }
+                        qs.leftOuterJoin(subExpr, schExpr, table_expr_sub, true, true);
+
+                        // Select the Id column(s) of the other class (via the Left Outer Join)
+                        int[] columnNumbersByField = qs.select(joinTableIdentifier, selectMapping, true);
+                        stmtMapping.setColumnPositions(columnNumbersByField);
+                    }
+                    else
+                    {
+                        // The statement selects the join table, and joins to the element, and the owner column should be selected
+                        // Select the owner mapping of the join table directly (no join needed)
+                        int[] columnNumbersByField = qs.select(selectMapping, true);
+                        stmtMapping.setColumnPositions(columnNumbersByField);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Get the indexes/position for Mapping columns in a given the initial 
+     * position. Used to set parameters in PreparedStatements
+     * @param initialPosition the initialPosition
+     * @param mapping the Mapping
+     * @return an array containing indexes for parameters
+     */
+    public static int[] getParametersIndex(int initialPosition, JavaTypeMapping mapping)
+    {
+        if (mapping.getNumberOfDatastoreFields() < 1)
+        {
+            return new int[]{initialPosition};
+        }
+
+        int parameter[] = new int[mapping.getNumberOfDatastoreFields()];
+        for (int i=0; i<parameter.length; i++)
+        {
+            parameter[i] = initialPosition+i;
+        }
+        return parameter;
+    }
+}
\ No newline at end of file

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/expression/StatementText.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/expression/StatementText.java	2009-01-01 11:42:40 UTC (rev 4480)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/expression/StatementText.java	2009-01-01 14:54:53 UTC (rev 4481)
@@ -28,7 +28,6 @@
 
 import org.datanucleus.ObjectManager;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
-import org.datanucleus.store.mapped.mapping.Mappings;
 
 /**
  * Representation of a snippet of an SQL statement.
@@ -191,7 +190,7 @@
                 JavaTypeMapping mapping = param.mapping;
                 Object value = param.value;
 
-                mapping.setObject(om, datastoreStatement, Mappings.getParametersIndex(num, mapping), value);
+                mapping.setObject(om, datastoreStatement, ExpressionHelper.getParametersIndex(num, mapping), value);
                 if (mapping.getNumberOfDatastoreFields() > 0)
                 {
                     num += mapping.getNumberOfDatastoreFields();

Deleted: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/Mappings.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/Mappings.java	2009-01-01 11:42:40 UTC (rev 4480)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/mapping/Mappings.java	2009-01-01 14:54:53 UTC (rev 4481)
@@ -1,317 +0,0 @@
-/**********************************************************************
-Copyright (c) 2003 Erik Bengtson and others. All rights reserved. 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
- 
-
-Contributors:
-2003 Andy Jefferson - coding standards
-2005 Andy Jefferson - added handling for left outer join of related fields when in fetch group
-2006 Andy Jefferson - added support for primary join table and select of owner object
-    ...
-**********************************************************************/
-package org.datanucleus.store.mapped.mapping;
-
-import org.datanucleus.ClassLoaderResolver;
-import org.datanucleus.metadata.AbstractMemberMetaData;
-import org.datanucleus.metadata.Relation;
-import org.datanucleus.store.mapped.DatastoreClass;
-import org.datanucleus.store.mapped.DatastoreContainerObject;
-import org.datanucleus.store.mapped.DatastoreElementContainer;
-import org.datanucleus.store.mapped.DatastoreIdentifier;
-import org.datanucleus.store.mapped.IdentifierType;
-import org.datanucleus.store.mapped.MappedStoreManager;
-import org.datanucleus.store.mapped.StatementMappingIndex;
-import org.datanucleus.store.mapped.expression.LogicSetExpression;
-import org.datanucleus.store.mapped.expression.QueryExpression;
-import org.datanucleus.store.mapped.expression.ScalarExpression;
-
-/**
- * Helper class for doing many tasks with mapping.
- */
-public class Mappings
-{
-    /**
-     * Add columns to a query. Columns added to the query are obtained from the
-     * mappings included in the statementExpressionIndex passed as parameter.
-     * After adding columns to the query, statementExpressionIndex is updated
-     * with the index/position of the columns in the query.
-     * @param qs the Query Statement
-     * @param statementExpressionIndex the list of mapping/column indexes to be
-     *                                 included in the query
-     */
-    public static void selectMapping(QueryExpression qs,
-                                     StatementMappingIndex[] statementExpressionIndex)
-    {
-        selectMapping(qs, null, statementExpressionIndex);
-    }
-
-    /**
-     * Add columns to a query. Columns added to the query are obtained from the
-     * mappings included in the statementExpressionIndex passed as parameter.
-     * After adding columns to the query, statementExpressionIndex is updated
-     * with the index/position of the columns in the query.
-     * @param qs the Query Statement
-     * @param tableIdentifier the Identifier for the table which the columns are from (may be null, if TODO)
-     * @param statementExpressionIndex the list of mapping/column indexes to be
-     *                                 included in the query
-     */
-    public static void selectMapping(QueryExpression qs,
-                                     DatastoreIdentifier tableIdentifier,
-                                     StatementMappingIndex[] statementExpressionIndex)
-    {
-        if (statementExpressionIndex == null)
-        {
-            return;
-        }
-        for (int i = 0; i < statementExpressionIndex.length; ++i)
-        {
-            if (statementExpressionIndex[i] != null)
-            {
-                JavaTypeMapping m = statementExpressionIndex[i].getMapping();
-                if (m != null)
-                {
-                    if (m.getNumberOfDatastoreFields() > 0)
-                    {
-                        int[] columnNumbersByField = (tableIdentifier != null) ? qs.select(tableIdentifier, m, true) : qs.select(m, true);
-                        statementExpressionIndex[i].setColumnPositions(columnNumbersByField);
-                    }
-                    else
-                    {
-                        setStatementExpressionForFieldWithNoDatastoreColumns(qs, tableIdentifier, m, statementExpressionIndex[i]);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Convenience method that sets the StatementExpressionIndex for a mapping that has no datastore mappings
-     * @param qs The QueryStatement
-     * @param tableIdentifier the Identifier for the table which the columns are from (may be null, if TODO)
-     * @param m The mapping
-     * @param statementExpressionIndex The StatementExpressionIndex to update
-     */
-    private static void setStatementExpressionForFieldWithNoDatastoreColumns(QueryExpression qs,
-                                                                             DatastoreIdentifier tableIdentifier,
-                                                                             JavaTypeMapping m, 
-                                                                             StatementMappingIndex statementExpressionIndex)
-    {
-        AbstractMemberMetaData fmd = m.getFieldMetaData();
-        ClassLoaderResolver clr = qs.getClassLoaderResolver();
-        int relationType = fmd.getRelationType(clr);
-        if (relationType == Relation.ONE_TO_ONE_BI)
-        {
-            if (fmd.getMappedBy() != null)
-            {
-                // "mapped-by" at this side
-                // 1-1 bidirectional single FK relation, with FK in source table.
-                // This field is not stored, but instead a foreign is set in the source table which stores a reference to this (target table).
-                // A FK is set in the source table refering to the target table.
-                // Do a LEFT OUTER JOIN to the related (source) table(s) to pick up the identifier value of this.
-                /*
-                 * For example :-
-                 * TABLE A (TARGET)               TABLE B (SOURCE)
-                 * ID                             ID  A_ID (FK)
-                 * --                             --  ----
-                 * 18                             21  18
-                 * 
-                 * Class A                        Class B
-                 * {                              {
-                 *    B b;                            A a;
-                 * }                              }
-                 */
-
-                int[] colNums = null;
-                MappedStoreManager storeMgr = qs.getStoreManager();
-                JavaTypeMapping[] sourceMappings = null;
-                DatastoreClass[] sourceTables = null;
-                if (m instanceof ReferenceMapping)
-                {
-                    // Reference field (with "n" implementations)
-                    JavaTypeMapping[] refMappings = ((ReferenceMapping)m).getJavaTypeMapping();
-                    sourceTables = new DatastoreClass[refMappings.length];
-                    sourceMappings = new JavaTypeMapping[refMappings.length];
-                    for (int i=0;i<refMappings.length;i++)
-                    {
-                        sourceTables[i] = storeMgr.getDatastoreClass(refMappings[i].type, qs.getClassLoaderResolver());
-                        sourceMappings[i] = sourceTables[i].getFieldMapping(fmd.getMappedBy());
-                    }
-                }
-                else
-                {
-                    // PC field
-                    sourceTables = new DatastoreClass[1];
-                    sourceMappings = new JavaTypeMapping[1];
-                    sourceTables[0] = storeMgr.getDatastoreClass(fmd.getTypeName(), qs.getClassLoaderResolver());
-                    sourceMappings[0] = sourceTables[0].getFieldMapping(fmd.getMappedBy());
-                }
-
-                for (int i=0;i<sourceMappings.length;i++)
-                {
-                    // Do a LEFT OUTER JOIN for this sourceMapping back to the target id column(s)
-
-                    // TODO Move this hardcoded table name out into the calling class so it controls the names of all table aliases
-                    DatastoreIdentifier sourceTableIdentifier =
-                        storeMgr.getIdentifierFactory().newIdentifier(IdentifierType.TABLE,
-                            "SOURCECLASS" + fmd.getAbsoluteFieldNumber() + "_" + i);
-                    LogicSetExpression sourceTableExpr = qs.newTableExpression(sourceTables[i], sourceTableIdentifier, true)[0];
-
-                    // Left outer join from target ID to the mapped-by field on the source class
-                    ScalarExpression sourceExpr = sourceMappings[i].newScalarExpression(qs, sourceTableExpr);
-                    ScalarExpression targetExpr;
-                    if (tableIdentifier != null)
-                    {
-                        LogicSetExpression targetTableExpr;
-                        if (qs.getTableExpression(tableIdentifier) == null)
-                        {
-                            targetTableExpr = qs.newTableExpression(m.getDatastoreContainer(), tableIdentifier);
-                        }
-                        else
-                        {
-                            targetTableExpr = qs.getTableExpression(tableIdentifier);
-                        }
-                        targetExpr = m.getDatastoreContainer().getIDMapping().newScalarExpression(qs, targetTableExpr);
-                    }
-                    else
-                    {
-                        targetExpr = m.getDatastoreContainer().getIDMapping().newScalarExpression(qs, 
-                            qs.getMainTableExpression());
-                    }
-                    qs.leftOuterJoin(sourceExpr, targetExpr, sourceTableExpr, true, true);
-
-                    // Select the Id column(s) of the source class (via the Left Outer Join)
-                    int[] columnNumbersByField = qs.select(sourceTableIdentifier, sourceTables[i].getIDMapping(), true);
-
-                    // Copy these column numbers into our overall column numbers set
-                    if (sourceMappings.length == 1)
-                    {
-                        // We only have one source so just reference these
-                        colNums = columnNumbersByField;
-                    }
-                    else if (colNums != null)
-                    {
-                        // Append to the end of where we have got to
-                        int[] tmpColNums = colNums;
-                        colNums = new int[tmpColNums.length + columnNumbersByField.length];
-                        for (int j=0;j<tmpColNums.length;j++)
-                        {
-                            colNums[j] = tmpColNums[j];
-                        }
-                        for (int j=0;j<columnNumbersByField.length;j++)
-                        {
-                            colNums[tmpColNums.length+j] = columnNumbersByField[j];
-                        }
-                        tmpColNums = null;
-                    }
-                    else
-                    {
-                        // Add to the start of our column numbers
-                        colNums = new int[columnNumbersByField.length];
-                        for (int j=0;j<columnNumbersByField.length;j++)
-                        {
-                            colNums[j] = columnNumbersByField[j];
-                        }
-                    }
-                }
-
-                statementExpressionIndex.setColumnPositions(colNums);
-            }
-        }
-        else if (relationType == Relation.MANY_TO_ONE_BI)
-        {
-            AbstractMemberMetaData[] relatedMmds = fmd.getRelatedMemberMetaData(clr);
-            // TODO Cater for more than 1 related field
-            if (fmd.getJoinMetaData() != null || relatedMmds[0].getJoinMetaData() != null)
-            {
-                // 1-N bidirectional join table relation.
-                // Do a LEFT OUTER JOIN to the join table to pick up the value.
-                MappedStoreManager storeMgr = qs.getStoreManager();
-                DatastoreContainerObject joinTable = storeMgr.getDatastoreContainerObject(relatedMmds[0]);
-                JavaTypeMapping referenceMapping = null;
-                JavaTypeMapping selectMapping = null;
-
-                DatastoreElementContainer collTable = (DatastoreElementContainer)joinTable;
-                referenceMapping = collTable.getElementMapping();
-                selectMapping = collTable.getOwnerMapping();
-
-                DatastoreContainerObject mainTable = qs.getMainTableExpression().getMainTable();
-                if (!mainTable.equals(joinTable))
-                {
-                    // Statement selects the element table and the owner column should be selected
-                    // Join across to the join table, and select the owner mapping of the join table
-
-                    // TODO Move this hardcoded table name out into the calling class so it controls the names of all table aliases
-                    DatastoreIdentifier joinTableIdentifier =
-                        storeMgr.getIdentifierFactory().newIdentifier(IdentifierType.TABLE, 
-                            "JOINTABLE" + fmd.getAbsoluteFieldNumber());
-                    LogicSetExpression table_expr_sub = qs.newTableExpression(joinTable, joinTableIdentifier, true)[0];
-
-                    // Left outer join from our Id to the mapped-by field on the other class
-                    ScalarExpression subExpr = referenceMapping.newScalarExpression(qs, table_expr_sub);
-                    ScalarExpression schExpr = null;
-                    if (tableIdentifier != null)
-                    {
-                        LogicSetExpression targetTableExpr;
-                        if (qs.getTableExpression(tableIdentifier) == null)
-                        {
-                            targetTableExpr = qs.newTableExpression(m.getDatastoreContainer(), tableIdentifier);
-                        }
-                        else
-                        {
-                            targetTableExpr = qs.getTableExpression(tableIdentifier);
-                        }
-                        schExpr = m.getDatastoreContainer().getIDMapping().newScalarExpression(qs, targetTableExpr);
-                    }
-                    else
-                    {
-                        schExpr = m.getDatastoreContainer().getIDMapping().newScalarExpression(qs, qs.getMainTableExpression());
-                    }
-                    qs.leftOuterJoin(subExpr, schExpr, table_expr_sub, true, true);
-
-                    // Select the Id column(s) of the other class (via the Left Outer Join)
-                    int[] columnNumbersByField = qs.select(joinTableIdentifier, selectMapping, true);
-                    statementExpressionIndex.setColumnPositions(columnNumbersByField);
-                }
-                else
-                {
-                    // The statement selects the join table, and joins to the element, and the owner column should be selected
-                    // Select the owner mapping of the join table directly (no join needed)
-                    int[] columnNumbersByField = qs.select(selectMapping, true);
-                    statementExpressionIndex.setColumnPositions(columnNumbersByField);
-                }
-            }
-        }
-    }
-
-    /**
-     * Get the indexes/position for Mapping columns in a given the initial 
-     * position. Used to set parameters in PreparedStatements
-     * @param initialPosition the initialPosition
-     * @param mapping the Mapping
-     * @return an array containing indexes for parameters
-     **/
-    public static int[] getParametersIndex(int initialPosition, JavaTypeMapping mapping)
-    {
-        if (mapping.getNumberOfDatastoreFields() < 1)
-        {
-            return new int[]{initialPosition};
-        }
-
-        int parameter[] = new int[mapping.getNumberOfDatastoreFields()];
-        for (int i=0; i<parameter.length; i++)
-        {
-            parameter[i] = initialPosition+i;
-        }
-        return parameter;
-    }
-}
\ No newline at end of file

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStore.java	2009-01-01 11:42:40 UTC (rev 4480)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStore.java	2009-01-01 14:54:53 UTC (rev 4481)
@@ -44,10 +44,10 @@
 import org.datanucleus.store.mapped.IdentifierType;
 import org.datanucleus.store.mapped.StatementMappingForClass;
 import org.datanucleus.store.mapped.StatementMappingIndex;
+import org.datanucleus.store.mapped.expression.ExpressionHelper;
 import org.datanucleus.store.mapped.expression.QueryExpression;
 import org.datanucleus.store.mapped.mapping.AbstractContainerMapping;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
-import org.datanucleus.store.mapped.mapping.Mappings;
 import org.datanucleus.store.mapped.mapping.ReferenceMapping;
 import org.datanucleus.store.query.ResultObjectFactory;
 import org.datanucleus.util.ClassUtils;
@@ -564,6 +564,9 @@
                     {
                         // Field is not a container, and is to be fetched (eliminates fields as FKs in other class)
                         stmtMappings[prefetchFieldNumbers[i]] = new StatementMappingIndex(m);
+                        ExpressionHelper.selectMapping(stmtMappings[prefetchFieldNumbers[i]], stmt,
+                            stmt.getTableExpression(elmIdentifier) != null ? elmIdentifier : null, clr);
+
                         fn[prefetchFieldCount++] = prefetchFieldNumbers[i];
                     }
                 }
@@ -571,14 +574,6 @@
 
             int[] fieldNumbers = new int[prefetchFieldCount];
             System.arraycopy(fn, 0, fieldNumbers, 0, prefetchFieldCount);
-            if (stmt.getTableExpression(elmIdentifier) != null)
-            {
-                Mappings.selectMapping(stmt, elmIdentifier, stmtMappings);
-            }
-            else
-            {
-                Mappings.selectMapping(stmt, stmtMappings);
-            }
 
             StatementMappingForClass mappingDefinition = new StatementMappingForClass(null);
             for (int i=0;i<fieldNumbers.length;i++)

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassTableExtent.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassTableExtent.java	2009-01-01 11:42:40 UTC (rev 4480)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassTableExtent.java	2009-01-01 14:54:53 UTC (rev 4481)
@@ -41,11 +41,11 @@
 import org.datanucleus.store.mapped.MappedStoreManager;
 import org.datanucleus.store.mapped.StatementMappingForClass;
 import org.datanucleus.store.mapped.StatementMappingIndex;
+import org.datanucleus.store.mapped.expression.ExpressionHelper;
 import org.datanucleus.store.mapped.expression.QueryExpression;
 import org.datanucleus.store.mapped.expression.Queryable;
 import org.datanucleus.store.mapped.mapping.AbstractContainerMapping;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
-import org.datanucleus.store.mapped.mapping.Mappings;
 import org.datanucleus.store.query.ResultObjectFactory;
 import org.datanucleus.store.rdbms.RDBMSManager;
 import org.datanucleus.store.rdbms.query.RDBMSDiscriminatorIteratorStatement;
@@ -269,19 +269,20 @@
             // TODO When we have all possible candidates in single table and using discriminator
             // we should really select all fields here to save doing the retrieve of the other fields later.
             // Currently we only retrieve the fetch-plan/DFG fields for the base candidate class
-
+            ClassLoaderResolver clr = stmt.getClassLoaderResolver();
+            AbstractClassMetaData cmd = 
+                storeMgr.getOMFContext().getMetaDataManager().getMetaDataForClass(getCandidateClass(), clr);
             if (useFetchPlan)
             {
                 // Select all fields in the FetchPlan
                 // TODO This only utilises the first table. What if we have multiple ?
-                AbstractClassMetaData cmd = storeMgr.getOMFContext().getMetaDataManager().getMetaDataForClass(getCandidateClass(), stmt.getClassLoaderResolver());
                 getFetchPlan().manageFetchPlanForClass(cmd);
                 FetchPlanForClass fpc = getFetchPlan().getFetchPlanForClass(cmd);
                 int fieldNumbers[] = fpc.getFieldsInActualFetchPlan();
                 int prefetchFieldCount = 0;
                 int fieldCount = cmd.getNoOfInheritedManagedMembers() + cmd.getNoOfManagedMembers();
-                
                 int fn[] = new int[fieldNumbers.length];
+
                 stmtMappings = new StatementMappingIndex[fieldCount];
                 for (int i = 0; i < fieldNumbers.length; ++i)
                 {
@@ -292,28 +293,19 @@
                         if (m.includeInFetchStatement() && !(m instanceof AbstractContainerMapping))
                         {
                             stmtMappings[fieldNumbers[i]] = new StatementMappingIndex(m);
+                            ExpressionHelper.selectMapping(stmtMappings[fieldNumbers[i]], stmt, 
+                                stmt.getTableExpression(elmIdentifier) != null ? elmIdentifier : null, clr);
                             fn[prefetchFieldCount++] = fieldNumbers[i];
                         }
                     }
                 }
-                
+
                 prefetchFieldNumbers = new int[prefetchFieldCount];
                 System.arraycopy(fn, 0, prefetchFieldNumbers, 0, prefetchFieldCount);
-                
-                // select the fetch-plan fields to be fetched from the database
-                if (stmt.getTableExpression(elmIdentifier) != null)
-                {
-                    Mappings.selectMapping(stmt, elmIdentifier, stmtMappings);
-                }
-                else
-                {
-                    Mappings.selectMapping(stmt, stmtMappings);
-                }
             }
             else
             {
                 // if no fetchplan is used and is application identity, select only PK fields
-                AbstractClassMetaData cmd = storeMgr.getOMFContext().getMetaDataManager().getMetaDataForClass(getCandidateClass(),stmt.getClassLoaderResolver());
                 if (cmd.getIdentityType() == IdentityType.APPLICATION)
                 {
                     prefetchFieldNumbers = new int[cmd.getPKMemberPositions().length];
@@ -328,18 +320,11 @@
                             if (m.includeInFetchStatement() && !(m instanceof AbstractContainerMapping))
                             {
                                 stmtMappings[prefetchFieldNumbers[i]] = new StatementMappingIndex(m);
+                                ExpressionHelper.selectMapping(stmtMappings[prefetchFieldNumbers[i]], stmt,
+                                    stmt.getTableExpression(elmIdentifier) != null ? elmIdentifier : null, clr);
                             }
                         }
                     }
-                    // following the actual fetch plan, we select the fields to be fetched from the database
-                    if (stmt.getTableExpression(elmIdentifier) != null)
-                    {
-                        Mappings.selectMapping(stmt, elmIdentifier, stmtMappings);
-                    }
-                    else
-                    {
-                        Mappings.selectMapping(stmt, stmtMappings);
-                    }
                 }
             }
         }

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassViewExtent.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassViewExtent.java	2009-01-01 11:42:40 UTC (rev 4480)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/extent/ClassViewExtent.java	2009-01-01 14:54:53 UTC (rev 4481)
@@ -20,6 +20,7 @@
 **********************************************************************/
 package org.datanucleus.store.rdbms.extent;
 
+import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.ObjectManager;
 import org.datanucleus.exceptions.NucleusException;
 import org.datanucleus.exceptions.NucleusUserException;
@@ -29,11 +30,11 @@
 import org.datanucleus.store.mapped.MappedStoreManager;
 import org.datanucleus.store.mapped.StatementMappingIndex;
 import org.datanucleus.store.mapped.query.IncompatibleQueryElementTypeException;
+import org.datanucleus.store.mapped.expression.ExpressionHelper;
 import org.datanucleus.store.mapped.expression.QueryExpression;
 import org.datanucleus.store.mapped.expression.Queryable;
 import org.datanucleus.store.mapped.mapping.AbstractContainerMapping;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
-import org.datanucleus.store.mapped.mapping.Mappings;
 import org.datanucleus.store.query.ResultObjectFactory;
 import org.datanucleus.store.rdbms.RDBMSManager;
 import org.datanucleus.store.rdbms.query.TransientIDROF;
@@ -139,7 +140,11 @@
     public ResultObjectFactory newResultObjectFactory(QueryExpression stmt, boolean ignoreCache, 
             Class resultClass, boolean useFetchPlan)
     {
-        Mappings.selectMapping(stmt,stmtMappings);
+        ClassLoaderResolver clr = stmt.getClassLoaderResolver();
+        for (int i = 0; i < stmtMappings.length; ++i)
+        {
+            ExpressionHelper.selectMapping(stmtMappings[i], stmt, null, clr);
+        }
 
         return new TransientIDROF(getCandidateClass(), prefetchFieldNumbers, stmtMappings);
     }

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleBlobRDBMSMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleBlobRDBMSMapping.java	2009-01-01 11:42:40 UTC (rev 4480)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleBlobRDBMSMapping.java	2009-01-01 14:54:53 UTC (rev 4481)
@@ -44,9 +44,9 @@
 import org.datanucleus.store.mapped.DatastoreField;
 import org.datanucleus.store.mapped.FetchStatement;
 import org.datanucleus.store.mapped.MappedStoreManager;
+import org.datanucleus.store.mapped.expression.ExpressionHelper;
 import org.datanucleus.store.mapped.mapping.DatastoreMapping;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
-import org.datanucleus.store.mapped.mapping.Mappings;
 import org.datanucleus.store.rdbms.RDBMSFetchStatement;
 import org.datanucleus.store.rdbms.RDBMSManager;
 import org.datanucleus.store.rdbms.SQLController;
@@ -342,7 +342,7 @@
                 try
                 {
                     Object pcObject = sm.getObject();
-                    idMapping.setObject(om, ps, Mappings.getParametersIndex(1, idMapping), pcObject);
+                    idMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(1, idMapping), pcObject);
 
                     ResultSet rs = sqlControl.executeStatementQuery(mconn, textStmt, ps);
 

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleClobRDBMSMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleClobRDBMSMapping.java	2009-01-01 11:42:40 UTC (rev 4480)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleClobRDBMSMapping.java	2009-01-01 14:54:53 UTC (rev 4481)
@@ -37,9 +37,9 @@
 import org.datanucleus.store.mapped.FetchStatement;
 import org.datanucleus.store.mapped.MappedStoreManager;
 import org.datanucleus.store.mapped.exceptions.DatastoreFieldDefinitionException;
+import org.datanucleus.store.mapped.expression.ExpressionHelper;
 import org.datanucleus.store.mapped.mapping.DatastoreMapping;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
-import org.datanucleus.store.mapped.mapping.Mappings;
 import org.datanucleus.store.rdbms.RDBMSFetchStatement;
 import org.datanucleus.store.rdbms.RDBMSManager;
 import org.datanucleus.store.rdbms.SQLController;
@@ -232,7 +232,7 @@
                 try
                 {
                     Object pcObject = sm.getObject();
-                    idMapping.setObject(om, ps, Mappings.getParametersIndex(1, idMapping), pcObject);
+                    idMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(1, idMapping), pcObject);
 
                     ResultSet rs = sqlControl.executeStatementQuery(mconn, textStmt, ps);
                     try

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query2/JDOQLQuery2.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query2/JDOQLQuery2.java	2009-01-01 11:42:40 UTC (rev 4480)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query2/JDOQLQuery2.java	2009-01-01 14:54:53 UTC (rev 4481)
@@ -18,28 +18,40 @@
 package org.datanucleus.store.rdbms.query2;
 
 import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
 import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.ManagedConnection;
 import org.datanucleus.ObjectManager;
+import org.datanucleus.FetchPlan.FetchPlanForClass;
 import org.datanucleus.exceptions.NucleusException;
+import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.query.compiler.QueryCompilation;
 import org.datanucleus.query.evaluator.JDOQLEvaluator;
 import org.datanucleus.query.evaluator.JavaQueryEvaluator;
 import org.datanucleus.store.mapped.DatastoreClass;
+import org.datanucleus.store.mapped.StatementMappingForClass;
+import org.datanucleus.store.mapped.StatementMappingIndex;
+import org.datanucleus.store.mapped.mapping.AbstractContainerMapping;
+import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
 import org.datanucleus.store.query.AbstractJDOQLQuery;
 import org.datanucleus.store.query.Query;
+import org.datanucleus.store.query.ResultObjectFactory;
 import org.datanucleus.store.rdbms.RDBMSManager;
 import org.datanucleus.store.rdbms.SQLController;
 import org.datanucleus.store.rdbms.query.RDBMSQueryUtils;
+import org.datanucleus.store.rdbms.sql.DiscriminatorStatementGenerator;
 import org.datanucleus.store.rdbms.sql.SQLStatement;
 import org.datanucleus.store.rdbms.sql.SQLText;
+import org.datanucleus.store.rdbms.sql.StatementGenerator;
+import org.datanucleus.store.rdbms.sql.UnionStatementGenerator;
 import org.datanucleus.util.NucleusLogger;
 
 /**
@@ -88,13 +100,7 @@
             return Collections.EMPTY_LIST;
         }
 
-        boolean inMemory = false;
-        String queryInMemoryStr = (String)getExtension("datanucleus.query.evaluateInMemory");
-        if (queryInMemoryStr != null && queryInMemoryStr.equalsIgnoreCase("true"))
-        {
-            inMemory = true;
-        }
-
+        boolean inMemory = evaluateInMemory();
         ManagedConnection mconn = om.getStoreManager().getConnection(om);
         try
         {
@@ -105,22 +111,37 @@
                 NucleusLogger.QUERY.debug(LOCALISER.msg("021046", "JDOQL", getSingleStringQuery(), null));
             }
             List candidates = null;
-            boolean filterInMemory = false;
-            boolean orderingInMemory = false;
 
-            if (candidateCollection == null)
+            RDBMSManager storeMgr = (RDBMSManager)getStoreManager();
+            DatastoreClass candidateTable = storeMgr.getDatastoreClass(candidateClass.getName(), clr);
+            AbstractClassMetaData acmd = getObjectManager().getMetaDataManager().getMetaDataForClass(candidateClass, clr);
+            if (candidateCollection != null)
             {
+                candidates = new ArrayList(candidateCollection);
+            }
+            else if (candidateExtent != null)
+            {
+                // TODO Allow lazy resolution of the candidates rather than direct copying
+                candidates = new ArrayList();
+                Iterator iter = candidateExtent.iterator();
+                while (iter.hasNext())
+                {
+                    candidates.add(iter.next());
+                }
+            }
+            else
+            {
                 if (inMemory)
                 {
                     // TODO Retrieve all possible candidates
                     candidates = new ArrayList();
-                    filterInMemory = true;
-                    orderingInMemory = true;
                 }
                 else
                 {
                     // Create the native query for this compiled query
-                    SQLStatement stmt = getNativeQueryForCompiledQuery(compilation, parameters);
+                    StatementMappingForClass mappingDefinition = new StatementMappingForClass(null);
+                    SQLStatement stmt = getNativeQueryForCompiledQuery(compilation, parameters, false,
+                        mappingDefinition, candidateTable, acmd);
                     boolean useUpdateLock = RDBMSQueryUtils.useUpdateLockForQuery(this);
                     stmt.addExtension("lock-for-update", new Boolean(useUpdateLock));
                     SQLText sqlText = null;
@@ -137,12 +158,14 @@
                         // TODO Distinguish between update and delete
                         throw new NucleusException("DataNucleus doesnt currently support bulk delete statements");
                     }
+
+                    // TODO Set up mapping definition for results processing of query
                     NucleusLogger.QUERY.debug(">> statement=" + sqlText.toSQL(0));
 
                     try
                     {
-                        SQLController sqlControl = ((RDBMSManager)getStoreManager()).getSQLController();
-                        PreparedStatement ps = 
+                        SQLController sqlControl = storeMgr.getSQLController();
+                        PreparedStatement ps =
                             RDBMSQueryUtils.getPreparedStatementForQuery(mconn, sqlText.toSQL(0), this);
                         try
                         {
@@ -152,8 +175,12 @@
                             if (type == Query.SELECT)
                             {
                                 // SELECT query
-                                /*ResultSet rs = */
+                                ResultSet rs =
                                     sqlControl.executeStatementQuery(mconn, sqlText.toString(), ps);
+                                ResultObjectFactory rof =
+                                    storeMgr.newResultObjectFactory(candidateTable, acmd, mappingDefinition, 
+                                        useUpdateLock, false, false, getFetchPlan(), candidateClass);
+                            //    rof.getObject(om, rs);
                                 // TODO Process this and return it. Make sure all objects have StateManagers
                             }
                         }
@@ -168,20 +195,15 @@
                     }
                 }
             }
-            else
-            {
-                candidates = new ArrayList(candidateCollection);
-                filterInMemory = true;
-                orderingInMemory = true;
-            }
 
             // Apply any restrictions to the results (that we can't use in the native query)
             JavaQueryEvaluator resultMapper = new JDOQLEvaluator(this, candidates, compilation, clr);
-            Collection results = resultMapper.execute(filterInMemory, orderingInMemory, true, true, true);
+            Collection results = resultMapper.execute(inMemory, inMemory, inMemory, inMemory, inMemory);
 
             if (NucleusLogger.QUERY.isDebugEnabled())
             {
-                NucleusLogger.QUERY.debug(LOCALISER.msg("021074", "JDOQL", "" + (System.currentTimeMillis() - startTime)));
+                NucleusLogger.QUERY.debug(LOCALISER.msg("021074", "JDOQL", 
+                    "" + (System.currentTimeMillis() - startTime)));
             }
 
             return results;
@@ -196,36 +218,81 @@
      * Method to return a (native) query statement for the compiled query.
      * @param compilation Compiled query
      * @param parameters Input parameters
+     * @param mappingDefinition Mappings for the processing the results (populated during this call)
      * @return The native (SQL) query statement for this RDBMS datastore
-     * TODO Change this to not use QueryStatement
      */
-    private SQLStatement getNativeQueryForCompiledQuery(QueryCompilation compilation, Map parameters)
+    private SQLStatement getNativeQueryForCompiledQuery(QueryCompilation compilation, Map parameters,
+            boolean inMemory, StatementMappingForClass mappingDefinition, DatastoreClass candidateTable,
+            AbstractClassMetaData candidateCmd)
     {
         SQLStatement stmt = null;
 
         RDBMSManager storeMgr = (RDBMSManager)getStoreManager();
-        ClassLoaderResolver clr = getObjectManager().getClassLoaderResolver();
         if (candidateCollection != null)
         {
-            // TODO Create QueryStatement and restrict to just the candidate instances
+            // TODO Create SQLStatement and restrict to just the candidate instances
         }
         else
         {
             // TODO Make use of Extent to create QueryStatement
-            DatastoreClass candidateTable = storeMgr.getDatastoreClass(candidateClass.getName(), clr);
-            stmt = new SQLStatement(storeMgr, candidateTable, null);
-
-            if (result != null)
+            StatementGenerator stmtGen = null;
+            if (candidateTable.getDiscriminatorMapping(false) != null)
             {
-                // Select result column(s)
+                stmtGen = new DiscriminatorStatementGenerator(storeMgr, candidateClass, subclasses, null);
             }
             else
             {
-                // Select identity field(s) for candidate
+                stmtGen = new UnionStatementGenerator(storeMgr, candidateClass, subclasses, null);
             }
+            stmt = stmtGen.getStatement();
         }
 
-        // TODO Process the filter, ordering, result, etc and apply to the QueryStatement
+        // Select any fields required
+        if (inMemory)
+        {
+            // Select fetchplan fields
+            // TODO Support not using the fetch plan fields
+            getFetchPlan().manageFetchPlanForClass(candidateCmd);
+            FetchPlanForClass fpc = getFetchPlan().getFetchPlanForClass(candidateCmd);
+            int fieldNumbers[] = fpc.getFieldsInActualFetchPlan();
+            int fieldCount = candidateCmd.getNoOfInheritedManagedMembers() + candidateCmd.getNoOfManagedMembers();
+            for (int i=0;i<fieldCount;i++)
+            {
+                JavaTypeMapping m = candidateTable.getFieldMapping(
+                    candidateCmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumbers[i]));
+                if (m != null)
+                {
+                    // omit fields not stored in the table, e.g. List, Set, etc or transactional
+                    if (m.includeInFetchStatement() && !(m instanceof AbstractContainerMapping))
+                    {
+                        StatementMappingIndex stmtMapping = new StatementMappingIndex(m);
+                        if (m.getNumberOfDatastoreFields() > 0)
+                        {
+                            // Select of fields with columns in this table
+                            if (m.getDatastoreContainer() == stmt.getPrimaryTable().getTable())
+                            {
+                                int[] columnNumbersByField = stmt.select(stmt.getPrimaryTable(), m, null);
+                                stmtMapping.setColumnPositions(columnNumbersByField);
+                            }
+                            else
+                            {
+                                // Handle the field being in a superclass table
+                            }
+                        }
+                        else
+                        {
+                            // Select of related objects with FK in other table
+                        }
+                        mappingDefinition.addMappingForMember(fieldNumbers[i], stmtMapping);
+                    }
+                }
+            }
+        }
+        else
+        {
+            // TODO Process the filter, ordering, result, etc and apply to the SQLStatement
+            // Make use of QueryToSQLMapper
+        }
 
         return stmt;
     }

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query2/QueryToSQLMapper.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query2/QueryToSQLMapper.java	2009-01-01 11:42:40 UTC (rev 4480)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query2/QueryToSQLMapper.java	2009-01-01 14:54:53 UTC (rev 4481)
@@ -28,7 +28,7 @@
 
 /**
  * Class which maps a compiled query to an SQL query.
- * Will form part of DataNucleus Access Platform 1.1.
+ * Will form part of DataNucleus AccessPlatform 1.1 and later.
  */
 public class QueryToSQLMapper extends AbstractExpressionEvaluator
 {

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/DeleteRequest.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/DeleteRequest.java	2009-01-01 11:42:40 UTC (rev 4480)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/DeleteRequest.java	2009-01-01 14:54:53 UTC (rev 4481)
@@ -45,10 +45,10 @@
 import org.datanucleus.store.mapped.DatastoreClass;
 import org.datanucleus.store.mapped.DatastoreField;
 import org.datanucleus.store.mapped.StatementMappingIndex;
+import org.datanucleus.store.mapped.expression.ExpressionHelper;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
 import org.datanucleus.store.mapped.mapping.MappingCallbacks;
 import org.datanucleus.store.mapped.mapping.MappingConsumer;
-import org.datanucleus.store.mapped.mapping.Mappings;
 import org.datanucleus.store.mapped.mapping.PersistenceCapableMapping;
 import org.datanucleus.store.mapped.mapping.ReferenceMapping;
 import org.datanucleus.store.rdbms.RDBMSManager;
@@ -341,7 +341,7 @@
                         try
                         {
                             ps = sqlControl.getStatementForUpdate(mconn, clearLinkStmt.toString(), false);
-                            refMapping.setObject(om, ps, Mappings.getParametersIndex(1, refMapping), sm.getObject());
+                            refMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(1, refMapping), sm.getObject());
 
                             sqlControl.executeStatementUpdate(mconn, clearLinkStmt.toString(), ps, true);
                         }

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java	2009-01-01 11:42:40 UTC (rev 4480)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java	2009-01-01 14:54:53 UTC (rev 4481)
@@ -50,6 +50,7 @@
 import org.datanucleus.store.mapped.MappedStoreManager;
 import org.datanucleus.store.mapped.StatementMappingForClass;
 import org.datanucleus.store.mapped.StatementMappingIndex;
+import org.datanucleus.store.mapped.expression.ExpressionHelper;
 import org.datanucleus.store.mapped.expression.LogicSetExpression;
 import org.datanucleus.store.mapped.expression.MapStoreQueryable;
 import org.datanucleus.store.mapped.expression.QueryExpression;
@@ -59,7 +60,6 @@
 import org.datanucleus.store.mapped.mapping.EmbeddedKeyPCMapping;
 import org.datanucleus.store.mapped.mapping.EmbeddedValuePCMapping;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
-import org.datanucleus.store.mapped.mapping.Mappings;
 import org.datanucleus.store.mapped.mapping.ReferenceMapping;
 import org.datanucleus.store.mapped.mapping.SerialisedPCMapping;
 import org.datanucleus.store.mapped.mapping.SerialisedReferenceMapping;
@@ -643,7 +643,7 @@
             // Dont try to insert any mappings with insert parameter that isnt ? (e.g Oracle)
             return jdbcPosition;
         }
-        keyMapping.setObject(om, ps, Mappings.getParametersIndex(jdbcPosition, keyMapping), key);
+        keyMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(jdbcPosition, keyMapping), key);
         return jdbcPosition + keyMapping.getNumberOfDatastoreFields();
     }
 
@@ -663,7 +663,7 @@
             // Don't try to insert any mappings with insert parameter that isn't ? (e.g Oracle)
             return jdbcPosition;
         }
-        valueMapping.setObject(om, ps, Mappings.getParametersIndex(jdbcPosition, valueMapping), value);
+        valueMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(jdbcPosition, valueMapping), value);
         return jdbcPosition + valueMapping.getNumberOfDatastoreFields();
     }
 
@@ -789,7 +789,7 @@
                     try
                     {
                         int jdbcPosition = 1;
-                        fieldMapping.setObject(om, ps, Mappings.getParametersIndex(jdbcPosition, fieldMapping), key);
+                        fieldMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(jdbcPosition, fieldMapping), key);
                         jdbcPosition += fieldMapping.getNumberOfDatastoreFields();
                         jdbcPosition = elementContainerStoreSpecialization.populateOwnerInStatement(sm, om, ps, 
                             jdbcPosition, this);
@@ -857,7 +857,7 @@
                     try
                     {
                         int jdbcPosition = 1;
-                        fieldMapping.setObject(om, ps, Mappings.getParametersIndex(jdbcPosition, fieldMapping), 
+                        fieldMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(jdbcPosition, fieldMapping), 
                             newValue);
                         jdbcPosition += fieldMapping.getNumberOfDatastoreFields();
                         jdbcPosition = elementContainerStoreSpecialization.populateOwnerInStatement(sm, om, 
@@ -1030,35 +1030,6 @@
         else
         {
             // Value = PC
-
-            // Select any datastore/version columns
-            int[] datastoreIndex = null;
-            int[] versionIndex = null;
-            if (stmt.getTableExpression(elmIdentifier) != null)
-            {
-                if (valueTable.getIdentityType() == IdentityType.DATASTORE)
-                {
-                    datastoreIndex = stmt.select(elmIdentifier, valueTable.getDataStoreObjectIdMapping(),true);
-                }
-                if (valueTable.getVersionMapping(true) != null)
-                {
-                    versionIndex = stmt.select(elmIdentifier, valueTable.getVersionMapping(true), true);
-                }
-            }
-            else
-            {
-                if (valueTable.getIdentityType() == IdentityType.DATASTORE)
-                {
-                    datastoreIndex = stmt.select(stmt.getMainTableAlias(), 
-                        valueTable.getDataStoreObjectIdMapping(),true);
-                }
-                if (valueTable.getVersionMapping(true) != null)
-                {
-                    versionIndex = stmt.select(stmt.getMainTableAlias(), 
-                        valueTable.getVersionMapping(true), true);
-                }
-            }
-
             StatementMappingIndex[] stmtMappings = null;
             int[] prefetchFieldNumbers = null;
             if (useFetchPlan)
@@ -1082,6 +1053,9 @@
                         if (m.includeInFetchStatement() && !(m instanceof AbstractContainerMapping))
                         {
                             stmtMappings[fieldNumbers[i]] = new StatementMappingIndex(m);
+                            ExpressionHelper.selectMapping(stmtMappings[fieldNumbers[i]], stmt,
+                                stmt.getTableExpression(elmIdentifier) != null ? elmIdentifier : null, clr);
+
                             fn[prefetchFieldCount++] = fieldNumbers[i];
                         }
                     }
@@ -1108,35 +1082,37 @@
                             if (m.includeInFetchStatement() && !(m instanceof AbstractContainerMapping))
                             {
                                 stmtMappings[prefetchFieldNumbers[i]] = new StatementMappingIndex(m);
+                                ExpressionHelper.selectMapping(stmtMappings[prefetchFieldNumbers[i]], stmt,
+                                    stmt.getTableExpression(elmIdentifier) != null ? elmIdentifier : null, clr);
                             }
                         }
                     }
                 }
             }
 
-            if (stmt.getTableExpression(elmIdentifier) != null)
-            {
-                Mappings.selectMapping(stmt, elmIdentifier, stmtMappings);
-            }
-            else
-            {
-                Mappings.selectMapping(stmt, stmtMappings);
-            }
-
             StatementMappingForClass mappingDefinition = new StatementMappingForClass(null);
             for (int i=0;i<prefetchFieldNumbers.length;i++)
             {
                 mappingDefinition.addMappingForMember(prefetchFieldNumbers[i], stmtMappings[prefetchFieldNumbers[i]]);
             }
-            if (datastoreIndex != null)
+
+            if (valueTable.getIdentityType() == IdentityType.DATASTORE)
             {
+                // Add datastore-id surrogate column
+                int[] datastoreIndex = stmt.select(
+                    stmt.getTableExpression(elmIdentifier) != null ? elmIdentifier : stmt.getMainTableAlias(), 
+                    valueTable.getDataStoreObjectIdMapping(),true);
                 StatementMappingIndex datastoreMappingIdx = 
                     new StatementMappingIndex(valueTable.getDataStoreObjectIdMapping());
                 datastoreMappingIdx.setColumnPositions(datastoreIndex);
                 mappingDefinition.addMappingForMember(StatementMappingForClass.MEMBER_DATASTORE_ID, datastoreMappingIdx);
             }
-            if (versionIndex != null)
+            if (valueTable.getVersionMapping(true) != null)
             {
+                // Add version surrogate column
+                int[] versionIndex = stmt.select(
+                    stmt.getTableExpression(elmIdentifier) != null ? elmIdentifier : stmt.getMainTableAlias(), 
+                    valueTable.getVersionMapping(true), true);
                 StatementMappingIndex versionMappingIdx = new StatementMappingIndex(valueTable.getVersionMapping(true));
                 versionMappingIdx.setColumnPositions(versionIndex);
                 mappingDefinition.addMappingForMember(StatementMappingForClass.MEMBER_VERSION, versionMappingIdx);

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/FKMapStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/FKMapStore.java	2009-01-01 11:42:40 UTC (rev 4480)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/FKMapStore.java	2009-01-01 14:54:53 UTC (rev 4481)
@@ -47,12 +47,12 @@
 import org.datanucleus.store.mapped.DatastoreContainerObject;
 import org.datanucleus.store.mapped.DatastoreIdentifier;
 import org.datanucleus.store.mapped.expression.BooleanExpression;
+import org.datanucleus.store.mapped.expression.ExpressionHelper;
 import org.datanucleus.store.mapped.expression.LogicSetExpression;
 import org.datanucleus.store.mapped.expression.QueryExpression;
 import org.datanucleus.store.mapped.expression.ScalarExpression;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
 import org.datanucleus.store.mapped.mapping.MappingConsumer;
-import org.datanucleus.store.mapped.mapping.Mappings;
 import org.datanucleus.store.mapped.mapping.SerialisedMapping;
 import org.datanucleus.store.mapped.query.IncompatibleQueryElementTypeException;
 import org.datanucleus.store.rdbms.RDBMSManager;
@@ -470,12 +470,12 @@
                     {
                         if (ownerMemberMetaData != null)
                         {
-                            ownerMapping.setObject(om, ps, Mappings.getParametersIndex(1,ownerMapping), null,
+                            ownerMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(1,ownerMapping), null,
                                 sm, ownerMemberMetaData.getAbsoluteFieldNumber());
                         }
                         else
                         {
-                            ownerMapping.setObject(om, ps, Mappings.getParametersIndex(1,ownerMapping), null);
+                            ownerMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(1,ownerMapping), null);
                         }
                         jdbcPosition += ownerMapping.getNumberOfDatastoreFields();
                     }
@@ -538,12 +538,12 @@
                     {
                         if (ownerMemberMetaData != null)
                         {
-                            ownerMapping.setObject(om, ps, Mappings.getParametersIndex(1,ownerMapping), null,
+                            ownerMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(1,ownerMapping), null,
                                 sm, ownerMemberMetaData.getAbsoluteFieldNumber());
                         }
                         else
                         {
-                            ownerMapping.setObject(om, ps, Mappings.getParametersIndex(1,ownerMapping), null);
+                            ownerMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(1,ownerMapping), null);
                         }
                         jdbcPosition += ownerMapping.getNumberOfDatastoreFields();
                     }

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/FKSetStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/FKSetStore.java	2009-01-01 11:42:40 UTC (rev 4480)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/FKSetStore.java	2009-01-01 14:54:53 UTC (rev 4481)
@@ -49,12 +49,12 @@
 import org.datanucleus.store.mapped.DatastoreClass;
 import org.datanucleus.store.mapped.DatastoreContainerObject;
 import org.datanucleus.store.mapped.DatastoreIdentifier;
+import org.datanucleus.store.mapped.expression.ExpressionHelper;
 import org.datanucleus.store.mapped.expression.LogicSetExpression;
 import org.datanucleus.store.mapped.expression.QueryExpression;
 import org.datanucleus.store.mapped.expression.ScalarExpression;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
 import org.datanucleus.store.mapped.mapping.MappingConsumer;
-import org.datanucleus.store.mapped.mapping.Mappings;
 import org.datanucleus.store.mapped.query.IncompatibleQueryElementTypeException;
 import org.datanucleus.store.rdbms.RDBMSManager;
 import org.datanucleus.store.rdbms.SQLController;
@@ -408,12 +408,12 @@
                     {
                         if (ownerMemberMetaData != null)
                         {
-                            ownerMapping.setObject(om, ps, Mappings.getParametersIndex(jdbcPosition, ownerMapping), 
+                            ownerMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(jdbcPosition, ownerMapping), 
                                 null, sm, ownerMemberMetaData.getAbsoluteFieldNumber());
                         }
                         else
                         {
-                            ownerMapping.setObject(om, ps, Mappings.getParametersIndex(jdbcPosition, ownerMapping), 
+                            ownerMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(jdbcPosition, ownerMapping), 
                                 null);
                         }
                     }
@@ -421,12 +421,12 @@
                     {
                         if (ownerMemberMetaData != null)
                         {
-                            ownerMapping.setObject(om, ps, Mappings.getParametersIndex(jdbcPosition, ownerMapping), 
+                            ownerMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(jdbcPosition, ownerMapping), 
                                 sm.getObject(), sm, ownerMemberMetaData.getAbsoluteFieldNumber());
                         }
                         else
                         {
-                            ownerMapping.setObject(om, ps, Mappings.getParametersIndex(jdbcPosition, ownerMapping), 
+                            ownerMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(jdbcPosition, ownerMapping), 
                                 sm.getObject());
                         }
                     }
@@ -436,7 +436,7 @@
                     {
                         jdbcPosition = getSpecialization().populateRelationDiscriminatorInStatement(om, ps, jdbcPosition, this);
                     }
-                    elementMapping.setObject(om, ps, Mappings.getParametersIndex(jdbcPosition, elementMapping), element);
+                    elementMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(jdbcPosition, elementMapping), element);
                     jdbcPosition += elementMapping.getNumberOfDatastoreFields();
 
                     sqlControl.executeStatementUpdate(mconn, stmt, ps, true);

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/JoinMapStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/JoinMapStore.java	2009-01-01 11:42:40 UTC (rev 4480)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/JoinMapStore.java	2009-01-01 14:54:53 UTC (rev 4481)
@@ -46,11 +46,11 @@
 import org.datanucleus.store.mapped.DatastoreIdentifier;
 import org.datanucleus.store.mapped.IdentifierType;
 import org.datanucleus.store.mapped.expression.BooleanExpression;
+import org.datanucleus.store.mapped.expression.ExpressionHelper;
 import org.datanucleus.store.mapped.expression.LogicSetExpression;
 import org.datanucleus.store.mapped.expression.QueryExpression;
 import org.datanucleus.store.mapped.expression.ScalarExpression;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
-import org.datanucleus.store.mapped.mapping.Mappings;
 import org.datanucleus.store.mapped.mapping.SerialisedMapping;
 import org.datanucleus.store.mapped.query.IncompatibleQueryElementTypeException;
 import org.datanucleus.store.rdbms.SQLController;
@@ -610,7 +610,7 @@
             {
                 // Only set the adapter mapping if we have a new object
                 long nextIDAdapter = getNextIDForAdapterColumn(ownerSM);
-                adapterMapping.setObject(om, ps, Mappings.getParametersIndex(jdbcPosition, adapterMapping), new Long(nextIDAdapter));
+                adapterMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(jdbcPosition, adapterMapping), new Long(nextIDAdapter));
                 jdbcPosition += adapterMapping.getNumberOfDatastoreFields();
             }
             jdbcPosition = populateKeyInStatement(om, ps, key, jdbcPosition);

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/MapEntrySetStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/MapEntrySetStore.java	2009-01-01 11:42:40 UTC (rev 4480)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/MapEntrySetStore.java	2009-01-01 14:54:53 UTC (rev 4481)
@@ -38,13 +38,13 @@
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.store.mapped.DatastoreContainerObject;
 import org.datanucleus.store.mapped.DatastoreIdentifier;
+import org.datanucleus.store.mapped.expression.ExpressionHelper;
 import org.datanucleus.store.mapped.expression.LogicSetExpression;
 import org.datanucleus.store.mapped.expression.QueryExpression;
 import org.datanucleus.store.mapped.expression.ScalarExpression;
 import org.datanucleus.store.mapped.mapping.EmbeddedKeyPCMapping;
 import org.datanucleus.store.mapped.mapping.EmbeddedValuePCMapping;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
-import org.datanucleus.store.mapped.mapping.Mappings;
 import org.datanucleus.store.mapped.mapping.SerialisedPCMapping;
 import org.datanucleus.store.mapped.mapping.SerialisedReferenceMapping;
 import org.datanucleus.store.query.ResultObjectFactory;
@@ -414,11 +414,11 @@
                     keyMapping instanceof SerialisedPCMapping ||
                     keyMapping instanceof SerialisedReferenceMapping)
                 {
-                    key = keyMapping.getObject(om, rs, Mappings.getParametersIndex(jdbcPosition, keyMapping), sm, ownerFieldNum);
+                    key = keyMapping.getObject(om, rs, ExpressionHelper.getParametersIndex(jdbcPosition, keyMapping), sm, ownerFieldNum);
                 }
                 else
                 {
-                    key = keyMapping.getObject(om, rs, Mappings.getParametersIndex(jdbcPosition, keyMapping));
+                    key = keyMapping.getObject(om, rs, ExpressionHelper.getParametersIndex(jdbcPosition, keyMapping));
                 }
 
                 jdbcPosition += keyMapping.getNumberOfDatastoreFields();
@@ -427,11 +427,11 @@
                     valueMapping instanceof SerialisedPCMapping ||
                     valueMapping instanceof SerialisedReferenceMapping)
                 {
-                    value = valueMapping.getObject(om, rs, Mappings.getParametersIndex(jdbcPosition, valueMapping), sm, ownerFieldNum);
+                    value = valueMapping.getObject(om, rs, ExpressionHelper.getParametersIndex(jdbcPosition, valueMapping), sm, ownerFieldNum);
                 }
                 else
                 {
-                    value = valueMapping.getObject(om, rs, Mappings.getParametersIndex(jdbcPosition, valueMapping));
+                    value = valueMapping.getObject(om, rs, ExpressionHelper.getParametersIndex(jdbcPosition, valueMapping));
                 }
 
                 results.add(new EntryImpl(sm, key, value));

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/MapValueSetStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/MapValueSetStore.java	2009-01-01 11:42:40 UTC (rev 4480)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/MapValueSetStore.java	2009-01-01 14:54:53 UTC (rev 4481)
@@ -37,11 +37,11 @@
 import org.datanucleus.store.mapped.DatastoreClass;
 import org.datanucleus.store.mapped.DatastoreIdentifier;
 import org.datanucleus.store.mapped.IdentifierType;
+import org.datanucleus.store.mapped.expression.ExpressionHelper;
 import org.datanucleus.store.mapped.expression.LogicSetExpression;
 import org.datanucleus.store.mapped.expression.QueryExpression;
 import org.datanucleus.store.mapped.expression.ScalarExpression;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
-import org.datanucleus.store.mapped.mapping.Mappings;
 import org.datanucleus.store.rdbms.RDBMSManager;
 import org.datanucleus.store.rdbms.SQLController;
 import org.datanucleus.store.rdbms.SQLWarnings;
@@ -321,7 +321,7 @@
                     {
                         if (rs.next())
                         {
-                            key = keyMapping.getObject(om, rs, Mappings.getParametersIndex(1,keyMapping));
+                            key = keyMapping.getObject(om, rs, ExpressionHelper.getParametersIndex(1,keyMapping));
                             keyExists = true;
                         }
 

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSAbstractCollectionStoreSpecialization.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSAbstractCollectionStoreSpecialization.java	2009-01-01 11:42:40 UTC (rev 4480)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSAbstractCollectionStoreSpecialization.java	2009-01-01 14:54:53 UTC (rev 4481)
@@ -33,9 +33,9 @@
 import org.datanucleus.store.mapped.query.UnionIteratorStatement;
 import org.datanucleus.store.mapped.query.DiscriminatorIteratorStatement;
 import org.datanucleus.store.mapped.exceptions.MappedDatastoreException;
+import org.datanucleus.store.mapped.expression.ExpressionHelper;
 import org.datanucleus.store.mapped.mapping.EmbeddedElementPCMapping;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
-import org.datanucleus.store.mapped.mapping.Mappings;
 import org.datanucleus.store.mapped.scostore.AbstractCollectionStore;
 import org.datanucleus.store.mapped.scostore.AbstractCollectionStoreSpecialization;
 import org.datanucleus.store.mapped.scostore.ElementContainerStore;
@@ -144,7 +144,7 @@
                 try
                 {
                     int jdbcPosition = 1;
-                    fieldMapping.setObject(om, ps, Mappings.getParametersIndex(jdbcPosition, fieldMapping), value);
+                    fieldMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(jdbcPosition, fieldMapping), value);
                     jdbcPosition += fieldMapping.getNumberOfDatastoreFields();
                     jdbcPosition = populateOwnerInStatement(sm, om, ps, jdbcPosition, ecs);
                     jdbcPosition = populateEmbeddedElementFieldsInStatement(sm, element, ps, jdbcPosition,

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSElementContainerStoreSpecialization.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSElementContainerStoreSpecialization.java	2009-01-01 11:42:40 UTC (rev 4480)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSElementContainerStoreSpecialization.java	2009-01-01 14:54:53 UTC (rev 4481)
@@ -34,10 +34,10 @@
 import org.datanucleus.store.fieldmanager.FieldManager;
 import org.datanucleus.store.mapped.MappedStoreManager;
 import org.datanucleus.store.mapped.StatementMappingIndex;
+import org.datanucleus.store.mapped.expression.ExpressionHelper;
 import org.datanucleus.store.mapped.expression.QueryExpression;
 import org.datanucleus.store.mapped.mapping.EmbeddedElementPCMapping;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
-import org.datanucleus.store.mapped.mapping.Mappings;
 import org.datanucleus.store.mapped.scostore.BaseContainerStore;
 import org.datanucleus.store.mapped.scostore.BaseElementContainerStoreSpecialization;
 import org.datanucleus.store.mapped.scostore.ElementContainerStore;
@@ -96,13 +96,13 @@
         if (bcs.getOwnerMemberMetaData() != null)
         {
             bcs.getOwnerMapping().setObject(om, ps,
-                Mappings.getParametersIndex(jdbcPosition, bcs.getOwnerMapping()),
+                ExpressionHelper.getParametersIndex(jdbcPosition, bcs.getOwnerMapping()),
                 sm.getObject(), sm, bcs.getOwnerMemberMetaData().getAbsoluteFieldNumber());
         }
         else
         {
             bcs.getOwnerMapping().setObject(om, ps,
-                Mappings.getParametersIndex(jdbcPosition, bcs.getOwnerMapping()),
+                ExpressionHelper.getParametersIndex(jdbcPosition, bcs.getOwnerMapping()),
                 sm.getObject());
         }
         return jdbcPosition + bcs.getOwnerMapping().getNumberOfDatastoreFields();
@@ -120,7 +120,7 @@
                                                            ElementContainerStore ecs)
     {
         ecs.getRelationDiscriminatorMapping().setObject(
-            om, ps, Mappings.getParametersIndex(jdbcPosition, ecs.getRelationDiscriminatorMapping()), ecs.getRelationDiscriminatorValue());
+            om, ps, ExpressionHelper.getParametersIndex(jdbcPosition, ecs.getRelationDiscriminatorMapping()), ecs.getRelationDiscriminatorValue());
         return jdbcPosition + ecs.getRelationDiscriminatorMapping().getNumberOfDatastoreFields();
     }
 
@@ -578,7 +578,7 @@
         // Include element type
         if (strategy == DiscriminatorStrategy.CLASS_NAME)
         {
-            discrimMapping.setObject(om, ps, Mappings.getParametersIndex(jdbcPosition, discrimMapping),
+            discrimMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(jdbcPosition, discrimMapping),
                 info.getClassName());
             jdbcPosition += discrimMapping.getNumberOfDatastoreFields();
         }
@@ -586,7 +586,7 @@
         {
             if (strategy == DiscriminatorStrategy.VALUE_MAP)
             {
-                discrimMapping.setObject(om, ps, Mappings.getParametersIndex(jdbcPosition, discrimMapping),
+                discrimMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(jdbcPosition, discrimMapping),
                     info.getAbstractClassMetaData().getInheritanceMetaData().getDiscriminatorMetaData().getValue());
                 jdbcPosition += discrimMapping.getNumberOfDatastoreFields();
             }
@@ -604,7 +604,7 @@
                     String subclass = (String) iter.next();
                     if (strategy == DiscriminatorStrategy.CLASS_NAME)
                     {
-                        discrimMapping.setObject(om, ps, Mappings.getParametersIndex(jdbcPosition,
+                        discrimMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(jdbcPosition,
                             discrimMapping), subclass);
                         jdbcPosition += discrimMapping.getNumberOfDatastoreFields();
                     }
@@ -614,7 +614,7 @@
                         {
                             AbstractClassMetaData subclassCmd = storeMgr.getOMFContext().getMetaDataManager()
                                 .getMetaDataForClass(subclass, clr);
-                            discrimMapping.setObject(om, ps, Mappings.getParametersIndex(jdbcPosition,
+                            discrimMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(jdbcPosition,
                                 discrimMapping),
                                 subclassCmd.getInheritanceMetaData().getDiscriminatorMetaData().getValue());
                             jdbcPosition += discrimMapping.getNumberOfDatastoreFields();
@@ -661,7 +661,7 @@
      */
     protected int populateOrderInStatement(ObjectManager om, Object ps, int idx, int jdbcPosition, JavaTypeMapping orderMapping)
     {
-        orderMapping.setObject(om, ps, Mappings.getParametersIndex(jdbcPosition, orderMapping), new Integer(idx));
+        orderMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(jdbcPosition, orderMapping), new Integer(idx));
         return jdbcPosition + orderMapping.getNumberOfDatastoreFields();
     }
 
@@ -729,7 +729,7 @@
             // Don't try to insert any mappings with insert parameter that isn't ? (e.g Oracle)
             return jdbcPosition;
         }
-        elementMapping.setObject(om, ps, Mappings.getParametersIndex(jdbcPosition, elementMapping), element);
+        elementMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(jdbcPosition, elementMapping), element);
         return jdbcPosition + elementMapping.getNumberOfDatastoreFields();
     }
 }
\ No newline at end of file

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSFKArrayStoreSpecialization.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSFKArrayStoreSpecialization.java	2009-01-01 11:42:40 UTC (rev 4480)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSFKArrayStoreSpecialization.java	2009-01-01 14:54:53 UTC (rev 4481)
@@ -27,8 +27,8 @@
 import org.datanucleus.exceptions.NucleusDataStoreException;
 import org.datanucleus.store.mapped.DatastoreClass;
 import org.datanucleus.store.mapped.MappedStoreManager;
+import org.datanucleus.store.mapped.expression.ExpressionHelper;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
-import org.datanucleus.store.mapped.mapping.Mappings;
 import org.datanucleus.store.mapped.scostore.ElementContainerStore;
 import org.datanucleus.store.mapped.scostore.FKArrayStoreSpecialization;
 import org.datanucleus.store.rdbms.RDBMSManager;
@@ -252,7 +252,7 @@
                     if (owner == null)
                     {
                         JavaTypeMapping ownerMapping = ecs.getOwnerMapping();
-                        ownerMapping.setObject(om, ps, Mappings.getParametersIndex(jdbcPosition, ownerMapping), null);
+                        ownerMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(jdbcPosition, ownerMapping), null);
                         jdbcPosition += ownerMapping.getNumberOfDatastoreFields();
                     }
                     else

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSFKListStoreSpecialization.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSFKListStoreSpecialization.java	2009-01-01 11:42:40 UTC (rev 4480)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSFKListStoreSpecialization.java	2009-01-01 14:54:53 UTC (rev 4481)
@@ -28,8 +28,8 @@
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.store.mapped.DatastoreContainerObject;
 import org.datanucleus.store.mapped.MappedStoreManager;
+import org.datanucleus.store.mapped.expression.ExpressionHelper;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
-import org.datanucleus.store.mapped.mapping.Mappings;
 import org.datanucleus.store.mapped.scostore.ElementContainerStore;
 import org.datanucleus.store.mapped.scostore.FKListStore;
 import org.datanucleus.store.mapped.scostore.FKListStoreSpecialization;
@@ -420,11 +420,11 @@
                     {
                         if (ownerMemberMetaData != null)
                         {
-                            ownerMapping.setObject(om, ps, Mappings.getParametersIndex(jdbcPosition, ownerMapping), null);
+                            ownerMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(jdbcPosition, ownerMapping), null);
                         }
                         else
                         {
-                            ownerMapping.setObject(om, ps, Mappings.getParametersIndex(jdbcPosition, ownerMapping), null, sm,
+                            ownerMapping.setObject(om, ps, ExpressionHelper.getParametersIndex(jdbcPosition, ownerMapping), null, sm,
                                 ownerMemberMetaData.getAbsoluteFieldNumber());
                         }
                         jdbcPosition += ownerMapping.getNumberOfDatastoreFields();

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/SQLText.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/SQLText.java	2009-01-01 11:42:40 UTC (rev 4480)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/SQLText.java	2009-01-01 14:54:53 UTC (rev 4481)
@@ -23,8 +23,8 @@
 import java.util.List;
 
 import org.datanucleus.ObjectManager;
+import org.datanucleus.store.mapped.expression.ExpressionHelper;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
-import org.datanucleus.store.mapped.mapping.Mappings;
 import org.datanucleus.store.rdbms.sql.expression.SQLExpression;
 
 /**
@@ -188,7 +188,7 @@
                 JavaTypeMapping mapping = param.mapping;
                 Object value = param.value;
 
-                mapping.setObject(om, ps, Mappings.getParametersIndex(num, mapping), value);
+                mapping.setObject(om, ps, ExpressionHelper.getParametersIndex(num, mapping), value);
                 if (mapping.getNumberOfDatastoreFields() > 0)
                 {
                     num += mapping.getNumberOfDatastoreFields();

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/SchemaTable.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/SchemaTable.java	2009-01-01 11:42:40 UTC (rev 4480)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/SchemaTable.java	2009-01-01 14:54:53 UTC (rev 4481)
@@ -36,9 +36,9 @@
 import org.datanucleus.store.StoreData;
 import org.datanucleus.store.mapped.IdentifierFactory;
 import org.datanucleus.store.mapped.MappedStoreData;
+import org.datanucleus.store.mapped.expression.ExpressionHelper;
 import org.datanucleus.store.mapped.mapping.JavaTypeMapping;
 import org.datanucleus.store.mapped.mapping.MappingManager;
-import org.datanucleus.store.mapped.mapping.Mappings;
 import org.datanucleus.store.rdbms.RDBMSManager;
 import org.datanucleus.store.rdbms.SQLController;
 import org.datanucleus.store.rdbms.exceptions.MissingTableException;
@@ -228,23 +228,23 @@
         {
             int jdbc_id = 1;
 
-            classMapping.setString(null, ps, Mappings.getParametersIndex(jdbc_id, classMapping), data.getName());
+            classMapping.setString(null, ps, ExpressionHelper.getParametersIndex(jdbc_id, classMapping), data.getName());
             jdbc_id += classMapping.getNumberOfDatastoreFields();
 
-            tableMapping.setString(null, ps, Mappings.getParametersIndex(jdbc_id, tableMapping), data.hasTable() ? data.getTableName() : "");
+            tableMapping.setString(null, ps, ExpressionHelper.getParametersIndex(jdbc_id, tableMapping), data.hasTable() ? data.getTableName() : "");
             jdbc_id += tableMapping.getNumberOfDatastoreFields();
 
-            typeMapping.setString(null, ps, Mappings.getParametersIndex(jdbc_id, typeMapping), data.isFCO() ? "FCO" : "SCO");
+            typeMapping.setString(null, ps, ExpressionHelper.getParametersIndex(jdbc_id, typeMapping), data.isFCO() ? "FCO" : "SCO");
             jdbc_id += typeMapping.getNumberOfDatastoreFields();
 
-            ownerMapping.setString(null, ps, Mappings.getParametersIndex(jdbc_id, ownerMapping), data.isTableOwner() ? "1" : "0");
+            ownerMapping.setString(null, ps, ExpressionHelper.getParametersIndex(jdbc_id, ownerMapping), data.isTableOwner() ? "1" : "0");
             jdbc_id += ownerMapping.getNumberOfDatastoreFields();
 
             // TODO Sort out version
-            versionMapping.setString(null, ps, Mappings.getParametersIndex(jdbc_id, versionMapping), "DataNucleus");
+            versionMapping.setString(null, ps, ExpressionHelper.getParametersIndex(jdbc_id, versionMapping), "DataNucleus");
             jdbc_id += versionMapping.getNumberOfDatastoreFields();
 
-            interfaceNameMapping.setString(null, ps, Mappings.getParametersIndex(jdbc_id, interfaceNameMapping), data.getInterfaceName());
+            interfaceNameMapping.setString(null, ps, ExpressionHelper.getParametersIndex(jdbc_id, interfaceNameMapping), data.getInterfaceName());
             jdbc_id += interfaceNameMapping.getNumberOfDatastoreFields();
 
             sqlControl.executeStatementUpdate(conn, insertStmt, ps, true);
@@ -278,7 +278,7 @@
             try
             {
                 int jdbc_id = 1;
-                tableMapping.setString(null, ps, Mappings.getParametersIndex(jdbc_id, tableMapping), data.getName());
+                tableMapping.setString(null, ps, ExpressionHelper.getParametersIndex(jdbc_id, tableMapping), data.getName());
 
                 ResultSet rs = sqlControl.executeStatementQuery(conn, fetchStmt, ps);
                 try


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4482
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4482&view=rev
Author:   andy_jefferson
Date:     2009-01-01 15:00:24 +0000 (Thu, 01 Jan 2009)

Log Message:
-----------
Commonised surrogate col treatment

Modified Paths:
--------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStore.java	2009-01-01 14:54:53 UTC (rev 4481)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/ElementContainerStore.java	2009-01-01 15:00:24 UTC (rev 4482)
@@ -453,35 +453,8 @@
         else
         {
             // Element = PC
-            int[] datastoreIndex = null;
-            int[] versionIndex = null;
 
             // Select any datastore/version columns
-            if (stmt.getTableExpression(elmIdentifier) != null)
-            {
-                if (elementInfo[0].getDatastoreClass().getIdentityType() == IdentityType.DATASTORE)
-                {
-                    datastoreIndex = stmt.select(elmIdentifier, elementInfo[0].getDatastoreClass().getDataStoreObjectIdMapping(), true);
-                }
-                JavaTypeMapping verMapping = elementInfo[0].getDatastoreClass().getVersionMapping(true);
-                if (verMapping != null)
-                {
-                    versionIndex = stmt.select(elmIdentifier, verMapping, true);
-                }
-            }
-            else
-            {
-                if (elementInfo[0].getDatastoreClass().getIdentityType() == IdentityType.DATASTORE)
-                {
-                    datastoreIndex = stmt.select(stmt.getMainTableAlias(), 
-                        elementInfo[0].getDatastoreClass().getDataStoreObjectIdMapping(),true);
-                }
-                JavaTypeMapping verMapping = elementInfo[0].getDatastoreClass().getVersionMapping(true);
-                if (verMapping != null)
-                {
-                    versionIndex = stmt.select(stmt.getMainTableAlias(), verMapping, true);
-                }
-            }
 
             StatementMappingIndex[] stmtMappings = null;
 
@@ -580,19 +553,31 @@
             {
                 mappingDefinition.addMappingForMember(fieldNumbers[i], stmtMappings[fieldNumbers[i]]);
             }
-            if (datastoreIndex != null)
+
+            if (elementInfo[0].getDatastoreClass().getIdentityType() == IdentityType.DATASTORE)
             {
-                JavaTypeMapping datastoreMapping = elementInfo[0].getDatastoreClass().getDataStoreObjectIdMapping();
-                StatementMappingIndex datastoreMappingIdx = new StatementMappingIndex(datastoreMapping);
+                // Add datastore-id surrogate column
+                int[] datastoreIndex = stmt.select(
+                    stmt.getTableExpression(elmIdentifier) != null ? elmIdentifier : stmt.getMainTableAlias(), 
+                    elementInfo[0].getDatastoreClass().getDataStoreObjectIdMapping(), true);
+                StatementMappingIndex datastoreMappingIdx = new StatementMappingIndex(
+                    elementInfo[0].getDatastoreClass().getDataStoreObjectIdMapping());
                 datastoreMappingIdx.setColumnPositions(datastoreIndex);
-                mappingDefinition.addMappingForMember(StatementMappingForClass.MEMBER_DATASTORE_ID, datastoreMappingIdx);
+                mappingDefinition.addMappingForMember(StatementMappingForClass.MEMBER_DATASTORE_ID, 
+                    datastoreMappingIdx);
             }
-            if (versionIndex != null)
+
+            JavaTypeMapping verMapping = elementInfo[0].getDatastoreClass().getVersionMapping(true);
+            if (verMapping != null)
             {
-                JavaTypeMapping verMapping = elementInfo[0].getDatastoreClass().getVersionMapping(true);
+                // Add version surrogate column
+                int[] versionIndex = stmt.select(
+                    stmt.getTableExpression(elmIdentifier) != null ? elmIdentifier : stmt.getMainTableAlias(),
+                    verMapping, true);
                 StatementMappingIndex versionMappingIdx = new StatementMappingIndex(verMapping);
                 versionMappingIdx.setColumnPositions(versionIndex);
-                mappingDefinition.addMappingForMember(StatementMappingForClass.MEMBER_VERSION, versionMappingIdx);
+                mappingDefinition.addMappingForMember(StatementMappingForClass.MEMBER_VERSION,
+                    versionMappingIdx);
             }
 
             return storeMgr.newResultObjectFactory(elementInfo != null ? elementInfo[0].getDatastoreClass() : null,

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java	2009-01-01 14:54:53 UTC (rev 4481)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java	2009-01-01 15:00:24 UTC (rev 4482)
@@ -1102,20 +1102,24 @@
                 int[] datastoreIndex = stmt.select(
                     stmt.getTableExpression(elmIdentifier) != null ? elmIdentifier : stmt.getMainTableAlias(), 
                     valueTable.getDataStoreObjectIdMapping(),true);
-                StatementMappingIndex datastoreMappingIdx = 
-                    new StatementMappingIndex(valueTable.getDataStoreObjectIdMapping());
+                StatementMappingIndex datastoreMappingIdx = new StatementMappingIndex(
+                    valueTable.getDataStoreObjectIdMapping());
                 datastoreMappingIdx.setColumnPositions(datastoreIndex);
-                mappingDefinition.addMappingForMember(StatementMappingForClass.MEMBER_DATASTORE_ID, datastoreMappingIdx);
+                mappingDefinition.addMappingForMember(StatementMappingForClass.MEMBER_DATASTORE_ID, 
+                    datastoreMappingIdx);
             }
-            if (valueTable.getVersionMapping(true) != null)
+
+            JavaTypeMapping verMapping = valueTable.getVersionMapping(true);
+            if (verMapping != null)
             {
                 // Add version surrogate column
                 int[] versionIndex = stmt.select(
                     stmt.getTableExpression(elmIdentifier) != null ? elmIdentifier : stmt.getMainTableAlias(), 
-                    valueTable.getVersionMapping(true), true);
-                StatementMappingIndex versionMappingIdx = new StatementMappingIndex(valueTable.getVersionMapping(true));
+                    verMapping, true);
+                StatementMappingIndex versionMappingIdx = new StatementMappingIndex(verMapping);
                 versionMappingIdx.setColumnPositions(versionIndex);
-                mappingDefinition.addMappingForMember(StatementMappingForClass.MEMBER_VERSION, versionMappingIdx);
+                mappingDefinition.addMappingForMember(StatementMappingForClass.MEMBER_VERSION, 
+                    versionMappingIdx);
             }
 
             return storeMgr.newResultObjectFactory(storeMgr.getDatastoreClass(getValueType(), clr),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4492
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4492&view=rev
Author:   andy_jefferson
Date:     2009-01-02 15:02:40 +0000 (Fri, 02 Jan 2009)

Log Message:
-----------
Move some resources to store.mapped

Modified Paths:
--------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation.properties
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation_es.properties
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/identifier/AbstractIdentifierFactory.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation.properties
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation_es.properties

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation.properties
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation.properties	2009-01-02 14:56:17 UTC (rev 4491)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation.properties	2009-01-02 15:02:40 UTC (rev 4492)
@@ -35,4 +35,11 @@
 020189=Field "{0}" is defined as a reference type (interface or Object) and was specified as being implemented by class "{1}" but this class was not found!
 020190=Field "{0}" is defined as a reference type (interface or Object) ("{1}") and was specified as being implemented by class "{2}" but this is an interface!
 
+#
+# Identifiers
+#
+039000=Case Identifier "{0}" is not supported. Please choose a supported case
+039001=Identifier Factory required identifiers in "{0}" but datastore adapter doesnt support this exactly, so using "{1}" instead
+039002=Identifier Factory requires identifiers in "{0}" but this is impossible with the current datastore adapter.
+
 057023=Class "{0}" has not got its own table and no subclass tables are found for this class. Creation of schema is impossible!

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation_es.properties
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation_es.properties	2009-01-02 14:56:17 UTC (rev 4491)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation_es.properties	2009-01-02 15:02:40 UTC (rev 4492)
@@ -36,4 +36,12 @@
 020189=\xA1El campo "{0}" esta declarado como referencia ("interface" o java.lang.Object) ("{1}") y debe tener una implementaci\xF3n "{2}", pero esta clase no existe!
 020190=\xA1El campo "{0}" esta declarado como referencia ("interface" o java.lang.Object) y debe tener una implementaci\xF3n "{1}" pero este es Interface tambi\xE9n!
 
+#
+# Identifiers
+#
+039000=Caja de identificaci\xF3n "{0}" no esta apoyada. Por favor elige otra
+039001=Factoria de identificaciones las queria en "{0}" pero el adaptador del base de datos no lo apoya. Ya usamos "{1}"
+039002=Factoria de identificaciones las quiere en "{0}" pero es imposible con este adaptador de base de datos, y no hay otra opci\xF3n.
+
+
 057023=La clase "{0}" no tiene su propia tabla y no hay subclases con tablas tampoco. No es posible crear el esquema!

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/identifier/AbstractIdentifierFactory.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/identifier/AbstractIdentifierFactory.java	2009-01-02 14:56:17 UTC (rev 4491)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/identifier/AbstractIdentifierFactory.java	2009-01-02 15:02:40 UTC (rev 4492)
@@ -45,7 +45,7 @@
 {
     /** Localiser for messages. */
     protected static final Localiser LOCALISER = Localiser.getInstance(
-        "org.datanucleus.store.rdbms.Localisation", MappedStoreManager.class.getClassLoader());
+        "org.datanucleus.store.mapped.Localisation", MappedStoreManager.class.getClassLoader());
 
     public static final int CASE_PRESERVE = 1;
     public static final int CASE_UPPER = 2;

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation.properties
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation.properties	2009-01-02 14:56:17 UTC (rev 4491)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation.properties	2009-01-02 15:02:40 UTC (rev 4492)
@@ -112,10 +112,6 @@
 #
 # Identifiers
 #
-039000=Case Identifier "{0}" is not supported. Please choose a supported case
-039001=Identifier Factory required identifiers in "{0}" but datastore adapter doesnt support this exactly, so using "{1}" instead
-039002=Identifier Factory requires identifiers in "{0}" but this is impossible with the current datastore adapter.
-
 039003=Identifier Factory with name "{0}" is not registered! Please check your CLASSPATH for presence of the plugin containing this factory, and your PMF settings for identifier factory.
 039004=Identifier Factory "{0}" is registered to use class "{1}" yet this class is not found. Please check the plugin specification and the CLASSPATH
 039005=Identifier Factory "{0}" has thrown an error upon construction. Please check the validity of the IdentifierFactory plugin.

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation_es.properties
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation_es.properties	2009-01-02 14:56:17 UTC (rev 4491)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation_es.properties	2009-01-02 15:02:40 UTC (rev 4492)
@@ -112,9 +112,6 @@
 #
 # Identifiers
 #
-039000=Caja de identificaci\xF3n "{0}" no esta apoyada. Por favor elige otra
-039001=Factoria de identificaciones las queria en "{0}" pero el adaptador del base de datos no lo apoya. Ya usamos "{1}"
-039002=Factoria de identificaciones las quiere en "{0}" pero es imposible con este adaptador de base de datos, y no hay otra opci\xF3n.
 039003=Factoria de identificaciones "{0}" no esta registrada! Por favor compruebe el CLASSPATH para el plugin que la contiene, y la especificacion de PMF.
 039004=Factoria de identificaciones "{0}" esta registrada para usar la clase "{1}" pero no la existe. Por favor compruebe el plugin y CLASSPATH
 039005=Factoria de identificaciones "{0}" ha tirado un error con construirla. Por favor compruebe la validez del plugin.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4493
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4493&view=rev
Author:   andy_jefferson
Date:     2009-01-02 15:05:24 +0000 (Fri, 02 Jan 2009)

Log Message:
-----------
Move some resources to store.mapped

Modified Paths:
--------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation.properties
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation_es.properties
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/exceptions/TooManyForeignKeysException.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/exceptions/TooManyIndicesException.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation.properties
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation_es.properties

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation.properties
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation.properties	2009-01-02 15:02:40 UTC (rev 4492)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation.properties	2009-01-02 15:05:24 UTC (rev 4493)
@@ -28,6 +28,10 @@
 020007=Duplicate column name "{0}" defined for table "{1}". You cannot map multiple fields to the same column. The duplicated columns are specified by {2} and {3}.
 020008=? datastore-identity|index columns|other non mapped to any field ?
 
+020015=Exceeded maximum of {0} foreign keys for table {1}
+020016=Exceeded maximum of {0} index keys for table {1}
+
+
 020185=Field "{0}" should be using "subclass-table" inheritance strategy yet isnt. Please report this.
 020186=Field "{0}" is declared type requiring multiple FKs and has had its column(s) specified, however the number of columns specified ({1}) is not the same as the number of possible FKs for this field ({2}).
 020187=Added column for type "{0}" for field "{1}" (field declared as using subclass-table)

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation_es.properties
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation_es.properties	2009-01-02 15:02:40 UTC (rev 4492)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation_es.properties	2009-01-02 15:05:24 UTC (rev 4493)
@@ -28,7 +28,10 @@
 020007=El nombre de la columna "{0}", de la tabla "{1}" esta duplicado. No se pueden mapear varios campos a una misma columna. El columnas utilizada {2} y {3}.
 020008=? datastore-identity|index columns|other non mapped to any field ?
 
+020015=Ha excedido el maximum de {0} claves for\xE1neas por la tabla {1}
+020016=Ha excedido el maximo de {0} \xEDndices por la tabla {1}
 
+
 020185=Field "{0}" should be using "subclass-table" inheritance strategy yet isnt. Please report this.
 020186=El campo "{0}" esta declarado para usar algunas claves ajenas y tiene una especificacion de las columnas, pero el numero de columnas ({1}) no es igual que el numero de claves ajenas de este campo ({2}).
 020187=Una columna a\xF1adido por el tipo "{0}" del campo "{1}" (declarada para usar "subclass-table")

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/exceptions/TooManyForeignKeysException.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/exceptions/TooManyForeignKeysException.java	2009-01-02 15:02:40 UTC (rev 4492)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/exceptions/TooManyForeignKeysException.java	2009-01-02 15:05:24 UTC (rev 4493)
@@ -30,8 +30,8 @@
  */
 public class TooManyForeignKeysException extends NucleusDataStoreException
 {
-    protected static final Localiser LOCALISER=Localiser.getInstance("org.datanucleus.store.rdbms.Localisation",
-        MappedStoreManager.class.getClassLoader());
+    protected static final Localiser LOCALISER=Localiser.getInstance(
+        "org.datanucleus.store.mapped.Localisation", MappedStoreManager.class.getClassLoader());
 
     /**
      * Constructs a too-many-foreign-keys exception.

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/exceptions/TooManyIndicesException.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/exceptions/TooManyIndicesException.java	2009-01-02 15:02:40 UTC (rev 4492)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/exceptions/TooManyIndicesException.java	2009-01-02 15:05:24 UTC (rev 4493)
@@ -29,8 +29,8 @@
  */
 public class TooManyIndicesException extends NucleusDataStoreException
 {
-    protected static final Localiser LOCALISER=Localiser.getInstance("org.datanucleus.store.rdbms.Localisation",
-        MappedStoreManager.class.getClassLoader());
+    protected static final Localiser LOCALISER=Localiser.getInstance(
+        "org.datanucleus.store.mapped.Localisation", MappedStoreManager.class.getClassLoader());
 
     /**
      * Constructs a too-many-indices exception.

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation.properties
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation.properties	2009-01-02 15:02:40 UTC (rev 4492)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation.properties	2009-01-02 15:05:24 UTC (rev 4493)
@@ -74,8 +74,6 @@
 020012=Table "{0}" is of wrong type {1}. Should be a table
 020013=Table "{0}" is of wrong type {1}. Should be a view
 020014=Cannot define a primary key column in a view : {0}, column={1}
-020015=Exceeded maximum of {0} foreign keys for table {1}
-020016=Exceeded maximum of {0} index keys for table {1}
 020017=Invalid view definition for {0} : {1}
 020018=Wrong precision for column {0} : was {1} (according to the JDBC driver) but should be {2} (based on the MetaData definition).
 020020=Wrong precision for column {0} : was {1} (according to the JDBC driver) but should be {2} (based on the MetaData definition for field {3}).

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation_es.properties
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation_es.properties	2009-01-02 15:02:40 UTC (rev 4492)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation_es.properties	2009-01-02 15:05:24 UTC (rev 4493)
@@ -74,8 +74,6 @@
 020012=La tabla no es del tipo adecuado. Debe ser una tabla : {0} tipo {1}
 020013=La tabla no es del tipo adecuado. Debe ser un view : {0} tipo {1}
 020014=No se puede definir una columna de clave primaria en una vista : {0}, columna={1}
-020015=Ha excedido el maximum de {0} claves for\xE1neas por la tabla {1}
-020016=Ha excedido el maximo de {0} \xEDndices por la tabla {1}
 020017=La definition de vista para {0} : {1} no es v\xE1lida
 020018=La precision de la columna {0} no es correcta : era {1} (segun el driver de JDBC) pero debe ser {2} (segun la definicion de MetaData).
 020019=La precision de la columna {0} no es correcta : era {1} (segun el driver de JDBC) pero debe ser {2} (segun la definicion de MetaData del {3}).


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4494
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4494&view=rev
Author:   andy_jefferson
Date:     2009-01-02 17:31:00 +0000 (Fri, 02 Jan 2009)

Log Message:
-----------
[NUCRDBMS-79] Move some resources for SCO that can be used by all mapped stores

Modified Paths:
--------------
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation.properties
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation_es.properties
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/BaseContainerStore.java
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation.properties
    platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation_es.properties

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation.properties
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation.properties	2009-01-02 15:05:24 UTC (rev 4493)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation.properties	2009-01-02 17:31:00 UTC (rev 4494)
@@ -46,4 +46,119 @@
 039001=Identifier Factory required identifiers in "{0}" but datastore adapter doesnt support this exactly, so using "{1}" instead
 039002=Identifier Factory requires identifiers in "{0}" but this is impossible with the current datastore adapter.
 
+
+055009=Object "{0}" has field "{1}" with a 1-N bidirectional relation and adding element "{2}" so setting the owner of the element.
+055010=Object "{0}" has a 1-N bidirectional collection field "{1}" and having element removed. Element "{2}" is having its owner field nulled.
+
+#
+# SCO
+#
+056000=The field "{0}" has been declared as being an array, yet there is no <array> MetaData specified!
+056001=The field "{0}" has been declared as being a collection, yet there is no <collection> MetaData specified!
+056002=The field "{0}" has been declared as being a map, yet there is no <map> MetaData specified!
+056003=The MetaData for the element class "{0}" of the collection field "{1}" was not found.
+056004=The MetaData for the value class "{0}" of the map field "{1}" was not found.
+056005=Iterator query statement is null !!
+056006=Iteration request failed : {0}
+056007=Size request failed : {0}
+056008=Contains request failed : {0}
+056009=Add request failed : {0}
+056010=Update embedded key failed : {0}
+056011=Update embedded value failed : {0}
+056012=Remove request failed : {0}
+056013=Clear request failed : {0}
+056014=Get request failed : {0}
+056015=Set request failed : {0}
+056016=Put request failed : {0}
+056017=IndexOf request failed : {0}
+056018=ContainsKey request failed : {0}
+056019=ContainsValue request failed : {0}
+056020=MaxAdapterColumnId request failed : {0}
+056021=Can't query over a Collection of second-class elements.
+056022=Can't query over a Map of second-class elements.
+056023=GetIndices failed : One or more elements specified doesnt exist : {0}
+
+056024=Field "{0}" has been defined as "mapped-by" the field "{1}" yet this "mapped-by" field doesn't exist in the class "{2}".
+056025=Field "{0}" has been defined as "mapped-by" field "{1}" yet this is of an incorrect type ({2}). The field that is set as the "mapped-by" must be of type "{3}"
+056026=The owner field {0} of element class {1} has an incorrect type "{2}". Should be "{3}"
+056027=Could not update the foreign key using statement : {0}
+#
+# SCO Collection
+#
+056028=Collection field "{0}" has been specified to contain the element "{1}" unembedded yet this is already identified as being stored embedded in a different field. This is invalid. You can't store the same object embedded and unembedded!
+
+056029=Class "{0}" has collection field "{1}" and this has no mapping in the table for the element class "{2}" owner field "{3}"
+056030=Class "{0}" has collection field "{1}" and this has no mapping in the table for the element class "{2}"
+
+056031=The field "{0}" is a collection field where the elements use "subclass-table" inheritance strategy and where there are more than 1 subclass where the element is persisted. DataNucleus doesnt currently support this situation.
+056032=Collection has been defined with elements of an interface type "{0}" and there are more than 1 implementation for this interface type found. DataNucleus doesnt currently support use of interface where there is more than 1 interface implementation.
+
+056033=Class {0} is not a valid element type for this collection (Field "{1}"). Must be "{2}" or subclass
+
+056034=Removal of element(s) from FK Collection deletes the element(s) since the field is "dependent"
+056035=Removal of element(s) from FK Collection deletes the element(s) since owner/index columns weren't nullable
+056036=Removal of element(s) from FK Collection nulls the FK while leaving the element(s) intact.
+
+056037=Object "{0}" has a collection "{1}" yet element "{2}" doesnt have the owner set. Managing the relation and setting the owner.
+056038=Object "{0}" has a collection "{1}" yet element "{2}" has its owner set to "{3}". This is inconsistent and needs correcting.
+
+#
+# SCO Set
+#
+056039=Null elements not allowed in persistent sets.
+056040=Collection field "{0}" was asked to add element "{1}" to the M-N relation but the element already has this field in its collection
+
+#
+# SCO List
+#
+056041=Class "{0}" has collection field "{1}" and this has no mapping in the table for the index of the element class "{2}". Maybe you declared the field as a java.util.Collection and instantiated it as a java.util.List yet omitted the <order> element in the MetaData ?
+056042=Remove of element from Inverse List deleted the element since owner/index columns weren't nullable
+056043=Remove of element from Inverse List removed the element from the List while leaving the element intact.
+056044=Field "{0}" has been instantiated as a List using a join table yet the join table has no "ordering" column. Please specify the <order> tag in the MetaData.
+
+#
+# SCO Array
+#
+056045=The field "{0}" is an array field where the elements use "subclass-table" inheritance strategy and where there are more than 1 subclass where the element is persisted. DataNucleus doesnt currently support this situation.
+056046=Class "{0}" has array field "{1}" and this has no mapping in the table for the element class "{2}" owner field "{3}"
+056047=Class "{0}" has array field "{1}" and this has no mapping in the table for the element class "{2}"
+056048=Class "{0}" has array field "{1}" and this has no mapping in the table for the index of the element class "{2}"
+056049=Array is of an interface type "{0}" and there are more than 1 implementation for this interface type found. DataNucleus doesnt currently support use of interface where there is more than 1 interface implementation.
+
+#
+# SCO Map
+#
+056050=The Map "{0}" has been specified without a key "mapped-by" field. You must specify a <key mapped-by=...> since the key is a field in the value class.
+056051=The Map "{0}" has been specified with a key type of "{1}" yet the field of the key in the value class is of type "{2}"!
+056052=Value class "{0}" has been defined to contain a field "{1}" that represents the key of the map but this field was not found!
+
+056053=Class "{0}" has map field "{1}" and this has no mapping in the table for the value class "{2}" key field "{3}"
+056054=Class "{0}" has map field "{1}" and this has no mapping in the table for the key class "{2}" value field "{3}"
+056055=The owner field {0} of value class {1} has an incorrect type "{2}". Should be "{3}"
+056056=Class "{0}" has map field "{1}" and this has no mapping in the table for the value class "{2}"
+
+056057=The Map "{0}" has been specified without a value "mapped-by" field. You must specify a <value mapped-by=...> since the value is a field in the key class.
+056058=The Map "{0}" has been specified with a value type of "{1}" yet the field of the value in the key class is of type "{2}"!
+056059=Key class "{0}" has been defined to contain a field "{1}" that represents the value of the map but this field was not found!
+
+056060=Can't write key from a different Persistence Manager
+056061=Can't write value from a different Persistence Manager
+056062=Null keys not allowed in persistent maps.
+056063=Null values not allowed in persistent maps.
+056064=Class {0} is not a valid key type for this Map. Must be {1}
+056065=Class {0} is not a valid value type for this Map. Must be {1}
+056066=Collection has been specified with an value-type "{0}" which is an interface. DataNucleus doesnt currently fully support the use of value-types that are interfaces. Please change the element-type to be a class.
+056067=Field "{0}" has been defined as "mapped-by" the field "{1}" yet this "mapped-by" field doesn't exist in the class "{2}".
+056068=Field "{0}" has been defined as "mapped-by" field "{1}" yet this is of an incorrect type ({2}). The field that is set as the "mapped-by" must be of type "{3}"
+
+056069=The MetaData for the key class "{0}" of the map field "{1}" was not found.
+056070=The MetaData for the value class "{0}" of the map field "{1}" was not found.
+
+056071=Field "{0}" is a Map formed by a ForeignKey. There is no key/value "mapped-by" specified. You must specify <key mapped-by="..."> if you want to use a Map ForeignKey relation.
+056072=Field "{0}" is a Map formed by a ForeignKey where the key is stored in the value object, however the value object is not PersistenceCapable (it is "{1}"). The value must be PersistenceCapable to use this type of relation.
+056073=Field "{0}" is a Map formed by a ForeignKey where the value is stored in the key object, however the key object is not PersistenceCapable (it is "{1}"). The key must be PersistenceCapable to use this type of relation.
+056074=Field "{0}" is a Map formed by a ForeignKey where the value is stored in the key object, however the DataNucleus doesnt currently support this type of relation.
+
+
+
 057023=Class "{0}" has not got its own table and no subclass tables are found for this class. Creation of schema is impossible!

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation_es.properties
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation_es.properties	2009-01-02 15:05:24 UTC (rev 4493)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/Localisation_es.properties	2009-01-02 17:31:00 UTC (rev 4494)
@@ -47,4 +47,120 @@
 039002=Factoria de identificaciones las quiere en "{0}" pero es imposible con este adaptador de base de datos, y no hay otra opci\xF3n.
 
 
+055009=El objeto "{0}" tiene campo "{1}" con una relacion bidireccional, y a\xF1adiendo el elemento "{2}" aqi que ponemos el valor del due\xF1o en el elemento.
+055010=El objeto "{0}" tiene una relacion 1-N bidireccional "{1}" y vamos a quitar un elemento. Elemento "{2}" va a tener el due\xF1o anulado.
+
+#
+# SCO
+#
+056000=\xA1El campo "{0}" es una matriz, pero no hay MetaData de <array>!
+056001=\xA1El campo "{0}" es una collecci\xF3n, pero no hay MetaData de <collection>!
+056002=\xA1El campo "{0}" es una mapa, pero no hay MetaData de <map>!
+056003=\xA1El MetaData de la clase de elemento "{0}" del campo de collecci\xF3n "{1}" no esta!
+056004=\xA1El MetaData de la clase de elemento "{0}" del campo de mapa "{1}" no esta!
+056005=El estatement del iterador es nulo !!
+056006=Solicitud de iterar ha fallado : {0}
+056007=Solicitud de tama\xF1o ha fallado : {0}
+056008=Solicitud de contener ha fallado : {0}
+056009=Solicitud de a\xF1adir ha fallado : {0}
+056010=Solicitud de cambiar la clave embedded ha fallado : {0}
+056011=Solicitud de cambiar el valor embedded ha fallado : {0}
+056012=Solicitud de borrar ha fallado : {0}
+056013=Solicitud de vaciar ha fallado : {0}
+056014=Solicitud de obtener ha fallado : {0}
+056015=Solicitud de poner ha fallado : {0}
+056016=Solicitud de poner ha fallado : {0}
+056017=Solicitud de IndexOf ha fallado : {0}
+056018=Solicitud de ContainsKey ha fallado : {0}
+056019=Solicitud de ContainsValue ha fallado : {0}
+056020=Solicitud de MaxAdapterColumnId ha fallado : {0}
+056021=No se puede preguntar sobre una Collection de elementos de segunda clase
+056022=No se puede preguntar sobre un Map de valores de segunda clase
+056023=GetIndices ha fallado : unos elementos no existen : {0}
+
+056024=El campo "{0}" tiene "mapped-by" como "{1}" pero ese campo "mapped-by" no existe en la clase "{2}".
+056025=El campo "{0}" tiene "mapped-by" como "{1}" pero el tipo de ese es incorrecto ({2}). El campo de "mapped-by" tiene que ser del tipo "{3}"
+056026=El campo due\xF1o {0} de la clase de elemento {1} tiene un tipo incorrecto "{2}". Debe ser "{3}"
+056027=Could not update the foreign key using statement : {0}
+
+#
+# SCO Collection
+#
+056028=El campo de collecci\xF3n "{0}" debe contener el elemento "{1}" pero este elemento esta almacenado como "embedded" en otro campo. \xA1Es imposible!. No se puede almacenar un objeto como SCO ("embedded") y como FCO al mismo tiempo
+
+056029=La clase "{0}" tiene campo de collecci\xF3n "{1}" pero este no tiene un Mapping en la tabla de la clase de elementos "{2}" campo "{3}"
+056030=La clase "{0}" tiene un campo de collecci\xF3n "{1}" pero este no tiene un Mapping en la tabla de la clase de elementos "{2}"
+
+056031=El campo "{0}" es una collecci\xF3n con elementos que usan la estrategia de heredar de "subclass-table" y hay m\xE1s que una tabla basica para los elementos. DataNucleus no apoya esta situaci\xF3n.
+056032=La collecci\xF3n tiene element-type "{0}" que es interface y tiene m\xE1s que una implementaci\xF3n. DataNucleus no apoya el uso de los interfaces cuando haya m\xE1s que una implementaci\xF3n disponible.
+
+056033=La clase {0} no es de un tipo valido para esta collecci\xF3n (Campo "{1}"). Debe ser "{2}" o algun subclase
+
+056034=La borracion del elemento de FK Collection borra los elementos porque el campo es "dependent"
+056035=La borracion del elemento de FK Collection ha borrado los elementos porque las columnas de owner/index no son nulable
+056036=La borracion del elemento de FK Collection ha anulado el FK y los ha dejado en la base de datos.
+
+056037=El objeto "{0}" tiene una colleccion "{1}" pero el elemento "{2}" no tiene el due\xF1o puesto. Manejando la relaci\xF3n y poniendo el due\xF1o.
+056038=El objeto "{0}" tiene una colleccion "{1}" pero el elemento "{2}" tiene el due\xF1o de "{3}". \xA1Usted tiene que corregirlo!
+
+#
+# SCO Set
+#
+056039=Elementos nulos no estan permitidos en persistent sets.
+056040=El campo de collecci\xF3n "{0}" tenia que a\xF1adir el elemento "{1}" a la relaci\xF3n M-N pero este elemento ya existe.
+
+#
+# SCO List
+#
+056041=La clase "{0}" tiene un campo de collecci\xF3n "{1}" pero este no tiene un Mapping por el indice de la lista en la tabla de la clase de elementos "{2}". \xBFQuizas usted haya declarado el campo como java.util.Collection pero lo haya instanciado como java.util.List sin poner <order> en el MetaData?
+056042=La borracion del elemento de Inverse List ha borrado el elemento porque las columnas de owner/index no son nulable
+056043=La borracion del elemento de Inverse List ha quitado el elemento de List y lo ha dejado en la base de datos.
+056044=El campo "{0}" ha sido instanciado como una lista usando tabla de juntar pero la tabla no tiene una columna de "order". Por favor, ponga un elemento <order> en el MetaData.
+
+#
+# SCO Array
+#
+056045=El campo "{0}" es una collecci\xF3n con elementos que usan la estrategia de heredar de "subclass-table" y hay m\xE1s que una tabla basica para los elementos. DataNucleus no apoya esta situaci\xF3n.
+056046=La clase "{0}" tiene campo de matriz "{1}" pero este no tiene un Mapping en la tabla de la clase de elementos "{2}" campo "{3}"
+056047=La clase "{0}" tiene un campo de matriz "{1}" pero este no tiene un Mapping en la tabla de la clase de elementos "{2}"
+056048=La clase "{0}" tiene un campo de matriz "{1}" pero este no tiene un Mapping por el indice de la lista en la tabla de la clase de elementos "{2}"
+056049=La matriz tiene element "{0}" que es interface y tiene m\xE1s que una implementaci\xF3n. DataNucleus no apoya el uso de los interfaces cuando haya m\xE1s que una implementaci\xF3n disponible.
+
+#
+# SCO Map
+#
+056050=La Mapa "{0}" no tiene ninguna especificacion <key mapped-by=...>. Usted tiene que poner un <key mapped-by=...> porque se almacena la llave en un campo en el valor.
+056051=\xA1La Mapa "{0}" tiene un tipo de llave de "{1}" pero el campo de la llave en el valor es de tipo "{2}"!
+056052=\xA1La clase de valor "{0}" tiene que contener un campo "{1}" que representa la llave, pero no hay ningun campo con este nombre!
+
+056057=La Mapa "{0}" no tiene ninguna especificacion <value mapped-by=...>. Usted tiene que poner un <value mapped-by=...> porque se almacena el valor en un campo en la llave.
+056058=\xA1La Mapa "{0}" tiene un tipo de valor de "{1}" pero el campo de; valor en la llave es de tipo "{2}"!
+056059=\xA1La clase del llave "{0}" tiene que contener un campo "{1}" que representa el valor, pero no hay ningun campo con este nombre!
+
+056053=La clase "{0}" tiene un campo de Mapa "{1}" pero no tiene un Mapping para la clase de los valores "{2}" campo de llave "{3}"
+056054=La clase "{0}" tiene un campo de Mapa "{1}" pero no tiene un Mapping para la clase de las llaves "{2}" campo de valor "{3}"
+056055=The owner field {0} of value class {1} has an incorrect type "{2}". Should be "{3}"
+056056=\xA1La clase "{0}" tiene un campo de Mapa "{1}" pero no hay ningun Mapping en la tabla de la clase de valores "{2}" para llegar al due\xF1o!
+
+056060=No se puede escribir la llave de otro Persistence Manager
+056061=No se puede escribir valor de otro Persistence Manager
+056062=Llaves nulas no estan permitidas en persistent maps.
+056063=Valores nulos no estan permitidos en persistent maps.
+056064=La clase {0} no es de un tipo valido para una llave de este Map. Debe ser {1}
+056065=La clase {0} no es de un tipo valido para un valor de este Map. Debe ser {1}
+056066=El Mapa tiene value-type "{0}" que es interface. DataNucleus no apoya totalmente un value-type asi. Por favor cambialo por una clase.
+056067=El campo "{0}" tiene un "mapped-by" con el campo "{1}" pero este campo de "mapped-by" no existe en la clase "{2}".
+056068=El campo "{0}" tiene un "mapped-by" con el campo "{1}" pero el tipo esta incorrecta ({2}). El campo de "mapped-by" debe ser de tipo "{3}"
+
+056069=\xA1El MetaData de la clase de la llave "{0}" del campo de la mapa "{1}" no esta!
+056070=\xA1El MetaData de la clase del valor "{0}" del campo de la mapa "{1}" no esta!
+
+056071=El campo "{0}" es una mapa de ForeignKey. No hay ningun key/value "mapped-by". Usted tiene que poner <key mapped-by="..."> para usar una relaci\xF3n de mapa de ForeignKey.
+056072=El campo "{0}" es una mapa de ForeignKey donde se almacena la llave en el valor, pero el valor no es PersistenceCapable (es "{1}"). Usted tiene que usar un valor de PersistenceCapable para usar este tipo de relaci\xF3n
+056072=El campo "{0}" es una mapa de ForeignKey donde se almacena el valor en la llave, pero la llave no es PersistenceCapable (es "{1}"). Usted tiene que usar una llave de PersistenceCapable para usar este tipo de relaci\xF3n
+056074=El campo "{0}" es una mapa de ForeignKey donde el valor se almacena en la llave, pero DataNucleus no apoya esta relaci\xF3n
+
+
+
+
 057023=La clase "{0}" no tiene su propia tabla y no hay subclases con tablas tampoco. No es posible crear el esquema!

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/BaseContainerStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/BaseContainerStore.java	2009-01-02 15:05:24 UTC (rev 4493)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/mapped/scostore/BaseContainerStore.java	2009-01-02 17:31:00 UTC (rev 4494)
@@ -38,7 +38,7 @@
 {
     /** Localiser for messages. */
     protected static final Localiser LOCALISER = Localiser.getInstance(
-        "org.datanucleus.store.rdbms.Localisation", MappedStoreManager.class.getClassLoader());
+        "org.datanucleus.store.mapped.Localisation", MappedStoreManager.class.getClassLoader());
 
     /** Manager for the store. */
     protected MappedStoreManager storeMgr;

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation.properties
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation.properties	2009-01-02 15:05:24 UTC (rev 4493)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation.properties	2009-01-02 17:31:00 UTC (rev 4494)
@@ -369,119 +369,7 @@
 055007=Attempt to store value "{0}" in column "{1}" that has maximum length of {2}. Please correct your data!
 055008=Attempt to store a char with unassigned value (0x0) but this database doesnt support storing this value. Using space (' ') instead
 
-055009=Object "{0}" has field "{1}" with a 1-N bidirectional relation and adding element "{2}" so setting the owner of the element.
-055010=Object "{0}" has a 1-N bidirectional collection field "{1}" and having element removed. Element "{2}" is having its owner field nulled.
-
 #
-# SCO
-#
-056000=The field "{0}" has been declared as being an array, yet there is no <array> MetaData specified!
-056001=The field "{0}" has been declared as being a collection, yet there is no <collection> MetaData specified!
-056002=The field "{0}" has been declared as being a map, yet there is no <map> MetaData specified!
-056003=The MetaData for the element class "{0}" of the collection field "{1}" was not found.
-056004=The MetaData for the value class "{0}" of the map field "{1}" was not found.
-056005=Iterator query statement is null !!
-056006=Iteration request failed : {0}
-056007=Size request failed : {0}
-056008=Contains request failed : {0}
-056009=Add request failed : {0}
-056010=Update embedded key failed : {0}
-056011=Update embedded value failed : {0}
-056012=Remove request failed : {0}
-056013=Clear request failed : {0}
-056014=Get request failed : {0}
-056015=Set request failed : {0}
-056016=Put request failed : {0}
-056017=IndexOf request failed : {0}
-056018=ContainsKey request failed : {0}
-056019=ContainsValue request failed : {0}
-056020=MaxAdapterColumnId request failed : {0}
-056021=Can't query over a Collection of second-class elements.
-056022=Can't query over a Map of second-class elements.
-056023=GetIndices failed : One or more elements specified doesnt exist : {0}
-
-056024=Field "{0}" has been defined as "mapped-by" the field "{1}" yet this "mapped-by" field doesn't exist in the class "{2}".
-056025=Field "{0}" has been defined as "mapped-by" field "{1}" yet this is of an incorrect type ({2}). The field that is set as the "mapped-by" must be of type "{3}"
-056026=The owner field {0} of element class {1} has an incorrect type "{2}". Should be "{3}"
-056027=Could not update the foreign key using statement : {0}
-#
-# SCO Collection
-#
-056028=Collection field "{0}" has been specified to contain the element "{1}" unembedded yet this is already identified as being stored embedded in a different field. This is invalid. You can't store the same object embedded and unembedded!
-
-056029=Class "{0}" has collection field "{1}" and this has no mapping in the table for the element class "{2}" owner field "{3}"
-056030=Class "{0}" has collection field "{1}" and this has no mapping in the table for the element class "{2}"
-
-056031=The field "{0}" is a collection field where the elements use "subclass-table" inheritance strategy and where there are more than 1 subclass where the element is persisted. DataNucleus doesnt currently support this situation.
-056032=Collection has been defined with elements of an interface type "{0}" and there are more than 1 implementation for this interface type found. DataNucleus doesnt currently support use of interface where there is more than 1 interface implementation.
-
-056033=Class {0} is not a valid element type for this collection (Field "{1}"). Must be "{2}" or subclass
-
-056034=Removal of element(s) from FK Collection deletes the element(s) since the field is "dependent"
-056035=Removal of element(s) from FK Collection deletes the element(s) since owner/index columns weren't nullable
-056036=Removal of element(s) from FK Collection nulls the FK while leaving the element(s) intact.
-
-056037=Object "{0}" has a collection "{1}" yet element "{2}" doesnt have the owner set. Managing the relation and setting the owner.
-056038=Object "{0}" has a collection "{1}" yet element "{2}" has its owner set to "{3}". This is inconsistent and needs correcting.
-
-#
-# SCO Set
-#
-056039=Null elements not allowed in persistent sets.
-056040=Collection field "{0}" was asked to add element "{1}" to the M-N relation but the element already has this field in its collection
-
-#
-# SCO List
-#
-056041=Class "{0}" has collection field "{1}" and this has no mapping in the table for the index of the element class "{2}". Maybe you declared the field as a java.util.Collection and instantiated it as a java.util.List yet omitted the <order> element in the MetaData ?
-056042=Remove of element from Inverse List deleted the element since owner/index columns weren't nullable
-056043=Remove of element from Inverse List removed the element from the List while leaving the element intact.
-056044=Field "{0}" has been instantiated as a List using a join table yet the join table has no "ordering" column. Please specify the <order> tag in the MetaData.
-
-#
-# SCO Array
-#
-056045=The field "{0}" is an array field where the elements use "subclass-table" inheritance strategy and where there are more than 1 subclass where the element is persisted. DataNucleus doesnt currently support this situation.
-056046=Class "{0}" has array field "{1}" and this has no mapping in the table for the element class "{2}" owner field "{3}"
-056047=Class "{0}" has array field "{1}" and this has no mapping in the table for the element class "{2}"
-056048=Class "{0}" has array field "{1}" and this has no mapping in the table for the index of the element class "{2}"
-056049=Array is of an interface type "{0}" and there are more than 1 implementation for this interface type found. DataNucleus doesnt currently support use of interface where there is more than 1 interface implementation.
-
-#
-# SCO Map
-#
-056050=The Map "{0}" has been specified without a key "mapped-by" field. You must specify a <key mapped-by=...> since the key is a field in the value class.
-056051=The Map "{0}" has been specified with a key type of "{1}" yet the field of the key in the value class is of type "{2}"!
-056052=Value class "{0}" has been defined to contain a field "{1}" that represents the key of the map but this field was not found!
-
-056053=Class "{0}" has map field "{1}" and this has no mapping in the table for the value class "{2}" key field "{3}"
-056054=Class "{0}" has map field "{1}" and this has no mapping in the table for the key class "{2}" value field "{3}"
-056055=The owner field {0} of value class {1} has an incorrect type "{2}". Should be "{3}"
-056056=Class "{0}" has map field "{1}" and this has no mapping in the table for the value class "{2}"
-
-056057=The Map "{0}" has been specified without a value "mapped-by" field. You must specify a <value mapped-by=...> since the value is a field in the key class.
-056058=The Map "{0}" has been specified with a value type of "{1}" yet the field of the value in the key class is of type "{2}"!
-056059=Key class "{0}" has been defined to contain a field "{1}" that represents the value of the map but this field was not found!
-
-056060=Can't write key from a different Persistence Manager
-056061=Can't write value from a different Persistence Manager
-056062=Null keys not allowed in persistent maps.
-056063=Null values not allowed in persistent maps.
-056064=Class {0} is not a valid key type for this Map. Must be {1}
-056065=Class {0} is not a valid value type for this Map. Must be {1}
-056066=Collection has been specified with an value-type "{0}" which is an interface. DataNucleus doesnt currently fully support the use of value-types that are interfaces. Please change the element-type to be a class.
-056067=Field "{0}" has been defined as "mapped-by" the field "{1}" yet this "mapped-by" field doesn't exist in the class "{2}".
-056068=Field "{0}" has been defined as "mapped-by" field "{1}" yet this is of an incorrect type ({2}). The field that is set as the "mapped-by" must be of type "{3}"
-
-056069=The MetaData for the key class "{0}" of the map field "{1}" was not found.
-056070=The MetaData for the value class "{0}" of the map field "{1}" was not found.
-
-056071=Field "{0}" is a Map formed by a ForeignKey. There is no key/value "mapped-by" specified. You must specify <key mapped-by="..."> if you want to use a Map ForeignKey relation.
-056072=Field "{0}" is a Map formed by a ForeignKey where the key is stored in the value object, however the value object is not PersistenceCapable (it is "{1}"). The value must be PersistenceCapable to use this type of relation.
-056073=Field "{0}" is a Map formed by a ForeignKey where the value is stored in the key object, however the key object is not PersistenceCapable (it is "{1}"). The key must be PersistenceCapable to use this type of relation.
-056074=Field "{0}" is a Map formed by a ForeignKey where the value is stored in the key object, however the DataNucleus doesnt currently support this type of relation.
-
-#
 # Tables
 #
 057000=Table object has already been initialised : {0}

Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation_es.properties
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation_es.properties	2009-01-02 15:05:24 UTC (rev 4493)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/Localisation_es.properties	2009-01-02 17:31:00 UTC (rev 4494)
@@ -367,120 +367,7 @@
 055007=Intento de poner el valor "{0}" en la columna "{1}" que tiene tama\xF1o maximo de {2}. Por favor corrige el valor
 055008=Intento de poner un 'char' sin valor pero este base de datos no apoya un valor asi. Usando ' '
 
-055009=El objeto "{0}" tiene campo "{1}" con una relacion bidireccional, y a\xF1adiendo el elemento "{2}" aqi que ponemos el valor del due\xF1o en el elemento.
-055010=El objeto "{0}" tiene una relacion 1-N bidireccional "{1}" y vamos a quitar un elemento. Elemento "{2}" va a tener el due\xF1o anulado.
-
 #
-# SCO
-#
-056000=\xA1El campo "{0}" es una matriz, pero no hay MetaData de <array>!
-056001=\xA1El campo "{0}" es una collecci\xF3n, pero no hay MetaData de <collection>!
-056002=\xA1El campo "{0}" es una mapa, pero no hay MetaData de <map>!
-056003=\xA1El MetaData de la clase de elemento "{0}" del campo de collecci\xF3n "{1}" no esta!
-056004=\xA1El MetaData de la clase de elemento "{0}" del campo de mapa "{1}" no esta!
-056005=El estatement del iterador es nulo !!
-056006=Solicitud de iterar ha fallado : {0}
-056007=Solicitud de tama\xF1o ha fallado : {0}
-056008=Solicitud de contener ha fallado : {0}
-056009=Solicitud de a\xF1adir ha fallado : {0}
-056010=Solicitud de cambiar la clave embedded ha fallado : {0}
-056011=Solicitud de cambiar el valor embedded ha fallado : {0}
-056012=Solicitud de borrar ha fallado : {0}
-056013=Solicitud de vaciar ha fallado : {0}
-056014=Solicitud de obtener ha fallado : {0}
-056015=Solicitud de poner ha fallado : {0}
-056016=Solicitud de poner ha fallado : {0}
-056017=Solicitud de IndexOf ha fallado : {0}
-056018=Solicitud de ContainsKey ha fallado : {0}
-056019=Solicitud de ContainsValue ha fallado : {0}
-056020=Solicitud de MaxAdapterColumnId ha fallado : {0}
-056021=No se puede preguntar sobre una Collection de elementos de segunda clase
-056022=No se puede preguntar sobre un Map de valores de segunda clase
-056023=GetIndices ha fallado : unos elementos no existen : {0}
-
-056024=El campo "{0}" tiene "mapped-by" como "{1}" pero ese campo "mapped-by" no existe en la clase "{2}".
-056025=El campo "{0}" tiene "mapped-by" como "{1}" pero el tipo de ese es incorrecto ({2}). El campo de "mapped-by" tiene que ser del tipo "{3}"
-056026=El campo due\xF1o {0} de la clase de elemento {1} tiene un tipo incorrecto "{2}". Debe ser "{3}"
-056027=Could not update the foreign key using statement : {0}
-
-#
-# SCO Collection
-#
-056028=El campo de collecci\xF3n "{0}" debe contener el elemento "{1}" pero este elemento esta almacenado como "embedded" en otro campo. \xA1Es imposible!. No se puede almacenar un objeto como SCO ("embedded") y como FCO al mismo tiempo
-
-056029=La clase "{0}" tiene campo de collecci\xF3n "{1}" pero este no tiene un Mapping en la tabla de la clase de elementos "{2}" campo "{3}"
-056030=La clase "{0}" tiene un campo de collecci\xF3n "{1}" pero este no tiene un Mapping en la tabla de la clase de elementos "{2}"
-
-056031=El campo "{0}" es una collecci\xF3n con elementos que usan la estrategia de heredar de "subclass-table" y hay m\xE1s que una tabla basica para los elementos. DataNucleus no apoya esta situaci\xF3n.
-056032=La collecci\xF3n tiene element-type "{0}" que es interface y tiene m\xE1s que una implementaci\xF3n. DataNucleus no apoya el uso de los interfaces cuando haya m\xE1s que una implementaci\xF3n disponible.
-
-056033=La clase {0} no es de un tipo valido para esta collecci\xF3n (Campo "{1}"). Debe ser "{2}" o algun subclase
-
-056034=La borracion del elemento de FK Collection borra los elementos porque el campo es "dependent"
-056035=La borracion del elemento de FK Collection ha borrado los elementos porque las columnas de owner/index no son nulable
-056036=La borracion del elemento de FK Collection ha anulado el FK y los ha dejado en la base de datos.
-
-056037=El objeto "{0}" tiene una colleccion "{1}" pero el elemento "{2}" no tiene el due\xF1o puesto. Manejando la relaci\xF3n y poniendo el due\xF1o.
-056038=El objeto "{0}" tiene una colleccion "{1}" pero el elemento "{2}" tiene el due\xF1o de "{3}". \xA1Usted tiene que corregirlo!
-
-#
-# SCO Set
-#
-056039=Elementos nulos no estan permitidos en persistent sets.
-056040=El campo de collecci\xF3n "{0}" tenia que a\xF1adir el elemento "{1}" a la relaci\xF3n M-N pero este elemento ya existe.
-
-#
-# SCO List
-#
-056041=La clase "{0}" tiene un campo de collecci\xF3n "{1}" pero este no tiene un Mapping por el indice de la lista en la tabla de la clase de elementos "{2}". \xBFQuizas usted haya declarado el campo como java.util.Collection pero lo haya instanciado como java.util.List sin poner <order> en el MetaData?
-056042=La borracion del elemento de Inverse List ha borrado el elemento porque las columnas de owner/index no son nulable
-056043=La borracion del elemento de Inverse List ha quitado el elemento de List y lo ha dejado en la base de datos.
-056044=El campo "{0}" ha sido instanciado como una lista usando tabla de juntar pero la tabla no tiene una columna de "order". Por favor, ponga un elemento <order> en el MetaData.
-
-#
-# SCO Array
-#
-056045=El campo "{0}" es una collecci\xF3n con elementos que usan la estrategia de heredar de "subclass-table" y hay m\xE1s que una tabla basica para los elementos. DataNucleus no apoya esta situaci\xF3n.
-056046=La clase "{0}" tiene campo de matriz "{1}" pero este no tiene un Mapping en la tabla de la clase de elementos "{2}" campo "{3}"
-056047=La clase "{0}" tiene un campo de matriz "{1}" pero este no tiene un Mapping en la tabla de la clase de elementos "{2}"
-056048=La clase "{0}" tiene un campo de matriz "{1}" pero este no tiene un Mapping por el indice de la lista en la tabla de la clase de elementos "{2}"
-056049=La matriz tiene element "{0}" que es interface y tiene m\xE1s que una implementaci\xF3n. DataNucleus no apoya el uso de los interfaces cuando haya m\xE1s que una implementaci\xF3n disponible.
-
-#
-# SCO Map
-#
-056050=La Mapa "{0}" no tiene ninguna especificacion <key mapped-by=...>. Usted tiene que poner un <key mapped-by=...> porque se almacena la llave en un campo en el valor.
-056051=\xA1La Mapa "{0}" tiene un tipo de llave de "{1}" pero el campo de la llave en el valor es de tipo "{2}"!
-056052=\xA1La clase de valor "{0}" tiene que contener un campo "{1}" que representa la llave, pero no hay ningun campo con este nombre!
-
-056057=La Mapa "{0}" no tiene ninguna especificacion <value mapped-by=...>. Usted tiene que poner un <value mapped-by=...> porque se almacena el valor en un campo en la llave.
-056058=\xA1La Mapa "{0}" tiene un tipo de valor de "{1}" pero el campo de; valor en la llave es de tipo "{2}"!
-056059=\xA1La clase del llave "{0}" tiene que contener un campo "{1}" que representa el valor, pero no hay ningun campo con este nombre!
-
-056053=La clase "{0}" tiene un campo de Mapa "{1}" pero no tiene un Mapping para la clase de los valores "{2}" campo de llave "{3}"
-056054=La clase "{0}" tiene un campo de Mapa "{1}" pero no tiene un Mapping para la clase de las llaves "{2}" campo de valor "{3}"
-056055=The owner field {0} of value class {1} has an incorrect type "{2}". Should be "{3}"
-056056=\xA1La clase "{0}" tiene un campo de Mapa "{1}" pero no hay ningun Mapping en la tabla de la clase de valores "{2}" para llegar al due\xF1o!
-
-056060=No se puede escribir la llave de otro Persistence Manager
-056061=No se puede escribir valor de otro Persistence Manager
-056062=Llaves nulas no estan permitidas en persistent maps.
-056063=Valores nulos no estan permitidos en persistent maps.
-056064=La clase {0} no es de un tipo valido para una llave de este Map. Debe ser {1}
-056065=La clase {0} no es de un tipo valido para un valor de este Map. Debe ser {1}
-056066=El Mapa tiene value-type "{0}" que es interface. DataNucleus no apoya totalmente un value-type asi. Por favor cambialo por una clase.
-056067=El campo "{0}" tiene un "mapped-by" con el campo "{1}" pero este campo de "mapped-by" no existe en la clase "{2}".
-056068=El campo "{0}" tiene un "mapped-by" con el campo "{1}" pero el tipo esta incorrecta ({2}). El campo de "mapped-by" debe ser de tipo "{3}"
-
-056069=\xA1El MetaData de la clase de la llave "{0}" del campo de la mapa "{1}" no esta!
-056070=\xA1El MetaData de la clase del valor "{0}" del campo de la mapa "{1}" no esta!
-
-056071=El campo "{0}" es una mapa de ForeignKey. No hay ningun key/value "mapped-by". Usted tiene que poner <key mapped-by="..."> para usar una relaci\xF3n de mapa de ForeignKey.
-056072=El campo "{0}" es una mapa de ForeignKey donde se almacena la llave en el valor, pero el valor no es PersistenceCapable (es "{1}"). Usted tiene que usar un valor de PersistenceCapable para usar este tipo de relaci\xF3n
-056072=El campo "{0}" es una mapa de ForeignKey donde se almacena el valor en la llave, pero la llave no es PersistenceCapable (es "{1}"). Usted tiene que usar una llave de PersistenceCapable para usar este tipo de relaci\xF3n
-056074=El campo "{0}" es una mapa de ForeignKey donde el valor se almacena en la llave, pero DataNucleus no apoya esta relaci\xF3n
-
-#
 # RDBMS Tables
 #
 057000=Ya existe la tabla : {0}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.