Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
2 changes: 1 addition & 1 deletion libs/commcare
Submodule commcare updated 44 files
+4 βˆ’3 .github/contributing.md
+9 βˆ’0 .github/dependabot.yml
+1 βˆ’1 .github/workflows/build.yml
+6 βˆ’5 build.gradle
+7 βˆ’1 src/cli/java/org/commcare/util/cli/CliMain.java
+1 βˆ’0 src/cli/java/org/commcare/util/screen/EntityScreen.java
+1 βˆ’4 src/cli/java/org/commcare/util/screen/EntityScreenHelper.java
+136 βˆ’77 src/main/java/org/commcare/cases/entity/AsyncEntity.java
+73 βˆ’10 src/main/java/org/commcare/cases/entity/AsyncNodeEntityFactory.java
+57 βˆ’0 src/main/java/org/commcare/cases/entity/EntityLoadingProgressListener.java
+7 βˆ’2 src/main/java/org/commcare/cases/entity/EntityStorageCache.java
+36 βˆ’0 src/main/java/org/commcare/cases/entity/NodeEntityFactory.java
+2 βˆ’2 src/main/java/org/commcare/core/interfaces/HttpResponseProcessor.java
+6 βˆ’0 src/main/java/org/commcare/core/interfaces/ResponseStreamAccessor.java
+18 βˆ’1 src/main/java/org/commcare/core/network/AuthInfo.java
+62 βˆ’15 src/main/java/org/commcare/core/network/ModernHttpRequester.java
+2 βˆ’3 src/main/java/org/commcare/modern/reference/JavaHttpReference.java
+4 βˆ’0 src/main/java/org/commcare/modern/session/SessionWrapper.java
+0 βˆ’2 src/main/java/org/commcare/session/SessionInstanceBuilder.java
+25 βˆ’1 src/main/java/org/commcare/suite/model/Detail.java
+23 βˆ’0 src/main/java/org/commcare/suite/model/DetailField.java
+30 βˆ’0 src/main/java/org/commcare/util/CommCarePlatform.java
+131 βˆ’34 src/main/java/org/commcare/util/EncryptionUtils.java
+8 βˆ’3 src/main/java/org/commcare/util/LogTypes.java
+4 βˆ’1 src/main/java/org/commcare/xml/DetailFieldParser.java
+3 βˆ’2 src/main/java/org/commcare/xml/DetailParser.java
+2 βˆ’0 src/main/java/org/javarosa/core/api/ILogger.java
+5 βˆ’1 src/main/java/org/javarosa/core/model/instance/DataInstance.java
+9 βˆ’0 src/main/java/org/javarosa/core/model/instance/ExternalDataInstance.java
+43 βˆ’0 src/main/java/org/javarosa/core/model/utils/GeoPointUtils.java
+2 βˆ’29 src/main/java/org/javarosa/core/model/utils/PolygonUtils.java
+14 βˆ’1 src/main/java/org/javarosa/core/services/Logger.java
+10 βˆ’0 src/main/java/org/javarosa/core/services/storage/IStorageUtilityIndexed.java
+7 βˆ’0 src/main/java/org/javarosa/core/services/storage/util/DummyIndexedStorageUtility.java
+36 βˆ’0 src/main/java/org/javarosa/core/util/DAG.java
+2 βˆ’2 src/main/java/org/javarosa/model/xform/DataModelSerializer.java
+8 βˆ’7 src/main/java/org/javarosa/xpath/expr/XPathClosestPointOnPolygonFunc.java
+2 βˆ’1 src/main/java/org/javarosa/xpath/expr/XPathExpression.java
+2 βˆ’1 src/main/java/org/javarosa/xpath/expr/XPathIsPointInsidePolygonFunc.java
+10 βˆ’1 src/test/java/org/commcare/backend/suite/model/test/AppStructureTests.java
+43 βˆ’9 src/test/java/org/commcare/test/utilities/CasePurgeTest.java
+1 βˆ’1 src/test/resources/app_structure/app_strings.txt
+17 βˆ’2 src/test/resources/app_structure/suite.xml
+664 βˆ’0 src/test/resources/case_relationship_tests.json
26 changes: 26 additions & 0 deletions src/main/java/org/commcare/formplayer/sandbox/SqlStorage.java
Original file line number Diff line number Diff line change
Expand Up @@ -607,6 +607,32 @@ public void deleteStorage() {
}


@Override
public Vector<Integer> getBulkIdsForIndex(String indexName, Collection<String> matchingValues) {
Vector<Integer> ids = new Vector<>();
String fieldName = TableBuilder.scrubName(indexName);
List<Pair<String, String[]>> whereParamList = TableBuilder.sqlList(matchingValues, "?");
try {
for (Pair<String, String[]> querySet : whereParamList) {
try (PreparedStatement selectStatement = SqlHelper.prepareTableSelectStatement(
connectionHandler.getConnection(),
tableName,
fieldName + " IN " + querySet.first,
querySet.second)) {

try (ResultSet resultSet = selectStatement.executeQuery()) {
while (resultSet.next()) {
ids.add(resultSet.getInt(DatabaseHelper.ID_COL));
}
}
}
}
return ids;
} catch (SQLException e) {
throw new SQLiteRuntimeException(e);
}
}

/**
* Retrieves a set of the models in storage based on a list of values matching one if the
* indexes of this storage
Expand Down
Loading