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

bmomjian · bmomjian · commit d622cf867bb1 · 2002-02-18T06:49:20.000Z
to use separate LIMIT/OFFSET clauses.
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.276 2001/12/09 04:39:39 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.277 2002/02/18 06:49:20 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -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."); }
 		;
 
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.276 2001/12/09 04:39:39 thomas Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.277 2002/02/18 06:49:20 momjian Exp $`
`15`	`15`	`*`
`16`	`16`	`* HISTORY`
`17`	`17`	`* AUTHOR DATE MAJOR EVENT`
`@@ -3669,11 +3669,9 @@ select_limit: LIMIT select_limit_value OFFSET select_offset_value`
`3669`	`3669`	`{ $$ = makeList2(NULL, $2); }`
`3670`	`3670`	`\| OFFSET select_offset_value`
`3671`	`3671`	`{ $$ = makeList2($2, NULL); }`
`3672`		`- \| LIMIT select_limit_value ',' select_offset_value`
`3673`		`- { $$ = makeList2($4, $2); }`
`3674`		`- /* enable this in 7.3, bjm 2001-10-22`
`3675`		`- { elog(ERROR, "LIMIT #,# syntax no longer supported.\n\tUse separate LIMIT and OFFSET clauses."); }`
`3676`		`- */`
	`3672`	`+ \| LIMIT select_limit_value ',' select_offset_value`
	`3673`	`+ /* Disabled because it was too confusing, bjm 2002-02-18 */`
	`3674`	`+ { elog(ERROR, "LIMIT #,# syntax not supported.\n\tUse separate LIMIT and OFFSET clauses."); }`
`3677`	`3675`	`;`
`3678`	`3676`
`3679`	`3677`