Skip to content

Commit

Permalink
Merge pull request #831 from rparada/erxquery-refinements
Browse files Browse the repository at this point in the history
Renamed removesForeignKeysFromRowValues property
  • Loading branch information
darkv authored Mar 27, 2017
2 parents 04975fe + 76f38df commit bb8bde7
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@
* <ol>
* <li>er.extensions.eof.ERXQuery.useBindVariables=false</li>
* <li>er.extensions.eof.ERXQuery.useEntityRestrictingQualifiers=true</li>
* <li>er.extensions.eof.ERXQuery.removesForeignKeysFromRowValues=true</li>
* <li>er.extensions.eof.ERXQuery.removeForeignKeysFromRowValues=true</li>
* </ol>
*
* @author Ricardo J. Parada
Expand Down Expand Up @@ -770,7 +770,7 @@ protected int doPerform(EOAdaptorChannel channel) {
// Fetch results
try {
boolean hasInitValues = initValues.count() > 0;
boolean removesForeignKeysFromRowValues = ERXProperties.booleanForKeyWithDefault("er.extensions.eof.ERXQuery.removesForeignKeysFromRowValues", true);
boolean removeForeignKeysFromRowValues = ERXProperties.booleanForKeyWithDefault("er.extensions.eof.ERXQuery.removeForeignKeysFromRowValues", true);
NSMutableDictionary<String, Object> row = channel.fetchRow();
while (row != null) {
// Replace any foreign keys with their corresponding relationship keys
Expand All @@ -785,7 +785,7 @@ protected int doPerform(EOAdaptorChannel channel) {
eo = ERXEOControlUtilities.objectWithPrimaryKeyValue(ec, entityName, primaryKeyValue, null, refreshRefetchedObjects);
row.setObjectForKey(eo, relationshipKey);
}
if (removesForeignKeysFromRowValues) {
if (removeForeignKeysFromRowValues) {
row.removeObjectForKey(foreignKey);
}
}
Expand Down

0 comments on commit bb8bde7

Please sign in to comment.