NonReferenceFieldException throw when external object referencing a parent field via indirect lookup on a custom object. (#498)

cdelfattore · ImJohnMDaniel · web-flow · commit 8499ee57ad96 · 2025-11-05T08:17:18.000-05:00
Co-authored-by: John M. Daniel &lt;ImJohnMDaniel@users.noreply.github.com&gt;
diff --git a/sfdx-source/apex-common/main/classes/fflib_QueryFactory.cls b/sfdx-source/apex-common/main/classes/fflib_QueryFactory.cls
@@ -122,7 +122,8 @@ public class fflib_QueryFactory { //No explicit sharing declaration - inherit fr
 				fflib_SecurityUtils.checkFieldIsReadable(lastSObjectType, token);
 			}
 
-			if (token != null && i.hasNext() && tokenDescribe.getSoapType() == Schema.SoapType.ID) {
+			if (token != null && i.hasNext() && (tokenDescribe.getSoapType() == Schema.SoapType.ID
+				|| (tokenDescribe.getSoapType() == Schema.SoapType.STRING && tokenDescribe.getType() == Schema.DisplayType.REFERENCE))) {
 				List<Schema.sObjectType> relatedObjs = tokenDescribe.getReferenceTo(); //if it's polymorphic, it matters which one we use - i.e. Lead.Owner is GROUP|USER and each has different fields.
 
 				if (relatedObjs.size() == 1 || relatedSObjectType == null) {

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,8 @@ public class fflib_QueryFactory { //No explicit sharing declaration - inherit fr`
`122`	`122`	`fflib_SecurityUtils.checkFieldIsReadable(lastSObjectType, token);`
`123`	`123`	`}`
`124`	`124`
`125`		`- if (token != null && i.hasNext() && tokenDescribe.getSoapType() == Schema.SoapType.ID) {`
	`125`	`+ if (token != null && i.hasNext() && (tokenDescribe.getSoapType() == Schema.SoapType.ID`
	`126`	`+ \|\| (tokenDescribe.getSoapType() == Schema.SoapType.STRING && tokenDescribe.getType() == Schema.DisplayType.REFERENCE))) {`
`126`	`127`	`List<Schema.sObjectType> relatedObjs = tokenDescribe.getReferenceTo(); //if it's polymorphic, it matters which one we use - i.e. Lead.Owner is GROUP\|USER and each has different fields.`
`127`	`128`
`128`	`129`	`if (relatedObjs.size() == 1 \|\| relatedSObjectType == null) {`