[Tora-cvs] SF.net SVN: tora:[4137] branches/tora-trotl/sandbox/OracleSQL.g

[<ibr...@us...>]

Revision: 4137
          http://tora.svn.sourceforge.net/tora/?rev=4137&view=rev
Author:   ibre5041
Date:     2011-11-15 20:19:00 +0000 (Tue, 15 Nov 2011)
Log Message:
-----------
analytic function call fix

Modified Paths:
--------------
    branches/tora-trotl/sandbox/OracleSQL.g

Modified: branches/tora-trotl/sandbox/OracleSQL.g
===================================================================
--- branches/tora-trotl/sandbox/OracleSQL.g	2011-11-10 22:28:19 UTC (rev 4136)
+++ branches/tora-trotl/sandbox/OracleSQL.g	2011-11-15 20:19:00 UTC (rev 4137)
@@ -1010,7 +1010,7 @@
 	;
 type_names
 	:	k_only? (schema_name DOT)? identifier[T_UNKNOWN,0]
-		( k_only? (schema_name DOT)? identifier[T_UNKNOWN,0] )*
+		(COMMA k_only? (schema_name DOT)? identifier[T_UNKNOWN,0] )*
 	;
 integer
 	:	NUMBER
@@ -1244,12 +1244,12 @@
 percent_rank_aggregate
 	:	k_percent_rank LPAREN expression_list RPAREN k_within r_group
         LPAREN r_order r_by sql_expression (r_asc | r_desc)? (k_nulls (k_first | k_last))?
-        (COMMA sql_expression (r_asc | r_desc)? (k_nulls (k_first | k_last))?)* 
+        (COMMA sql_expression (r_asc | r_desc)? (k_nulls (k_first | k_last))?)* RPAREN
     ;
 dense_rank_aggregate
 	: k_dense_rank LPAREN expression_list RPAREN k_within r_group
         LPAREN r_order r_by sql_expression (r_asc | r_desc)? (k_nulls (k_first | k_last))?
-        (COMMA sql_expression (r_asc | r_desc)? (k_nulls (k_first | k_last))?)*
+        (COMMA sql_expression (r_asc | r_desc)? (k_nulls (k_first | k_last))?)* RPAREN
     ;
 
 percent_rank_analytic
@@ -1258,8 +1258,8 @@
 
 percent_cont_disc_analytic
 	: (k_percentile_disc | k_percentile_cont)
-	LPAREN sql_expression RPAREN k_within r_group LPAREN order_by_clause RPAREN
-        (k_over LPAREN query_partition_clause RPAREN)?
+	LPAREN sql_expression RPAREN k_within r_group LPAREN order_by_clause
+        (k_over LPAREN query_partition_clause RPAREN)? RPAREN
 	;
 
 dense_rank_analytic

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.