Oct 4, 2024 · Oct 22, 2024 · Oct 22, 2024 · Oct 22, 2024 · Oct 23, 2024 · Dec 20, 2024
diff --git a/src/alasqlparser.jison b/src/alasqlparser.jison
 'LIMIT'return 'LIMIT'
 'MATCHED'return 'MATCHED'
 'MATRIX'return 'MATRIX'

 /*"MAX"return 'MAX'*/
 /*"MIN"return 'MIN'*/

 'MAX'(\s+)?/'('return 'MAX'
 'MAX'(\s+)?/(','|')')return 'MAXNUM'
 'MIN'(\s+)?/'('return 'MIN'

 'MAX'\s*/'('return 'MAX'
 'MAX'\s*/(','|')')return 'MAXNUM'
 'MIN'\s*/'('return 'MIN'
 "MERGE"return 'MERGE'
 "MINUS"return 'EXCEPT'
 "MINUTE"return 'MINUTE'
 'WEEKDAY'return 'DAYOFWEEK'
 'WORK'                                          return 'TRANSACTION'  /* Is this keyword required? */
 'YEAR'return 'YEAR'

 (\d*[.])?\d+[eE]\d+return 'NUMBER'
 (\d*[.])?\d+return 'NUMBER'

 (\d+\.?\d*|\.\d+)([eE][+-]?\d+)?return 'NUMBER'
 '->'return 'ARROW'
 '#'return 'SHARP'
 '+'return 'PLUS'

 Call
 : CALL FuncValue
 //{ $$ = $2; }
 { $$ = new yy.ExpressionStatement({expression:$2}); }
 ;

diff --git a/src/alasqlparser.js b/src/alasqlparser.js
Original file line number	Diff line number	Diff line change
Expand Up		@@ -178,14 +178,9 @@ DATABASE(S)?return 'DATABASE'
		'LIMIT'return 'LIMIT'
		'MATCHED'return 'MATCHED'
		'MATRIX'return 'MATRIX'

		/"MAX"return 'MAX'/
		/"MIN"return 'MIN'/

		'MAX'(\s+)?/'('return 'MAX'
		'MAX'(\s+)?/(','\|')')return 'MAXNUM'
		'MIN'(\s+)?/'('return 'MIN'

		'MAX'\s*/'('return 'MAX'
		'MAX'\s*/(','\|')')return 'MAXNUM'
		'MIN'\s*/'('return 'MIN'
		"MERGE"return 'MERGE'
		"MINUS"return 'EXCEPT'
		"MINUTE"return 'MINUTE'
Expand DownExpand Up		@@ -291,10 +286,7 @@ SETS return 'SET'
		'WEEKDAY'return 'DAYOFWEEK'
		'WORK' return 'TRANSACTION' /* Is this keyword required? */
		'YEAR'return 'YEAR'

		(\d*[.])?\d+[eE]\d+return 'NUMBER'
		(\d*[.])?\d+return 'NUMBER'

		(\d+\.?\d*\|\.\d+)([eE][+-]?\d+)?return 'NUMBER'
		'->'return 'ARROW'
		'#'return 'SHARP'
		'+'return 'PLUS'
Expand DownExpand Up		@@ -3031,7 +3023,6 @@ Query

		Call
		: CALL FuncValue
		//{ $$ = $2; }
		{ $$ = new yy.ExpressionStatement({expression:$2}); }
		;

Expand Down