Merge pull request #562 from metabase/clojure_1.7

Bump Clojure to 1.7. Bump a few other deps

src/metabase/models/query_execution.clj

 (ns metabase.models.query-execution
-  (:require [korma.core :refer :all, :exclude [defentity]]
+  (:require [korma.core :refer :all, :exclude [defentity update]]
             [metabase.api.common :refer [check]]
             [metabase.db :refer :all]
             (metabase.models [common :refer :all]

src/metabase/models/session.clj

 (ns metabase.models.session
-  (:require [korma.core :refer :all, :exclude [defentity]]
+  (:require [korma.core :refer :all, :exclude [defentity update]]
             [metabase.db :refer :all]
             (metabase.models [common :refer :all]
                              [interface :refer :all]

src/metabase/models/setting.clj

@@ -3,7 +3,7 @@
   (:require [clojure.core.match :refer [match]]
             [clojure.string :as s]
             [environ.core :as env]
-            [korma.core :refer :all :exclude [defentity delete]]
+            [korma.core :as k]
             [metabase.db :refer [sel del]]
             [metabase.models.interface :refer :all]))
 
@@ -67,12 +67,12 @@
   [k v]
   {:pre [(keyword? k)
          (string? v)]}
-  (if (get k) (update Setting
-                      (set-fields {:value v})
-                      (where {:key (name k)}))
-      (insert Setting
-              (values {:key (name k)
-                       :value v})))
+  (if (get k) (k/update Setting
+                        (k/set-fields {:value v})
+                        (k/where {:key (name k)}))
+      (k/insert Setting
+                (k/values {:key (name k)
+                           :value v})))
   (restore-cache-if-needed)
   (swap! cached-setting->value assoc k v)
   v)
@@ -158,7 +158,7 @@
   (atom nil))
 
 (defentity Setting
-  [(table :setting)])
+  [(k/table :setting)])
 
 (defn- settings-list
   "Return a list of all Settings (as created with `defsetting`)."
@@ -169,10 +169,10 @@
        (map meta)
        (filter ::is-setting?)
        (map (fn [{k :name desc :doc default ::default-value}]
-              {:key (keyword k)
+              {:key         (keyword k)
                :description desc
-               :default (or (when (get-from-env-var k)
-                              (format "Using $MB_%s" (-> (name k)
-                                                         (s/replace "-" "_")
-                                                         s/upper-case)))
-                            default)}))))
+               :default     (or (when (get-from-env-var k)
+                                  (format "Using $MB_%s" (-> (name k)
+                                                             (s/replace "-" "_")
+                                                             s/upper-case)))
+                                default)}))))

