diff --git a/project.clj b/project.clj index 054ed73..3f7b02e 100644 --- a/project.clj +++ b/project.clj @@ -5,11 +5,15 @@ :license {:name "MIT License" :url "http://opensource.org/licenses/MIT"} - :dependencies [[gered/views "1.5"] - [org.clojure/tools.logging "0.3.1"]] + :dependencies [[net.gered/views "1.6-SNAPSHOT"] + [org.clojure/tools.logging "1.2.4"]] :profiles {:provided - {:dependencies - [[org.clojure/clojure "1.8.0"] - [org.clojure/java.jdbc "0.6.1"] - [honeysql "0.6.3"]]}}) + {:dependencies [[org.clojure/clojure "1.10.3"] + [org.clojure/java.jdbc "0.7.12"] + [com.github.seancorfield/honeysql "2.2.840"]]} + + :test + {:dependencies [[pjstadig/humane-test-output "0.11.0"]] + :injections [(require 'pjstadig.humane-test-output) + (pjstadig.humane-test-output/activate!)]}}) diff --git a/src/views/honeysql/core.clj b/src/views/honeysql/core.clj index 31e4c6c..87c2bf2 100644 --- a/src/views/honeysql/core.clj +++ b/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])) diff --git a/src/views/honeysql/util.clj b/src/views/honeysql/util.clj index 8e7db15..0423e04 100644 --- a/src/views/honeysql/util.clj +++ b/src/views/honeysql/util.clj @@ -1,7 +1,7 @@ (ns views.honeysql.util (:require - [honeysql.core :as hsql] - [honeysql.helpers :as hh] + [honey.sql :as hsql] + [honey.sql.helpers :as hh] [clojure.string :refer [split]])) ;; The following is used for full refresh views where we can have CTEs and diff --git a/src/views/honeysql/view.clj b/src/views/honeysql/view.clj index 5e2c32c..8f85cb1 100644 --- a/src/views/honeysql/view.clj +++ b/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]])) diff --git a/test/views/honeysql/honeysql_analysis_tests.clj b/test/views/honeysql/honeysql_analysis_tests.clj index 14ccf64..6c6d0ea 100644 --- a/test/views/honeysql/honeysql_analysis_tests.clj +++ b/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] diff --git a/test/views/honeysql/vexec_tests.clj b/test/views/honeysql/vexec_tests.clj index 7810bb9..f216326 100644 --- a/test/views/honeysql/vexec_tests.clj +++ b/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 {}) diff --git a/test/views/honeysql/view_tests.clj b/test/views/honeysql/view_tests.clj index 50e7bcf..74fe869 100644 --- a/test/views/honeysql/view_tests.clj +++ b/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 {})