From 76f38df9bb67ae63ee3aad8d6450dc70d6ab31f2 Mon Sep 17 00:00:00 2001 From: Ricardo Parada Date: Mon, 27 Mar 2017 12:17:04 -0400 Subject: [PATCH] Renamed property from removesForeignKeysFromRowValues to removeForeignKeysFromRowValues This makes it consistent with the other two property names --- .../ERExtensions/Sources/er/extensions/eof/ERXQuery.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXQuery.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXQuery.java index 62930a7a94e..18989a94ddd 100644 --- a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXQuery.java +++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXQuery.java @@ -261,7 +261,7 @@ *
    *
  1. er.extensions.eof.ERXQuery.useBindVariables=false
  2. *
  3. er.extensions.eof.ERXQuery.useEntityRestrictingQualifiers=true
  4. - *
  5. er.extensions.eof.ERXQuery.removesForeignKeysFromRowValues=true
  6. + *
  7. er.extensions.eof.ERXQuery.removeForeignKeysFromRowValues=true
  8. *
* * @author Ricardo J. Parada @@ -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 row = channel.fetchRow(); while (row != null) { // Replace any foreign keys with their corresponding relationship keys @@ -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); } }