Fix table constraints

HealthSamurai · Dec 14, 2023 · 1454fc6 · 1454fc6
1 parent 22cb4b1
commit 1454fc6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/dsql/pg.clj b/src/dsql/pg.clj
@@ -1158,9 +1158,11 @@
       (conj "TABLE")
       (cond-> not-ex (conj "IF NOT EXISTS"))
       (identifier opts table-name)
-      (cond-> columns    (conj "(" (mk-columns opts columns)))
-      (cond-> constraint (conj "," (mk-table-constraint constraint)))
-      (cond-> columns    (conj ")"))
+      (cond-> (or columns constraint) (conj "("))
+      (cond-> columns    (conj (mk-columns opts columns)))
+      (cond-> (and columns constraint) (conj ","))
+      (cond-> constraint (conj (mk-table-constraint constraint)))
+      (cond-> (or columns constraint) (conj ")"))
 
       (cond-> partition-of (conj "partition of" (name partition-of) ))
       (cond-> for (conj "for values"

diff --git a/test/dsql/pg_test.clj b/test/dsql/pg_test.clj
@@ -618,6 +618,12 @@
     :columns {:a {:type "integer" }}}
    ["CREATE TABLE \"MyTable\" ( \"a\" integer )"])
 
+  (format=
+   {:ql/type :pg/create-table
+    :table-name "mytable"
+    :constraint {:primary-key [:id :partition]}}
+   ["CREATE TABLE mytable ( PRIMARY KEY (\"id\", \"partition\") )"])
+
   (format=
    {:ql/type :pg/create-table
     :table-name "mytable"