Cater for owner being embedded, so navigate to real owner. For #138

Author: andyjefferson

src/main/java/org/datanucleus/store/rdbms/scostore/BackingStoreHelper.java

@@ -63,7 +63,7 @@ public static int populateOwnerInStatement(ObjectProvider op, ExecutionContext e
         boolean embedded = false;
         if (op.isEmbedded() && ownerMappingTable instanceof JoinTable && ((JoinTable)ownerMappingTable).getOwnerTable() != null)
         {
-            // Embedded object with this join table, so get the owner object (which will be used in the ownerMapping)
+            // Embedded object with this join table, so get the owner object (which will be used in the ownerMapping) TODO Cater for nested embedded?
             ObjectProvider[] ownerOPs = ec.getOwnersForEmbeddedObjectProvider(op);
             if (ownerOPs != null && ownerOPs.length == 1)
             {

src/main/java/org/datanucleus/store/rdbms/scostore/FKArrayStore.java

@@ -626,12 +626,24 @@ public Iterator<E> iterator(ObjectProvider ownerOP)
             SQLController sqlControl = storeMgr.getSQLController();
             try
             {
-                // Create the statement and set the owner
+                // Create the statement
                 PreparedStatement ps = sqlControl.getStatementForQuery(mconn, stmt);
+
+                // Set the owner
+                ObjectProvider stmtOwnerOP = ownerOP;
+                if (ownerOP.isEmbedded())
+                {
+                    // Embedded object with this join table, so get the owner object (which will be used in the ownerMapping)
+                    ObjectProvider[] ownerOPs = ec.getOwnersForEmbeddedObjectProvider(ownerOP);
+                    if (ownerOPs != null && ownerOPs.length == 1)
+                    {
+                        stmtOwnerOP = ownerOPs[0];
+                    }
+                }
                 int numParams = ownerIdx.getNumberOfParameterOccurrences();
                 for (int paramInstance=0;paramInstance<numParams;paramInstance++)
                 {
-                    ownerIdx.getMapping().setObject(ec, ps, ownerIdx.getParameterPositionsForOccurrence(paramInstance), ownerOP.getObject());
+                    ownerIdx.getMapping().setObject(ec, ps, ownerIdx.getParameterPositionsForOccurrence(paramInstance), stmtOwnerOP.getObject());
                 }
 
                 try

src/main/java/org/datanucleus/store/rdbms/scostore/FKListStore.java

@@ -1092,12 +1092,24 @@ protected ListIterator<E> listIterator(ObjectProvider op, int startIdx, int endI
             SQLController sqlControl = storeMgr.getSQLController();
             try
             {
-                // Create the statement and set the owner
+                // Create the statement
                 PreparedStatement ps = sqlControl.getStatementForQuery(mconn, stmt);
+
+                // Set the owner
+                ObjectProvider stmtOwnerOP = op;
+                if (op.isEmbedded())
+                {
+                    // Embedded object with this join table, so get the owner object (which will be used in the ownerMapping)
+                    ObjectProvider[] ownerOPs = ec.getOwnersForEmbeddedObjectProvider(op);
+                    if (ownerOPs != null && ownerOPs.length == 1)
+                    {
+                        stmtOwnerOP = ownerOPs[0];
+                    }
+                }
                 int numParams = ownerIdx.getNumberOfParameterOccurrences();
                 for (int paramInstance=0;paramInstance<numParams;paramInstance++)
                 {
-                    ownerIdx.getMapping().setObject(ec, ps, ownerIdx.getParameterPositionsForOccurrence(paramInstance), op.getObject());
+                    ownerIdx.getMapping().setObject(ec, ps, ownerIdx.getParameterPositionsForOccurrence(paramInstance), stmtOwnerOP.getObject());
                 }
 
                 try

src/main/java/org/datanucleus/store/rdbms/scostore/FKSetStore.java

@@ -1135,12 +1135,24 @@ public Iterator<E> iterator(ObjectProvider op)
             SQLController sqlControl = storeMgr.getSQLController();
             try
             {
-                // Create the statement and set the owner
+                // Create the statement
                 PreparedStatement ps = sqlControl.getStatementForQuery(mconn, stmt);
+
+                // Set the owner
+                ObjectProvider stmtOwnerOP = op;
+                if (op.isEmbedded())
+                {
+                    // Embedded object with this join table, so get the owner object (which will be used in the ownerMapping)
+                    ObjectProvider[] ownerOPs = ec.getOwnersForEmbeddedObjectProvider(op);
+                    if (ownerOPs != null && ownerOPs.length == 1)
+                    {
+                        stmtOwnerOP = ownerOPs[0];
+                    }
+                }
                 int numParams = ownerStmtMapIdx.getNumberOfParameterOccurrences();
                 for (int paramInstance=0;paramInstance<numParams;paramInstance++)
                 {
-                    ownerStmtMapIdx.getMapping().setObject(ec, ps, ownerStmtMapIdx.getParameterPositionsForOccurrence(paramInstance), op.getObject());
+                    ownerStmtMapIdx.getMapping().setObject(ec, ps, ownerStmtMapIdx.getParameterPositionsForOccurrence(paramInstance), stmtOwnerOP.getObject());
                 }
 
                 try