src/metabase/models/table.clj

 (ns metabase.models.table
-  (:require [korma.core :refer :all, :exclude [defentity]]
+  (:require [korma.core :refer :all, :exclude [defentity update]]
             [metabase.db :refer :all]
             (metabase.models [common :as common]
                              [database :as db]

src/metabase/models/user.clj

 (ns metabase.models.user
   (:require [cemerick.friend.credentials :as creds]
-            [korma.core :refer :all, :exclude [defentity]]
+            [korma.core :refer :all, :exclude [defentity update]]
             [metabase.db :refer :all]
             [metabase.email.messages :as email]
             [metabase.models.interface :refer :all]

test/metabase/api/card_test.clj

 (ns metabase.api.card-test
   "Tests for /api/card endpoints."
   (:require [expectations :refer :all]
-            [korma.core :refer :all]
             [metabase.db :refer :all]
             (metabase.models [card :refer [Card]]
                              [common :as common])

test/metabase/api/dash_test.clj

 (ns metabase.api.dash-test
   "Tests for /api/dash endpoints."
   (:require [expectations :refer :all]
-            [korma.core :refer :all]
             [metabase.api.card-test :refer [post-card]]
             [metabase.db :refer :all]
             (metabase.models [hydrate :refer [hydrate]]

test/metabase/api/meta/dataset_test.clj

 (ns metabase.api.meta.dataset-test
   "Unit tests for /api/meta/dataset endpoints."
   (:require [expectations :refer :all]
-            [korma.core :refer :all]
+            [korma.core :as k]
             [metabase.db :refer :all]
             [metabase.models.query-execution :refer [QueryExecution]]
             [metabase.test.data :refer :all]
@@ -11,7 +11,7 @@
 ;;; ## POST /api/meta/dataset
 ;; Just a basic sanity check to make sure Query Processor endpoint is still working correctly.
 (expect-eval-actual-first
-    (match-$ (sel :one :fields [QueryExecution :id :uuid] (order :id :desc))
+    (match-$ (sel :one :fields [QueryExecution :id :uuid] (k/order :id :desc))
       {:data      {:rows    [[1000]]
                    :columns ["count"]
                    :cols    [{:base_type "IntegerField", :special_type "number", :name "count", :id nil, :table_id nil,
@@ -30,7 +30,7 @@
 
 ;; Even if a query fails we still expect a 200 response from the api
 (expect-eval-actual-first
-  (match-$ (sel :one QueryExecution (order :id :desc))
+  (match-$ (sel :one QueryExecution (k/order :id :desc))
     {:data {:rows []
             :cols []
             :columns []}

test/metabase/api/session_test.clj

 (ns metabase.api.session-test
   "Tests for /api/session"
   (:require [expectations :refer :all]
-            [korma.core :refer :all]
             [metabase.db :refer :all]
             [metabase.http-client :refer :all]
             (metabase.models [session :refer [Session]]

test/metabase/api/user_test.clj

 (ns metabase.api.user-test
   "Tests for /api/user endpoints."
   (:require [expectations :refer :all]
-            [korma.core :refer :all]
+            [korma.core :as k]
             [metabase.db :refer :all]
             [metabase.http-client :as http]
             [metabase.middleware.auth :as auth]
@@ -217,7 +217,7 @@
 (let [user-last-name (random-name)]
   (expect-eval-actual-first
       (let [{user-id :id} (sel :one User :last_name user-last-name)]
-        (sel :one :fields [Session :id] :user_id user-id (order :created_at :desc))) ; get the latest Session for this User
+        (sel :one :fields [Session :id] :user_id user-id (k/order :created_at :desc))) ; get the latest Session for this User
     (let [password {:old "password"
                     :new "whateverUP12!!"}
           {:keys [email id] :as user} (create-user :password (:old password) :last_name user-last-name)

test/metabase/driver/generic_sql_test.clj

 (ns metabase.driver.generic-sql-test
   (:require [expectations :refer :all]
-            [korma.core :refer :all]
             [metabase.db :refer :all]
             [metabase.driver :as driver]
             (metabase.driver [h2 :as h2]
@@ -49,21 +48,3 @@
 ;; ## TEST FIELD-AVG-LENGTH
 (expect 13
   (i/field-avg-length h2/driver @users-name-field))
-
-
-;; ## TEST CHECK-FOR-URLS
-;; (expect 0.375
-;;   (with-temp-table [table {:url "VARCHAR(254)"}]
-;;     (insert table
-;;             (values [{:url "http://www.google.com"}   ; 1/1 *
-;;                      {:url nil}                       ; 1/1 (ignored)
-;;                      {:url "https://amazon.co.uk"}    ; 2/2 *
-;;                      {:url "http://what.com?ok=true"} ; 3/3 *
-;;                      {:url "http://missing-period"}   ; 3/4
-;;                      {:url "ftp://not-http"}          ; 3/5
-;;                      {:url "http//amazon.com.uk"}     ; 3/6
-;;                      {:url "Not a URL"}               ; 3/7
-;;                      {:url "Not-a-url"}]))            ; 3/8
-;;     (i/field-percent-urls h2/driver {:name "URL"
-;;                                      :table (delay (assoc table
-;;                                                           :db test-db))})))

test/metabase/driver/sync_test.clj

 (ns metabase.driver.sync-test
   (:require [expectations :refer :all]
-            [korma.core :refer :all]
             [metabase.db :refer :all]
             [metabase.driver :as driver]
             (metabase.driver [h2 :as h2]