Namespace form & indentation cleanup; docstring improvments

src/metabase/api/dataset.clj

@@ -42,8 +42,10 @@
   (let [source-card-id (query->source-card-id query)]
     (api/cancellable-json-response
      (fn []
-       (qp/process-query-and-save-with-max! query {:executed-by api/*current-user-id*, :context :ad-hoc,
-                                                   :card-id     source-card-id,        :nested? (boolean source-card-id)})))))
+       (qp/process-query-and-save-with-max!
+           query
+           {:executed-by api/*current-user-id*, :context :ad-hoc,
+            :card-id     source-card-id,        :nested? (boolean source-card-id)})))))
 
 
 ;;; ----------------------------------- Downloading Query Results in Other Formats -----------------------------------

src/metabase/api/field.clj

 (ns metabase.api.field
   (:require [compojure.core :refer [DELETE GET POST PUT]]
+            [metabase
+             [query-processor :as qp]
+             [related :as related]
+             [util :as u]]
             [metabase.api.common :as api]
             [metabase.db.metadata-queries :as metadata]
             [metabase.models
@@ -7,9 +11,6 @@
              [field :as field :refer [Field]]
              [field-values :as field-values :refer [FieldValues]]
              [table :refer [Table]]]
-            [metabase.query-processor :as qp]
-            [metabase.related :as related]
-            [metabase.util :as u]
             [metabase.util.schema :as su]
             [schema.core :as s]
             [toucan

src/metabase/models/card.clj

@@ -56,17 +56,17 @@
       :Segment (extract-ids :segment inner-query)})))
 
 
-;;; -------------------------------------------------- Revisions --------------------------------------------------
+;;; --------------------------------------------------- Revisions ----------------------------------------------------
 
 (defn serialize-instance
   "Serialize a `Card` for use in a `Revision`."
   ([instance]
    (serialize-instance nil nil instance))
   ([_ _ instance]
-   (dissoc instance :created_at :updated_at)))
+   (dissoc instance :created_at :updated_at :result_metadata)))
 
 
-;;; -------------------------------------------------- Lifecycle --------------------------------------------------
+;;; --------------------------------------------------- Lifecycle ----------------------------------------------------
 
 (defn populate-query-fields
   "Lift `database_id`, `table_id`, and `query_type` from query definition."

src/metabase/models/permissions.clj

@@ -102,6 +102,7 @@
   (assert-not-admin-group permissions)
   (assert-valid-object permissions))
 
+
 ;;; ------------------------------------------------- Path Util Fns --------------------------------------------------
 
 (def ^:private MapOrID
@@ -569,8 +570,10 @@
   [current-revision old new]
   (when *current-user-id*
     (db/insert! PermissionsRevision
-      :id     (inc current-revision) ; manually specify ID here so if one was somehow inserted in the meantime in the fraction of a second
-      :before  old                   ; since we called `check-revision-numbers` the PK constraint will fail and the transaction will abort
+      ;; manually specify ID here so if one was somehow inserted in the meantime in the fraction of a second since we
+      ;; called `check-revision-numbers` the PK constraint will fail and the transaction will abort
+      :id     (inc current-revision)
+      :before  old
       :after   new
       :user_id *current-user-id*)))
 

src/metabase/public_settings.clj

 (ns metabase.public-settings
-  (:require [clojure.string :as s]
+  (:require [clojure.string :as str]
             [metabase
              [config :as config]
              [types :as types]]
@@ -47,8 +47,8 @@
   (tru "The base URL of this Metabase instance, e.g. \"http://metabase.my-company.com\".")
   :setter (fn [new-value]
             (setting/set-string! :site-url (when new-value
-                                             (cond->> (s/replace new-value #"/$" "")
-                                               (not (s/starts-with? new-value "http")) (str "http://"))))))
+                                             (cond->> (str/replace new-value #"/$" "")
+                                               (not (str/starts-with? new-value "http")) (str "http://"))))))
 
 (defsetting site-locale
   (str  (tru "The default language for this Metabase instance.")

src/metabase/query_processor/util.clj

@@ -46,9 +46,12 @@
       (str/replace #"_" "-")
       keyword))
 
+;; TODO - rename this to `get-in-mbql-query-recursive` or something like that?
 (defn get-in-query
-  "Similar to `get-in` but will look in either `:query` or recursively in `[:query :source-query]`. Using
-  this function will avoid having to check if there's a nested query vs. top-level query."
+  "Similar to `get-in` but will look in either `:query` or recursively in `[:query :source-query]`. Using this function
+  will avoid having to check if there's a nested query vs. top-level query. Results in deeper levels of nesting are
+  preferred; i.e. if a key is present in both a `:source-query` and the top-level query, the value from the source
+  query will be returned."
   ([m ks]
    (get-in-query m ks nil))
   ([m ks not-found]

src/metabase/util.clj

@@ -18,9 +18,9 @@
            [java.text Normalizer Normalizer$Form]
            java.util.concurrent.TimeoutException))
 
-;; This is the very first log message that will get printed.  It's here because this is one of the very first
-;; namespaces that gets loaded, and the first that has access to the logger It shows up a solid 10-15 seconds before
-;; the "Starting Metabase in STANDALONE mode" message because so many other namespaces need to get loaded
+;; This is the very first log message that will get printed.
+;; It's here because this is one of the very first namespaces that gets loaded, and the first that has access to the logger
+;; It shows up a solid 10-15 seconds before the "Starting Metabase in STANDALONE mode" message because so many other namespaces need to get loaded
 (log/info (trs "Loading Metabase..."))
 
 ;; Set the default width for pprinting to 200 instead of 72. The default width is too narrow and wastes a lot of space

src/metabase/util/embed.clj

@@ -7,12 +7,14 @@
             [cheshire.core :as json]
             [clojure.string :as str]
             [hiccup.core :refer [html]]
+            [metabase
+             [public-settings :as public-settings]
+             [util :as u]]
             [metabase.models.setting :as setting]
-            [metabase.public-settings :as public-settings]
-            [metabase.util.i18n :refer [tru]]
+            [metabase.util.i18n :refer [trs tru]]
             [ring.util.codec :as codec]))
 
-;;; ------------------------------------------------------------ PUBLIC LINKS UTIL FNS ------------------------------------------------------------
+;;; --------------------------------------------- PUBLIC LINKS UTIL FNS ----------------------------------------------
 
 (defn- oembed-url
   "Return an oEmbed URL for the RELATIVE-PATH.
@@ -51,7 +53,7 @@
                   :frameborder 0}]))
 
 
-;;; ------------------------------------------------------------ EMBEDDING UTIL FNS ------------------------------------------------------------
+;;; ----------------------------------------------- EMBEDDING UTIL FNS -----------------------------------------------
 
 (setting/defsetting ^:private embedding-secret-key
   (tru "Secret key used to sign JSON Web Tokens for requests to `/api/embed` endpoints.")
@@ -68,8 +70,9 @@
     (json/parse-string (codecs/bytes->str (codec/base64-decode header)) keyword)))
 
 (defn- check-valid-alg
-  "Check that the JWT `alg` isn't `none`. `none` is valid per the standard, but for obvious reasons we want to make sure our keys are signed.
-   Unfortunately, I don't think there's an easy way to do this with the JWT library we use, so manually parse the token and check the alg."
+  "Check that the JWT `alg` isn't `none`. `none` is valid per the standard, but for obvious reasons we want to make sure
+  our keys are signed. Unfortunately, I don't think there's an easy way to do this with the JWT library we use, so
+  manually parse the token and check the alg."
   [^String message]
   (let [{:keys [alg]} (jwt-header message)]
     (when-not alg
@@ -78,9 +81,9 @@
       (throw (Exception. (str (trs "JWT `alg` cannot be `none`.")))))))
 
 (defn unsign
-  "Parse a \"signed\" (base-64 encoded) JWT and return a Clojure representation.
-   Check that the signature is valid (i.e., check that it was signed with `embedding-secret-key`)
-   and it's otherwise a valid JWT (e.g., not expired), or throw an Exception."
+  "Parse a \"signed\" (base-64 encoded) JWT and return a Clojure representation. Check that the signature is
+  valid (i.e., check that it was signed with `embedding-secret-key`) and it's otherwise a valid JWT (e.g., not
+  expired), or throw an Exception."
   [^String message]
   (when (seq message)
     (try

test/metabase/automagic_dashboards/comparison_test.clj

 (ns metabase.automagic-dashboards.comparison-test
   (:require [expectations :refer :all]
             [metabase.automagic-dashboards
-             [comparison :refer :all :as c]
+             [comparison :as c :refer :all]
              [core :refer [automagic-analysis]]]
             [metabase.models
              [card :refer [Card]]
              [query :as query]
              [segment :refer [Segment]]
-             [table :refer [Table] :as table]]
-            [metabase.test.data :as data]
-            [metabase.test.automagic-dashboards :refer :all]
+             [table :as table :refer [Table]]]
+            [metabase.test
+             [automagic-dashboards :refer :all]
+             [data :as data]]
             [toucan.util.test :as tt]))
 
 (def ^:private segment

test/metabase/query_processor_test/failure_test.clj

@@ -2,8 +2,8 @@
   "Tests for how the query processor as a whole handles failures."
   (:require [expectations :refer [expect]]
             [metabase.query-processor :as qp]
-            [metabase.test.data :as data]
-            [metabase.query-processor.interface :as qp.i])
+            [metabase.query-processor.interface :as qp.i]
+            [metabase.test.data :as data])
   (:import metabase.driver.h2.H2Driver))
 
 (defn- bad-query []