count(distinct colum1, ..., columnN)

martin-pabst · martin-pabst · commit 0a8813edba77 · 2024-01-19T14:06:56.000+01:00
diff --git a/src/client/compiler/parser/AST.ts b/src/client/compiler/parser/AST.ts
@@ -257,7 +257,8 @@ export type MethodcallNode = {
     rightBracketPosition: TextPosition,
     identifier: string,
     operands: TermNode[],
-    commaPositions: TextPosition[]
+    commaPositions: TextPosition[],
+    distinctBeforeParameters: boolean
 }
 
 export type UnaryOpNode = {
diff --git a/src/client/compiler/parser/Parser.ts b/src/client/compiler/parser/Parser.ts
@@ -2188,7 +2188,8 @@ export class Parser {
                         rightBracketPosition: rightBracketPosition,
                         operands: parameters.nodes,
                         identifier: identifier1,
-                        commaPositions: parameters.commaPositions
+                        commaPositions: parameters.commaPositions,
+                        distinctBeforeParameters: parameters.distinctBeforeParameters
                     }
                 } else {
                     term = {
@@ -2294,13 +2295,14 @@ export class Parser {
     }
 
 
-    parseMethodCallParameters(): { rightBracketPosition: TextPosition, nodes: TermNode[], commaPositions: TextPosition[] } {
+    parseMethodCallParameters(): { rightBracketPosition: TextPosition, nodes: TermNode[], commaPositions: TextPosition[], distinctBeforeParameters: boolean } {
         // Assumption: current token is (        
         this.nextToken();
+        let distinctBeforeParameters = this.comesToken(TokenType.keywordDistinct, true);
         if (this.tt == TokenType.rightBracket) {
             let rightBracketPosition = this.getCurrentPosition();
             this.nextToken();
-            return { rightBracketPosition: rightBracketPosition, nodes: [], commaPositions: [] };
+            return { rightBracketPosition: rightBracketPosition, nodes: [], commaPositions: [], distinctBeforeParameters: distinctBeforeParameters };
         }
 
         let parameters: TermNode[] = [];
@@ -2339,7 +2341,7 @@ export class Parser {
         let position = this.getCurrentPosition();
         let rightBracketFound = this.expect(TokenType.rightBracket, true);
 
-        return { rightBracketPosition: rightBracketFound ? position : null, nodes: parameters, commaPositions: commaPositions };
+        return { rightBracketPosition: rightBracketFound ? position : null, nodes: parameters, commaPositions: commaPositions, distinctBeforeParameters: distinctBeforeParameters };
 
     }
 
@@ -2369,7 +2371,8 @@ export class Parser {
                         rightBracketPosition: parameters.rightBracketPosition,
                         operands: parameters.nodes,
                         identifier: identifier,
-                        commaPositions: parameters.commaPositions
+                        commaPositions: parameters.commaPositions,
+                        distinctBeforeParameters: parameters.distinctBeforeParameters
                     }
                 }
                 // else {
diff --git a/src/client/compiler/parser/SymbolResolver.ts b/src/client/compiler/parser/SymbolResolver.ts
@@ -594,8 +594,10 @@ export class SymbolResolver {
 
             return node.sqlType;
         } else {
-
-            methods = methods.filter(m => m.parameters.length == node.operands.length);
+            let isCountMethod = node.identifier.toLocaleLowerCase() == "count";
+            if(!isCountMethod){
+                methods = methods.filter(m => m.parameters.length == node.operands.length);
+            }
             if (node.operands.length == 1 && node.operands[0].type == TokenType.allColumns) {
                 methods = methods.filter(m => m.acceptsStarParameter);
                 node.sqlType = methods[0].returnType;
@@ -624,7 +626,7 @@ export class SymbolResolver {
                         break;
                     }
                 }
-                if (found) {
+                if (found || isCountMethod) {
                     node.sqlType = method.returnType;
                     return node.sqlType;
                 }

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,8 @@ export type MethodcallNode = {`
`257`	`257`	`rightBracketPosition: TextPosition,`
`258`	`258`	`identifier: string,`
`259`	`259`	`operands: TermNode[],`
`260`		`- commaPositions: TextPosition[]`
	`260`	`+ commaPositions: TextPosition[],`
	`261`	`+ distinctBeforeParameters: boolean`
`261`	`262`	`}`
`262`	`263`
`263`	`264`	`export type UnaryOpNode = {`