Merge pull request #443 from duddlf23/cast-type-format-fix

Improve type formatting logic in :cast function
seancorfield · Nov 20, 2022 · e4f0a5e · e4f0a5e
2 parents 562b206 + a87fa0c
commit e4f0a5e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -702,7 +702,7 @@ have a lot of function calls needed in code:
     (sql/format {:pretty true}))
 => ["
 INSERT INTO sample
-(location) VALUES (ST_SETSRID(ST_MAKEPOINT(?, ?), CAST(? AS integer)))
+(location) VALUES (ST_SETSRID(ST_MAKEPOINT(?, ?), CAST(? AS INTEGER)))
 "
 0.291 32.621 4325]
 ```

diff --git a/doc/special-syntax.md b/doc/special-syntax.md
@@ -79,7 +79,7 @@ that produces a SQL type:
 
 ```clojure
 (sql/format-expr [:cast :a :int])
-;;=> ["CAST(a AS int)"]
+;;=> ["CAST(a AS INT)"]
 ```
 
 ## composite

diff --git a/src/honey/sql.cljc b/src/honey/sql.cljc
@@ -1426,7 +1426,9 @@
     :cast
     (fn [_ [x type]]
       (let [[sql & params]   (format-expr x)
-            [sql' & params'] (format-expr type)]
+            [sql' & params'] (if (ident? type)
+                               [(sql-kw type)]
+                               (format-expr type))]
         (-> [(str "CAST(" sql " AS " sql' ")")]
             (into params)
             (into params'))))

diff --git a/test/honey/sql/helpers_test.cljc b/test/honey/sql/helpers_test.cljc
@@ -249,10 +249,19 @@
                (sql/format))))))
 
 (deftest test-cast
-  (is (= ["SELECT foo, CAST(bar AS integer)"]
+  (is (= ["SELECT foo, CAST(bar AS INTEGER)"]
          (sql/format {:select [:foo [[:cast :bar :integer]]]})))
-  (is (= ["SELECT foo, CAST(bar AS integer)"]
-         (sql/format {:select [:foo [[:cast :bar 'integer]]]}))))
+  (is (= ["SELECT foo, CAST(bar AS INTEGER)"]
+         (sql/format {:select [:foo [[:cast :bar 'integer]]]})))
+  (is (= ["SELECT foo, CAST(bar AS DOUBLE PRECISION)"] ;; Postgres example
+         (sql/format {:select [:foo [[:cast :bar :double-precision]]]})))
+  (is (= ["SELECT \"foo\", CAST(\"bar\" AS INTEGER)"]
+         (sql/format {:select [:foo [[:cast :bar :integer]]]} {:quoted true})))
+  (is (= ["SELECT `foo`, CAST(`bar` AS INTEGER)"]
+         (sql/format {:select [:foo [[:cast :bar :integer]]]} {:dialect :mysql})))
+  (is (= ["SELECT `foo`, CAST(`bar` AS CHAR(10))"]
+         (sql/format {:select [:foo [[:cast :bar [:char 10]]]]} {:dialect :mysql
+                                                                 :inline true}))))
 
 (deftest test-value
   (is (= ["INSERT INTO foo (bar) VALUES (?)" {:baz "my-val"}]