JDBC-177 allow numbers in column specs in create-table-ddl

Author: seancorfield

.joker

@@ -0,0 +1,3 @@
+{:known-macros [clojure.java.jdbc/with-db-connection
+                clojure.java.jdbc/with-db-metadata
+                clojure.java.jdbc/with-db-transaction]}

CHANGES.md

@@ -1,3 +1,7 @@
+Changes coming in 0.7.10
+
+* Relax restriction on `create-table-ddl` column specs to allow numbers (as well as keywords and strings) [JDBC-177](https://dev.clojure.org/jira/browse/JDBC-177).
+
 Changes in 0.7.9
 
 * Fix behavior of multi-inserts when database does not support generated keys [JDBC-176](https://dev.clojure.org/jira/browse/JDBC-176).

src/main/clojure/clojure/java/jdbc.clj

@@ -1692,10 +1692,11 @@ http://clojure-doc.org/articles/ecosystem/java_jdbc/home.html"}
          entities       (:entities   opts identity)
          table-name     (as-sql-name entities table)
          table-spec-str (or (and table-spec (str " " table-spec)) "")
+         stringify      (fn [x] (if (keyword? x) (name x) (str x)))
          spec-to-string (fn [spec]
                           (try
                             (str/join " " (cons (as-sql-name entities (first spec))
-                                                (map name (rest spec))))
+                                                (map stringify (rest spec))))
                             (catch Exception _
                               (throw (IllegalArgumentException.
                                       "column spec is not a sequence of keywords / strings")))))]

src/main/clojure/clojure/java/jdbc/spec.clj

@@ -1,4 +1,4 @@
-;;  Copyright (c) 2016-2017 Sean Corfield. All rights reserved.
+;;  Copyright (c) 2016-2019 Sean Corfield. All rights reserved.
 ;;  The use and distribution terms for this software are covered by
 ;;  the Eclipse Public License 1.0
 ;;  (http://opensource.org/licenses/eclipse-1.0.php) which can be
@@ -407,7 +407,9 @@
                      :opts         (s/? ::exec-sql-options))
         :ret  ::execute-result)
 
-(s/def ::column-spec (s/cat :col ::identifier :spec (s/* (s/or :kw keyword? :str string?))))
+(s/def ::column-spec (s/cat :col ::identifier :spec (s/* (s/or :kw keyword?
+                                                               :str string?
+                                                               :num number?))))
 
 (s/fdef sql/create-table-ddl
         :args (s/cat :table ::identifier

src/test/clojure/clojure/java/jdbc_test.clj

@@ -21,7 +21,7 @@
 ;;  Migrated from clojure.contrib.test-sql 17 April 2011
 
 (ns clojure.java.jdbc-test
-  (:require [clojure.test :refer :all]
+  (:require [clojure.test :refer [deftest is use-fixtures]]
             [clojure.java.jdbc :as sql]
             [clojure.string :as str]))
 
@@ -887,27 +887,27 @@
         (is (= "fruit" (-> table-info
                            first
                            :table_name
-                           clojure.string/lower-case)))))
-    (sql/with-db-connection [conn db]
-      (sql/with-db-metadata [metadata conn {}]
-        (let [table-info (sql/metadata-query (.getTables metadata
-                                                         nil nil nil
-                                                         (into-array ["TABLE" "VIEW"])))]
-          (is (not= [] table-info))
-          (is (= "fruit" (-> table-info
-                             first
-                             :table_name
-                             clojure.string/lower-case)))))
-      ;; JDBC-171 this used to blow up because the connnection is closed
-      (sql/with-db-metadata [metadata conn {}]
-        (let [table-info (sql/metadata-query (.getTables metadata
-                                                         nil nil nil
-                                                         (into-array ["TABLE" "VIEW"])))]
-          (is (not= [] table-info))
-          (is (= "fruit" (-> table-info
-                             first
-                             :table_name
-                             clojure.string/lower-case))))))))
+                           clojure.string/lower-case))))
+     (sql/with-db-connection [conn db]
+       (sql/with-db-metadata [metadata conn {}]
+         (let [table-info (sql/metadata-query (.getTables metadata
+                                                          nil nil nil
+                                                          (into-array ["TABLE" "VIEW"])))]
+           (is (not= [] table-info))
+           (is (= "fruit" (-> table-info
+                              first
+                              :table_name
+                              clojure.string/lower-case)))))
+       ;; JDBC-171 this used to blow up because the connnection is closed
+       (sql/with-db-metadata [metadata conn {}]
+         (let [table-info (sql/metadata-query (.getTables metadata
+                                                          nil nil nil
+                                                          (into-array ["TABLE" "VIEW"])))]
+           (is (not= [] table-info))
+           (is (= "fruit" (-> table-info
+                              first
+                              :table_name
+                              clojure.string/lower-case)))))))))
 
 (deftest test-metadata-managed-computed
   (doseq [db (test-specs)]
@@ -1254,6 +1254,22 @@
               {:id (generated-key db 3) :name "Orange" :appearance "round" :cost nil :grade nil}
               {:id (generated-key db 2) :name "Pear" :appearance "yellow" :cost nil :grade nil}] rows)))))
 
+(deftest test-create-table-ddl
+  (is (re-find #"`foo` int default 0"
+               (sql/create-table-ddl :table
+                                     [[:foo :int :default 0]]
+                                     {:entities (sql/quoted :mysql)}))))
+
+(comment
+   db (sql/create-table-ddl
+       table
+       [[:id :int "PRIMARY KEY AUTO_INCREMENT"]
+        [:name "VARCHAR(32)"]
+        [:appearance "VARCHAR(32)"]
+        [:cost :int]
+        [:grade :real]]
+       {:table-spec "ENGINE=InnoDB"}))
+
 (deftest test-resultset-read-column
   (extend-protocol sql/IResultSetReadColumn
     String