Merge pull request #24 from rlaiola/whitespacefix

Allow whitespaces in functions of value expressions
dbis-uibk · Apr 11, 2024 · bf90e55 · bf90e55
2 parents 27a6261 + 2c81544
commit bf90e55
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/db/parser/parser_ra.ts b/src/db/parser/parser_ra.ts
@@ -3,6 +3,9 @@ import { i18n } from 'calc2/i18n';
 const pegParserRelalg = require('./grammar_ra.pegjs') as any;
 
 export function parseRelalg(text: string, relationNames: string[] = []): relalgAst.rootRelalg {
+	// Remove any whitespace before '(' character
+	text = text.replace(/\s*\(/g, '(');
+
 	const ast = pegParserRelalg.parse(text, {
 		startRule: 'start',
 		relationNames: relationNames,

diff --git a/src/db/relalg.ts b/src/db/relalg.ts
@@ -137,7 +137,8 @@ const pegParserSql = require('./parser/grammar_sql.pegjs') as any;
 export function parseSQLSelect(text: string): sqlAst.rootSql {
 
 	return pegParserSql.parse(
-		text,
+		// Remove any whitespace before '(' character
+		text.replace(/\s*\(/g, '('),
 		{
 			startRule: 'start',
 			tracer: undefined,