Disable LIMIT #,# syntax, as agreed to months ago. Print message saying

to use separate LIMIT/OFFSET clauses.

diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 359ecc72696395532b46e1358915cb243b6a3d28..5d34eeadea27b8284acc92127e9dfffe5757e541 100644 (file)
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -3669,11 +3669,9 @@ select_limit:    LIMIT select_limit_value OFFSET select_offset_value
                        { $$ = makeList2(NULL, $2); }
                | OFFSET select_offset_value
                        { $$ = makeList2($2, NULL); }
-               | LIMIT select_limit_value ',' select_offset_value 
-                       { $$ = makeList2($4, $2); }
-                       /* enable this in 7.3, bjm 2001-10-22
-                       { elog(ERROR, "LIMIT #,# syntax no longer supported.\n\tUse separate LIMIT and OFFSET clauses."); }
-                       */
+               | LIMIT select_limit_value ',' select_offset_value
+                       /* Disabled because it was too confusing, bjm 2002-02-18 */
+                       { elog(ERROR, "LIMIT #,# syntax not supported.\n\tUse separate LIMIT and OFFSET clauses."); }
                ;