luciano/honeysql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure xs in format-values is a vector

Browse source
This commit is contained in:
Oleksandr Yakushev 2025-05-05 01:41:37 +03:00
parent f5dbc274be
commit 580d0a6b7f
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/honey/sql.cljc
View file

@ -1165,8 +1165,8 @@
;; use the keys from the first map if they match so that ;; use the keys from the first map if they match so that
;; users can rely on the key ordering if they want to, ;; users can rely on the key ordering if they want to,
;; e.g., see test that uses array-map for the first row ;; e.g., see test that uses array-map for the first row
cols-n (into #{} (mapcat keys) (filter map? xs)) cols-n (into #{} (comp (filter map?) (mapcat keys)) xs)
cols (if (= (set cols-1) cols-n) cols-1 cols-n)] cols (if (= (into #{} cols-1) cols-n) cols-1 cols-n)]
[cols (when-not skip-cols-sql [cols (when-not skip-cols-sql
(str "(" (str "("
(join ", " (map #(format-entity % {:drop-ns true})) cols) (join ", " (map #(format-entity % {:drop-ns true})) cols)
@ -1177,14 +1177,15 @@
row-ctr (and (sequential? xs) row-ctr (and (sequential? xs)
(ident? (first xs)) (ident? (first xs))
(contains? #{:row 'row} (first xs))) (contains? #{:row 'row} (first xs)))
xs (if row-ctr (rest xs) xs)] xs (if (sequential? xs) (vec xs) xs)
xs (if row-ctr (subvec xs 1) xs)]
(cond (and (ident? xs) (contains? #{:default 'default} xs)) (cond (and (ident? xs) (contains? #{:default 'default} xs))
[(str (sql-kw xs) " " (sql-kw k))] [(str (sql-kw xs) " " (sql-kw k))]
(empty? xs) (empty? xs)
[(str (sql-kw k) " ()")] [(str (sql-kw k) " ()")]
(sequential? first-xs) (sequential? first-xs)
;; [[1 2 3] [4 5 6]] ;; [[1 2 3] [4 5 6]]
(let [n-1 (map count (filter sequential? xs)) (let [n-1 (into [] (comp (filter sequential?) (map count)) xs)
;; issue #291: ensure all value sequences are the same length ;; issue #291: ensure all value sequences are the same length
xs' (if (apply = n-1) xs' (if (apply = n-1)
xs xs