bugfixes...

martin-pabst · martin-pabst · commit 1ec64d575e8c · 2025-02-26T21:06:20.000+01:00
diff --git a/src/client/compiler/parser/Parser.ts b/src/client/compiler/parser/Parser.ts
@@ -5,6 +5,7 @@ import { ASTNode, BracketsNode, SelectNode, TermNode, TableOrSubqueryNode, Table
 import { Module } from "./Module.js";
 import { Column } from "./SQLTable.js";
 import { SQLBaseType, SQLNumberEnumType, SQLTextEnumType, SQLType } from "./SQLTypes.js";
+import { truncateSync } from "fs";
 
 export type SQLStatement = {
     ast: ASTNode,
@@ -282,7 +283,9 @@ export class Parser {
             return ret;
         }
 
-        return token.indexOf(this.tt) >= 0;
+        let found = token.indexOf(this.tt) >= 0;
+        if(found && skip) this.nextToken;
+        return found;
 
     }
 
@@ -673,6 +676,9 @@ export class Parser {
                 case TokenType.keywordConstraint:
                     this.parseAddConstraint(node);
                     break;
+                default:
+                    this.parseAddColumn(node);
+                    break;
             }
         } while (this.tt == TokenType.comma);
     }
diff --git a/src/client/compiler/parser/SQLTypes.ts b/src/client/compiler/parser/SQLTypes.ts
@@ -411,6 +411,8 @@ charType.addBinaryOperation(TokenType.keywordLike, charType, booleanType);
 charType.addBinaryOperation(TokenType.keywordLike, textType, booleanType);
 textType.addBinaryOperation(TokenType.keywordLike, textType, booleanType);
 
+booleanType.addBinaryOperation(TokenType.equal, booleanType, booleanType);
+
 let numericBinaryOperators: TokenType[] = [TokenType.plus, TokenType.minus, TokenType.multiplication, TokenType.division, TokenType.modulo];
 let comparisonOperators: TokenType[] = [TokenType.lower, TokenType.lowerOrEqual, TokenType.greater, TokenType.greaterOrEqual, TokenType.equal, TokenType.notEqual];
 

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import { ASTNode, BracketsNode, SelectNode, TermNode, TableOrSubqueryNode, Table`
`5`	`5`	`import { Module } from "./Module.js";`
`6`	`6`	`import { Column } from "./SQLTable.js";`
`7`	`7`	`import { SQLBaseType, SQLNumberEnumType, SQLTextEnumType, SQLType } from "./SQLTypes.js";`
	`8`	`+import { truncateSync } from "fs";`
`8`	`9`
`9`	`10`	`export type SQLStatement = {`
`10`	`11`	`ast: ASTNode,`
`@@ -282,7 +283,9 @@ export class Parser {`
`282`	`283`	`return ret;`
`283`	`284`	`}`
`284`	`285`
`285`		`- return token.indexOf(this.tt) >= 0;`
	`286`	`+ let found = token.indexOf(this.tt) >= 0;`
	`287`	`+ if(found && skip) this.nextToken;`
	`288`	`+ return found;`
`286`	`289`
`287`	`290`	`}`
`288`	`291`
`@@ -673,6 +676,9 @@ export class Parser {`
`673`	`676`	`case TokenType.keywordConstraint:`
`674`	`677`	`this.parseAddConstraint(node);`
`675`	`678`	`break;`
	`679`	`+ default:`
	`680`	`+ this.parseAddColumn(node);`
	`681`	`+ break;`
`676`	`682`	`}`
`677`	`683`	`} while (this.tt == TokenType.comma);`
`678`	`684`	`}`