📝 JSONCompactEachRowWithNamesAndTypes Formatter (#135)

* 📝 JSONCompactEachRowWithNamesAndTypes Formatter Signed-off-by: Julio Jimenez <[email protected]> * README Signed-off-by: Julio Jimenez <[email protected]> * jsoncompacteachrowwithnamesandtypes Signed-off-by: Julio Jimenez <[email protected]> * reorder Signed-off-by: Julio Jimenez <[email protected]> --------- Signed-off-by: Julio Jimenez <[email protected]>
juliojimenez · Feb 19, 2023 · b322ec3 · b322ec3
1 parent f2e0c48
commit b322ec3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -222,6 +222,7 @@ clickhouse-cl supports automatic input and output format processing for the form
 | [JSONStringsEachRowWithProgress](https://clickhouse.com/docs/en/interfaces/formats/#jsonstringseachrowwithprogress) || :heavy_check_mark: | BOOST-JSON:JSON-OBJECT | jget *obj* *key* |
 | [JSONCompactEachRow](https://clickhouse.com/docs/en/interfaces/formats/#jsoncompacteachrow) | :heavy_check_mark: | :heavy_check_mark: | BOOST-JSON:JSON-OBJECT | jget *obj* *key* |
 | [JSONCompactEachRowWithNames](https://clickhouse.com/docs/en/interfaces/formats/#jsoncompacteachrowwithnames) | :heavy_check_mark: | :heavy_check_mark: | BOOST-JSON:JSON-OBJECT | jget *obj* *key* |
+| [JSONCompactEachRowWithNamesAndTypes](https://clickhouse.com/docs/en/interfaces/formats/#jsoncompacteachrowwithnamesandtypes) | :heavy_check_mark: | :heavy_check_mark: | BOOST-JSON:JSON-OBJECT | jget *obj* *key* |
 | [Pretty](https://clickhouse.com/docs/en/interfaces/formats/#pretty) || :heavy_check_mark: || Best viewed with `:console t` |
 
 ### Functions

diff --git a/clickhouse.asd b/clickhouse.asd
@@ -2,7 +2,7 @@
   :description "Common Lisp ClickHouse Client Library"
   :author "[email protected]"
   :license "Apache-2.0"
-  :version "0.17.0"
+  :version "0.18.0"
   :depends-on (#:boost-json
 	             #:dexador
 	             #:lexer
@@ -15,7 +15,6 @@
                  (:file "clickhouse" :depends-on ("http" "ch-sql-parser")))))
   :in-order-to ((test-op (test-op "clickhouse-test"))))
 
-
 (asdf:defsystem #:clickhouse/ci
   :description "CI for Common Lisp ClickHouse Client Library"
   :author "[email protected]"

diff --git a/src/ch-sql-parser.lisp b/src/ch-sql-parser.lisp
@@ -270,7 +270,14 @@
                   (progn
                     (setf chosen-format (token-value (nth (+ 1 i) lexer)))
                     ;(print chosen-format)
-                    (cond ((equal chosen-format "JSON") (setf *format* 'json))
+                    (cond ((equal chosen-format "TabSeparated") (setf *format* 'tabseparated))
+                          ((equal chosen-format "TabSeparatedRaw") (setf *format* 'tabseparatedraw))
+                          ((equal chosen-format "TabSeparatedWithNames") (setf *format* 'tabseparatedwithnames))
+                          ((equal chosen-format "TabSeparatedWithNamesAndTypes") (setf *format* 'tabseparatedwithnamesandtypes))
+                          ((equal chosen-format "CSV") (setf *format* 'csv))
+                          ((equal chosen-format "CSVWithNames") (setf *format* 'csvwithnames))
+                          ((equal chosen-format "CSVWithNamesAndTypes") (setf *format* 'csvwithnamesandtypes))
+                          ((equal chosen-format "JSON") (setf *format* 'json))
                           ((equal chosen-format "JSONStrings") (setf *format* 'jsonstrings))
                           ((equal chosen-format "JSONColumns") (setf *format* 'jsoncolumns))
                           ((equal chosen-format "JSONColumnsWithMetadata") (setf *format* 'jsoncolumnswithmetadata))
@@ -283,14 +290,8 @@
                           ((equal chosen-format "JSONStringsEachRowWithProgress") (setf *format* 'jsonstringseachrowwithprogress))
                           ((equal chosen-format "JSONCompactEachRow") (setf *format* 'jsoncompacteachrow))
                           ((equal chosen-format "JSONCompactEachRowWithNames") (setf *format* 'jsoncompacteachrowwithnames))
+                          ((equal chosen-format "JSONCompactEachRowWithNamesAndTypes") (setf *format* 'jsoncompacteachrowwithnamesandtypes))
                           ((equal chosen-format "Pretty") (setf *format* 'pretty))
-                          ((equal chosen-format "TabSeparated") (setf *format* 'tabseparated))
-                          ((equal chosen-format "TabSeparatedRaw") (setf *format* 'tabseparatedraw))
-                          ((equal chosen-format "TabSeparatedWithNames") (setf *format* 'tabseparatedwithnames))
-                          ((equal chosen-format "TabSeparatedWithNamesAndTypes") (setf *format* 'tabseparatedwithnamesandtypes))
-                          ((equal chosen-format "CSV") (setf *format* 'csv))
-                          ((equal chosen-format "CSVWithNames") (setf *format* 'csvwithnames))
-                          ((equal chosen-format "CSVWithNamesAndTypes") (setf *format* 'csvwithnamesandtypes))
                           (t (setf *format* nil))))))))
 
 (defun to-vector (val)

diff --git a/src/utils.lisp b/src/utils.lisp
@@ -54,7 +54,8 @@
 																			(equalp formatting clickhouse.ch-sql-parser::'jsonstringseachrow)
 																			(equalp formatting clickhouse.ch-sql-parser::'jsonstringseachrowwithprogress)
 																			(equalp formatting clickhouse.ch-sql-parser::'jsoncompacteachrow)
-																			(equalp formatting clickhouse.ch-sql-parser::'jsoncompacteachrowwithnames))
+																			(equalp formatting clickhouse.ch-sql-parser::'jsoncompacteachrowwithnames)
+																			(equalp formatting clickhouse.ch-sql-parser::'jsoncompacteachrowwithnamesandtypes))
 																		(jsoneachrow-formats b))
 																	((equalp formatting clickhouse.ch-sql-parser::'pretty)
 																	 (pretty-formatter b))