Now wrapping all subqueries within WITH

alexander-teshabaev · alexander-teshabaev · commit 8d8a787e7d32 · 2023-01-26T21:24:24.000+01:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "clickhouse-query",
-  "version": "1.7.3",
+  "version": "1.7.4",
   "description": "ClickHouse Query is intuitive query builder to overcome the complexity of ClickHouse SQL syntax.",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
diff --git a/src/Query.ts b/src/Query.ts
@@ -210,7 +210,7 @@ export class Query extends FilterableQuery {
                 if (hasInnerWithStatement) {
                     preparedWithPart = `WITH ${(alias ? `${alias} AS` : '')} (${withPart.generateSql()})`;
                 } else {
-                    preparedWithPart = `WITH ${(alias ? `${alias} AS` : '')} ${withPart.generateSql()}`;
+                    preparedWithPart = `WITH ${(alias ? `${alias} AS` : '')} (${withPart.generateSql()})`;
                 }
             }
             sql = `${preparedWithPart} ${sql}`;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "clickhouse-query",`
`3`		`- "version": "1.7.3",`
	`3`	`+ "version": "1.7.4",`
`4`	`4`	`"description": "ClickHouse Query is intuitive query builder to overcome the complexity of ClickHouse SQL syntax.",`
`5`	`5`	`"main": "dist/src/index.js",`
`6`	`6`	`"types": "dist/src/index.d.ts",`
Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ export class Query extends FilterableQuery {`
`210`	`210`	`if (hasInnerWithStatement) {`
`211`	`211`	preparedWithPart = `WITH ${(alias ? `${alias} AS` : '')} (${withPart.generateSql()})`;
`212`	`212`	`} else {`
`213`		- preparedWithPart = `WITH ${(alias ? `${alias} AS` : '')} ${withPart.generateSql()}`;
	`213`	+ preparedWithPart = `WITH ${(alias ? `${alias} AS` : '')} (${withPart.generateSql()})`;
`214`	`214`	`}`
`215`	`215`	`}`
`216`	`216`	sql = `${preparedWithPart} ${sql}`;