Merge remote-tracking branch 'origin/main' into fix/query-limit

Author: zonotope

deps.edn

@@ -1,7 +1,7 @@
 {:deps     {org.clojure/clojure            {:mvn/version "1.11.1"}
-            org.clojure/data.xml           {:mvn/version "0.2.0-alpha7"}
+            org.clojure/data.xml           {:mvn/version "0.2.0-alpha8"}
             com.fluree/alphabase           {:mvn/version "3.3.0"}
-            ;com.fluree/db                  {:mvn/version "2.0.0-alpha6"}
+            com.fluree/db                  {:mvn/version "2.0.0-beta1"}
             ;com.fluree/db                  {:local/root "../db"}
             com.fluree/db                  {:git/url "https://github.com/fluree/db.git"
                                             :sha "3906fe606739aaf8c154b92b39e56d0c68c6c2a5"}
@@ -15,8 +15,8 @@
             clucie/clucie                  {:mvn/version "0.4.2"}
 
             ;; AWS S3 API
-            com.cognitect.aws/api          {:mvn/version "0.8.587"}
-            com.cognitect.aws/endpoints    {:mvn/version "1.1.12.280"}
+            com.cognitect.aws/api          {:mvn/version "0.8.603"}
+            com.cognitect.aws/endpoints    {:mvn/version "1.1.12.307"}
             com.cognitect.aws/s3           {:mvn/version "822.2.1145.0"}
 
             ;; web server
@@ -26,7 +26,7 @@
             compojure/compojure            {:mvn/version "1.7.0"}
 
             ;; logging
-            ch.qos.logback/logback-classic {:mvn/version "1.4.0"}
+            ch.qos.logback/logback-classic {:mvn/version "1.4.4"}
             cambium/cambium.core           {:mvn/version "1.1.1"}
             cambium/cambium.codec-cheshire {:mvn/version "1.0.0"}
             cambium/cambium.logback.json   {:mvn/version "0.4.5"}
@@ -51,7 +51,7 @@
  :aliases
  {:mvn/group-id    com.fluree
   :mvn/artifact-id ledger
-  :mvn/version     "2.0.0-alpha6"
+  :mvn/version     "2.0.0-beta1"
 
   :dev
   {:extra-paths ["dev" "test" "dev-resources"]
@@ -61,7 +61,7 @@
   {:extra-paths ["test" "test-resources" "dev-resources"]
    :extra-deps  {com.cognitect/test-runner
                  {:git/url "https://github.com/cognitect-labs/test-runner.git"
-                  :sha     "a85b3b02765fb68684ab9ee4a8598eacf7e471d2"}}
+                  :sha     "a522ab2851a2aa5bf9c22a942b45287a3a019310"}}
    :exec-fn     cognitect.test-runner.api/test}
 
   :jar
@@ -121,7 +121,7 @@
    :main-opts   ["-m" "cloverage.coverage" "-p" "src" "-s" "test" "--test-ns-regex" "^fluree\\.db\\.ledger\\.ledger-test*$" "--output" "scanning_results/coverage"]}
 
   :eastwood
-  {:extra-deps {jonase/eastwood {:mvn/version "1.2.5"}}
+  {:extra-deps {jonase/eastwood {:mvn/version "1.3.0"}}
    :main-opts  ["-m" "eastwood.lint" {:source-paths ["src"] :test-paths ["test"]
                                       :config-files ["test-resources/eastwood-config.clj"]}]}
 
@@ -130,5 +130,5 @@
    :main-opts  ["-m" "antq.core" "--skip=github-action"]}
 
   :clj-kondo
-  {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2022.09.08"}}
+  {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2022.10.05"}}
    :main-opts  ["-m" "clj-kondo.main" "--lint" "src" "--config" ".clj-kondo/config.edn"]}}}

test/fluree/db/ledger/predicate/json_test.clj

@@ -99,6 +99,17 @@
         (is (= {:bizz "buzz"} (-> res second (get "_user/json")))
             (str "Unexpected query result: " (pr-str res)))))
 
+    (testing "analytical query from triples w/ orderBy returns parsed JSON when requested"
+      (let [query {:select {"?s" ["*"]}
+                   :where  [["?s" "_user/username" "?o"]]
+                   :opts   {:parseJSON true
+                            :orderBy   "?o"}}
+            res   (<!! (fdb/query-async db query))]
+        (is (= {:foo "bar"} (-> res first (get "_user/json")))
+            (str "Unexpected query result: " (pr-str res)))
+        (is (= {:bizz "buzz"} (-> res second (get "_user/json")))
+            (str "Unexpected query result: " (pr-str res)))))
+
     (testing "basic query with graph crawl returns parsed JSON when requested"
       (let [query {:select ["*" {:friend ["*"]}]
                    :from   "_user"
@@ -124,7 +135,3 @@
                    :opts   {:parseJSON true}}
             res   (<!! (fdb/query-async db query))]
         (is (every? #{{:bizz "buzz"} {:foo "bar"}} res))))))
-
-
-
-