Fixed invalid alias usage for WITH in case of subquery

Author: alexander-teshabaev

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
+## v1.7.3 - 2023-01-26
+
+### Fixed
+- Fixed invalid alias usage for WITH in case of subquery
+
 ## v1.7.2 - 2023-01-01
 
 ### Fixed

__tests__/Query.test.ts

@@ -481,7 +481,7 @@ describe('Query', () => {
                 .orderBy([['table_disk_usage', 'DESC']])
                 .limit(10)
                 .generateSql();
-            expect(sql).toBe(`WITH (WITH 2022-12-11 AS some_date SELECT sum(bytes) FROM system.parts WHERE active = 1) AS alias SELECT (sum(bytes) / total_disk_usage) * 100 AS table_disk_usage, table FROM system.parts GROUP BY table ORDER BY table_disk_usage DESC LIMIT 10`);
+            expect(sql).toBe(`WITH alias AS (WITH 2022-12-11 AS some_date SELECT sum(bytes) FROM system.parts WHERE active = 1) SELECT (sum(bytes) / total_disk_usage) * 100 AS table_disk_usage, table FROM system.parts GROUP BY table ORDER BY table_disk_usage DESC LIMIT 10`);
         });
 
         it('Using WITH within WITH as list of params', () => {

src/Query.ts

@@ -197,19 +197,22 @@ export class Query extends FilterableQuery {
                     }
                 }
                 preparedWithPart = `WITH ${withChunks.join(', ')}`;
+                if (alias) {
+                    preparedWithPart += ` AS ${alias}`;
+                }
             } else if (typeof withPart === 'string') {
                 preparedWithPart = `WITH '${withPart}'`;
+                if (alias) {
+                    preparedWithPart += ` AS ${alias}`;
+                }
             } else if (withPart instanceof Query) {
                 const hasInnerWithStatement = withPart.withPart[0];
                 if (hasInnerWithStatement) {
-                    preparedWithPart = `WITH (${withPart.generateSql()})`;
+                    preparedWithPart = `WITH ${(alias ? `${alias} AS` : '')} (${withPart.generateSql()})`;
                 } else {
-                    preparedWithPart = `WITH ${withPart.generateSql()}`;
+                    preparedWithPart = `WITH ${(alias ? `${alias} AS` : '')} ${withPart.generateSql()}`;
                 }
             }
-            if (alias) {
-                preparedWithPart = `${preparedWithPart} AS ${alias}`;
-            }
             sql = `${preparedWithPart} ${sql}`;
         } else {
             if (this.aliasPart) {