Fix the problem where LinkedHashMap wasn't mapped correctly

kawasima · Jun 3, 2019 · 0d1b8de · 0d1b8de
1 parent 49926c9
commit 0d1b8de
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/metabase/driver/gremlin/query_processor.clj b/src/metabase/driver/gremlin/query_processor.clj
@@ -22,10 +22,16 @@
   (for [col columns]
     (get m col)))
 
+(defn- unnested-seq [s]
+  (if (and (seq? s) (= (count s) 1) (seq? (first s)))
+    (first s)
+    s))
+
 (defn gremlin-query-results [query]
   (let [result-seq (-> (.submit *gremlin-client* query)
                        .iterator
                        iterator-seq)
+;        _ (map println result-seq)
         results (->> result-seq
                      (map #(condp instance? (.getObject %)
                              String        {"item" (.getString %)}
@@ -37,10 +43,11 @@
                              Boolean       {"item" (.getBoolean %)}
                              Edge          (element->map (.getEdge %))
                              Vertex        (element->map (.getVertex %))
-                             java.util.Map (let [m (.getObject %)
-                                                 k (first (.keySet m))]
-                                             {"item" k, "count" (.get m k)})
+                             java.util.Map (let [m (.getObject %)]
+                                             (for [k (.keySet m)]
+                                               {"item" k, "count" (.get m k)}))
                              (.getObject %)))
+                     unnested-seq
                      vec)
 
         columns (->> results