Skip to content

Fix test failures when field encryption is enabled for SOQL order by clauses #523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nwcm wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix test failures when field encryption is enabled for SOQL order by clauses #523

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff8c3fe
fix: order test for inner query
nwcm Nov 20, 2025
5954acc
fix: inner order test for encryption support
nwcm Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletions sfdx-source/apex-common/test/classes/fflib_SObjectSelectorTest.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,10 +456,14 @@ private with sharing class fflib_SObjectSelectorTest
static void toSOQL_When_SystemModeAndChildRelationship_Expect_WellFormedSOQL(){
AccessLevelAccountSelector sel = new AccessLevelAccountSelector(fflib_SObjectSelector.DataAccess.SYSTEM_MODE);

String soql = sel.createSelectAccountWithOpportunitiesSOQL();
AccessLevelOpportunitySelector innerSelector = new AccessLevelOpportunitySelector();

String expected = String.format('SELECT name, id, annualrevenue, accountnumber, (currencyisocode, )?\\(SELECT name, id, amount, closedate(, currencyisocode)? FROM Opportunities ORDER BY {0} ASC NULLS FIRST \\) FROM Account WITH SYSTEM_MODE ORDER BY {0} ASC NULLS FIRST ',
new List<String>{sel.getOrderBy()});
String soql = sel.createSelectAccountWithOpportunitiesSOQL();

String expected = String.format(
'SELECT name, id, annualrevenue, accountnumber, (currencyisocode, )?\\(SELECT name, id, amount, closedate(, currencyisocode)? FROM Opportunities ORDER BY {0} ASC NULLS FIRST \\) FROM Account WITH SYSTEM_MODE ORDER BY {1} ASC NULLS FIRST ',
new List<String>{ innerSelector.getOrderBy(), sel.getOrderBy() }
);
Pattern soqlPattern = Pattern.compile(expected);
Matcher soqlMatcher = soqlPattern.matcher(soql);
System.assert(soqlMatcher.matches(),'Expected: ' + expected + ' Actual:' + soql);
Expand Down Expand Up @@ -829,16 +833,18 @@ private with sharing class fflib_SObjectSelectorTest
TaskSelector tSel = new TaskSelector();
fflib_QueryFactory tQF = tSel.addQueryFactorySubselect(listEmailQF);

String expected
= 'SELECT name, id, annualrevenue, accountnumber, '
+ '(SELECT id, contractnumber, '
+ '(SELECT name, id, amount, closedate, '
+ '(SELECT id, name, '
+ '(SELECT id, subject FROM Tasks ORDER BY Subject ASC NULLS FIRST ) '
+ 'FROM ListEmails ORDER BY Name ASC NULLS FIRST ) '
+ 'FROM Opportunities ORDER BY Name ASC NULLS FIRST ) '
+ 'FROM Contracts ORDER BY ContractNumber ASC NULLS FIRST ) '
+ 'FROM Account WITH USER_MODE ORDER BY Name ASC NULLS FIRST ';
String expected = String.format(
'SELECT name, id, annualrevenue, accountnumber, ' +
'(SELECT id, contractnumber, ' +
'(SELECT name, id, amount, closedate, ' +
'(SELECT id, name, ' +
'(SELECT id, subject FROM Tasks ORDER BY {0} ASC NULLS FIRST ) ' +
'FROM ListEmails ORDER BY {1} ASC NULLS FIRST ) ' +
'FROM Opportunities ORDER BY {2} ASC NULLS FIRST ) ' +
'FROM Contracts ORDER BY {3} ASC NULLS FIRST ) ' +
'FROM Account WITH USER_MODE ORDER BY {4} ASC NULLS FIRST ',
new List<String>{ tSel.getOrderBy(), listEmailSel.getOrderBy(), oppSel.getOrderBy(), cSel.getOrderBy(), aSel.getOrderBy() }
);

Assert.areEqual(expected,aQF.toSOQL());
}
Expand Down