Accept safe string in clickhouse with (#79)

* Accept safe string in clickhouse with * update docs * fix test * fix ci * fix ci
lucasavila00 · Aug 31, 2023 · 30ff217 · 30ff217
1 parent 436b49b
commit 30ff217
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/docs/api/classes/select-statement.ts.md b/docs/api/classes/select-statement.ts.md
@@ -218,6 +218,7 @@ clickhouse: {
   with_: <NewSelection extends string>(
     it: Record<
       NewSelection,
+      | SafeString
       | SelectStatement<any, any, any, any>
       | AliasedSelectStatement<any, any, any, any>
       | StringifiedSelectStatement<any, any, any, any>

diff --git a/src/classes/select-statement.ts b/src/classes/select-statement.ts
@@ -11,7 +11,7 @@ import {
 } from "../consume-fields";
 import { AliasedRows, StarSymbol } from "../data-wrappers";
 import { printAliasedSelectStatement, printSelectStatement } from "../print";
-import { SafeString } from "../safe-string";
+import { SafeString, isSafeString } from "../safe-string";
 import {
     ClickhouseWith,
     CTE,
@@ -268,6 +268,7 @@ export class SelectStatement<
                 | AliasedSelectStatement<any, any, any, any>
                 | StringifiedSelectStatement<any, any, any, any>
                 | AliasedStringifiedSelectStatement<any, any, any, any>
+                | SafeString
             >
         ): SelectStatement<
             Selection | NewSelection,
@@ -277,7 +278,14 @@ export class SelectStatement<
         > =>
             this.copy().setClickhouseWith([
                 ...this.__props.clickhouseWith,
-                it,
+                Object.fromEntries(
+                    Object.entries(it).map(([key, value]) => [
+                        key,
+                        isSafeString(value)
+                            ? StringifiedSelectStatement.fromSafeString(value)
+                            : value,
+                    ])
+                ) as any,
             ]) as any,
 
         /**

diff --git a/tests/clickhouse-suite/with.test.ts b/tests/clickhouse-suite/with.test.ts
@@ -32,6 +32,23 @@ describe("clickhouse with", () => {
             ]
         `);
     });
+    it("from safe string", async () => {
+        const q = fromNothing({ it: dsql(10) })
+            .clickhouse.with_({
+                wont_use: dsql(20),
+            })
+            .stringify();
+        expect(q).toMatchInlineSnapshot(
+            `WITH (20) AS \`wont_use\` SELECT 10 AS \`it\``
+        );
+        expect(await run(q)).toMatchInlineSnapshot(`
+            Array [
+              Array [
+                10,
+              ],
+            ]
+        `);
+    });
 
     it("from stringified select statement", async () => {
         const q = fromNothing({ it: dsql(10) })