Fix new searchbuilder on oracle (#2205)
* Fix new searchbuilder on oracle * Add changelog
This commit is contained in:
parent
18541d4388
commit
6e72ee8f6b
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
type: fix
|
||||
issue: 2205
|
||||
title: "The new JPA SearchBuilder failed to perform FHIR Searches on Oracle DB with an invalid SQL error. This has been corrected."
|
|
@ -354,12 +354,7 @@ public class SearchQueryBuilder {
|
|||
if (maxResultsToFetch != null || offset != null) {
|
||||
|
||||
maxResultsToFetch = defaultIfNull(maxResultsToFetch, 10000);
|
||||
|
||||
sql = "SELECT " +
|
||||
myFirstPredicateBuilder.getResourceIdColumn().getColumnNameSQL() +
|
||||
" FROM ( " + sql + " ) " +
|
||||
" AS " + myFirstPredicateBuilder.getResourceIdColumn().getColumnNameSQL();
|
||||
|
||||
|
||||
LimitHandler limitHandler = myDialect.getLimitHandler();
|
||||
RowSelection selection = new RowSelection();
|
||||
selection.setFirstRow(offset);
|
||||
|
|
|
@ -3650,6 +3650,8 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
|
|||
p2.addName().setFamily(methodName + "2");
|
||||
IIdType pid2 = myClient.create().resource(p2).execute().getId().toUnqualifiedVersionless();
|
||||
|
||||
myCaptureQueriesListener.clear();
|
||||
|
||||
HttpGet get = new HttpGet(ourServerBase + "/Patient?_lastUpdated=lt" + new InstantType(new Date(time1)).getValueAsString());
|
||||
CloseableHttpResponse response = ourHttpClient.execute(get);
|
||||
try {
|
||||
|
@ -3664,6 +3666,8 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
|
|||
response.close();
|
||||
}
|
||||
|
||||
myCaptureQueriesListener.logSelectQueries();
|
||||
|
||||
get = new HttpGet(ourServerBase + "/Patient?_lastUpdated=gt" + new InstantType(new Date(time1)).getValueAsString());
|
||||
response = ourHttpClient.execute(get);
|
||||
try {
|
||||
|
|
Loading…
Reference in New Issue