fix XTQL return format

Author: refset

src/clj/xt_play/transactions.clj

@@ -160,17 +160,26 @@
                       (let [result (if query
                                      (xtdb/query node txs)
                                      (xtdb/submit! node txs {:system-time system-time}))
-                            elapsed-ms (Math/round (/ (- (System/nanoTime) start-time) 1000000.0))]
-                        (if query
-                          (assoc {} :result result :timing-ms elapsed-ms)
-                          (assoc result :timing-ms elapsed-ms)))
+                            elapsed-ms (Math/round (/ (- (System/nanoTime) start-time) 1000000.0))
+                            formatted-result (if query
+                                               (if (and (= "xtql" tx-type) (every? map? result))
+                                                 (if (empty? result)
+                                                   [[]]
+                                                   (let [ks (keys (apply merge result))]
+                                                     (into [(vec ks)]
+                                                           (mapv (fn [row]
+                                                                   (mapv #(util/transform-dates-to-sql (get row %)) ks))
+                                                                 result))))
+                                                 result)
+                                               [[]])]
+                        [{:result formatted-result :timing-ms elapsed-ms}])
                       (catch Throwable ex
                         (let [elapsed-ms (Math/round (/ (- (System/nanoTime) start-time) 1000000.0))]
                           (log/error "Exception while running transaction" (ex-message ex))
-                          {:error {:message (ex-message ex)
-                                   :exception (.getClass ex)
-                                   :data (ex-data ex)}
-                           :timing-ms elapsed-ms})))))
+                          [{:error {:message (ex-message ex)
+                                    :exception (.getClass ex)
+                                    :data (ex-data ex)}
+                            :timing-ms elapsed-ms}])))))
                 tx-batches))]
     (log/info "run!-tx-res" tx-results)
     tx-results))
@@ -215,12 +224,13 @@
                                        (reset! tx-in-progress? true))
                                      (try
                                        (let [[rs warnings] (xtdb/jdbc-execute! conn statement)
-                                             res (xform-result rs)]
+                                             is-dml? (dml? (first statement))
+                                             res (if is-dml? [[]] (xform-result rs))]
                                          (when is-commit?
                                            (reset! tx-in-progress? false))
                                          (log/info :run-with-jdbc-conn-warnings warnings)
                                          (if skip-result?
-                                           nil ;; Return nil for auto-added BEGIN/COMMIT
+                                           nil
                                            {:result res
                                             :warnings warnings}))
                                        (catch Exception ex
@@ -252,9 +262,7 @@
     (fn [node]
       (if (#{"sql-v2" "sql"} tx-type)
         (run!-with-jdbc-conn node tx-batches)
-        (let [res (run!-tx node tx-type tx-batches)]
-          (log/debug "run!!" res)
-          (mapv util/map-results->rows res))))))
+        (run!-tx node tx-type tx-batches)))))
 
 (defn docs-run!!
   "Given transaction batches and a query from the docs, will return the query

src/cljs/xt_play/view.cljs

@@ -244,7 +244,8 @@
         statements (second (get tx-batches position))
         loading? (rf/subscribe [::run/loading?])
         show-results? (rf/subscribe [::run/show-results?])
-        results-or-failure (rf/subscribe [::run/results-or-failure])]
+        results-or-failure (rf/subscribe [::run/results-or-failure])
+        tx-type (rf/subscribe [:get-type])]
     (when (or @loading?
               @show-results?)
       ^{:key position}
@@ -273,7 +274,9 @@
                            (= [[]] result)) no-results-message
                       (and (not (:query statements))
                            (= [[]] result)) [:div {:class "pl-2 pt-2"}
-                                             "Statement succeeded."]
+                                             (if (= @tx-type :xtql)
+                                               "Transaction succeeded."
+                                               "Statement succeeded.")]
                       (every? empty? result) (empty-rows-message result)
                       (seq result) [display-table result (str position "-" idx)]
                       :else no-results-message)