Fix mother search

opensrp · May 9, 2023 · 06a3dc8 · 06a3dc8
1 parent 7ee84b5
commit 06a3dc8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/opensrp-child/src/main/java/org/smartregister/child/provider/RegisterQueryProvider.java b/opensrp-child/src/main/java/org/smartregister/child/provider/RegisterQueryProvider.java
@@ -17,9 +17,9 @@ public String getObjectIdsQuery(String mainCondition, String filters) {
             strFilters = String.format(" WHERE (" + getDemographicTable() + ".first_name LIKE '%%%s%%' OR "+getDemographicTable()+ ".last_name LIKE '%%%s%%')", filters, filters);
         }
 
-        return "SELECT " + getChildDetailsTable() + ".id " +
-                "FROM " + getChildDetailsTable() + " " + getChildDetailsTable() + " " +
-                "LEFT JOIN " + getDemographicTable() + " ON " + getChildDetailsTable() + ".id = " + getDemographicTable() + ".base_entity_id " +
+        return "SELECT " + getDemographicTable() + ".id " +
+                "FROM " + getDemographicTable() + " " + getDemographicTable() + " " +
+                "LEFT JOIN " + getChildDetailsTable() + " ON " + getDemographicTable() + ".id = " + getChildDetailsTable() + ".base_entity_id " +
                 strMainCondition + strFilters;
     }
 

diff --git a/opensrp-child/src/test/java/org/smartregister/child/provider/RegisterQueryProviderTest.java b/opensrp-child/src/test/java/org/smartregister/child/provider/RegisterQueryProviderTest.java
@@ -14,8 +14,8 @@ public class RegisterQueryProviderTest extends BaseUnitTest {
 
     private RegisterQueryProvider queryProvider;
 
-    private String expectedQuery = "SELECT ec_child_details.id FROM ec_child_details ec_child_details " +
-            "LEFT JOIN ec_client ON ec_child_details.id = ec_client.base_entity_id ";
+    private String expectedQuery = "SELECT ec_client.id FROM ec_client ec_client LEFT JOIN ec_child_details " +
+            "ON ec_client.id = ec_child_details.base_entity_id ";
 
     private String registerQuery = "SELECT %s FROM ec_child_details " +
             "JOIN ec_mother_details ON ec_child_details.relational_id = ec_mother_details.base_entity_id " +