Fix formatting

Author: scimetfoo

src/honeysql_postgres/format.cljc

@@ -1,5 +1,5 @@
 (ns ^{:doc "Extension of the honeysql format functions specifically for postgreSQL"}
-    honeysql-postgres.format
+ honeysql-postgres.format
   (:require [honeysql.format :as sqlf :refer [fn-handler format-clause format-modifiers]] ;; multi-methods
             [honeysql-postgres.util :as util]
             [clojure.string :as string]))
@@ -100,8 +100,8 @@
 
 (defmethod format-clause :on-conflict-constraint [[_ k] _]
   (str "ON CONFLICT ON CONSTRAINT " (-> k
-                                       util/get-first
-                                       sqlf/to-sql)))
+                                        util/get-first
+                                        sqlf/to-sql)))
 
 (defmethod format-clause :on-conflict [[_ ids] _]
   (str "ON CONFLICT " (util/comma-join-args ids)))

src/honeysql_postgres/util.cljc

@@ -1,5 +1,5 @@
 (ns ^{:doc "Postgres Honeysql utils"}
-    honeysql-postgres.util
+ honeysql-postgres.util
   (:refer-clojure :exclude [format partition-by])
   (:require [honeysql.format :as sqlf]))
 
@@ -27,8 +27,8 @@
         (prep-check '([:= :a :b] [:< :a :c])) => [:and [:= :a :b] [:< :a :c]]"
   [args]
   (let [preds (if (= 1 (count args))
-                  (first args)
-                  args)
+                (first args)
+                args)
         [logic-op preds] (if (keyword? (first preds))
                            [(first preds) (rest preds)]
                            [:and preds])]

test/honeysql_postgres/postgres_test.cljc

@@ -55,24 +55,22 @@
                            do-nothing))
                sql/format)))))
 
-
 (deftest upsert-where-test
   (is (= ["INSERT INTO user (phone, name) VALUES (?, ?) ON CONFLICT (phone) WHERE phone IS NOT NULL DO UPDATE SET phone = EXCLUDED.phone, name = EXCLUDED.name WHERE user.active = FALSE" "5555555" "John"]
          (sql/format
-           {:insert-into :user
-            :values      [{:phone "5555555" :name "John"}]
-            :upsert      {:on-conflict   [:phone]
-                          :where         [:<> :phone nil]
-                          :do-update-set {:fields [:phone :name]
-                                          :where  [:= :user.active false]}}}))))
-
+          {:insert-into :user
+           :values      [{:phone "5555555" :name "John"}]
+           :upsert      {:on-conflict   [:phone]
+                         :where         [:<> :phone nil]
+                         :do-update-set {:fields [:phone :name]
+                                         :where  [:= :user.active false]}}}))))
 
 (deftest returning-test
   (testing "returning clause in sql generation for postgresql"
     (is (= ["DELETE FROM distributors WHERE did > 10 RETURNING *"]
            (sql/format {:delete-from :distributors
                         :where [:> :did :10]
-                        :returning [:*] })))
+                        :returning [:*]})))
     (is (= ["UPDATE distributors SET dname = ? WHERE did = 2 RETURNING did dname" "Foo Bar Designs"]
            (-> (update :distributors)
                (sset {:dname "Foo Bar Designs"})
@@ -209,26 +207,25 @@
   (testing "select from table with ILIKE operator"
     (is (= ["SELECT * FROM products WHERE name ILIKE ?" "%name%"]
            (-> (select :*)
-              (from :products)
-              (where [:ilike :name "%name%"])
-              sql/format)))))
+               (from :products)
+               (where [:ilike :name "%name%"])
+               sql/format)))))
 
 (deftest select-where-not-ilike
   (testing "select from table with NOT ILIKE operator"
     (is (= ["SELECT * FROM products WHERE name NOT ILIKE ?" "%name%"]
            (-> (select :*)
-              (from :products)
-              (where [:not-ilike :name "%name%"])
-              sql/format)))))
+               (from :products)
+               (where [:not-ilike :name "%name%"])
+               sql/format)))))
 
 (deftest values-except-select
   (testing "select which values are not not present in a table"
     (is (= ["VALUES (?), (?), (?) EXCEPT SELECT id FROM images" 4 5 6]
            (sql/format
-                  {:except
-                   [{:values [[4] [5] [6]]}
-                    {:select [:id] :from [:images]}]})))))
-
+            {:except
+             [{:values [[4] [5] [6]]}
+              {:select [:id] :from [:images]}]})))))
 
 (deftest select-except-select
   (testing "select which rows are not present in another table"
@@ -238,7 +235,6 @@
              [{:select [:ip]}
               {:select [:ip] :from [:ip_location]}]})))))
 
-
 (deftest values-except-all-select
   (testing "select which values are not not present in a table"
     (is (= ["VALUES (?), (?), (?) EXCEPT ALL SELECT id FROM images" 4 5 6]
@@ -247,7 +243,6 @@
              [{:values [[4] [5] [6]]}
               {:select [:id] :from [:images]}]})))))
 
-
 (deftest select-except-all-select
   (testing "select which rows are not present in another table"
     (is (= ["SELECT ip EXCEPT ALL SELECT ip FROM ip_location"]
@@ -260,6 +255,6 @@
   (testing "select distinct on"
     (is (= ["SELECT DISTINCT ON(\"a\", \"b\") \"c\" FROM \"products\" "]
            (-> (select :c)
-              (from :products)
-              (modifiers :distinct-on :a :b)
-              (sql/format :quoting :ansi))))))
+               (from :products)
+               (modifiers :distinct-on :a :b)
+               (sql/format :quoting :ansi))))))