📝 JSONCompactStrings Formatter (#127)

* 📝 JSONCompactStrings Formatter Signed-off-by: Julio Jimenez <[email protected]> * README Signed-off-by: Julio Jimenez <[email protected]> * jsoncompactstrings Signed-off-by: Julio Jimenez <[email protected]> * tests Signed-off-by: Julio Jimenez <[email protected]> * another readme Signed-off-by: Julio Jimenez <[email protected]> --------- Signed-off-by: Julio Jimenez <[email protected]>
juliojimenez · Feb 15, 2023 · 59cdeb6 · 59cdeb6
1 parent 96eb5c3
commit 59cdeb6
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ Common Lisp ClickHouse Client Library
 - [Formats](#formats)
   - [Functions](#functions)
     - [jget](#jget)
-- [Common Forms](#common-forms)
+- [Examples](#examples)
   - [Connection to a local database](#connection-to-a-local-database)
   - [Query](#query)
 - [Bugs, Features, and Vulnerabilities Reporting](#bugs-features-and-vulnerabilities-reporting)
@@ -201,8 +201,8 @@ clickhouse-cl supports automatic input and output format processing for the form
 
 | Format | Input | Output | Result | Functions |
 | ------ | ----- | ------ | ------ | --------- |
-| TabSeparated | :heavy_check_mark: | :heavy_check_mark: | '('(string*)*) ||
-| TabSeparatedRaw | :heavy_check_mark: | :heavy_check_mark: | '('(string*)*) ||
+| [TabSeparated](https://clickhouse.com/docs/en/interfaces/formats/#tabseparated) | :heavy_check_mark: | :heavy_check_mark: | '('(string*)*) ||
+| [TabSeparatedRaw](https://clickhouse.com/docs/en/interfaces/formats/#tabseparatedraw) | :heavy_check_mark: | :heavy_check_mark: | '('(string*)*) ||
 | TabSeparatedWithNames | :heavy_check_mark: | :heavy_check_mark: | '('(string*)*) ||
 | TabSeparatedWithNamesAndTypes | :heavy_check_mark: | :heavy_check_mark: | '('(string*)*) ||
 | CSV | :heavy_check_mark: | :heavy_check_mark: | '('(string*)*) ||
@@ -214,6 +214,7 @@ clickhouse-cl supports automatic input and output format processing for the form
 | JSONColumns | :heavy_check_mark: | :heavy_check_mark: | BOOST-JSON:JSON-OBJECT | jget *obj* *key* |
 | JSONColumnsWithMetadata | :heavy_check_mark: | :heavy_check_mark: | BOOST-JSON:JSON-OBJECT | jget *obj* *key* |
 | JSONCompact | :heavy_check_mark: | :heavy_check_mark: | BOOST-JSON:JSON-OBJECT | jget *obj* *key* |
+| JSONCompactStrings || :heavy_check_mark: | BOOST-JSON:JSON-OBJECT | jget *obj* *key* |
 | Pretty || :heavy_check_mark: || Best viewed with `:console t` |
 
 ### Functions
@@ -236,7 +237,7 @@ CL-USER> (ch:jget *result* "rows")
 T
 ```
 
-## Common Forms
+## Examples
 
 ### Connection to a local database
 

diff --git a/clickhouse-test.asd b/clickhouse-test.asd
@@ -3,7 +3,7 @@
 
   :author "[email protected]"
   :license  "Apache-2.0"
-  :version "0.0.15"
+  :version "0.0.16"
   :depends-on (#:clickhouse
 	       #:fiveam)
   :components ((:module "t"

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.9.0"
+  :version "0.10.0"
   :depends-on (#:boost-json
 	       #:dexador
 	       #:lexer

diff --git a/src/ch-sql-parser.lisp b/src/ch-sql-parser.lisp
@@ -275,6 +275,7 @@
               ((equal chosen-format "JSONColumns") (setf *format* 'jsoncolumns))
               ((equal chosen-format "JSONColumnsWithMetadata") (setf *format* 'jsoncolumnswithmetadata))
               ((equal chosen-format "JSONCompact") (setf *format* 'jsoncompact))
+              ((equal chosen-format "JSONCompactStrings") (setf *format* 'jsoncompactstrings))
               ((equal chosen-format "Pretty") (setf *format* 'pretty))
               ((equal chosen-format "TabSeparated") (setf *format* 'tabseparated))
               ((equal chosen-format "TabSeparatedRaw") (setf *format* 'tabseparatedraw))

diff --git a/src/utils.lisp b/src/utils.lisp
@@ -34,7 +34,8 @@
 																		(equalp formatting clickhouse.ch-sql-parser::'jsonstrings)
 																		(equalp formatting clickhouse.ch-sql-parser::'jsoncolumns)
 																		(equalp formatting clickhouse.ch-sql-parser::'jsoncolumnswithmetadata)
-																		(equalp formatting clickhouse.ch-sql-parser::'jsoncompact))
+																		(equalp formatting clickhouse.ch-sql-parser::'jsoncompact)
+																		(equalp formatting clickhouse.ch-sql-parser::'jsoncompactstrings))
 																	 (json-formats b))
 																	((equalp formatting clickhouse.ch-sql-parser::'pretty)
 																	 (pretty-formatter b))

diff --git a/t/clickhouse.lisp b/t/clickhouse.lisp
@@ -69,6 +69,24 @@
   (is (equalp "│ 1 │
 " (clickhouse.utils::pretty-formatter-title-row '(0 4) '("1")))))
 
+(test pretty-formatter-border-top
+  (is (equalp "┌───┐
+" (clickhouse.utils::pretty-formatter-border 
+    '(0 4)
+    #\BOX_DRAWINGS_LIGHT_DOWN_AND_RIGHT
+    #\BOX_DRAWINGS_LIGHT_DOWN_AND_LEFT
+    #\BOX_DRAWINGS_LIGHT_DOWN_AND_HORIZONTAL
+    #\BOX_DRAWINGS_LIGHT_HORIZONTAL))))
+
+(test pretty-formatter-border-bottom
+  (is (equalp "├───┤
+" (clickhouse.utils::pretty-formatter-border 
+    '(0 4)
+    #\BOX_DRAWINGS_LIGHT_VERTICAL_AND_RIGHT
+    #\BOX_DRAWINGS_LIGHT_VERTICAL_AND_LEFT
+    #\BOX_DRAWINGS_LIGHT_VERTICAL_AND_HORIZONTAL
+    #\BOX_DRAWINGS_LIGHT_HORIZONTAL))))
+
 (test tab-separated-formatter
   (is (equalp
        '("7" "8" "9")