update dependencies

project.clj

@@ -5,11 +5,15 @@
   :license      {:name "MIT License"
                  :url "http://opensource.org/licenses/MIT"}
 
-  :dependencies [[gered/views "1.5"]
+  :dependencies [[net.gered/views "1.6-SNAPSHOT"]
-                 [org.clojure/tools.logging "0.3.1"]]
+                 [org.clojure/tools.logging "1.2.4"]]
 
   :profiles     {:provided
-                 {:dependencies
+                 {:dependencies [[org.clojure/clojure "1.10.3"]
-                  [[org.clojure/clojure "1.8.0"]
+                                 [org.clojure/java.jdbc "0.7.12"]
-                   [org.clojure/java.jdbc "0.6.1"]
+                                 [com.github.seancorfield/honeysql "2.2.840"]]}
-                   [honeysql "0.6.3"]]}})
+
+                 :test
+                 {:dependencies [[pjstadig/humane-test-output "0.11.0"]]
+                  :injections   [(require 'pjstadig.humane-test-output)
+                                 (pjstadig.humane-test-output/activate!)]}})

src/views/honeysql/core.clj

@@ -4,7 +4,7 @@
   (:require
     [views.core :refer [hint put-hints!]]
     [views.honeysql.util :refer [query-tables]]
-    [honeysql.core :as hsql]
+    [honey.sql :as hsql]
     [clojure.tools.logging :refer [error]]
     [clojure.java.jdbc :as j]))
 

src/views/honeysql/util.clj

@@ -1,7 +1,7 @@
 (ns views.honeysql.util
   (:require
-    [honeysql.core :as hsql]
+    [honey.sql :as hsql]
-    [honeysql.helpers :as hh]
+    [honey.sql.helpers :as hh]
     [clojure.string :refer [split]]))
 
 ;; The following is used for full refresh views where we can have CTEs and

src/views/honeysql/view.clj

@@ -3,7 +3,7 @@
     [views.protocols :refer :all]
     [views.honeysql.core :refer [hint-type]]
     [views.honeysql.util :refer [query-tables]]
-    [honeysql.core :as hsql]
+    [honey.sql :as hsql]
     [clojure.set :refer [intersection]]
     [clojure.java.jdbc :as j]
     [clojure.tools.logging :refer [warn]]))

test/views/honeysql/honeysql_analysis_tests.clj

@@ -4,7 +4,7 @@
     views.honeysql.test-fixtures
     views.honeysql.util)
   (:require
-    [honeysql.core :as hsql]))
+    [honey.sql :as hsql]))
 
 (deftest simple-from-clause
   (is (= #{:foo}
@@ -89,7 +89,7 @@
                        [:top_regions
                         {:select [:region]
                          :from   [:regional_sales]
-                         :where  [:> :total_sales {:select [(hsql/raw "SUM(total_sales) / 10")]
+                         :where  [:> :total_sales {:select [[:raw "SUM(total_sales) / 10"]]
                                                    :from   [:regional_sales]}]}]]
             :select   [:region :product [(hsql/call :sum :quantity) "product_units"] [(hsql/call :sum :amount) "product_sales"]]
             :from     [:orders]

test/views/honeysql/vexec_tests.clj

@@ -6,7 +6,7 @@
   (:require
     [clojure.java.jdbc :as jdbc]
     [views.core :as views]
-    [honeysql.core :as hsql]))
+    [honey.sql :as hsql]))
 
 (defn vexec-redefs-fixture [f]
   (reset! redefs-called {})

test/views/honeysql/view_tests.clj

@@ -8,7 +8,7 @@
   (:require
     [clojure.java.jdbc :as jdbc]
     [views.core :as views]
-    [honeysql.core :as hsql]))
+    [honey.sql :as hsql]))
 
 (defn view-redefs-fixture [f]
   (reset! redefs-called {})