From 07d1967935831d9b23a46e0415794fba1f22fd34 Mon Sep 17 00:00:00 2001 From: Raman Arora Date: Wed, 10 Jun 2020 19:26:42 -0400 Subject: [PATCH 1/2] Fixed malformed queries. --- .../autopsy/centralrepository/datamodel/PersonaAccount.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PersonaAccount.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PersonaAccount.java index d0322ddbca..33b5cf1cf8 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PersonaAccount.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PersonaAccount.java @@ -277,7 +277,7 @@ public class PersonaAccount { public static Collection getPersonaAccountsForAccount(long accountId) throws CentralRepoException { String queryClause = PERSONA_ACCOUNTS_QUERY_CALUSE + " WHERE persona_accounts.account_id = " + accountId - + "AND p.status_id != " + Persona.PersonaStatus.DELETED.getStatusId(); + + " AND personas.status_id != " + Persona.PersonaStatus.DELETED.getStatusId(); CentralRepository cr = CentralRepository.getInstance(); @@ -306,7 +306,7 @@ public class PersonaAccount { public static Collection getPersonaAccountsForIdentifierLike(String accountIdentifierSubstring) throws CentralRepoException { String queryClause = PERSONA_ACCOUNTS_QUERY_CALUSE + " WHERE LOWER(accounts.account_unique_identifier) LIKE LOWER('%" + accountIdentifierSubstring + "%')" - + "AND p.status_id != " + Persona.PersonaStatus.DELETED.getStatusId(); + + " AND personas.status_id != " + Persona.PersonaStatus.DELETED.getStatusId(); CentralRepository cr = CentralRepository.getInstance(); if (cr != null) { From 7bf28b10e2c71afe1e4e92f96249a2099da20463 Mon Sep 17 00:00:00 2001 From: Raman Arora Date: Wed, 10 Jun 2020 20:26:57 -0400 Subject: [PATCH 2/2] Fixed another (new) query filter out deleted personas. --- .../autopsy/centralrepository/datamodel/PersonaAccount.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PersonaAccount.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PersonaAccount.java index 33b5cf1cf8..527e432682 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PersonaAccount.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PersonaAccount.java @@ -331,7 +331,9 @@ public class PersonaAccount { */ public static Collection getPersonaAccountsForAccount(Account account) throws CentralRepoException { String queryClause = PERSONA_ACCOUNTS_QUERY_CALUSE - + " WHERE LOWER(accounts.account_unique_identifier) LIKE LOWER('%" + account.getTypeSpecificID() + "%') AND type_name = '" + account.getAccountType().getTypeName() + "' "; + + " WHERE LOWER(accounts.account_unique_identifier) LIKE LOWER('%" + account.getTypeSpecificID() + "%')" + + " AND type_name = '" + account.getAccountType().getTypeName() + "' " + + " AND personas.status_id != " + Persona.PersonaStatus.DELETED.getStatusId(); CentralRepository cr = CentralRepository.getInstance(); if (cr != null) {