#470: remove redundant join and cleanup whitespace in sql

GIScience · Nov 9, 2022 · be47d39 · be47d39
1 parent 6d942c4
commit be47d39
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/oshdb-util/src/main/java/org/heigit/ohsome/oshdb/util/tagtranslator/JdbcTagTranslator.java b/oshdb-util/src/main/java/org/heigit/ohsome/oshdb/util/tagtranslator/JdbcTagTranslator.java
@@ -29,20 +29,19 @@ public class JdbcTagTranslator implements TagTranslator {
 
 
   private static final String OSHDB_OSM_KEY = String.format("SELECT txt, id"
-          + " from %s "
+          + " from %s"
           + " where id = any(?)", TableNames.E_KEY);
 
-  private static final String OSHDB_OSM_TAG = String.format("SELECT kv.txt, valueid"
-      + " from %s k"
-      + " left join %s kv on k.id = kv.keyid"
-      + " where k.id = ? and kv.valueid = any (?)", TableNames.E_KEY, TableNames.E_KEYVALUE);
+  private static final String OSHDB_OSM_TAG = String.format("SELECT txt, valueid"
+      + " from %s"
+      + " where keyid = ? and valueid = any (?)", TableNames.E_KEYVALUE);
 
   private static final String OSM_OSHDB_ROLE = String.format("SELECT id, txt"
-      + " from %s "
+      + " from %s"
       + " where txt = any (?)", TableNames.E_ROLE);
 
   private static final String OSHDB_OSM_ROLE = String.format("SELECT txt, id"
-      + " from %s "
+      + " from %s"
       + " where id = any (?)", TableNames.E_ROLE);
 
   private final DataSource source;