This commit is contained in:
Michael Buckley 2024-09-27 17:16:08 -04:00
parent 93d520a422
commit 75b894e9b4
3 changed files with 0 additions and 4 deletions

View File

@ -442,7 +442,6 @@ public class SearchQueryBuilder {
if (mySelectPartitionId) {
mySelectedResourceIdColumn = root.getResourceIdColumn();
mySelectedPartitionIdColumn = root.getPartitionIdColumn();
// fixme reverse?
mySelect.addColumns(mySelectedPartitionIdColumn, mySelectedResourceIdColumn);
} else {
mySelectedResourceIdColumn = root.getResourceIdColumn();
@ -478,7 +477,6 @@ public class SearchQueryBuilder {
@Nonnull
public DbColumn[] toJoinColumns(DbColumn partitionIdColumn, DbColumn resourceIdColumn) {
if (isIncludePartitionIdInJoins()) {
// fixme can we reverse these?
return new DbColumn[] {partitionIdColumn, resourceIdColumn};
} else {
return new DbColumn[] {resourceIdColumn};

View File

@ -155,7 +155,6 @@ public class SearchQueryExecutor implements ISearchQueryExecutor {
if (nextRowAsArray.length == 1) {
myNext = (Long) nextRowAsArray[0];
} else {
// fixme reverse
Integer nextPartitionId = (Integer) nextRowAsArray[0];
myNext = (Long) nextRowAsArray[1];
}

View File

@ -63,7 +63,6 @@ public class FhirResourceDaoR4SearchSqlTest extends BaseJpaR4Test {
myPatientDao.search(map);
assertEquals(1, myCaptureQueriesListener.countSelectQueries());
String sql = myCaptureQueriesListener.getSelectQueriesForCurrentThread().get(0).getSql(false, false);
// fixme log bug about duplicate join of string in sort when also in query
assertEquals("SELECT t1.RES_ID FROM HFJ_RESOURCE t1 INNER JOIN HFJ_SPIDX_TOKEN t0 ON (t1.RES_ID = t0.RES_ID) LEFT OUTER JOIN HFJ_SPIDX_STRING t2 ON ((t1.RES_ID = t2.RES_ID) AND (t2.HASH_IDENTITY = ?)) WHERE (t0.HASH_VALUE = ?) ORDER BY t2.SP_VALUE_NORMALIZED ASC NULLS LAST", sql);
}