From 902b064898c6bed27dfe1b8984624d9d67e01886 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Tue, 16 Jun 2020 12:39:13 +0200
Subject: [PATCH] refactor MySQLGetAllNames.java
---
.../backend/implementation/MySQL/MySQLGetAllNames.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/caosdb/server/database/backend/implementation/MySQL/MySQLGetAllNames.java b/src/main/java/caosdb/server/database/backend/implementation/MySQL/MySQLGetAllNames.java
index c7d9c020..be7ff115 100644
--- a/src/main/java/caosdb/server/database/backend/implementation/MySQL/MySQLGetAllNames.java
+++ b/src/main/java/caosdb/server/database/backend/implementation/MySQL/MySQLGetAllNames.java
@@ -18,9 +18,11 @@ public class MySQLGetAllNames extends MySQLTransaction implements GetAllNamesImp
super(access);
}
- // TODO
public static final String STMT_GET_ALL_NAMES =
- "Select e.name as EntityName, e.role as EntityRole, a.acl as ACL FROM entities as e JOIN entity_acl as a ON (a.id=e.acl) WHERE e.name IS NOT NULL and e.role!='ROLE'";
+ "SELECT d.value as EntityName, e.role AS EntityRole, a.acl AS ACL "
+ + "FROM name_data AS d JOIN entities AS e JOIN entity_acl AS a "
+ + "ON (d.domain_id = 0 AND d.property_id = 20 AND d.entity_id = e.id AND a.id = e.acl) "
+ + "WHERE e.role != 'ROLE' AND e.role != 'DATATYPE'";
@Override
public List<SparseEntity> execute() {
--
GitLab