Merge pull request 'NodeMember: CommenCore' (#27) from nodemember into master

Reviewed-on: #27
Reviewed-by: Lixfel <lixfel@steamwar.de>

src/de/steamwar/sql/NodeMember.java

@@ -26,6 +26,7 @@ import de.steamwar.sql.internal.Table;
 import lombok.AllArgsConstructor;
 
 import java.util.HashSet;
+import java.util.Optional;
 import java.util.Set;
 
 @AllArgsConstructor
@@ -39,13 +40,16 @@ public class NodeMember {
     private static final SelectStatement<NodeMember> getNodeMember = table.select(Table.PRIMARY);
     private static final SelectStatement<NodeMember> getNodeMembers = table.selectFields("NodeId");
     private static final SelectStatement<NodeMember> getSchematics = table.selectFields("UserId");
-    private static final Statement create = table.insertAll();
+    private static final Statement create = table.insert(Table.PRIMARY);
     private static final Statement delete = table.delete(Table.PRIMARY);
+    private static final Statement updateParent = table.update(Table.PRIMARY, "ParentId");
 
     @Field(keys = {Table.PRIMARY})
     private final int nodeId;
     @Field(keys = {Table.PRIMARY})
     private final int userId;
+    @Field(nullable = true, def = "null")
+    private Integer parentId;
 
     public int getNode() {
         return nodeId;
@@ -55,13 +59,17 @@ public class NodeMember {
         return userId;
     }
 
+    public Optional<Integer> getParent() {
+        return Optional.ofNullable(parentId);
+    }
+
     public void delete() {
         delete.update(nodeId, userId);
     }
 
     public static NodeMember createNodeMember(int node, int member) {
         create.update(node, member);
-        return new NodeMember(node, member);
+        return new NodeMember(node, member, null);
     }
 
     public static NodeMember getNodeMember(int node, int member) {
@@ -75,4 +83,9 @@ public class NodeMember {
     public static Set<NodeMember> getSchematics(int member) {
         return new HashSet<>(getSchematics.listSelect(member));
     }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+        updateParent.update(this.parentId, nodeId, userId);
+    }
 }

src/de/steamwar/sql/SchematicNode.java

@@ -21,14 +21,12 @@ package de.steamwar.sql;
 
 import de.steamwar.sql.internal.*;
 import lombok.AccessLevel;
+import lombok.Getter;
 import lombok.Setter;
 
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
 import java.sql.Timestamp;
 import java.time.Instant;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
@@ -43,34 +41,27 @@ public class SchematicNode {
         TAB_CACHE.clear();
     }
 
-    private static final String[] fields = {"NodeId", "NodeOwner", "NodeName", "ParentNode", "LastUpdate", "NodeItem", "NodeType", "NodeRank", "ReplaceColor", "AllowReplay", "NodeFormat"};
+    private static final String nodeSelector = "SELECT NodeId, NodeOwner, NodeOwner AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay, NodeFormat FROM SchematicNode ";
-    private static String nodeSelectCreator(String itemPrefix) {
-        return "SELECT " +  Arrays.stream(fields).map(s -> itemPrefix + s).collect(Collectors.joining(", ")) + " FROM SchematicNode ";
-    }
 
     private static final Table<SchematicNode> table = new Table<>(SchematicNode.class);
     private static final Statement create = table.insertFields(true, "NodeOwner", "NodeName", "ParentNode", "NodeItem", "NodeType");
     private static final Statement update = table.update(Table.PRIMARY, "NodeName", "ParentNode", "NodeItem", "NodeType", "NodeRank", "ReplaceColor", "AllowReplay", "NodeFormat");
     private static final Statement delete = table.delete(Table.PRIMARY);
 
-    private static final SelectStatement<SchematicNode> byId = table.select(Table.PRIMARY);
+    private static final SelectStatement<SchematicNode> byId = new SelectStatement<>(table, nodeSelector + "WHERE NodeId = ?");
-    private static final SelectStatement<SchematicNode> byOwnerNameParent = table.select("OwnerNameParent");
+    private static final SelectStatement<SchematicNode> byOwnerNameParent = new SelectStatement<>(table, nodeSelector + "WHERE NodeOwner = ? AND NodeName = ? AND ParentNode = ?");
-    private static final SelectStatement<SchematicNode> byOwnerNameParent_null = new SelectStatement<>(table, nodeSelectCreator("") + "WHERE NodeOwner = ? AND NodeName = ? AND ParentNode is NULL");
+    private static final SelectStatement<SchematicNode> byParent = new SelectStatement<>(table, nodeSelector + "WHERE ParentNode" + Statement.NULL_SAFE_EQUALS + "? ORDER BY NodeName");
-    private static final SelectStatement<SchematicNode> byParent = new SelectStatement<>(table, nodeSelectCreator("") + "WHERE ParentNode = ? ORDER BY NodeName");
+    private static final SelectStatement<SchematicNode> dirsByParent = new SelectStatement<>(table, nodeSelector + "WHERE ParentNode" + Statement.NULL_SAFE_EQUALS + "? AND NodeType is NULL ORDER BY NodeName");
-    private static final SelectStatement<SchematicNode> byParent_null = new SelectStatement<>(table, nodeSelectCreator("") + "WHERE ParentNode is NULL ORDER BY NodeName");
+    private static final SelectStatement<SchematicNode> byOwnerType = new SelectStatement<>(table, nodeSelector + "WHERE NodeOwner = ? AND NodeType = ? ORDER BY NodeName");
-    private static final SelectStatement<SchematicNode> dirsByParent = new SelectStatement<>(table, nodeSelectCreator("") + "WHERE ParentNode = ? AND NodeType is NULL ORDER BY NodeName");
+    private static final SelectStatement<SchematicNode> byType = new SelectStatement<>(table, nodeSelector + "WHERE NodeType = ? ORDER BY NodeName");
-    private static final SelectStatement<SchematicNode> dirsByParent_null = new SelectStatement<>(table, nodeSelectCreator("") + "WHERE ParentNode is NULL AND NodeType is NULL ORDER BY NodeName");
+    private static final SelectStatement<SchematicNode> all = new SelectStatement<>(table, "SELECT * FROM EffectiveSchematicNode WHERE EffectiveOwner = ? ORDER BY NodeName");
-    private static final SelectStatement<SchematicNode> byParentName = table.selectFields("NodeName", "ParentNode");
+    private static final SelectStatement<SchematicNode> list = new SelectStatement<>(table, "SELECT * FROM EffectiveSchematicNode WHERE EffectiveOwner = ? AND ParentNode" + Statement.NULL_SAFE_EQUALS + "? ORDER BY NodeName");
-    private static final SelectStatement<SchematicNode> byParentName_null = new SelectStatement<>(table, nodeSelectCreator("") + "WHERE NodeName = ? AND ParentNode is NULL");
+    private static final SelectStatement<SchematicNode> byParentName = new SelectStatement<>(table, "SELECT * FROM EffectiveSchematicNode WHERE EffectiveOwner = ? AND ParentNode" + Statement.NULL_SAFE_EQUALS + "? AND NodeName = ? ORDER BY NodeName");
-    private static final SelectStatement<SchematicNode> accessibleByUserTypeParent = new SelectStatement<>(table, "WITH RECURSIVE RSNB AS (WITH RECURSIVE RSN as (" + nodeSelectCreator("s.") + "s LEFT JOIN NodeMember n ON s.NodeId = n.NodeId WHERE (s.NodeOwner = ? OR n.UserId = ?) GROUP BY s.NodeId UNION " + nodeSelectCreator("SN.") + "AS SN, RSN WHERE SN.ParentNode = RSN.NodeId) SELECT * FROM RSN WHERE NodeType = ? UNION " + nodeSelectCreator("SN.") + "AS SN, RSNB WHERE SN.NodeId = RSNB.ParentNode)SELECT * FROM RSNB WHERE ParentNode = ? ORDER BY NodeName");
+    private static final SelectStatement<SchematicNode> schematicAccessibleForUser = new SelectStatement<>(table, "SELECT COUNT(DISTINCT NodeId) FROM EffectiveSchematicNode WHERE EffectiveOwner = ? AND NodeId = ?");
-    private static final SelectStatement<SchematicNode> accessibleByUserTypeParent_Null = new SelectStatement<>(table, "WITH RECURSIVE RSNB AS (WITH RECURSIVE RSN as (" + nodeSelectCreator("s.") + "s LEFT JOIN NodeMember n ON s.NodeId = n.NodeId WHERE (s.NodeOwner = ? OR n.UserId = ?) GROUP BY s.NodeId UNION " + nodeSelectCreator("SN.") + "AS SN, RSN WHERE SN.ParentNode = RSN.NodeId) SELECT * FROM RSN WHERE NodeType = ? UNION " + nodeSelectCreator("SN.") + "AS SN, RSNB WHERE SN.NodeId = RSNB.ParentNode)SELECT * FROM RSNB WHERE ParentNode is null ORDER BY NodeName");
+    private static final SelectStatement<SchematicNode> accessibleByUserTypeInParent = new SelectStatement<>(table, "WITH RECURSIVE RSN AS (SELECT NodeId, ParentNode FROM EffectiveSchematicNode WHERE NodeType = ? AND EffectiveOwner = ? UNION SELECT SN.NodeId, SN.ParentNode FROM RSN, EffectiveSchematicNode SN WHERE SN.NodeId = RSN.ParentNode AND EffectiveOwner = ?) SELECT SN.NodeId, SN.NodeOwner, ? AS EffectiveOwner, SN.NodeName, RSN.ParentNode, SN.LastUpdate, SN.NodeItem, SN.NodeType, SN.NodeRank, SN.ReplaceColor, SN.AllowReplay, SN.NodeFormat FROM RSN INNER JOIN SchematicNode SN ON RSN.NodeId = SN.NodeId WHERE RSN.ParentNode" + Statement.NULL_SAFE_EQUALS + "?");
-    private static final SelectStatement<SchematicNode> accessibleByUserType = new SelectStatement<>(table, "WITH RECURSIVE RSN as (" + nodeSelectCreator("s.") + "s LEFT JOIN NodeMember n ON s.NodeId = n.NodeId WHERE (s.NodeOwner = ? OR n.UserId = ?) GROUP BY s.NodeId UNION " + nodeSelectCreator("SN.") + "AS SN, RSN WHERE SN.ParentNode = RSN.NodeId) SELECT * FROM RSN WHERE NodeType = ? ORDER BY NodeName");
+    private static final SelectStatement<SchematicNode> accessibleByUserType = new SelectStatement<>(table, "SELECT * FROM EffectiveSchematicNode WHERE EffectiveOwner = ? AND NodeType = ?");
-    private static final SelectStatement<SchematicNode> byOwnerType = new SelectStatement<>(table, nodeSelectCreator("") + "WHERE NodeOwner = ? AND NodeType = ? ORDER BY NodeName");
+    private static final SelectStatement<SchematicNode> byIdAndUser = new SelectStatement<>(table, "SELECT * FROM EffectiveSchematicNode WHERE EffectiveOwner = ? AND NodeId = ?");
-    private static final SelectStatement<SchematicNode> byType = new SelectStatement<>(table, nodeSelectCreator("") + "WHERE NodeType = ? ORDER BY NodeName");
+    private static final SelectStatement<SchematicNode> allParentsOfNode = new SelectStatement<>(table, "WITH RECURSIVE R AS (SELECT NodeId, ParentNode FROM EffectiveSchematicNode WHERE NodeId = ? AND EffectiveOwner = ? UNION SELECT E.NodeId, E.ParentNode FROM R, EffectiveSchematicNode E WHERE R.ParentNode = E.NodeId AND E.EffectiveOwner = ?) SELECT SN.NodeId, SN.NodeOwner, ? AS EffectiveOwner, SN.NodeName, R.ParentNode, SN.LastUpdate, SN.NodeItem, SN.NodeType, SN.NodeRank, SN.ReplaceColor, SN.AllowReplay, SN.NodeFormat FROM R INNER JOIN SchematicNode SN ON SN.NodeId = R.NodeId");
-    private static final SelectStatement<SchematicNode> accessibleByUser = new SelectStatement<>(table, nodeSelectCreator("s.") + "s LEFT JOIN NodeMember n ON s.NodeId = n.NodeId WHERE (s.NodeOwner = ? OR n.UserId = ?) AND ((s.NodeOwner = ? AND s.ParentNode IS NULL) OR NOT s.NodeOwner = ?) GROUP BY s.NodeId ORDER BY s.NodeName");
-    private static final Statement schematicAccessibleForUser = new Statement("WITH RECURSIVE RSN AS (" + nodeSelectCreator("") + "WHERE NodeId = ? UNION " + nodeSelectCreator("SN.") + "SN, RSN WHERE RSN.ParentNode = SN.NodeId) SELECT COUNT(RSN.NodeId) AS `Accessible` FROM RSN LEFT Join NodeMember NM On NM.NodeId = RSN.NodeId WHERE NodeOwner = ? OR UserId = ? LIMIT 1");
-    private static final SelectStatement<SchematicNode> allAccessibleByUser = new SelectStatement<>(table, "WITH RECURSIVE RSN as (" + nodeSelectCreator("s.") + "s LEFT JOIN NodeMember n ON s.NodeId = n.NodeId WHERE (s.NodeOwner = ? OR n.UserId = ?) GROUP BY s.NodeId UNION " + nodeSelectCreator("SN.") + "AS SN, RSN WHERE SN.ParentNode = RSN.NodeId) SELECT * FROM RSN ORDER BY NodeName");
-    private static final SelectStatement<SchematicNode> allParentsOfNode = new SelectStatement<>(table, "WITH RECURSIVE RSN AS (" + nodeSelectCreator("") + "WHERE NodeId = ? UNION " + nodeSelectCreator("SN.") + "SN, RSN WHERE RSN.ParentNode = SN.NodeId) SELECT * FROM RSN ORDER BY NodeName");
 
     static {
         NodeMember.init();
@@ -80,6 +71,9 @@ public class SchematicNode {
     private final int nodeId;
     @Field(keys = {"OwnerNameParent"})
     private final int nodeOwner;
+    @Field(def = "0")
+    @Getter
+    private final int effectiveOwner;
     @Field(keys = {"OwnerNameParent"})
     private String nodeName;
     @Field(keys = {"OwnerNameParent"}, nullable = true)
@@ -100,11 +94,12 @@ public class SchematicNode {
     @Field(def = "1")
     private boolean nodeFormat;
 
-    private final Map<Integer, String> brCache = new HashMap<>();
+    private String brCache;
 
     public SchematicNode(
             int nodeId,
             int nodeOwner,
+            int effectiveOwner,
             String nodeName,
             Integer parentNode,
             Timestamp lastUpdate,
@@ -117,6 +112,7 @@ public class SchematicNode {
     ) {
         this.nodeId = nodeId;
         this.nodeOwner = nodeOwner;
+        this.effectiveOwner = effectiveOwner;
         this.nodeName = nodeName;
         this.parentNode = parentNode;
         this.nodeItem = nodeItem;
@@ -128,6 +124,54 @@ public class SchematicNode {
         this.nodeFormat = nodeFormat;
     }
 
+    public static List<SchematicNode> getAll(SteamwarUser user) {
+        return all.listSelect(user);
+    }
+
+    public static Map<Integer, List<SchematicNode>> getAllMap(SteamwarUser user) {
+        return map(getAll(user));
+    }
+
+    public static List<SchematicNode> list(SteamwarUser user, Integer schematicId) {
+        return list.listSelect(user, schematicId);
+    }
+
+    public static SchematicNode byParentName(SteamwarUser user, Integer schematicId, String name) {
+        return byParentName.select(user, schematicId, name);
+    }
+
+    public static List<SchematicNode> accessibleByUserType(SteamwarUser user, SchematicType type) {
+        return accessibleByUserType.listSelect(type, user, user, user);
+    }
+
+    public static Map<Integer, List<SchematicNode>> accessibleByUserTypeMap(SteamwarUser user, SchematicType type) {
+        return map(accessibleByUserType(user, type));
+    }
+
+    public static boolean schematicAccessibleForUser(SteamwarUser user, Integer schematicId) {
+        return schematicAccessibleForUser.select(user, schematicId) != null;
+    }
+
+    public static List<SchematicNode> accessibleByUserTypeParent(SteamwarUser user, SchematicType type, Integer parentId) {
+        return accessibleByUserTypeInParent.listSelect(type, user, user, user, parentId);
+    }
+
+    public static SchematicNode byIdAndUser(SteamwarUser user, Integer id) {
+        return byIdAndUser.select(user, id);
+    }
+
+    public static List<SchematicNode> parentsOfNode(SteamwarUser user, Integer id) {
+        return allParentsOfNode.listSelect(id, user, user, user);
+    }
+
+    private static Map<Integer, List<SchematicNode>> map(List<SchematicNode> in) {
+        Map<Integer, List<SchematicNode>> map = new HashMap<>();
+        for (SchematicNode effectiveSchematicNode : in) {
+            map.computeIfAbsent(effectiveSchematicNode.getOptionalParent().orElse(0), k -> new ArrayList<>()).add(effectiveSchematicNode);
+        }
+        return map;
+    }
+
     public static SchematicNode createSchematic(int owner, String name, Integer parent) {
         return createSchematicNode(owner, name, parent, SchematicType.Normal.toDB(), "");
     }
@@ -148,8 +192,6 @@ public class SchematicNode {
     }
 
     public static SchematicNode getSchematicNode(int owner, String name, Integer parent) {
-        if (parent == null || parent == 0)
-            return byOwnerNameParent_null.select(owner, name);
         return byOwnerNameParent.select(owner, name, parent);
     }
 
@@ -158,19 +200,10 @@ public class SchematicNode {
     }
 
     public static List<SchematicNode> getSchematicNodeInNode(Integer parent) {
-        if(parent == null || parent == 0) {
-            rootWarning();
-            return byParent_null.listSelect();
-        }
-
         return byParent.listSelect(parent);
     }
 
     public static List<SchematicNode> getSchematicDirectoryInNode(Integer parent) {
-        if(parent == null || parent == 0) {
-            rootWarning();
-            return dirsByParent_null.listSelect();
-        }
         return dirsByParent.listSelect(parent);
     }
 
@@ -185,10 +218,6 @@ public class SchematicNode {
     }
 
     public static SchematicNode getSchematicNode(String name, Integer parent) {
-        if(parent == null || parent == 0) {
-            rootWarning();
-            return byParentName_null.select(name);
-        }
         return byParentName.select(name, parent);
     }
 
@@ -197,13 +226,11 @@ public class SchematicNode {
     }
 
     public static List<SchematicNode> getAccessibleSchematicsOfTypeInParent(int owner, String schemType, Integer parent) {
-        if(parent == null || parent == 0)
+        return accessibleByUserTypeParent(SteamwarUser.get(owner), SchematicType.fromDB(schemType), parent);
-            return accessibleByUserTypeParent_Null.listSelect(owner, owner, schemType);
-        return accessibleByUserTypeParent.listSelect(owner, owner, schemType, parent);
     }
 
     public static List<SchematicNode> getAllAccessibleSchematicsOfType(int user, String schemType) {
-        return accessibleByUserType.listSelect(user, user, schemType);
+        return accessibleByUserType(SteamwarUser.get(user), SchematicType.fromDB(schemType));
     }
 
     public static List<SchematicNode> getAllSchematicsOfType(int owner, String schemType) {
@@ -233,21 +260,14 @@ public class SchematicNode {
         return finalList;
     }
 
+    @Deprecated
     public static List<SchematicNode> getSchematicsAccessibleByUser(int user, Integer parent) {
-        if (parent == null || parent == 0)
+        return list(SteamwarUser.get(user), parent);
-            return accessibleByUser.listSelect(user, user, user, user);
-
-        if(schematicAccessibleForUser.select(rs -> {
-            rs.next();
-            return rs.getInt("Accessible") > 0;
-        }, parent, user, user))
-            return getSchematicNodeInNode(parent);
-
-        return Collections.emptyList();
     }
 
+    @Deprecated
     public static List<SchematicNode> getAllSchematicsAccessibleByUser(int user) {
-        return allAccessibleByUser.listSelect(user, user);
+        return getAll(SteamwarUser.get(user));
     }
 
     public static List<SchematicNode> getAllParentsOfNode(SchematicNode node) {
@@ -262,33 +282,30 @@ public class SchematicNode {
         if (s.startsWith("/")) {
             s = s.substring(1);
         }
+        if (s.endsWith("/")) {
+            s = s.substring(0, s.length() - 1);
+        }
         if (s.isEmpty()) {
             return null;
         }
         if (s.contains("/")) {
             String[] layers = s.split("/");
-            SchematicNode currentNode = null;
+            Optional<SchematicNode> currentNode = Optional.ofNullable(SchematicNode.byParentName(user, null, layers[0]));
-            for (int i = 0; i < layers.length; i++) {
+            for (int i = 1; i < layers.length; i++) {
                 int finalI = i;
-                Optional<SchematicNode> node;
+                Optional<SchematicNode> node = currentNode.map(effectiveSchematicNode -> SchematicNode.byParentName(user, effectiveSchematicNode.getId(), layers[finalI]));
-                if (currentNode == null) {
-                    node = SchematicNode.getSchematicsAccessibleByUser(user.getId(), 0).stream().filter(node1 -> node1.getName().equals(layers[finalI])).findAny();
-                } else {
-                    node = Optional.ofNullable(SchematicNode.getSchematicNode(layers[i], currentNode.getId()));
-                }
                 if (!node.isPresent()) {
                     return null;
                 } else {
-                    currentNode = node.get();
+                    currentNode = node;
-                    if (!currentNode.isDir() && i != layers.length - 1) {
+                    if (!currentNode.map(SchematicNode::isDir).orElse(false) && i != layers.length - 1) {
                         return null;
                     }
                 }
             }
-            return currentNode;
+            return currentNode.orElse(null);
         } else {
-            String finalS = s;
+            return SchematicNode.byParentName(user, null, s);
-            return SchematicNode.getSchematicsAccessibleByUser(user.getId(), 0).stream().filter(node1 -> node1.getName().equals(finalS)).findAny().orElse(null);
         }
     }
 
@@ -306,11 +323,6 @@ public class SchematicNode {
         return finalList;
     }
 
-    @Deprecated
-    public static Integer countNodes() {
-        return -1;
-    }
-
     public int getId() {
         return nodeId;
     }
@@ -332,6 +344,10 @@ public class SchematicNode {
         return parentNode;
     }
 
+    public Optional<Integer> getOptionalParent() {
+        return Optional.ofNullable(parentNode);
+    }
+
     public void setParent(Integer parent) {
         this.parentNode = parent;
         updateDB();
@@ -448,7 +464,6 @@ public class SchematicNode {
     private void updateDB() {
         this.lastUpdate = Timestamp.from(Instant.now());
         update.update(nodeName, parentNode, nodeItem, nodeType, nodeRank, replaceColor, allowReplay, nodeFormat, nodeId);
-        this.brCache.clear();
         TAB_CACHE.clear();
     }
 
@@ -470,21 +485,29 @@ public class SchematicNode {
     }
 
     public String generateBreadcrumbs(SteamwarUser user) {
-        return brCache.computeIfAbsent(user.getId(), integer -> generateBreadcrumbs("/", user));
+        return byIdAndUser(user, nodeId).generateBreadcrumbs();
     }
 
     public String generateBreadcrumbs(String split, SteamwarUser user) {
+        return byIdAndUser(user, nodeId).generateBreadcrumbs(split);
+    }
+
+    public String generateBreadcrumbs() {
+        if(brCache == null) {
+            brCache = generateBreadcrumbs("/");
+        }
+        return brCache;
+    }
+
+    public String generateBreadcrumbs(String split) {
         StringBuilder builder = new StringBuilder(getName());
-        SchematicNode currentNode = this;
+        Optional<SchematicNode> currentNode = Optional.of(this);
-        if (currentNode.isDir()) builder.append("/");
+        if(currentNode.map(SchematicNode::isDir).orElse(false)) {
-        final Set<NodeMember> nodeMembers = NodeMember.getSchematics(user.getId());
+            builder.append(split);
-        AtomicInteger i = new AtomicInteger();
+        }
-        i.set(currentNode.getId());
+        while (currentNode.isPresent()) {
-        while (currentNode.getParentNode() != null && nodeMembers.stream().noneMatch(nodeMember -> nodeMember.getNode() == i.get())) {
+            currentNode = currentNode.flatMap(SchematicNode::getOptionalParent).map(integer -> byIdAndUser(SteamwarUser.get(effectiveOwner), integer));
-            currentNode = currentNode.getParentNode();
+            currentNode.ifPresent(node -> builder.insert(0, split).insert(0, node.getName()));
-            i.set(currentNode.getId());
-            builder.insert(0, split)
-                    .insert(0, currentNode.getName());
         }
         return builder.toString();
     }
@@ -528,20 +551,14 @@ public class SchematicNode {
             String preTab = s.substring(0, s.lastIndexOf("/") + 1);
             SchematicNode pa = SchematicNode.getNodeFromPath(user, preTab);
             if (pa == null) return Collections.emptyList();
-            List<SchematicNode> nodes = SchematicNode.getSchematicNodeInNode(pa);
+            List<SchematicNode> nodes = SchematicNode.list(user, pa.getId());
-            nodes.forEach(node -> list.add((sws ? "/" : "") + node.generateBreadcrumbs(user)));
+            nodes.forEach(node -> list.add((sws ? "/" : "") + node.generateBreadcrumbs()));
         } else {
-            List<SchematicNode> nodes = SchematicNode.getSchematicsAccessibleByUser(user.getId(), 0);
+            List<SchematicNode> nodes = SchematicNode.list(user, null);
             nodes.forEach(node -> list.add((sws ? "/" : "") + node.getName() + (node.isDir() ? "/" : "")));
         }
         list.remove("//copy");
         TAB_CACHE.computeIfAbsent(user.getId(), integer -> new HashMap<>()).putIfAbsent(cacheKey, list);
         return list;
     }
-
-    private static void rootWarning() {
-        ByteArrayOutputStream stacktraceOutput = new ByteArrayOutputStream();
-        new Throwable().printStackTrace(new PrintStream(stacktraceOutput));
-        SWException.log("PERFORMANCE!!! Getting all/weird subset of schematic nodes with parent NULL", stacktraceOutput.toString());
-    }
 }

src/de/steamwar/sql/internal/SelectStatement.java

@@ -31,7 +31,7 @@ public class SelectStatement<T> extends Statement {
     private final Table<T> table;
 
     SelectStatement(Table<T> table, String... kfields) {
-        this(table, "SELECT " + Arrays.stream(table.fields).map(f -> f.identifier).collect(Collectors.joining(", ")) + " FROM " + table.name + " WHERE " + Arrays.stream(kfields).map(f -> f + " = ?").collect(Collectors.joining(" AND ")));
+        this(table, "SELECT " + Arrays.stream(table.fields).map(f -> f.identifier).collect(Collectors.joining(", ")) + " FROM " + table.name + " WHERE " + Arrays.stream(kfields).map(f -> f + Statement.NULL_SAFE_EQUALS + "?").collect(Collectors.joining(" AND ")));
     }
 
     public SelectStatement(Table<T> table, String sql) {

src/de/steamwar/sql/internal/Statement.java

@@ -41,6 +41,7 @@ public class Statement implements AutoCloseable {
     static final Consumer<Table<?>> schemaCreator;
     static final String ON_DUPLICATE_KEY;
     static final UnaryOperator<String> upsertWrapper;
+    public static final String NULL_SAFE_EQUALS;
 
     private static final boolean MYSQL_MODE;
     private static final boolean PRODUCTION_DATABASE;
@@ -73,6 +74,7 @@ public class Statement implements AutoCloseable {
             schemaCreator = table -> {};
             ON_DUPLICATE_KEY = " ON DUPLICATE KEY UPDATE ";
             upsertWrapper = f -> f + " = VALUES(" + f + ")";
+            NULL_SAFE_EQUALS = " <=> ";
         } else {
             Connection connection;
 
@@ -89,6 +91,7 @@ public class Statement implements AutoCloseable {
             schemaCreator = Table::ensureExistanceInSqlite;
             ON_DUPLICATE_KEY = " ON CONFLICT DO UPDATE SET ";
             upsertWrapper = f -> f + " = " + f;
+            NULL_SAFE_EQUALS = " IS ";
         }
     }
 

src/de/steamwar/sql/internal/Table.java

@@ -75,7 +75,7 @@ public class Table<T> {
     }
 
     public Statement updateFields(String[] fields, String... kfields) {
-        return new Statement("UPDATE " + name + " SET " + Arrays.stream(fields).map(f -> f + " = ?").collect(Collectors.joining(", ")) + " WHERE " + Arrays.stream(kfields).map(f -> f + " = ?").collect(Collectors.joining(" AND ")));
+        return new Statement("UPDATE " + name + " SET " + Arrays.stream(fields).map(f -> f + " = ?").collect(Collectors.joining(", ")) + " WHERE " + Arrays.stream(kfields).map(f -> f + Statement.NULL_SAFE_EQUALS + "?").collect(Collectors.joining(" AND ")));
     }
 
     public Statement insert(String name) {
@@ -100,7 +100,7 @@ public class Table<T> {
     }
 
     public Statement deleteFields(String... kfields) {
-        return new Statement("DELETE FROM " + name + " WHERE " + Arrays.stream(kfields).map(f -> f + " = ?").collect(Collectors.joining(" AND ")));
+        return new Statement("DELETE FROM " + name + " WHERE " + Arrays.stream(kfields).map(f -> f + Statement.NULL_SAFE_EQUALS + "?").collect(Collectors.joining(" AND ")));
     }
 
     void ensureExistanceInSqlite() {