From 3cefe0e4d062f82e2524be47d85115cdd9d81efa Mon Sep 17 00:00:00 2001 From: Kelly Kelly <kelly@basistech.com> Date: Tue, 30 Jul 2019 18:19:47 -0400 Subject: [PATCH] Fixed postgre mulit-user cvt issue --- .../org/sleuthkit/datamodel/CommunicationsManager.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bindings/java/src/org/sleuthkit/datamodel/CommunicationsManager.java b/bindings/java/src/org/sleuthkit/datamodel/CommunicationsManager.java index 54f63e8c8..09b791dbb 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/CommunicationsManager.java +++ b/bindings/java/src/org/sleuthkit/datamodel/CommunicationsManager.java @@ -673,16 +673,16 @@ public List<AccountDeviceInstance> getAccountDeviceInstancesWithRelationships(Co String uniqueAccountQueryTemplate = " SELECT %1$1s as account_id," - + " data_source_obj_id" - + " FROM ( " + relTblfilterQuery + ")"; + + " data_source_obj_id" + + " FROM ( " + relTblfilterQuery + ")AS %2$s"; - String relationshipTableFilterQuery1 = String.format(uniqueAccountQueryTemplate, "account1_id"); - String relationshipTableFilterQuery2 = String.format(uniqueAccountQueryTemplate, "account2_id"); + String relationshipTableFilterQuery1 = String.format(uniqueAccountQueryTemplate, "account1_id", "union_query_1"); + String relationshipTableFilterQuery2 = String.format(uniqueAccountQueryTemplate, "account2_id", "union_query_2"); //this query groups by account_id and data_source_obj_id across both innerQueries String uniqueAccountQuery = "SELECT DISTINCT account_id, data_source_obj_id" - + " FROM ( " + relationshipTableFilterQuery1 + " UNION " + relationshipTableFilterQuery2 + " ) AS inner_union" + + " FROM ( " + relationshipTableFilterQuery1 + " UNION " + relationshipTableFilterQuery2 + " ) AS inner_union" + " GROUP BY account_id, data_source_obj_id"; // set up applicable filters -- GitLab