Merging upstream version 16.3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 7905 insertions, 7794 deletions

diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
index 16cfc49..5ff25f3 100644
--- a/src/interfaces/ecpg/preproc/ecpg.c
+++ b/src/interfaces/ecpg/preproc/ecpg.c
@@ -82,35 +82,46 @@ add_include_path(char *path)
 	}
 }
 
+/*
+ * Process a command line -D switch
+ */
 static void
 add_preprocessor_define(char *define)
 {
-	struct _defines *pd = defines;
-	char	   *ptr,
-			   *define_copy = mm_strdup(define);
+	/* copy the argument to avoid relying on argv storage */
+	char	   *define_copy = mm_strdup(define);
+	char	   *ptr;
+	struct _defines *newdef;
 
-	defines = mm_alloc(sizeof(struct _defines));
+	newdef = mm_alloc(sizeof(struct _defines));
 
 	/* look for = sign */
 	ptr = strchr(define_copy, '=');
 	if (ptr != NULL)
 	{
+		/* symbol has a value */
 		char	   *tmp;
 
-		/* symbol has a value */
-		for (tmp = ptr - 1; *tmp == ' '; tmp--);
+		/* strip any spaces between name and '=' */
+		for (tmp = ptr - 1; tmp >= define_copy && *tmp == ' '; tmp--);
 		tmp[1] = '\0';
-		defines->olddef = define_copy;
-		defines->newdef = ptr + 1;
+
+		/*
+		 * Note we don't bother to separately malloc cmdvalue; it will never
+		 * be freed so that's not necessary.
+		 */
+		newdef->cmdvalue = ptr + 1;
 	}
 	else
 	{
-		defines->olddef = define_copy;
-		defines->newdef = mm_strdup("1");
+		/* define it as "1"; again no need to malloc it */
+		newdef->cmdvalue = "1";
 	}
-	defines->pertinent = true;
-	defines->used = NULL;
-	defines->next = pd;
+	newdef->name = define_copy;
+	newdef->value = mm_strdup(newdef->cmdvalue);
+	newdef->used = NULL;
+	newdef->next = defines;
+	defines = newdef;
 }
 
 #define ECPG_GETOPT_LONG_REGRESSION		1
@@ -348,6 +359,8 @@ main(int argc, char *const argv[])
 			{
 				struct cursor *ptr;
 				struct _defines *defptr;
+				struct _defines *prevdefptr;
+				struct _defines *nextdefptr;
 				struct typedefs *typeptr;
 				struct declared_list *list;
 
@@ -385,28 +398,28 @@ main(int argc, char *const argv[])
 					free(this);
 				}
 
-				/* remove non-pertinent old defines as well */
-				while (defines && !defines->pertinent)
+				/* restore defines to their command-line state */
+				prevdefptr = NULL;
+				for (defptr = defines; defptr != NULL; defptr = nextdefptr)
 				{
-					defptr = defines;
-					defines = defines->next;
-
-					free(defptr->newdef);
-					free(defptr->olddef);
-					free(defptr);
-				}
-
-				for (defptr = defines; defptr != NULL; defptr = defptr->next)
-				{
-					struct _defines *this = defptr->next;
-
-					if (this && !this->pertinent)
+					nextdefptr = defptr->next;
+					if (defptr->cmdvalue != NULL)
 					{
-						defptr->next = this->next;
-
-						free(this->newdef);
-						free(this->olddef);
-						free(this);
+						/* keep it, resetting the value */
+						free(defptr->value);
+						defptr->value = mm_strdup(defptr->cmdvalue);
+						prevdefptr = defptr;
+					}
+					else
+					{
+						/* remove it */
+						if (prevdefptr != NULL)
+							prevdefptr->next = nextdefptr;
+						else
+							defines = nextdefptr;
+						free(defptr->name);
+						free(defptr->value);
+						free(defptr);
 					}
 				}
 
diff --git a/src/interfaces/ecpg/preproc/parse.pl b/src/interfaces/ecpg/preproc/parse.pl
index 7574fc3..9c45388 100644
--- a/src/interfaces/ecpg/preproc/parse.pl
+++ b/src/interfaces/ecpg/preproc/parse.pl
@@ -34,7 +34,8 @@ my $brace_indent = 0;
 my $yaccmode = 0;
 my $in_rule = 0;
 my $header_included = 0;
-my $feature_not_supported = 0;
+my $has_feature_not_supported = 0;
+my $has_if_command = 0;
 my $tokenmode = 0;
 
 my (%buff, $infield, $comment, %tokens, %addons);
@@ -151,12 +152,6 @@ sub main
 {
   line: while (<$parserfh>)
 	{
-		if (/ERRCODE_FEATURE_NOT_SUPPORTED/)
-		{
-			$feature_not_supported = 1;
-			next line;
-		}
-
 		chomp;
 
 		# comment out the line below to make the result file match (blank line wise)
@@ -182,6 +177,13 @@ sub main
 			$infield = 0;
 		}
 
+		if ($yaccmode == 1)
+		{
+			# Check for rules that throw FEATURE_NOT_SUPPORTED
+			$has_feature_not_supported = 1 if /ERRCODE_FEATURE_NOT_SUPPORTED/;
+			$has_if_command = 1 if /^\s*if/;
+		}
+
 		my $prec = 0;
 
 		# Make sure any braces are split
@@ -541,20 +543,17 @@ sub dump_fields
 
 		#Normal
 		add_to_buffer('rules', $ln);
-		if ($feature_not_supported == 1)
+		if ($has_feature_not_supported and not $has_if_command)
 		{
-
-			# we found an unsupported feature, but we have to
-			# filter out ExecuteStmt: CREATE OptTemp TABLE ...
-			# because the warning there is only valid in some situations
-			if ($flds->[0] ne 'create' || $flds->[2] ne 'table')
-			{
-				add_to_buffer('rules',
-					'mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");'
-				);
-			}
-			$feature_not_supported = 0;
+			# The backend unconditionally reports
+			# FEATURE_NOT_SUPPORTED in this rule, so let's emit
+			# a warning on the ecpg side.
+			add_to_buffer('rules',
+				'mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");'
+			);
 		}
+		$has_feature_not_supported = 0;
+		$has_if_command = 0;
 
 		if ($len == 0)
 		{
diff --git a/src/interfaces/ecpg/preproc/pgc.c b/src/interfaces/ecpg/preproc/pgc.c
index 7008e1f..7ba6c68 100644
--- a/src/interfaces/ecpg/preproc/pgc.c
+++ b/src/interfaces/ecpg/preproc/pgc.c
@@ -1796,7 +1796,14 @@ char *token_start;
 static int state_before_str_start;
 static int state_before_str_stop;
 
-struct _yy_buffer
+/*
+ * State for handling include files and macro expansion.  We use a new
+ * flex input buffer for each level of include or macro, and create a
+ * struct _yy_buffer to remember the previous level.  There is not a struct
+ * for the currently active input source; that state is kept in the global
+ * variables YY_CURRENT_BUFFER, yylineno, and input_filename.
+ */
+static struct _yy_buffer
 {
 	YY_BUFFER_STATE		buffer;
 	long				lineno;
@@ -1804,8 +1811,6 @@ struct _yy_buffer
 	struct _yy_buffer  *next;
 } *yy_buffer = NULL;
 
-static char *old;
-
 /*
  * Vars for handling ifdef/elif/endif constructs.  preproc_tos is the current
  * nesting depth of such constructs, and stacked_if_value[preproc_tos] is the
@@ -1831,7 +1836,7 @@ static struct _if_value
 	bool		else_branch;
 } stacked_if_value[MAX_NESTED_IF];
 
-#line 1835 "pgc.c"
+#line 1840 "pgc.c"
 #define YY_NO_INPUT 1
 /*
  * OK, here is a short description of lex/flex rules behavior.
@@ -1992,7 +1997,7 @@ static struct _if_value
 /* and then the other commands starting with "i", we have to add these
  * separately because the cppline production would match on "include" too
  */
-#line 1996 "pgc.c"
+#line 2001 "pgc.c"
 
 #define INITIAL 0
 #define xb 1
@@ -2230,16 +2235,18 @@ YY_DECL
 		}
 
 	{
-#line 443 "pgc.l"
+#line 448 "pgc.l"
 
 
 
-#line 447 "pgc.l"
+#line 452 "pgc.l"
 		/* code to execute during start of each call of yylex() */
+		char *newdefsymbol = NULL;
+
 		token_start = NULL;
 
 
-#line 2243 "pgc.c"
+#line 2250 "pgc.c"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -2305,7 +2312,7 @@ do_action:	/* This label is used only to access EOF actions. */
 case 1:
 /* rule 1 can match eol */
 YY_RULE_SETUP
-#line 452 "pgc.l"
+#line 459 "pgc.l"
 {
 					/* ignore */
 				}
@@ -2314,7 +2321,7 @@ YY_RULE_SETUP
 
 case 2:
 YY_RULE_SETUP
-#line 458 "pgc.l"
+#line 465 "pgc.l"
 {
 					token_start = yytext;
 					state_before_str_start = YYSTATE;
@@ -2329,7 +2336,7 @@ YY_RULE_SETUP
 
 case 3:
 YY_RULE_SETUP
-#line 470 "pgc.l"
+#line 477 "pgc.l"
 {
 					if (state_before_str_start == SQL)
 					{
@@ -2346,7 +2353,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 484 "pgc.l"
+#line 491 "pgc.l"
 {
 					if (state_before_str_start == SQL)
 					{
@@ -2373,27 +2380,27 @@ YY_RULE_SETUP
 case 5:
 /* rule 5 can match eol */
 YY_RULE_SETUP
-#line 507 "pgc.l"
+#line 514 "pgc.l"
 {
 					ECHO;
 				}
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 511 "pgc.l"
+#line 518 "pgc.l"
 {
 					ECHO;
 				}
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 515 "pgc.l"
+#line 522 "pgc.l"
 {
 					ECHO;
 				}
 	YY_BREAK
 case YY_STATE_EOF(xc):
-#line 519 "pgc.l"
+#line 526 "pgc.l"
 {
 					mmfatal(PARSE_ERROR, "unterminated /* comment");
 				}
@@ -2402,7 +2409,7 @@ case YY_STATE_EOF(xc):
 
 case 8:
 YY_RULE_SETUP
-#line 525 "pgc.l"
+#line 532 "pgc.l"
 {
 					token_start = yytext;
 					state_before_str_start = YYSTATE;
@@ -2413,22 +2420,22 @@ YY_RULE_SETUP
 /* <SQL> */
 case 9:
 /* rule 9 can match eol */
-#line 534 "pgc.l"
+#line 541 "pgc.l"
 case 10:
 /* rule 10 can match eol */
 YY_RULE_SETUP
-#line 534 "pgc.l"
+#line 541 "pgc.l"
 {
 					addlit(yytext, yyleng);
 				}
 	YY_BREAK
 case YY_STATE_EOF(xb):
-#line 537 "pgc.l"
+#line 544 "pgc.l"
 { mmfatal(PARSE_ERROR, "unterminated bit string literal"); }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 539 "pgc.l"
+#line 546 "pgc.l"
 {
 					token_start = yytext;
 					state_before_str_start = YYSTATE;
@@ -2437,12 +2444,12 @@ YY_RULE_SETUP
 				}
 	YY_BREAK
 case YY_STATE_EOF(xh):
-#line 545 "pgc.l"
+#line 552 "pgc.l"
 { mmfatal(PARSE_ERROR, "unterminated hexadecimal string literal"); }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 547 "pgc.l"
+#line 554 "pgc.l"
 {
 					token_start = yytext;
 					state_before_str_start = YYSTATE;
@@ -2453,7 +2460,7 @@ YY_RULE_SETUP
 
 case 13:
 YY_RULE_SETUP
-#line 555 "pgc.l"
+#line 562 "pgc.l"
 {
 					/* National character.
 					 * Transfer it as-is to the backend.
@@ -2466,7 +2473,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 565 "pgc.l"
+#line 572 "pgc.l"
 {
 					token_start = yytext;
 					state_before_str_start = YYSTATE;
@@ -2476,7 +2483,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 571 "pgc.l"
+#line 578 "pgc.l"
 {
 					token_start = yytext;
 					state_before_str_start = YYSTATE;
@@ -2486,7 +2493,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 577 "pgc.l"
+#line 584 "pgc.l"
 {
 					token_start = yytext;
 					state_before_str_start = YYSTATE;
@@ -2497,7 +2504,7 @@ YY_RULE_SETUP
 /* <SQL> */
 case 17:
 YY_RULE_SETUP
-#line 585 "pgc.l"
+#line 592 "pgc.l"
 {
 					/*
 					 * When we are scanning a quoted string and see an end
@@ -2514,7 +2521,7 @@ YY_RULE_SETUP
 case 18:
 /* rule 18 can match eol */
 YY_RULE_SETUP
-#line 597 "pgc.l"
+#line 604 "pgc.l"
 {
 					/*
 					 * Found a quote continuation, so return to the in-quote
@@ -2526,13 +2533,13 @@ YY_RULE_SETUP
 	YY_BREAK
 case 19:
 /* rule 19 can match eol */
-#line 606 "pgc.l"
+#line 613 "pgc.l"
 case 20:
 /* rule 20 can match eol */
-#line 607 "pgc.l"
+#line 614 "pgc.l"
 YY_RULE_SETUP
 case YY_STATE_EOF(xqs):
-#line 607 "pgc.l"
+#line 614 "pgc.l"
 {
 					/*
 					 * Failed to see a quote continuation.  Throw back
@@ -2575,31 +2582,31 @@ case YY_STATE_EOF(xqs):
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 647 "pgc.l"
+#line 654 "pgc.l"
 { addlit(yytext, yyleng); }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 648 "pgc.l"
+#line 655 "pgc.l"
 { addlit(yytext, yyleng); }
 	YY_BREAK
 case 23:
 /* rule 23 can match eol */
 YY_RULE_SETUP
-#line 649 "pgc.l"
+#line 656 "pgc.l"
 { addlit(yytext, yyleng); }
 	YY_BREAK
 case 24:
 /* rule 24 can match eol */
 YY_RULE_SETUP
-#line 650 "pgc.l"
+#line 657 "pgc.l"
 {
 					addlit(yytext, yyleng);
 				}
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 653 "pgc.l"
+#line 660 "pgc.l"
 {
 					addlit(yytext, yyleng);
 				}
@@ -2607,28 +2614,28 @@ YY_RULE_SETUP
 case 26:
 /* rule 26 can match eol */
 YY_RULE_SETUP
-#line 656 "pgc.l"
+#line 663 "pgc.l"
 {
 					addlit(yytext, yyleng);
 				}
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 659 "pgc.l"
+#line 666 "pgc.l"
 {
 					addlit(yytext, yyleng);
 				}
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 662 "pgc.l"
+#line 669 "pgc.l"
 {
 					addlit(yytext, yyleng);
 				}
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 665 "pgc.l"
+#line 672 "pgc.l"
 {
 					/* This is only needed for \ just before EOF */
 					addlitchar(yytext[0]);
@@ -2639,13 +2646,13 @@ case YY_STATE_EOF(xqc):
 case YY_STATE_EOF(xe):
 case YY_STATE_EOF(xn):
 case YY_STATE_EOF(xus):
-#line 669 "pgc.l"
+#line 676 "pgc.l"
 { mmfatal(PARSE_ERROR, "unterminated quoted string"); }
 	YY_BREAK
 
 case 30:
 YY_RULE_SETUP
-#line 672 "pgc.l"
+#line 679 "pgc.l"
 {
 					token_start = yytext;
 					if (dolqstart)
@@ -2658,7 +2665,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 681 "pgc.l"
+#line 688 "pgc.l"
 {
 					/* throw back all but the initial "$" */
 					yyless(1);
@@ -2669,7 +2676,7 @@ YY_RULE_SETUP
 /* <SQL> */
 case 32:
 YY_RULE_SETUP
-#line 689 "pgc.l"
+#line 696 "pgc.l"
 {
 					if (strcmp(yytext, dolqstart) == 0)
 					{
@@ -2695,34 +2702,34 @@ YY_RULE_SETUP
 case 33:
 /* rule 33 can match eol */
 YY_RULE_SETUP
-#line 710 "pgc.l"
+#line 717 "pgc.l"
 {
 					addlit(yytext, yyleng);
 				}
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 713 "pgc.l"
+#line 720 "pgc.l"
 {
 					addlit(yytext, yyleng);
 				}
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 716 "pgc.l"
+#line 723 "pgc.l"
 {
 					/* single quote or dollar sign */
 					addlitchar(yytext[0]);
 				}
 	YY_BREAK
 case YY_STATE_EOF(xdolq):
-#line 720 "pgc.l"
+#line 727 "pgc.l"
 { mmfatal(PARSE_ERROR, "unterminated dollar-quoted string"); }
 	YY_BREAK
 
 case 36:
 YY_RULE_SETUP
-#line 723 "pgc.l"
+#line 730 "pgc.l"
 {
 					state_before_str_start = YYSTATE;
 					BEGIN(xd);
@@ -2731,7 +2738,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 728 "pgc.l"
+#line 735 "pgc.l"
 {
 					state_before_str_start = YYSTATE;
 					BEGIN(xui);
@@ -2741,7 +2748,7 @@ YY_RULE_SETUP
 /* <SQL> */
 case 38:
 YY_RULE_SETUP
-#line 735 "pgc.l"
+#line 742 "pgc.l"
 {
 					BEGIN(state_before_str_start);
 					if (literallen == 0)
@@ -2760,7 +2767,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 750 "pgc.l"
+#line 757 "pgc.l"
 {
 					BEGIN(state_before_str_start);
 					base_yylval.str = mm_strdup(literalbuf);
@@ -2769,7 +2776,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 755 "pgc.l"
+#line 762 "pgc.l"
 {
 					BEGIN(state_before_str_start);
 					if (literallen == 0)
@@ -2781,7 +2788,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 763 "pgc.l"
+#line 770 "pgc.l"
 {
 					addlit(yytext, yyleng);
 				}
@@ -2789,19 +2796,19 @@ YY_RULE_SETUP
 case 42:
 /* rule 42 can match eol */
 YY_RULE_SETUP
-#line 766 "pgc.l"
+#line 773 "pgc.l"
 {
 					addlit(yytext, yyleng);
 				}
 	YY_BREAK
 case YY_STATE_EOF(xd):
 case YY_STATE_EOF(xui):
-#line 769 "pgc.l"
+#line 776 "pgc.l"
 { mmfatal(PARSE_ERROR, "unterminated quoted identifier"); }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 770 "pgc.l"
+#line 777 "pgc.l"
 {
 					state_before_str_start = YYSTATE;
 					BEGIN(xdc);
@@ -2811,61 +2818,61 @@ YY_RULE_SETUP
 case 44:
 /* rule 44 can match eol */
 YY_RULE_SETUP
-#line 775 "pgc.l"
+#line 782 "pgc.l"
 {
 					addlit(yytext, yyleng);
 				}
 	YY_BREAK
 case YY_STATE_EOF(xdc):
-#line 778 "pgc.l"
+#line 785 "pgc.l"
 { mmfatal(PARSE_ERROR, "unterminated quoted string"); }
 	YY_BREAK
 
 case 45:
 YY_RULE_SETUP
-#line 781 "pgc.l"
+#line 788 "pgc.l"
 {
 					return TYPECAST;
 				}
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 785 "pgc.l"
+#line 792 "pgc.l"
 {
 					return DOT_DOT;
 				}
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 789 "pgc.l"
+#line 796 "pgc.l"
 {
 					return COLON_EQUALS;
 				}
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 793 "pgc.l"
+#line 800 "pgc.l"
 {
 					return EQUALS_GREATER;
 				}
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 797 "pgc.l"
+#line 804 "pgc.l"
 {
 					return LESS_EQUALS;
 				}
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 801 "pgc.l"
+#line 808 "pgc.l"
 {
 					return GREATER_EQUALS;
 				}
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 805 "pgc.l"
+#line 812 "pgc.l"
 {
 					/* We accept both "<>" and "!=" as meaning NOT_EQUALS */
 					return NOT_EQUALS;
@@ -2873,7 +2880,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 810 "pgc.l"
+#line 817 "pgc.l"
 {
 					/* We accept both "<>" and "!=" as meaning NOT_EQUALS */
 					return NOT_EQUALS;
@@ -2881,7 +2888,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 815 "pgc.l"
+#line 822 "pgc.l"
 {
 			  /* are we simulating Informix? */
 				if (INFORMIX_MODE)
@@ -2894,7 +2901,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 825 "pgc.l"
+#line 832 "pgc.l"
 {
 					/*
 					 * We may find a ';' inside a structure
@@ -2908,7 +2915,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 836 "pgc.l"
+#line 843 "pgc.l"
 {
 					/*
 					 * Check for embedded slash-star or dash-dash; those
@@ -3008,7 +3015,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 933 "pgc.l"
+#line 940 "pgc.l"
 {
 					base_yylval.ival = atol(yytext+1);
 					return PARAM;
@@ -3016,14 +3023,14 @@ YY_RULE_SETUP
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 937 "pgc.l"
+#line 944 "pgc.l"
 {
 					mmfatal(PARSE_ERROR, "trailing junk after parameter");
 				}
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 941 "pgc.l"
+#line 948 "pgc.l"
 {
 					base_yylval.str = mm_strdup(yytext);
 					return IP;
@@ -3033,21 +3040,21 @@ YY_RULE_SETUP
 
 case 59:
 YY_RULE_SETUP
-#line 948 "pgc.l"
+#line 955 "pgc.l"
 {
 					return process_integer_literal(yytext, &base_yylval, 10);
 				}
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 951 "pgc.l"
+#line 958 "pgc.l"
 {
 					return process_integer_literal(yytext, &base_yylval, 16);
 				}
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 954 "pgc.l"
+#line 961 "pgc.l"
 {
 					base_yylval.str = mm_strdup(yytext);
 					return FCONST;
@@ -3055,7 +3062,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 958 "pgc.l"
+#line 965 "pgc.l"
 {
 					/* throw back the .., and treat as integer */
 					yyless(yyleng - 2);
@@ -3064,7 +3071,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 963 "pgc.l"
+#line 970 "pgc.l"
 {
 					base_yylval.str = mm_strdup(yytext);
 					return FCONST;
@@ -3072,7 +3079,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 967 "pgc.l"
+#line 974 "pgc.l"
 {
 					/*
 					 * throw back the [Ee][+-], and figure out whether what
@@ -3086,14 +3093,14 @@ YY_RULE_SETUP
 
 case 65:
 YY_RULE_SETUP
-#line 978 "pgc.l"
+#line 985 "pgc.l"
 {
 					return process_integer_literal(yytext, &base_yylval, 8);
 				}
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 981 "pgc.l"
+#line 988 "pgc.l"
 {
 					return process_integer_literal(yytext, &base_yylval, 2);
 				}
@@ -3104,42 +3111,42 @@ YY_RULE_SETUP
 	 */
 case 67:
 YY_RULE_SETUP
-#line 989 "pgc.l"
+#line 996 "pgc.l"
 {
 					mmfatal(PARSE_ERROR, "trailing junk after numeric literal");
 				}
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 992 "pgc.l"
+#line 999 "pgc.l"
 {
 					mmfatal(PARSE_ERROR, "trailing junk after numeric literal");
 				}
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 995 "pgc.l"
+#line 1002 "pgc.l"
 {
 					mmfatal(PARSE_ERROR, "trailing junk after numeric literal");
 				}
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 998 "pgc.l"
+#line 1005 "pgc.l"
 {
 					mmfatal(PARSE_ERROR, "trailing junk after numeric literal");
 				}
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 1001 "pgc.l"
+#line 1008 "pgc.l"
 {
 					mmfatal(PARSE_ERROR, "trailing junk after numeric literal");
 				}
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 1004 "pgc.l"
+#line 1011 "pgc.l"
 {
 					mmfatal(PARSE_ERROR, "trailing junk after numeric literal");
 				}
@@ -3147,7 +3154,7 @@ YY_RULE_SETUP
 case 73:
 /* rule 73 can match eol */
 YY_RULE_SETUP
-#line 1008 "pgc.l"
+#line 1015 "pgc.l"
 {
 					base_yylval.str = mm_strdup(yytext+1);
 					return CVARIABLE;
@@ -3155,8 +3162,9 @@ YY_RULE_SETUP
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 1013 "pgc.l"
+#line 1020 "pgc.l"
 {
+					/* First check to see if it's a define symbol to expand */
 					if (!isdefine())
 					{
 						int		kwvalue;
@@ -3195,7 +3203,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 1050 "pgc.l"
+#line 1058 "pgc.l"
 {
 					return yytext[0];
 				}
@@ -3207,12 +3215,12 @@ YY_RULE_SETUP
 case 76:
 /* rule 76 can match eol */
 YY_RULE_SETUP
-#line 1059 "pgc.l"
+#line 1067 "pgc.l"
 { BEGIN(SQL); return SQL_START; }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 1060 "pgc.l"
+#line 1068 "pgc.l"
 {
 						/* are we simulating Informix? */
 						if (INFORMIX_MODE)
@@ -3227,13 +3235,13 @@ YY_RULE_SETUP
 case 78:
 /* rule 78 can match eol */
 YY_RULE_SETUP
-#line 1070 "pgc.l"
+#line 1078 "pgc.l"
 { ECHO; }
 	YY_BREAK
 case 79:
 /* rule 79 can match eol */
 YY_RULE_SETUP
-#line 1071 "pgc.l"
+#line 1079 "pgc.l"
 {
 						if (system_includes)
 						{
@@ -3250,7 +3258,7 @@ YY_RULE_SETUP
 case 80:
 /* rule 80 can match eol */
 YY_RULE_SETUP
-#line 1083 "pgc.l"
+#line 1091 "pgc.l"
 {
 						if (system_includes)
 						{
@@ -3267,7 +3275,7 @@ YY_RULE_SETUP
 case 81:
 /* rule 81 can match eol */
 YY_RULE_SETUP
-#line 1095 "pgc.l"
+#line 1103 "pgc.l"
 {
 						base_yylval.str = mm_strdup(yytext);
 						return CPP_LINE;
@@ -3275,7 +3283,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 1099 "pgc.l"
+#line 1107 "pgc.l"
 {
 						/*
 						 * Try to detect a function name:
@@ -3307,185 +3315,185 @@ YY_RULE_SETUP
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 1127 "pgc.l"
+#line 1135 "pgc.l"
 { mmerror(PARSE_ERROR, ET_ERROR, "nested /* ... */ comments"); }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 1128 "pgc.l"
+#line 1136 "pgc.l"
 { return ':'; }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 1129 "pgc.l"
+#line 1137 "pgc.l"
 { return ';'; }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 1130 "pgc.l"
+#line 1138 "pgc.l"
 { return ','; }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 1131 "pgc.l"
+#line 1139 "pgc.l"
 { return '*'; }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 1132 "pgc.l"
+#line 1140 "pgc.l"
 { return '%'; }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 1133 "pgc.l"
+#line 1141 "pgc.l"
 { return '/'; }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 1134 "pgc.l"
+#line 1142 "pgc.l"
 { return '+'; }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 1135 "pgc.l"
+#line 1143 "pgc.l"
 { return '-'; }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 1136 "pgc.l"
+#line 1144 "pgc.l"
 { parenths_open++; return '('; }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 1137 "pgc.l"
+#line 1145 "pgc.l"
 { parenths_open--; return ')'; }
 	YY_BREAK
 case 94:
 /* rule 94 can match eol */
 YY_RULE_SETUP
-#line 1138 "pgc.l"
+#line 1146 "pgc.l"
 { ECHO; }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 1139 "pgc.l"
+#line 1147 "pgc.l"
 { return '{'; }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 1140 "pgc.l"
+#line 1148 "pgc.l"
 { return '}'; }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 1141 "pgc.l"
+#line 1149 "pgc.l"
 { return '['; }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 1142 "pgc.l"
+#line 1150 "pgc.l"
 { return ']'; }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 1143 "pgc.l"
+#line 1151 "pgc.l"
 { return '='; }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 1144 "pgc.l"
+#line 1152 "pgc.l"
 { return S_MEMBER; }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 1145 "pgc.l"
+#line 1153 "pgc.l"
 { return S_RSHIFT; }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 1146 "pgc.l"
+#line 1154 "pgc.l"
 { return S_LSHIFT; }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 1147 "pgc.l"
+#line 1155 "pgc.l"
 { return S_OR; }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 1148 "pgc.l"
+#line 1156 "pgc.l"
 { return S_AND; }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 1149 "pgc.l"
+#line 1157 "pgc.l"
 { return S_INC; }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 1150 "pgc.l"
+#line 1158 "pgc.l"
 { return S_DEC; }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 1151 "pgc.l"
+#line 1159 "pgc.l"
 { return S_EQUAL; }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 1152 "pgc.l"
+#line 1160 "pgc.l"
 { return S_NEQUAL; }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 1153 "pgc.l"
+#line 1161 "pgc.l"
 { return S_ADD; }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 1154 "pgc.l"
+#line 1162 "pgc.l"
 { return S_SUB; }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 1155 "pgc.l"
+#line 1163 "pgc.l"
 { return S_MUL; }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 1156 "pgc.l"
+#line 1164 "pgc.l"
 { return S_DIV; }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 1157 "pgc.l"
+#line 1165 "pgc.l"
 { return S_MOD; }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 1158 "pgc.l"
+#line 1166 "pgc.l"
 { return S_MEMPOINT; }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 1159 "pgc.l"
+#line 1167 "pgc.l"
 { return S_DOTPOINT; }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 1160 "pgc.l"
+#line 1168 "pgc.l"
 { return S_ANYTHING; }
 	YY_BREAK
 case 117:
 /* rule 117 can match eol */
 YY_RULE_SETUP
-#line 1161 "pgc.l"
+#line 1169 "pgc.l"
 { BEGIN(def_ident); }
 	YY_BREAK
 case 118:
 /* rule 118 can match eol */
 YY_RULE_SETUP
-#line 1162 "pgc.l"
+#line 1170 "pgc.l"
 {
 						/* are we simulating Informix? */
 						if (INFORMIX_MODE)
@@ -3502,13 +3510,13 @@ YY_RULE_SETUP
 case 119:
 /* rule 119 can match eol */
 YY_RULE_SETUP
-#line 1174 "pgc.l"
+#line 1182 "pgc.l"
 { BEGIN(undef); }
 	YY_BREAK
 case 120:
 /* rule 120 can match eol */
 YY_RULE_SETUP
-#line 1175 "pgc.l"
+#line 1183 "pgc.l"
 {
 						/* are we simulating Informix? */
 						if (INFORMIX_MODE)
@@ -3525,7 +3533,7 @@ YY_RULE_SETUP
 case 121:
 /* rule 121 can match eol */
 YY_RULE_SETUP
-#line 1187 "pgc.l"
+#line 1195 "pgc.l"
 {
 					struct _defines *ptr, *ptr2 = NULL;
 					int i;
@@ -3541,17 +3549,23 @@ YY_RULE_SETUP
 					yytext[i+1] = '\0';
 
 
-					for (ptr = defines; ptr != NULL; ptr2 = ptr, ptr = ptr->next)
+					/* Find and unset any matching define; should be only 1 */
+					for (ptr = defines; ptr; ptr2 = ptr, ptr = ptr->next)
 					{
-						if (strcmp(yytext, ptr->olddef) == 0)
+						if (strcmp(yytext, ptr->name) == 0)
 						{
-							if (ptr2 == NULL)
-								defines = ptr->next;
-							else
-								ptr2->next = ptr->next;
-							free(ptr->newdef);
-							free(ptr->olddef);
-							free(ptr);
+							free(ptr->value);
+							ptr->value = NULL;
+							/* We cannot forget it if there's a cmdvalue */
+							if (ptr->cmdvalue == NULL)
+							{
+								if (ptr2 == NULL)
+									defines = ptr->next;
+								else
+									ptr2->next = ptr->next;
+								free(ptr->name);
+								free(ptr);
+							}
 							break;
 						}
 					}
@@ -3562,7 +3576,7 @@ YY_RULE_SETUP
 case 122:
 /* rule 122 can match eol */
 YY_RULE_SETUP
-#line 1219 "pgc.l"
+#line 1233 "pgc.l"
 {
 						mmfatal(PARSE_ERROR, "missing identifier in EXEC SQL UNDEF command");
 						yyterminate();
@@ -3571,13 +3585,13 @@ YY_RULE_SETUP
 case 123:
 /* rule 123 can match eol */
 YY_RULE_SETUP
-#line 1223 "pgc.l"
+#line 1237 "pgc.l"
 { BEGIN(incl); }
 	YY_BREAK
 case 124:
 /* rule 124 can match eol */
 YY_RULE_SETUP
-#line 1224 "pgc.l"
+#line 1238 "pgc.l"
 {
 					  /* are we simulating Informix? */
 					  if (INFORMIX_MODE)
@@ -3594,7 +3608,7 @@ YY_RULE_SETUP
 case 125:
 /* rule 125 can match eol */
 YY_RULE_SETUP
-#line 1236 "pgc.l"
+#line 1250 "pgc.l"
 {
 					  if (preproc_tos >= MAX_NESTED_IF-1)
 						  mmfatal(PARSE_ERROR, "too many nested EXEC SQL IFDEF conditions");
@@ -3609,7 +3623,7 @@ YY_RULE_SETUP
 case 126:
 /* rule 126 can match eol */
 YY_RULE_SETUP
-#line 1246 "pgc.l"
+#line 1260 "pgc.l"
 {
 					  /* are we simulating Informix? */
 					  if (INFORMIX_MODE)
@@ -3633,7 +3647,7 @@ YY_RULE_SETUP
 case 127:
 /* rule 127 can match eol */
 YY_RULE_SETUP
-#line 1265 "pgc.l"
+#line 1279 "pgc.l"
 {
 					  if (preproc_tos >= MAX_NESTED_IF-1)
 						  mmfatal(PARSE_ERROR, "too many nested EXEC SQL IFDEF conditions");
@@ -3648,7 +3662,7 @@ YY_RULE_SETUP
 case 128:
 /* rule 128 can match eol */
 YY_RULE_SETUP
-#line 1275 "pgc.l"
+#line 1289 "pgc.l"
 {
 					  /* are we simulating Informix? */
 					  if (INFORMIX_MODE)
@@ -3672,7 +3686,7 @@ YY_RULE_SETUP
 case 129:
 /* rule 129 can match eol */
 YY_RULE_SETUP
-#line 1294 "pgc.l"
+#line 1308 "pgc.l"
 {
 						if (preproc_tos == 0)
 							mmfatal(PARSE_ERROR, "missing matching \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\"");
@@ -3685,7 +3699,7 @@ YY_RULE_SETUP
 case 130:
 /* rule 130 can match eol */
 YY_RULE_SETUP
-#line 1302 "pgc.l"
+#line 1316 "pgc.l"
 {
 					/* are we simulating Informix? */
 					if (INFORMIX_MODE)
@@ -3707,7 +3721,7 @@ YY_RULE_SETUP
 case 131:
 /* rule 131 can match eol */
 YY_RULE_SETUP
-#line 1320 "pgc.l"
+#line 1334 "pgc.l"
 {	/* only exec sql endif pops the stack, so take care of duplicated 'else' */
 					if (preproc_tos == 0)
 						mmfatal(PARSE_ERROR, "missing matching \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\"");
@@ -3731,7 +3745,7 @@ YY_RULE_SETUP
 case 132:
 /* rule 132 can match eol */
 YY_RULE_SETUP
-#line 1339 "pgc.l"
+#line 1353 "pgc.l"
 {
 					/* are we simulating Informix? */
 					if (INFORMIX_MODE)
@@ -3764,7 +3778,7 @@ YY_RULE_SETUP
 case 133:
 /* rule 133 can match eol */
 YY_RULE_SETUP
-#line 1367 "pgc.l"
+#line 1381 "pgc.l"
 {
 					if (preproc_tos == 0)
 						mmfatal(PARSE_ERROR, "unmatched EXEC SQL ENDIF");
@@ -3780,7 +3794,7 @@ YY_RULE_SETUP
 case 134:
 /* rule 134 can match eol */
 YY_RULE_SETUP
-#line 1378 "pgc.l"
+#line 1392 "pgc.l"
 {
 					/* are we simulating Informix? */
 					if (INFORMIX_MODE)
@@ -3804,13 +3818,13 @@ YY_RULE_SETUP
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
-#line 1399 "pgc.l"
+#line 1413 "pgc.l"
 { /* ignore */ }
 	YY_BREAK
 case 136:
 /* rule 136 can match eol */
 YY_RULE_SETUP
-#line 1401 "pgc.l"
+#line 1415 "pgc.l"
 {
 					{
 						struct _defines *defptr;
@@ -3827,11 +3841,17 @@ YY_RULE_SETUP
 							;
 						yytext[i+1] = '\0';
 
-						for (defptr = defines;
-							 defptr != NULL &&
-							 strcmp(yytext, defptr->olddef) != 0;
-							 defptr = defptr->next)
-							/* skip */ ;
+						/* Does a definition exist? */
+						for (defptr = defines; defptr; defptr = defptr->next)
+						{
+							if (strcmp(yytext, defptr->name) == 0)
+							{
+								/* Found it, but is it currently undefined? */
+								if (defptr->value == NULL)
+									defptr = NULL; /* pretend it's not found */
+								break;
+							}
+						}
 
 						this_active = (defptr ? ifcond : !ifcond);
 						stacked_if_value[preproc_tos].active =
@@ -3850,7 +3870,7 @@ YY_RULE_SETUP
 case 137:
 /* rule 137 can match eol */
 YY_RULE_SETUP
-#line 1437 "pgc.l"
+#line 1457 "pgc.l"
 {
 				mmfatal(PARSE_ERROR, "missing identifier in EXEC SQL IFDEF command");
 				yyterminate();
@@ -3858,9 +3878,9 @@ YY_RULE_SETUP
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
-#line 1441 "pgc.l"
+#line 1461 "pgc.l"
 {
-				old = mm_strdup(yytext);
+				newdefsymbol = mm_strdup(yytext);
 				BEGIN(def);
 				startlit();
 			}
@@ -3868,7 +3888,7 @@ YY_RULE_SETUP
 case 139:
 /* rule 139 can match eol */
 YY_RULE_SETUP
-#line 1446 "pgc.l"
+#line 1466 "pgc.l"
 {
 				mmfatal(PARSE_ERROR, "missing identifier in EXEC SQL DEFINE command");
 				yyterminate();
@@ -3877,28 +3897,33 @@ YY_RULE_SETUP
 case 140:
 /* rule 140 can match eol */
 YY_RULE_SETUP
-#line 1450 "pgc.l"
+#line 1470 "pgc.l"
 {
-						struct _defines *ptr, *this;
+						struct _defines *ptr;
 
+						/* Does it already exist? */
 						for (ptr = defines; ptr != NULL; ptr = ptr->next)
 						{
-							 if (strcmp(old, ptr->olddef) == 0)
-							 {
-								free(ptr->newdef);
-								ptr->newdef = mm_strdup(literalbuf);
-							 }
+							if (strcmp(newdefsymbol, ptr->name) == 0)
+							{
+								free(ptr->value);
+								ptr->value = mm_strdup(literalbuf);
+								/* Don't leak newdefsymbol */
+								free(newdefsymbol);
+								break;
+							}
 						}
 						if (ptr == NULL)
 						{
-							this = (struct _defines *) mm_alloc(sizeof(struct _defines));
-
-							/* initial definition */
-							this->olddef = old;
-							this->newdef = mm_strdup(literalbuf);
-							this->next = defines;
-							this->used = NULL;
-							defines = this;
+							/* Not present, make a new entry */
+							ptr = (struct _defines *) mm_alloc(sizeof(struct _defines));
+
+							ptr->name = newdefsymbol;
+							ptr->value = mm_strdup(literalbuf);
+							ptr->cmdvalue = NULL;
+							ptr->used = NULL;
+							ptr->next = defines;
+							defines = ptr;
 						}
 
 						BEGIN(C);
@@ -3907,31 +3932,31 @@ YY_RULE_SETUP
 case 141:
 /* rule 141 can match eol */
 YY_RULE_SETUP
-#line 1475 "pgc.l"
+#line 1500 "pgc.l"
 { addlit(yytext, yyleng); }
 	YY_BREAK
 case 142:
 /* rule 142 can match eol */
 YY_RULE_SETUP
-#line 1476 "pgc.l"
+#line 1501 "pgc.l"
 {	parse_include(); }
 	YY_BREAK
 case 143:
 /* rule 143 can match eol */
 YY_RULE_SETUP
-#line 1477 "pgc.l"
+#line 1502 "pgc.l"
 {	parse_include(); }
 	YY_BREAK
 case 144:
 /* rule 144 can match eol */
 YY_RULE_SETUP
-#line 1478 "pgc.l"
+#line 1503 "pgc.l"
 { parse_include(); }
 	YY_BREAK
 case 145:
 /* rule 145 can match eol */
 YY_RULE_SETUP
-#line 1479 "pgc.l"
+#line 1504 "pgc.l"
 {
 					mmfatal(PARSE_ERROR, "syntax error in EXEC SQL INCLUDE command");
 					yyterminate();
@@ -3946,10 +3971,11 @@ case YY_STATE_EOF(incl):
 case YY_STATE_EOF(def):
 case YY_STATE_EOF(def_ident):
 case YY_STATE_EOF(undef):
-#line 1484 "pgc.l"
+#line 1509 "pgc.l"
 {
 					if (yy_buffer == NULL)
 					{
+						/* No more input */
 						if (preproc_tos > 0)
 						{
 							preproc_tos = 0;
@@ -3959,16 +3985,20 @@ case YY_STATE_EOF(undef):
 					}
 					else
 					{
+						/* Revert to previous input source */
 						struct _yy_buffer *yb = yy_buffer;
 						int i;
 						struct _defines *ptr;
 
+						/* Check to see if we are exiting a macro value */
 						for (ptr = defines; ptr; ptr = ptr->next)
+						{
 							if (ptr->used == yy_buffer)
 							{
 								ptr->used = NULL;
-								break;
+								break; /* there can't be multiple matches */
 							}
+						}
 
 						if (yyin != NULL)
 							fclose(yyin);
@@ -3996,15 +4026,15 @@ case YY_STATE_EOF(undef):
 case 146:
 /* rule 146 can match eol */
 YY_RULE_SETUP
-#line 1530 "pgc.l"
+#line 1560 "pgc.l"
 { mmfatal(PARSE_ERROR, "internal error: unreachable state; please report this to <%s>", PACKAGE_BUGREPORT); }
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
-#line 1532 "pgc.l"
+#line 1562 "pgc.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 4008 "pgc.c"
+#line 4038 "pgc.c"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -5020,7 +5050,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 1532 "pgc.l"
+#line 1562 "pgc.l"
 
 
 /* LCOV_EXCL_STOP */
@@ -5219,15 +5249,24 @@ ecpg_isspace(char ch)
 	return false;
 }
 
-static bool isdefine(void)
+/*
+ * If yytext matches a define symbol, begin scanning the symbol's value
+ * and return true
+ */
+static bool
+isdefine(void)
 {
 	struct _defines *ptr;
 
 	/* is it a define? */
 	for (ptr = defines; ptr; ptr = ptr->next)
 	{
-		if (strcmp(yytext, ptr->olddef) == 0 && ptr->used == NULL)
+		/* notice we do not match anything being actively expanded */
+		if (strcmp(yytext, ptr->name) == 0 &&
+			ptr->value != NULL &&
+			ptr->used == NULL)
 		{
+			/* Save state associated with the current buffer */
 			struct _yy_buffer *yb;
 
 			yb = mm_alloc(sizeof(struct _yy_buffer));
@@ -5236,10 +5275,17 @@ static bool isdefine(void)
 			yb->lineno = yylineno;
 			yb->filename = mm_strdup(input_filename);
 			yb->next = yy_buffer;
+			yy_buffer = yb;
 
-			ptr->used = yy_buffer = yb;
+			/* Mark symbol as being actively expanded */
+			ptr->used = yb;
 
-			yy_scan_string(ptr->newdef);
+			/*
+			 * We use yy_scan_string which will copy the value, so there's
+			 * no need to worry about a possible undef happening while we
+			 * are still scanning it.
+			 */
+			yy_scan_string(ptr->value);
 			return true;
 		}
 	}
@@ -5247,7 +5293,12 @@ static bool isdefine(void)
 	return false;
 }
 
-static bool isinformixdefine(void)
+/*
+ * Handle replacement of INFORMIX built-in defines.  This works just
+ * like isdefine() except for the source of the string to scan.
+ */
+static bool
+isinformixdefine(void)
 {
 	const char *new = NULL;
 
diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
index dcd567e..bed86cc 100644
--- a/src/interfaces/ecpg/preproc/pgc.l
+++ b/src/interfaces/ecpg/preproc/pgc.l
@@ -69,7 +69,14 @@ char *token_start;
 static int state_before_str_start;
 static int state_before_str_stop;
 
-struct _yy_buffer
+/*
+ * State for handling include files and macro expansion.  We use a new
+ * flex input buffer for each level of include or macro, and create a
+ * struct _yy_buffer to remember the previous level.  There is not a struct
+ * for the currently active input source; that state is kept in the global
+ * variables YY_CURRENT_BUFFER, yylineno, and input_filename.
+ */
+static struct _yy_buffer
 {
 	YY_BUFFER_STATE		buffer;
 	long				lineno;
@@ -77,8 +84,6 @@ struct _yy_buffer
 	struct _yy_buffer  *next;
 } *yy_buffer = NULL;
 
-static char *old;
-
 /*
  * Vars for handling ifdef/elif/endif constructs.  preproc_tos is the current
  * nesting depth of such constructs, and stacked_if_value[preproc_tos] is the
@@ -444,6 +449,8 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 
 %{
 		/* code to execute during start of each call of yylex() */
+		char *newdefsymbol = NULL;
+
 		token_start = NULL;
 %}
 
@@ -1010,6 +1017,7 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 				}
 
 {identifier}	{
+					/* First check to see if it's a define symbol to expand */
 					if (!isdefine())
 					{
 						int		kwvalue;
@@ -1198,17 +1206,23 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 					yytext[i+1] = '\0';
 
 
-					for (ptr = defines; ptr != NULL; ptr2 = ptr, ptr = ptr->next)
+					/* Find and unset any matching define; should be only 1 */
+					for (ptr = defines; ptr; ptr2 = ptr, ptr = ptr->next)
 					{
-						if (strcmp(yytext, ptr->olddef) == 0)
+						if (strcmp(yytext, ptr->name) == 0)
 						{
-							if (ptr2 == NULL)
-								defines = ptr->next;
-							else
-								ptr2->next = ptr->next;
-							free(ptr->newdef);
-							free(ptr->olddef);
-							free(ptr);
+							free(ptr->value);
+							ptr->value = NULL;
+							/* We cannot forget it if there's a cmdvalue */
+							if (ptr->cmdvalue == NULL)
+							{
+								if (ptr2 == NULL)
+									defines = ptr->next;
+								else
+									ptr2->next = ptr->next;
+								free(ptr->name);
+								free(ptr);
+							}
 							break;
 						}
 					}
@@ -1413,11 +1427,17 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 							;
 						yytext[i+1] = '\0';
 
-						for (defptr = defines;
-							 defptr != NULL &&
-							 strcmp(yytext, defptr->olddef) != 0;
-							 defptr = defptr->next)
-							/* skip */ ;
+						/* Does a definition exist? */
+						for (defptr = defines; defptr; defptr = defptr->next)
+						{
+							if (strcmp(yytext, defptr->name) == 0)
+							{
+								/* Found it, but is it currently undefined? */
+								if (defptr->value == NULL)
+									defptr = NULL; /* pretend it's not found */
+								break;
+							}
+						}
 
 						this_active = (defptr ? ifcond : !ifcond);
 						stacked_if_value[preproc_tos].active =
@@ -1438,7 +1458,7 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 				yyterminate();
 			}
 <def_ident>{identifier} {
-				old = mm_strdup(yytext);
+				newdefsymbol = mm_strdup(yytext);
 				BEGIN(def);
 				startlit();
 			}
@@ -1447,26 +1467,31 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 				yyterminate();
 			}
 <def>{space}*";"	{
-						struct _defines *ptr, *this;
+						struct _defines *ptr;
 
+						/* Does it already exist? */
 						for (ptr = defines; ptr != NULL; ptr = ptr->next)
 						{
-							 if (strcmp(old, ptr->olddef) == 0)
-							 {
-								free(ptr->newdef);
-								ptr->newdef = mm_strdup(literalbuf);
-							 }
+							if (strcmp(newdefsymbol, ptr->name) == 0)
+							{
+								free(ptr->value);
+								ptr->value = mm_strdup(literalbuf);
+								/* Don't leak newdefsymbol */
+								free(newdefsymbol);
+								break;
+							}
 						}
 						if (ptr == NULL)
 						{
-							this = (struct _defines *) mm_alloc(sizeof(struct _defines));
-
-							/* initial definition */
-							this->olddef = old;
-							this->newdef = mm_strdup(literalbuf);
-							this->next = defines;
-							this->used = NULL;
-							defines = this;
+							/* Not present, make a new entry */
+							ptr = (struct _defines *) mm_alloc(sizeof(struct _defines));
+
+							ptr->name = newdefsymbol;
+							ptr->value = mm_strdup(literalbuf);
+							ptr->cmdvalue = NULL;
+							ptr->used = NULL;
+							ptr->next = defines;
+							defines = ptr;
 						}
 
 						BEGIN(C);
@@ -1483,6 +1508,7 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 <<EOF>>				{
 					if (yy_buffer == NULL)
 					{
+						/* No more input */
 						if (preproc_tos > 0)
 						{
 							preproc_tos = 0;
@@ -1492,16 +1518,20 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 					}
 					else
 					{
+						/* Revert to previous input source */
 						struct _yy_buffer *yb = yy_buffer;
 						int i;
 						struct _defines *ptr;
 
+						/* Check to see if we are exiting a macro value */
 						for (ptr = defines; ptr; ptr = ptr->next)
+						{
 							if (ptr->used == yy_buffer)
 							{
 								ptr->used = NULL;
-								break;
+								break; /* there can't be multiple matches */
 							}
+						}
 
 						if (yyin != NULL)
 							fclose(yyin);
@@ -1726,15 +1756,24 @@ ecpg_isspace(char ch)
 	return false;
 }
 
-static bool isdefine(void)
+/*
+ * If yytext matches a define symbol, begin scanning the symbol's value
+ * and return true
+ */
+static bool
+isdefine(void)
 {
 	struct _defines *ptr;
 
 	/* is it a define? */
 	for (ptr = defines; ptr; ptr = ptr->next)
 	{
-		if (strcmp(yytext, ptr->olddef) == 0 && ptr->used == NULL)
+		/* notice we do not match anything being actively expanded */
+		if (strcmp(yytext, ptr->name) == 0 &&
+			ptr->value != NULL &&
+			ptr->used == NULL)
 		{
+			/* Save state associated with the current buffer */
 			struct _yy_buffer *yb;
 
 			yb = mm_alloc(sizeof(struct _yy_buffer));
@@ -1743,10 +1782,17 @@ static bool isdefine(void)
 			yb->lineno = yylineno;
 			yb->filename = mm_strdup(input_filename);
 			yb->next = yy_buffer;
+			yy_buffer = yb;
 
-			ptr->used = yy_buffer = yb;
+			/* Mark symbol as being actively expanded */
+			ptr->used = yb;
 
-			yy_scan_string(ptr->newdef);
+			/*
+			 * We use yy_scan_string which will copy the value, so there's
+			 * no need to worry about a possible undef happening while we
+			 * are still scanning it.
+			 */
+			yy_scan_string(ptr->value);
 			return true;
 		}
 	}
@@ -1754,7 +1800,12 @@ static bool isdefine(void)
 	return false;
 }
 
-static bool isinformixdefine(void)
+/*
+ * Handle replacement of INFORMIX built-in defines.  This works just
+ * like isdefine() except for the source of the string to scan.
+ */
+static bool
+isinformixdefine(void)
 {
 	const char *new = NULL;
 
diff --git a/src/interfaces/ecpg/preproc/po/ru.po b/src/interfaces/ecpg/preproc/po/ru.po
index cf253c3..70a73fb 100644
--- a/src/interfaces/ecpg/preproc/po/ru.po
+++ b/src/interfaces/ecpg/preproc/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ecpg (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2023-08-28 07:59+0300\n"
+"POT-Creation-Date: 2024-05-04 16:29+0300\n"
 "PO-Revision-Date: 2022-09-05 13:32+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
@@ -186,181 +186,181 @@ msgstr ""
 msgid "%s home page: <%s>\n"
 msgstr "Домашн�� �траница %s: <%s>\n"
 
-#: ecpg.c:141
+#: ecpg.c:152
 #, c-format
 msgid "%s: could not locate my own executable path\n"
 msgstr "%s: не удало�ь найти путь к �об�твенному и�полн�емому файлу\n"
 
-#: ecpg.c:184 ecpg.c:235 ecpg.c:249 ecpg.c:275
+#: ecpg.c:195 ecpg.c:246 ecpg.c:260 ecpg.c:286
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Дл� дополнительной информации попробуйте \"%s --help\".\n"
 
-#: ecpg.c:192
+#: ecpg.c:203
 #, c-format
 msgid "%s: parser debug support (-d) not available\n"
 msgstr "%s: отладочные �ообщени� при разборе (-d) не поддерживают��\n"
 
-#: ecpg.c:219 ecpg.c:334 ecpg.c:345
+#: ecpg.c:230 ecpg.c:345 ecpg.c:356
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
 msgstr "%s: не удало�ь открыть файл \"%s\": %s\n"
 
-#: ecpg.c:263
+#: ecpg.c:274
 #, c-format
 msgid "%s, the PostgreSQL embedded C preprocessor, version %s\n"
 msgstr "%s, препроце��ор внедрённого в С �зыка СУБД PostgreSQL, вер�и� %s\n"
 
-#: ecpg.c:265
+#: ecpg.c:276
 #, c-format
 msgid "EXEC SQL INCLUDE ... search starts here:\n"
 msgstr "пои�к файлов дл� EXEC SQL INCLUDE ... начинает�� в каталогах:\n"
 
-#: ecpg.c:268
+#: ecpg.c:279
 #, c-format
 msgid "end of search list\n"
 msgstr "конец �пи�ка пои�ка\n"
 
-#: ecpg.c:274
+#: ecpg.c:285
 #, c-format
 msgid "%s: no input files specified\n"
 msgstr "%s: нет входных файлов\n"
 
-#: ecpg.c:478
+#: ecpg.c:491
 #, c-format
 msgid "cursor \"%s\" has been declared but not opened"
 msgstr "кур�ор \"%s\" был объ�влен, но не открыт"
 
-#: ecpg.c:491 preproc.y:130
+#: ecpg.c:504 preproc.y:130
 #, c-format
 msgid "could not remove output file \"%s\"\n"
 msgstr "ошибка при удалении выходного файла \"%s\"\n"
 
-#: pgc.l:520
+#: pgc.l:527
 #, c-format
 msgid "unterminated /* comment"
 msgstr "незавершённый комментарий /*"
 
-#: pgc.l:537
+#: pgc.l:544
 #, c-format
 msgid "unterminated bit string literal"
 msgstr "оборванна� битова� �трока"
 
-#: pgc.l:545
+#: pgc.l:552
 #, c-format
 msgid "unterminated hexadecimal string literal"
 msgstr "оборванна� ше�тнадцатерична� �трока"
 
-#: pgc.l:620
+#: pgc.l:627
 #, c-format
 msgid "invalid bit string literal"
 msgstr "неверна� битова� �трока"
 
-#: pgc.l:625
+#: pgc.l:632
 #, c-format
 msgid "invalid hexadecimal string literal"
 msgstr "неверна� ше�тнадцатерична� �трока"
 
-#: pgc.l:643
+#: pgc.l:650
 #, c-format
 msgid "unhandled previous state in xqs\n"
 msgstr ""
 "необрабатываемое предыдущее �о�то�ние при обнаружении закрывающего "
 "апо�трофа\n"
 
-#: pgc.l:669 pgc.l:778
+#: pgc.l:676 pgc.l:785
 #, c-format
 msgid "unterminated quoted string"
 msgstr "незавершённа� �трока в кавычках"
 
-#: pgc.l:720
+#: pgc.l:727
 #, c-format
 msgid "unterminated dollar-quoted string"
 msgstr "незавершённа� �трока � $"
 
-#: pgc.l:738 pgc.l:758
+#: pgc.l:745 pgc.l:765
 #, c-format
 msgid "zero-length delimited identifier"
 msgstr "пу�той идентификатор в кавычках"
 
-#: pgc.l:769
+#: pgc.l:776
 #, c-format
 msgid "unterminated quoted identifier"
 msgstr "незавершённый идентификатор в кавычках"
 
-#: pgc.l:938
+#: pgc.l:945
 #, c-format
 msgid "trailing junk after parameter"
 msgstr "му�орное �одержимое по�ле параметра"
 
-#: pgc.l:990 pgc.l:993 pgc.l:996 pgc.l:999 pgc.l:1002 pgc.l:1005
+#: pgc.l:997 pgc.l:1000 pgc.l:1003 pgc.l:1006 pgc.l:1009 pgc.l:1012
 #, c-format
 msgid "trailing junk after numeric literal"
 msgstr "му�орное �одержимое по�ле чи�ловой кон�танты"
 
-#: pgc.l:1127
+#: pgc.l:1135
 #, c-format
 msgid "nested /* ... */ comments"
 msgstr "вложенные комментарии /* ... */"
 
-#: pgc.l:1220
+#: pgc.l:1234
 #, c-format
 msgid "missing identifier in EXEC SQL UNDEF command"
 msgstr "в команде EXEC SQL UNDEF от�ут�твует идентификатор"
 
-#: pgc.l:1238 pgc.l:1251 pgc.l:1267 pgc.l:1280
+#: pgc.l:1252 pgc.l:1265 pgc.l:1281 pgc.l:1294
 #, c-format
 msgid "too many nested EXEC SQL IFDEF conditions"
 msgstr "�лишком много вложенных у�ловий EXEC SQL IFDEF"
 
-#: pgc.l:1296 pgc.l:1307 pgc.l:1322 pgc.l:1344
+#: pgc.l:1310 pgc.l:1321 pgc.l:1336 pgc.l:1358
 #, c-format
 msgid "missing matching \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
 msgstr "нет �оответ�твующего \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
 
-#: pgc.l:1298 pgc.l:1309 pgc.l:1490
+#: pgc.l:1312 pgc.l:1323 pgc.l:1516
 #, c-format
 msgid "missing \"EXEC SQL ENDIF;\""
 msgstr "от�ут�твует \"EXEC SQL ENDIF;\""
 
-#: pgc.l:1324 pgc.l:1346
+#: pgc.l:1338 pgc.l:1360
 #, c-format
 msgid "more than one EXEC SQL ELSE"
 msgstr "неоднократна� команда EXEC SQL ELSE"
 
-#: pgc.l:1369 pgc.l:1383
+#: pgc.l:1383 pgc.l:1397
 #, c-format
 msgid "unmatched EXEC SQL ENDIF"
 msgstr "непарна� команда EXEC SQL ENDIF"
 
-#: pgc.l:1438
+#: pgc.l:1458
 #, c-format
 msgid "missing identifier in EXEC SQL IFDEF command"
 msgstr "в команде EXEC SQL IFDEF от�ут�твует идентификатор"
 
-#: pgc.l:1447
+#: pgc.l:1467
 #, c-format
 msgid "missing identifier in EXEC SQL DEFINE command"
 msgstr "в команде EXEC SQL DEFINE от�ут�твует идентификатор"
 
-#: pgc.l:1480
+#: pgc.l:1505
 #, c-format
 msgid "syntax error in EXEC SQL INCLUDE command"
 msgstr "ошибка �интак�и�а в команде EXEC SQL INCLUDE"
 
-#: pgc.l:1530
+#: pgc.l:1560
 #, c-format
 msgid "internal error: unreachable state; please report this to <%s>"
 msgstr "внутренн�� ошибка: недо�тижимое �о�то�ние; пожалуй�та, �ообщите в <%s>"
 
-#: pgc.l:1682
+#: pgc.l:1712
 #, c-format
 msgid "Error: include path \"%s/%s\" is too long on line %d, skipping\n"
 msgstr ""
 "Ошибка: путь включаемых файлов \"%s/%s\" в �троке %d �лишком длинный, "
 "пропу�кает��\n"
 
-#: pgc.l:1705
+#: pgc.l:1735
 #, c-format
 msgid "could not open include file \"%s\" on line %d"
 msgstr "не удало�ь открыть включаемый файл \"%s\" (�трока %d)"
@@ -394,12 +394,12 @@ msgstr "определение типа не может включать иниÑ
 msgid "type name \"string\" is reserved in Informix mode"
 msgstr "им� типа \"string\" в режиме Informix зарезервировано"
 
-#: preproc.y:552 preproc.y:18392
+#: preproc.y:552 preproc.y:18385
 #, c-format
 msgid "type \"%s\" is already defined"
 msgstr "тип \"%s\" уже определён"
 
-#: preproc.y:577 preproc.y:19027 preproc.y:19349 variable.c:625
+#: preproc.y:577 preproc.y:19020 preproc.y:19342 variable.c:625
 #, c-format
 msgid "multidimensional arrays for simple data types are not supported"
 msgstr "многомерные ма��ивы � про�тыми типами данных не поддерживают��"
@@ -444,56 +444,55 @@ msgstr "оператор VAR Ñ� параметром AT не поддерживÐ
 msgid "AT option not allowed in WHENEVER statement"
 msgstr "оператор WHENEVER � параметром AT не поддерживает��"
 
-#: preproc.y:2300 preproc.y:2472 preproc.y:2477 preproc.y:2589 preproc.y:4248
-#: preproc.y:4322 preproc.y:4913 preproc.y:5446 preproc.y:5784 preproc.y:6084
-#: preproc.y:7648 preproc.y:9252 preproc.y:9257 preproc.y:12206
+#: preproc.y:2300 preproc.y:2587 preproc.y:4246 preproc.y:4910 preproc.y:5780
+#: preproc.y:6080 preproc.y:12199
 #, c-format
 msgid "unsupported feature will be passed to server"
 msgstr "неподдерживаема� функци� будет передана �ерверу"
 
-#: preproc.y:2847
+#: preproc.y:2845
 #, c-format
 msgid "SHOW ALL is not implemented"
 msgstr "SHOW ALL не реализовано"
 
-#: preproc.y:3531
+#: preproc.y:3529
 #, c-format
 msgid "COPY FROM STDIN is not implemented"
 msgstr "операци� COPY FROM STDIN не реализована"
 
-#: preproc.y:10303 preproc.y:17889
+#: preproc.y:10296 preproc.y:17882
 #, c-format
 msgid "\"database\" cannot be used as cursor name in INFORMIX mode"
 msgstr ""
 "в режиме INFORMIX нельз� и�пользовать \"database\" в каче�тве имени кур�ора"
 
-#: preproc.y:10310 preproc.y:17899
+#: preproc.y:10303 preproc.y:17892
 #, c-format
 msgid "using variable \"%s\" in different declare statements is not supported"
 msgstr ""
 "и�пользование переменной \"%s\" в разных операторах DECLARE не поддерживает��"
 
-#: preproc.y:10312 preproc.y:17901
+#: preproc.y:10305 preproc.y:17894
 #, c-format
 msgid "cursor \"%s\" is already defined"
 msgstr "кур�ор \"%s\" уже определён"
 
-#: preproc.y:10786
+#: preproc.y:10779
 #, c-format
 msgid "no longer supported LIMIT #,# syntax passed to server"
 msgstr "не поддерживаемое более предложение LIMIT #,# передано на �ервер"
 
-#: preproc.y:17581 preproc.y:17588
+#: preproc.y:17574 preproc.y:17581
 #, c-format
 msgid "CREATE TABLE AS cannot specify INTO"
 msgstr "в CREATE TABLE AS нельз� указать INTO"
 
-#: preproc.y:17624
+#: preproc.y:17617
 #, c-format
 msgid "expected \"@\", found \"%s\""
 msgstr "ожидал�� знак \"@\", но на �том ме�те \"%s\""
 
-#: preproc.y:17636
+#: preproc.y:17629
 #, c-format
 msgid ""
 "only protocols \"tcp\" and \"unix\" and database type \"postgresql\" are "
@@ -502,89 +501,89 @@ msgstr ""
 "поддерживают�� только протоколы \"tcp\" и \"unix\", а тип базы данных - "
 "\"postgresql\""
 
-#: preproc.y:17639
+#: preproc.y:17632
 #, c-format
 msgid "expected \"://\", found \"%s\""
 msgstr "ожидало�ь \"://\", но на �том ме�те \"%s\""
 
-#: preproc.y:17644
+#: preproc.y:17637
 #, c-format
 msgid "Unix-domain sockets only work on \"localhost\" but not on \"%s\""
 msgstr "Unix-�океты работают только � \"localhost\", но не � адре�ом \"%s\""
 
-#: preproc.y:17670
+#: preproc.y:17663
 #, c-format
 msgid "expected \"postgresql\", found \"%s\""
 msgstr "ожидал�� тип \"postgresql\", но на �том ме�те \"%s\""
 
-#: preproc.y:17673
+#: preproc.y:17666
 #, c-format
 msgid "invalid connection type: %s"
 msgstr "неверный тип подключени�: %s"
 
-#: preproc.y:17682
+#: preproc.y:17675
 #, c-format
 msgid "expected \"@\" or \"://\", found \"%s\""
 msgstr "ожидало�ь \"@\" или \"://\", но на �том ме�те \"%s\""
 
-#: preproc.y:17757 preproc.y:17775
+#: preproc.y:17750 preproc.y:17768
 #, c-format
 msgid "invalid data type"
 msgstr "неверный тип данных"
 
-#: preproc.y:17786 preproc.y:17803
+#: preproc.y:17779 preproc.y:17796
 #, c-format
 msgid "incomplete statement"
 msgstr "неполный оператор"
 
-#: preproc.y:17789 preproc.y:17806
+#: preproc.y:17782 preproc.y:17799
 #, c-format
 msgid "unrecognized token \"%s\""
 msgstr "нера�познанное ключевое �лово \"%s\""
 
-#: preproc.y:17851
+#: preproc.y:17844
 #, c-format
 msgid "name \"%s\" is already declared"
 msgstr "им� \"%s\" уже объ�влено"
 
-#: preproc.y:18140
+#: preproc.y:18133
 #, c-format
 msgid "only data types numeric and decimal have precision/scale argument"
 msgstr ""
 "точно�ть/ма�штаб можно указать только дл� типов данных numeric и decimal"
 
-#: preproc.y:18211
+#: preproc.y:18204
 #, c-format
 msgid "interval specification not allowed here"
 msgstr "определение интервала зде�ь не допу�кает��"
 
-#: preproc.y:18367 preproc.y:18419
+#: preproc.y:18360 preproc.y:18412
 #, c-format
 msgid "too many levels in nested structure/union definition"
 msgstr "�лишком много уровней в определении вложенной �труктуры/объединени�"
 
-#: preproc.y:18542
+#: preproc.y:18535
 #, c-format
 msgid "pointers to varchar are not implemented"
 msgstr "указатели на varchar не реализованы"
 
-#: preproc.y:18993
+#: preproc.y:18986
 #, c-format
 msgid "initializer not allowed in EXEC SQL VAR command"
 msgstr "команда EXEC SQL VAR не может включать инициализатор"
 
-#: preproc.y:19307
+#: preproc.y:19300
 #, c-format
 msgid "arrays of indicators are not allowed on input"
 msgstr "ма��ивы индикаторов на входе недопу�тимы"
 
-#: preproc.y:19494
+#: preproc.y:19487
 #, c-format
 msgid "operator not allowed in variable definition"
 msgstr "недопу�тимый оператор в определении переменной"
 
 #. translator: %s is typically the translation of "syntax error"
-#: preproc.y:19535
+#: preproc.y:19528
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s (примерное положение: \"%s\")"
diff --git a/src/interfaces/ecpg/preproc/preproc.c b/src/interfaces/ecpg/preproc/preproc.c
index 09a23d6..a73f427 100644
--- a/src/interfaces/ecpg/preproc/preproc.c
+++ b/src/interfaces/ecpg/preproc/preproc.c
@@ -2601,362 +2601,362 @@ static const yytype_int16 yyrline[] =
     2294,  2298,  2303,  2307,  2311,  2315,  2319,  2327,  2331,  2335,
     2339,  2343,  2347,  2355,  2363,  2367,  2376,  2378,  2386,  2390,
     2394,  2398,  2406,  2410,  2414,  2418,  2422,  2426,  2434,  2442,
-    2450,  2454,  2462,  2466,  2470,  2475,  2484,  2489,  2495,  2499,
-    2503,  2507,  2511,  2515,  2523,  2527,  2531,  2539,  2543,  2547,
-    2555,  2559,  2563,  2567,  2575,  2579,  2583,  2587,  2592,  2596,
-    2600,  2604,  2608,  2612,  2616,  2624,  2628,  2636,  2640,  2648,
-    2652,  2666,  2670,  2674,  2678,  2686,  2690,  2694,  2698,  2706,
-    2710,  2714,  2718,  2722,  2726,  2730,  2738,  2742,  2747,  2753,
-    2757,  2765,  2773,  2777,  2781,  2785,  2793,  2797,  2805,  2809,
-    2817,  2821,  2829,  2833,  2837,  2841,  2845,  2854,  2862,  2866,
-    2874,  2878,  2886,  2894,  2898,  2902,  2906,  2910,  2918,  2922,
-    2926,  2930,  2934,  2938,  2942,  2946,  2950,  2954,  2958,  2962,
-    2966,  2970,  2974,  2978,  2982,  2986,  2990,  2994,  2998,  3006,
-    3010,  3018,  3022,  3026,  3034,  3042,  3046,  3050,  3054,  3058,
-    3062,  3066,  3070,  3074,  3078,  3082,  3086,  3090,  3094,  3098,
-    3102,  3106,  3110,  3114,  3118,  3122,  3126,  3130,  3134,  3138,
-    3142,  3146,  3150,  3154,  3158,  3162,  3166,  3170,  3174,  3178,
-    3182,  3186,  3190,  3194,  3198,  3202,  3206,  3210,  3214,  3218,
-    3222,  3226,  3230,  3234,  3238,  3242,  3246,  3250,  3254,  3258,
-    3262,  3266,  3270,  3274,  3278,  3286,  3290,  3298,  3303,  3309,
-    3314,  3320,  3324,  3328,  3332,  3340,  3348,  3353,  3359,  3363,
-    3371,  3375,  3379,  3383,  3391,  3395,  3403,  3407,  3411,  3415,
-    3423,  3427,  3431,  3435,  3443,  3451,  3455,  3463,  3471,  3475,
-    3483,  3487,  3491,  3495,  3503,  3519,  3527,  3535,  3543,  3547,
-    3555,  3560,  3566,  3570,  3574,  3582,  3586,  3594,  3599,  3605,
-    3609,  3613,  3617,  3621,  3625,  3629,  3633,  3637,  3641,  3645,
-    3649,  3653,  3661,  3666,  3672,  3677,  3683,  3688,  3694,  3698,
-    3706,  3714,  3718,  3722,  3726,  3731,  3737,  3741,  3749,  3757,
-    3761,  3765,  3769,  3773,  3777,  3785,  3789,  3793,  3797,  3801,
-    3805,  3809,  3814,  3820,  3825,  3831,  3836,  3842,  3846,  3854,
-    3858,  3866,  3870,  3874,  3882,  3886,  3894,  3902,  3906,  3914,
-    3918,  3926,  3931,  3937,  3941,  3949,  3954,  3960,  3965,  3971,
-    3975,  3979,  3983,  3991,  3995,  3999,  4003,  4007,  4011,  4015,
-    4019,  4023,  4031,  4035,  4040,  4046,  4050,  4058,  4062,  4066,
-    4070,  4078,  4086,  4090,  4095,  4101,  4105,  4109,  4113,  4117,
-    4121,  4125,  4129,  4133,  4137,  4145,  4149,  4157,  4161,  4165,
-    4169,  4173,  4177,  4181,  4189,  4194,  4200,  4205,  4211,  4215,
-    4223,  4231,  4236,  4242,  4246,  4251,  4256,  4262,  4266,  4274,
-    4278,  4286,  4291,  4297,  4301,  4305,  4309,  4314,  4320,  4329,
-    4337,  4341,  4345,  4349,  4353,  4361,  4366,  4372,  4377,  4383,
-    4391,  4395,  4403,  4407,  4411,  4419,  4424,  4430,  4434,  4439,
-    4445,  4449,  4453,  4458,  4464,  4469,  4475,  4480,  4486,  4494,
-    4498,  4506,  4510,  4518,  4522,  4526,  4534,  4538,  4546,  4554,
-    4558,  4563,  4569,  4573,  4581,  4589,  4594,  4600,  4608,  4612,
-    4620,  4624,  4632,  4637,  4643,  4648,  4654,  4658,  4666,  4670,
-    4674,  4678,  4682,  4686,  4690,  4694,  4698,  4702,  4706,  4710,
-    4714,  4718,  4726,  4731,  4737,  4741,  4745,  4749,  4757,  4761,
-    4769,  4773,  4781,  4786,  4792,  4796,  4804,  4809,  4815,  4819,
-    4827,  4832,  4838,  4843,  4849,  4857,  4862,  4868,  4872,  4880,
-    4884,  4892,  4897,  4903,  4907,  4911,  4916,  4924,  4932,  4937,
-    4943,  4951,  4955,  4959,  4963,  4967,  4971,  4975,  4979,  4983,
-    4987,  4991,  4995,  4999,  5007,  5015,  5019,  5023,  5027,  5035,
-    5039,  5047,  5052,  5058,  5062,  5070,  5075,  5081,  5085,  5093,
-    5101,  5105,  5113,  5117,  5121,  5125,  5133,  5141,  5149,  5157,
-    5161,  5169,  5174,  5180,  5184,  5192,  5197,  5203,  5207,  5211,
-    5219,  5223,  5227,  5231,  5239,  5247,  5251,  5259,  5264,  5270,
-    5274,  5282,  5286,  5294,  5298,  5306,  5314,  5322,  5330,  5335,
-    5341,  5346,  5352,  5357,  5363,  5368,  5374,  5379,  5385,  5390,
-    5396,  5400,  5404,  5408,  5412,  5420,  5428,  5432,  5440,  5444,
-    5453,  5457,  5461,  5469,  5473,  5481,  5485,  5489,  5493,  5497,
-    5505,  5510,  5516,  5520,  5528,  5536,  5540,  5548,  5552,  5560,
-    5568,  5573,  5579,  5584,  5590,  5594,  5602,  5607,  5613,  5617,
-    5625,  5629,  5634,  5640,  5644,  5648,  5652,  5660,  5665,  5672,
-    5674,  5682,  5686,  5690,  5694,  5698,  5702,  5710,  5714,  5722,
-    5726,  5734,  5742,  5746,  5754,  5762,  5766,  5770,  5774,  5782,
-    5791,  5795,  5799,  5803,  5807,  5811,  5815,  5819,  5823,  5827,
-    5831,  5835,  5839,  5843,  5847,  5851,  5859,  5867,  5871,  5879,
-    5883,  5891,  5895,  5899,  5903,  5907,  5911,  5919,  5927,  5931,
-    5939,  5947,  5952,  5958,  5962,  5970,  5974,  5978,  5982,  5990,
-    5995,  6001,  6009,  6013,  6021,  6025,  6029,  6033,  6037,  6045,
-    6050,  6056,  6061,  6067,  6071,  6076,  6082,  6088,  6094,  6102,
-    6106,  6114,  6118,  6126,  6130,  6138,  6142,  6150,  6154,  6162,
-    6170,  6178,  6182,  6186,  6190,  6194,  6198,  6202,  6206,  6210,
-    6214,  6218,  6222,  6230,  6234,  6238,  6242,  6246,  6250,  6254,
-    6258,  6262,  6266,  6270,  6274,  6278,  6286,  6290,  6294,  6298,
-    6302,  6310,  6314,  6318,  6322,  6326,  6330,  6334,  6338,  6346,
-    6350,  6354,  6362,  6366,  6374,  6378,  6386,  6390,  6398,  6402,
-    6410,  6418,  6422,  6427,  6433,  6437,  6441,  6445,  6449,  6453,
-    6457,  6461,  6465,  6469,  6473,  6477,  6481,  6485,  6489,  6493,
-    6497,  6501,  6509,  6513,  6521,  6525,  6529,  6533,  6537,  6541,
-    6545,  6549,  6553,  6557,  6565,  6570,  6576,  6580,  6588,  6592,
-    6596,  6600,  6609,  6618,  6627,  6636,  6645,  6654,  6663,  6676,
-    6690,  6704,  6718,  6732,  6746,  6760,  6779,  6798,  6817,  6831,
-    6850,  6864,  6883,  6901,  6905,  6913,  6918,  6924,  6932,  6936,
-    6944,  6948,  6952,  6956,  6960,  6968,  6972,  6980,  6984,  6988,
-    6992,  6996,  7004,  7008,  7016,  7020,  7028,  7032,  7036,  7040,
-    7044,  7048,  7052,  7056,  7060,  7064,  7068,  7072,  7076,  7080,
-    7084,  7088,  7092,  7096,  7100,  7104,  7108,  7116,  7120,  7128,
-    7132,  7140,  7145,  7151,  7155,  7163,  7167,  7175,  7179,  7187,
-    7195,  7199,  7203,  7211,  7216,  7222,  7230,  7235,  7241,  7245,
-    7249,  7257,  7261,  7265,  7273,  7277,  7281,  7285,  7289,  7293,
-    7301,  7305,  7313,  7318,  7324,  7329,  7335,  7339,  7347,  7351,
-    7359,  7363,  7367,  7375,  7380,  7386,  7390,  7398,  7403,  7409,
-    7413,  7418,  7424,  7428,  7433,  7439,  7443,  7447,  7451,  7459,
-    7464,  7470,  7474,  7482,  7486,  7494,  7498,  7506,  7510,  7514,
-    7518,  7526,  7530,  7538,  7542,  7550,  7554,  7558,  7562,  7566,
-    7574,  7578,  7582,  7586,  7590,  7598,  7606,  7614,  7618,  7622,
-    7630,  7634,  7638,  7646,  7655,  7659,  7663,  7667,  7675,  7679,
-    7687,  7695,  7699,  7707,  7712,  7718,  7722,  7730,  7734,  7738,
-    7742,  7746,  7750,  7754,  7758,  7762,  7766,  7770,  7774,  7778,
-    7782,  7786,  7790,  7794,  7802,  7806,  7810,  7814,  7818,  7826,
-    7830,  7838,  7846,  7850,  7855,  7861,  7866,  7872,  7876,  7884,
-    7888,  7896,  7901,  7907,  7915,  7919,  7927,  7931,  7935,  7943,
-    7947,  7955,  7960,  7966,  7970,  7974,  7978,  7982,  7986,  7994,
-    7998,  8006,  8010,  8018,  8022,  8026,  8030,  8038,  8042,  8050,
-    8054,  8062,  8070,  8078,  8082,  8090,  8094,  8102,  8106,  8110,
-    8118,  8122,  8127,  8133,  8141,  8146,  8152,  8160,  8164,  8168,
-    8172,  8180,  8188,  8192,  8196,  8204,  8208,  8216,  8220,  8228,
-    8233,  8239,  8243,  8251,  8255,  8259,  8263,  8267,  8271,  8275,
-    8279,  8283,  8287,  8291,  8295,  8299,  8303,  8307,  8311,  8315,
-    8319,  8323,  8327,  8331,  8335,  8339,  8343,  8347,  8351,  8355,
-    8359,  8363,  8367,  8371,  8375,  8379,  8383,  8387,  8391,  8395,
-    8399,  8403,  8407,  8411,  8415,  8419,  8423,  8427,  8431,  8435,
-    8439,  8443,  8447,  8451,  8455,  8459,  8463,  8467,  8475,  8480,
-    8486,  8491,  8497,  8501,  8505,  8509,  8513,  8517,  8525,  8530,
-    8536,  8540,  8544,  8548,  8552,  8556,  8560,  8564,  8568,  8572,
-    8576,  8580,  8584,  8588,  8592,  8596,  8600,  8604,  8608,  8612,
-    8616,  8620,  8624,  8628,  8632,  8636,  8640,  8648,  8656,  8660,
-    8668,  8672,  8680,  8684,  8688,  8692,  8696,  8704,  8712,  8716,
-    8720,  8724,  8728,  8732,  8736,  8740,  8744,  8748,  8752,  8756,
-    8760,  8764,  8768,  8772,  8776,  8780,  8784,  8788,  8792,  8796,
-    8800,  8804,  8812,  8816,  8820,  8828,  8832,  8836,  8840,  8844,
-    8848,  8852,  8860,  8864,  8872,  8876,  8880,  8884,  8892,  8900,
-    8904,  8908,  8912,  8916,  8920,  8924,  8928,  8932,  8940,  8944,
-    8952,  8960,  8964,  8968,  8976,  8980,  8988,  8992,  8996,  9000,
-    9004,  9012,  9017,  9023,  9027,  9031,  9035,  9043,  9047,  9052,
-    9058,  9066,  9071,  9077,  9085,  9089,  9097,  9101,  9105,  9109,
-    9113,  9117,  9121,  9125,  9129,  9133,  9137,  9141,  9149,  9153,
-    9161,  9165,  9170,  9176,  9180,  9184,  9188,  9192,  9200,  9204,
-    9208,  9216,  9221,  9227,  9231,  9236,  9242,  9246,  9250,  9255,
-    9264,  9268,  9272,  9277,  9283,  9291,  9299,  9304,  9310,  9314,
-    9322,  9326,  9330,  9338,  9342,  9346,  9350,  9354,  9358,  9362,
-    9370,  9375,  9381,  9385,  9389,  9393,  9401,  9409,  9413,  9417,
-    9421,  9429,  9433,  9441,  9449,  9457,  9461,  9469,  9477,  9481,
-    9485,  9489,  9493,  9497,  9501,  9509,  9514,  9520,  9528,  9532,
-    9536,  9540,  9544,  9548,  9556,  9560,  9568,  9576,  9580,  9584,
-    9588,  9596,  9601,  9607,  9611,  9619,  9623,  9631,  9635,  9643,
-    9647,  9655,  9663,  9667,  9671,  9679,  9683,  9688,  9694,  9699,
-    9705,  9710,  9716,  9721,  9727,  9732,  9738,  9743,  9749,  9757,
-    9761,  9769,  9774,  9780,  9784,  9788,  9792,  9800,  9804,  9808,
-    9812,  9816,  9820,  9824,  9828,  9832,  9836,  9844,  9850,  9860,
-    9865,  9871,  9875,  9879,  9883,  9887,  9895,  9900,  9904,  9912,
-    9917,  9923,  9931,  9935,  9943,  9947,  9951,  9955,  9959,  9967,
-    9971,  9979,  9983,  9991,  9999, 10003, 10008, 10014, 10018, 10023,
-   10029, 10034, 10040, 10048, 10053, 10059, 10067, 10072, 10078, 10082,
-   10086, 10090, 10094, 10098, 10102, 10106, 10114, 10119, 10125, 10129,
-   10134, 10140, 10148, 10152, 10160, 10164, 10172, 10180, 10184, 10192,
-   10200, 10204, 10212, 10216, 10220, 10224, 10228, 10236, 10241, 10247,
-   10255, 10263, 10267, 10271, 10275, 10279, 10287, 10295, 10346, 10350,
-   10363, 10365, 10369, 10373, 10377, 10381, 10390, 10396, 10400, 10408,
-   10412, 10420, 10424, 10432, 10436, 10440, 10444, 10448, 10452, 10456,
-   10460, 10468, 10472, 10480, 10484, 10488, 10492, 10496, 10500, 10504,
-   10512, 10516, 10520, 10528, 10532, 10540, 10548, 10552, 10557, 10563,
-   10567, 10572, 10578, 10582, 10587, 10593, 10598, 10604, 10609, 10611,
-   10617, 10621, 10625, 10629, 10633, 10637, 10641, 10645, 10649, 10657,
-   10662, 10668, 10672, 10677, 10683, 10687, 10695, 10700, 10706, 10711,
-   10717, 10725, 10729, 10737, 10741, 10749, 10753, 10757, 10761, 10769,
-   10774, 10780, 10784, 10789, 10793, 10797, 10801, 10809, 10813, 10821,
-   10825, 10833, 10841, 10845, 10849, 10857, 10861, 10869, 10873, 10881,
-   10885, 10893, 10898, 10904, 10908, 10916, 10920, 10924, 10928, 10932,
-   10940, 10948, 10956, 10964, 10972, 10977, 10983, 10987, 10995, 11000,
-   11006, 11010, 11018, 11026, 11030, 11034, 11038, 11046, 11051, 11057,
-   11061, 11069, 11074, 11080, 11084, 11092, 11096, 11100, 11104, 11108,
-   11112, 11116, 11120, 11124, 11128, 11136, 11140, 11144, 11148, 11152,
-   11156, 11164, 11168, 11172, 11176, 11184, 11189, 11195, 11200, 11206,
-   11210, 11214, 11218, 11223, 11229, 11233, 11237, 11241, 11249, 11254,
-   11260, 11264, 11272, 11276, 11284, 11288, 11292, 11300, 11304, 11312,
-   11316, 11320, 11328, 11336, 11341, 11347, 11351, 11359, 11367, 11371,
-   11379, 11384, 11390, 11395, 11401, 11406, 11412, 11416, 11422, 11428,
-   11433, 11439, 11443, 11451, 11459, 11463, 11471, 11475, 11483, 11487,
-   11491, 11499, 11503, 11511, 11515, 11519, 11523, 11531, 11535, 11543,
-   11547, 11555, 11557, 11559, 11563, 11567, 11571, 11579, 11589, 11600,
-   11609, 11613, 11617, 11621, 11625, 11629, 11633, 11641, 11645, 11649,
-   11653, 11661, 11665, 11673, 11678, 11684, 11688, 11692, 11696, 11700,
-   11704, 11708, 11712, 11716, 11720, 11724, 11732, 11737, 11743, 11747,
-   11755, 11759, 11767, 11775, 11783, 11787, 11795, 11799, 11807, 11815,
-   11823, 11827, 11831, 11835, 11839, 11843, 11851, 11856, 11862, 11866,
-   11870, 11874, 11882, 11890, 11894, 11899, 11905, 11909, 11913, 11917,
-   11921, 11925, 11929, 11933, 11937, 11941, 11945, 11949, 11953, 11958,
-   11964, 11968, 11976, 11980, 11984, 11988, 11992, 11996, 12000, 12004,
-   12008, 12012, 12016, 12020, 12024, 12028, 12032, 12036, 12040, 12044,
-   12048, 12052, 12056, 12060, 12064, 12068, 12072, 12076, 12080, 12084,
-   12088, 12092, 12096, 12100, 12104, 12108, 12112, 12116, 12120, 12124,
-   12128, 12132, 12136, 12140, 12144, 12148, 12152, 12156, 12160, 12164,
-   12168, 12172, 12176, 12180, 12184, 12188, 12192, 12196, 12200, 12204,
-   12209, 12213, 12217, 12221, 12225, 12229, 12233, 12237, 12241, 12249,
-   12253, 12257, 12261, 12265, 12269, 12273, 12277, 12281, 12285, 12289,
-   12293, 12297, 12301, 12305, 12309, 12313, 12317, 12321, 12325, 12329,
-   12333, 12341, 12345, 12349, 12353, 12357, 12361, 12365, 12369, 12373,
-   12377, 12381, 12385, 12389, 12393, 12401, 12405, 12409, 12413, 12417,
-   12421, 12425, 12433, 12437, 12441, 12449, 12453, 12457, 12465, 12469,
-   12473, 12477, 12481, 12485, 12489, 12493, 12497, 12501, 12505, 12509,
-   12513, 12517, 12521, 12525, 12529, 12533, 12537, 12541, 12545, 12549,
-   12553, 12557, 12561, 12565, 12569, 12573, 12577, 12581, 12585, 12589,
-   12593, 12597, 12601, 12605, 12609, 12613, 12617, 12621, 12625, 12629,
-   12633, 12637, 12641, 12645, 12649, 12653, 12657, 12661, 12665, 12669,
-   12673, 12681, 12685, 12693, 12697, 12701, 12706, 12712, 12720, 12724,
-   12732, 12736, 12744, 12748, 12756, 12760, 12765, 12771, 12775, 12780,
-   12786, 12790, 12794, 12798, 12806, 12810, 12818, 12823, 12829, 12834,
-   12840, 12845, 12851, 12855, 12863, 12871, 12875, 12880, 12886, 12894,
-   12898, 12905, 12910, 12916, 12920, 12924, 12929, 12935, 12939, 12947,
-   12951, 12955, 12959, 12963, 12971, 12975, 12979, 12983, 12988, 12994,
-   12998, 13002, 13010, 13014, 13022, 13030, 13034, 13038, 13046, 13050,
-   13058, 13062, 13066, 13070, 13074, 13078, 13082, 13086, 13090, 13094,
-   13098, 13102, 13110, 13114, 13122, 13126, 13134, 13138, 13142, 13146,
-   13150, 13154, 13162, 13166, 13174, 13178, 13186, 13190, 13194, 13202,
-   13207, 13213, 13217, 13225, 13229, 13233, 13241, 13245, 13253, 13261,
-   13265, 13269, 13273, 13277, 13281, 13285, 13289, 13297, 13301, 13305,
-   13309, 13317, 13321, 13329, 13337, 13341, 13345, 13349, 13353, 13361,
-   13365, 13369, 13377, 13381, 13389, 13397, 13401, 13409, 13417, 13422,
-   13428, 13433, 13439, 13443, 13451, 13455, 13459, 13463, 13471, 13476,
-   13482, 13486, 13495, 13497, 13505, 13510, 13516, 13524, 13529, 13535,
-   13540, 13546, 13551, 13557, 13561, 13565, 13569, 13573, 13581, 13585,
-   13589, 13593, 13597, 13604, 13608, 13616, 13620, 13628, 13632, 13637,
-   13643, 13647, 13652, 13658, 13662, 13670, 13674, 13682, 13687, 13693,
-   13698, 13704, 13708, 13716, 13720, 13724, 13728, 13736, 13740, 13748,
-   13752, 13760, 13764, 13772, 13780, 13788, 13796, 13800, 13808, 13812,
-   13816, 13820, 13824, 13828, 13832, 13836, 13840, 13844, 13848, 13852,
-   13856, 13860, 13861, 13866, 13872, 13876, 13877, 13881, 13889, 13897,
-   13901, 13905, 13909, 13917, 13921, 13929, 13933, 13937, 13941, 13949,
-   13953, 13961, 13965, 13969, 13973, 13977, 13981, 13985, 13989, 13993,
-   13997, 14001, 14005, 14009, 14013, 14017, 14021, 14025, 14029, 14033,
-   14037, 14041, 14045, 14049, 14053, 14057, 14061, 14065, 14069, 14073,
-   14077, 14081, 14085, 14089, 14093, 14097, 14101, 14105, 14109, 14113,
-   14117, 14121, 14125, 14129, 14133, 14137, 14141, 14145, 14149, 14153,
-   14157, 14161, 14165, 14169, 14173, 14177, 14181, 14185, 14189, 14193,
-   14197, 14201, 14205, 14209, 14213, 14217, 14221, 14225, 14229, 14233,
-   14237, 14241, 14245, 14249, 14253, 14257, 14261, 14265, 14269, 14273,
-   14277, 14281, 14285, 14289, 14293, 14297, 14301, 14305, 14309, 14313,
-   14317, 14321, 14325, 14329, 14333, 14337, 14341, 14345, 14349, 14353,
-   14357, 14361, 14365, 14369, 14373, 14377, 14381, 14385, 14389, 14393,
-   14397, 14401, 14405, 14409, 14413, 14417, 14421, 14425, 14429, 14433,
-   14437, 14441, 14445, 14449, 14453, 14457, 14461, 14465, 14469, 14473,
-   14477, 14481, 14485, 14489, 14493, 14497, 14501, 14505, 14509, 14513,
-   14517, 14521, 14525, 14529, 14533, 14537, 14541, 14545, 14549, 14553,
-   14557, 14561, 14565, 14569, 14573, 14577, 14581, 14585, 14589, 14593,
-   14597, 14601, 14605, 14609, 14613, 14617, 14621, 14625, 14629, 14633,
-   14637, 14641, 14645, 14649, 14653, 14657, 14661, 14665, 14669, 14673,
-   14677, 14681, 14685, 14689, 14693, 14697, 14701, 14705, 14709, 14713,
-   14717, 14721, 14725, 14729, 14733, 14737, 14741, 14745, 14749, 14753,
-   14757, 14761, 14765, 14769, 14773, 14777, 14781, 14785, 14789, 14793,
-   14797, 14801, 14805, 14809, 14813, 14817, 14821, 14825, 14829, 14833,
-   14837, 14841, 14845, 14849, 14853, 14857, 14861, 14865, 14869, 14873,
-   14877, 14881, 14885, 14889, 14893, 14897, 14901, 14905, 14909, 14913,
-   14917, 14921, 14925, 14929, 14933, 14937, 14941, 14945, 14949, 14953,
-   14957, 14961, 14965, 14969, 14973, 14977, 14981, 14985, 14989, 14993,
-   14997, 15001, 15005, 15009, 15013, 15017, 15021, 15025, 15029, 15033,
-   15037, 15041, 15045, 15049, 15053, 15057, 15061, 15065, 15069, 15073,
-   15077, 15081, 15085, 15089, 15093, 15097, 15101, 15105, 15109, 15113,
-   15117, 15121, 15125, 15129, 15133, 15137, 15141, 15145, 15149, 15153,
-   15157, 15161, 15165, 15169, 15173, 15177, 15181, 15189, 15193, 15197,
-   15201, 15205, 15209, 15213, 15217, 15221, 15225, 15229, 15233, 15237,
-   15241, 15245, 15249, 15253, 15257, 15261, 15265, 15269, 15273, 15277,
-   15281, 15285, 15289, 15293, 15297, 15301, 15305, 15309, 15313, 15317,
-   15321, 15325, 15329, 15333, 15337, 15341, 15345, 15349, 15353, 15357,
-   15361, 15365, 15369, 15373, 15377, 15381, 15385, 15389, 15393, 15401,
-   15405, 15409, 15413, 15417, 15421, 15425, 15429, 15433, 15437, 15441,
-   15445, 15449, 15453, 15457, 15461, 15465, 15469, 15473, 15477, 15481,
-   15485, 15489, 15497, 15501, 15505, 15509, 15513, 15517, 15521, 15525,
-   15529, 15533, 15537, 15541, 15545, 15549, 15553, 15557, 15561, 15565,
-   15569, 15573, 15577, 15581, 15585, 15589, 15593, 15597, 15601, 15605,
-   15609, 15613, 15617, 15621, 15625, 15629, 15633, 15637, 15641, 15645,
-   15649, 15653, 15657, 15661, 15665, 15669, 15673, 15677, 15681, 15685,
-   15689, 15693, 15697, 15701, 15705, 15709, 15713, 15717, 15721, 15725,
-   15729, 15733, 15737, 15741, 15745, 15749, 15753, 15757, 15761, 15765,
-   15769, 15773, 15777, 15781, 15785, 15789, 15793, 15797, 15805, 15809,
-   15813, 15817, 15821, 15825, 15829, 15833, 15837, 15841, 15845, 15849,
-   15853, 15857, 15861, 15865, 15869, 15873, 15877, 15881, 15885, 15889,
-   15893, 15897, 15901, 15905, 15909, 15913, 15917, 15921, 15925, 15929,
-   15933, 15937, 15941, 15945, 15949, 15953, 15957, 15961, 15965, 15969,
-   15973, 15977, 15981, 15985, 15989, 15993, 15997, 16001, 16005, 16009,
-   16013, 16017, 16021, 16025, 16029, 16033, 16037, 16041, 16045, 16049,
-   16053, 16057, 16061, 16065, 16069, 16073, 16077, 16081, 16085, 16089,
-   16093, 16097, 16101, 16105, 16109, 16113, 16117, 16121, 16125, 16129,
-   16133, 16137, 16141, 16145, 16149, 16153, 16157, 16161, 16165, 16169,
-   16173, 16177, 16181, 16185, 16189, 16193, 16197, 16201, 16205, 16209,
-   16213, 16217, 16221, 16225, 16229, 16233, 16237, 16241, 16245, 16249,
-   16253, 16257, 16261, 16265, 16269, 16273, 16277, 16281, 16285, 16289,
-   16293, 16297, 16301, 16305, 16309, 16313, 16317, 16321, 16325, 16329,
-   16333, 16337, 16341, 16345, 16349, 16353, 16357, 16361, 16365, 16369,
-   16373, 16377, 16381, 16385, 16389, 16393, 16397, 16401, 16405, 16409,
-   16413, 16417, 16421, 16425, 16429, 16433, 16437, 16441, 16445, 16449,
-   16453, 16457, 16461, 16465, 16469, 16473, 16477, 16481, 16485, 16489,
-   16493, 16497, 16501, 16505, 16509, 16513, 16517, 16521, 16525, 16529,
-   16533, 16537, 16541, 16545, 16549, 16553, 16557, 16561, 16565, 16569,
-   16573, 16577, 16581, 16585, 16589, 16593, 16597, 16601, 16605, 16609,
-   16613, 16617, 16621, 16625, 16629, 16633, 16637, 16641, 16645, 16649,
-   16653, 16657, 16661, 16665, 16669, 16673, 16677, 16681, 16685, 16689,
-   16693, 16697, 16701, 16705, 16709, 16713, 16717, 16721, 16725, 16729,
-   16733, 16737, 16741, 16745, 16749, 16753, 16757, 16761, 16765, 16769,
-   16773, 16777, 16781, 16785, 16789, 16793, 16797, 16801, 16805, 16809,
-   16813, 16817, 16821, 16825, 16829, 16833, 16837, 16841, 16845, 16849,
-   16853, 16857, 16861, 16865, 16869, 16873, 16877, 16881, 16885, 16889,
-   16893, 16897, 16901, 16905, 16909, 16913, 16917, 16921, 16925, 16929,
-   16933, 16937, 16941, 16945, 16949, 16953, 16957, 16961, 16965, 16969,
-   16973, 16977, 16981, 16985, 16989, 16993, 16997, 17001, 17005, 17009,
-   17013, 17017, 17021, 17025, 17029, 17033, 17037, 17041, 17045, 17049,
-   17053, 17057, 17061, 17065, 17069, 17073, 17077, 17081, 17085, 17089,
-   17093, 17097, 17101, 17105, 17109, 17113, 17117, 17121, 17125, 17129,
-   17133, 17137, 17141, 17145, 17149, 17153, 17157, 17161, 17165, 17169,
-   17173, 17177, 17181, 17185, 17189, 17193, 17197, 17201, 17205, 17209,
-   17213, 17217, 17221, 17225, 17229, 17233, 17237, 17241, 17245, 17249,
-   17253, 17257, 17261, 17265, 17269, 17273, 17277, 17281, 17285, 17289,
-   17293, 17297, 17301, 17305, 17309, 17313, 17317, 17321, 17325, 17329,
-   17333, 17337, 17341, 17345, 17349, 17353, 17357, 17361, 17365, 17369,
-   17373, 17377, 17381, 17385, 17389, 17393, 17397, 17401, 17405, 17409,
-   17413, 17417, 17421, 17425, 17429, 17433, 17437, 17441, 17445, 17449,
-   17453, 17457, 17461, 17465, 17469, 17473, 17477, 17481, 17485, 17489,
-   17493, 17497, 17501, 17505, 17509, 17513, 17517, 17521, 17525, 17529,
-   17539, 17540, 17543, 17549, 17555, 17561, 17562, 17563, 17564, 17565,
-   17578, 17578, 17585, 17585, 17594, 17609, 17611, 17614, 17616, 17620,
-   17632, 17648, 17652, 17663, 17664, 17667, 17679, 17688, 17689, 17692,
-   17693, 17694, 17697, 17698, 17701, 17702, 17705, 17706, 17709, 17711,
-   17713, 17715, 17719, 17726, 17733, 17749, 17783, 17793, 17796, 17800,
-   17813, 17814, 17816, 17818, 17822, 17836, 17842, 17879, 17941, 17950,
-   17952, 17953, 17956, 17958, 17959, 17962, 17963, 17964, 17965, 17966,
-   17973, 17972, 17982, 17984, 17986, 17987, 17990, 17991, 17992, 17993,
-   17996, 17997, 18001, 18000, 18017, 18016, 18032, 18031, 18046, 18052,
-   18053, 18056, 18058, 18059, 18062, 18063, 18064, 18065, 18068, 18069,
-   18072, 18080, 18097, 18105, 18113, 18121, 18149, 18157, 18166, 18174,
-   18182, 18190, 18198, 18318, 18352, 18354, 18356, 18360, 18364, 18363,
-   18414, 18416, 18415, 18430, 18436, 18443, 18448, 18454, 18455, 18458,
-   18459, 18460, 18461, 18462, 18463, 18464, 18465, 18466, 18469, 18470,
-   18471, 18472, 18473, 18474, 18475, 18476, 18477, 18478, 18481, 18482,
-   18485, 18487, 18496, 18596, 18597, 18604, 18605, 18606, 18612, 18621,
-   18624, 18625, 18626, 18627, 18630, 18631, 18632, 18635, 18637, 18645,
-   18646, 18652, 18660, 18661, 18664, 18665, 18668, 18673, 18680, 18685,
-   18692, 18699, 18699, 18701, 18708, 18709, 18712, 18713, 18714, 18715,
-   18716, 18717, 18718, 18719, 18720, 18726, 18731, 18741, 18746, 18751,
-   18758, 18759, 18771, 18782, 18793, 18797, 18798, 18801, 18806, 18810,
-   18811, 18814, 18820, 18828, 18834, 18841, 18845, 18846, 18849, 18852,
-   18856, 18857, 18860, 18866, 18875, 18880, 18890, 18900, 18912, 18913,
-   18914, 18915, 18916, 18917, 18918, 18919, 18920, 18921, 18922, 18923,
-   18924, 18925, 18926, 18933, 18934, 18937, 18938, 18945, 18946, 18947,
-   18954, 18953, 18970, 18971, 18978, 18977, 19048, 19054, 19060, 19068,
-   19074, 19080, 19086, 19092, 19098, 19104, 19110, 19116, 19122, 19133,
-   19134, 19137, 19138, 19139, 19140, 19141, 19142, 19143, 19144, 19145,
-   19146, 19147, 19148, 19149, 19150, 19151, 19152, 19153, 19154, 19155,
-   19156, 19157, 19158, 19161, 19162, 19163, 19164, 19165, 19166, 19170,
-   19171, 19172, 19173, 19174, 19175, 19176, 19179, 19182, 19183, 19184,
-   19185, 19186, 19187, 19188, 19189, 19202, 19203, 19204, 19205, 19206,
-   19207, 19208, 19213, 19214, 19215, 19216, 19217, 19218, 19224, 19225,
-   19226, 19227, 19228, 19229, 19230, 19231, 19232, 19233, 19234, 19237,
-   19238, 19239, 19240, 19241, 19242, 19243, 19244, 19247, 19248, 19249,
-   19250, 19251, 19252, 19253, 19270, 19271, 19272, 19275, 19276, 19277,
-   19278, 19279, 19280, 19284, 19284, 19287, 19293, 19294, 19297, 19299,
-   19304, 19314, 19325, 19332, 19333, 19334, 19337, 19370, 19372, 19374,
-   19376, 19378, 19380, 19381, 19384, 19386, 19394, 19395, 19396, 19400,
-   19401, 19405, 19406, 19409, 19410, 19413, 19414, 19415, 19416, 19417,
-   19420, 19421, 19422, 19423, 19424, 19425, 19426, 19427, 19428, 19429,
-   19430, 19431, 19432, 19433, 19434, 19435, 19436, 19437, 19438, 19439,
-   19440, 19441, 19442, 19443, 19444, 19445, 19446, 19447, 19448, 19449,
-   19450, 19451, 19452, 19453, 19454, 19455, 19456, 19457, 19458, 19459,
-   19460, 19461, 19462, 19463, 19464, 19465, 19466, 19467, 19468, 19469,
-   19470, 19471, 19472, 19473, 19474, 19475, 19478, 19479, 19480, 19481,
-   19484, 19485, 19486, 19487, 19488, 19489, 19490, 19491, 19492, 19493,
-   19500, 19501, 19502, 19503, 19506, 19507, 19510, 19511, 19514, 19515,
-   19526, 19527
+    2450,  2454,  2462,  2466,  2470,  2474,  2482,  2487,  2493,  2497,
+    2501,  2505,  2509,  2513,  2521,  2525,  2529,  2537,  2541,  2545,
+    2553,  2557,  2561,  2565,  2573,  2577,  2581,  2585,  2590,  2594,
+    2598,  2602,  2606,  2610,  2614,  2622,  2626,  2634,  2638,  2646,
+    2650,  2664,  2668,  2672,  2676,  2684,  2688,  2692,  2696,  2704,
+    2708,  2712,  2716,  2720,  2724,  2728,  2736,  2740,  2745,  2751,
+    2755,  2763,  2771,  2775,  2779,  2783,  2791,  2795,  2803,  2807,
+    2815,  2819,  2827,  2831,  2835,  2839,  2843,  2852,  2860,  2864,
+    2872,  2876,  2884,  2892,  2896,  2900,  2904,  2908,  2916,  2920,
+    2924,  2928,  2932,  2936,  2940,  2944,  2948,  2952,  2956,  2960,
+    2964,  2968,  2972,  2976,  2980,  2984,  2988,  2992,  2996,  3004,
+    3008,  3016,  3020,  3024,  3032,  3040,  3044,  3048,  3052,  3056,
+    3060,  3064,  3068,  3072,  3076,  3080,  3084,  3088,  3092,  3096,
+    3100,  3104,  3108,  3112,  3116,  3120,  3124,  3128,  3132,  3136,
+    3140,  3144,  3148,  3152,  3156,  3160,  3164,  3168,  3172,  3176,
+    3180,  3184,  3188,  3192,  3196,  3200,  3204,  3208,  3212,  3216,
+    3220,  3224,  3228,  3232,  3236,  3240,  3244,  3248,  3252,  3256,
+    3260,  3264,  3268,  3272,  3276,  3284,  3288,  3296,  3301,  3307,
+    3312,  3318,  3322,  3326,  3330,  3338,  3346,  3351,  3357,  3361,
+    3369,  3373,  3377,  3381,  3389,  3393,  3401,  3405,  3409,  3413,
+    3421,  3425,  3429,  3433,  3441,  3449,  3453,  3461,  3469,  3473,
+    3481,  3485,  3489,  3493,  3501,  3517,  3525,  3533,  3541,  3545,
+    3553,  3558,  3564,  3568,  3572,  3580,  3584,  3592,  3597,  3603,
+    3607,  3611,  3615,  3619,  3623,  3627,  3631,  3635,  3639,  3643,
+    3647,  3651,  3659,  3664,  3670,  3675,  3681,  3686,  3692,  3696,
+    3704,  3712,  3716,  3720,  3724,  3729,  3735,  3739,  3747,  3755,
+    3759,  3763,  3767,  3771,  3775,  3783,  3787,  3791,  3795,  3799,
+    3803,  3807,  3812,  3818,  3823,  3829,  3834,  3840,  3844,  3852,
+    3856,  3864,  3868,  3872,  3880,  3884,  3892,  3900,  3904,  3912,
+    3916,  3924,  3929,  3935,  3939,  3947,  3952,  3958,  3963,  3969,
+    3973,  3977,  3981,  3989,  3993,  3997,  4001,  4005,  4009,  4013,
+    4017,  4021,  4029,  4033,  4038,  4044,  4048,  4056,  4060,  4064,
+    4068,  4076,  4084,  4088,  4093,  4099,  4103,  4107,  4111,  4115,
+    4119,  4123,  4127,  4131,  4135,  4143,  4147,  4155,  4159,  4163,
+    4167,  4171,  4175,  4179,  4187,  4192,  4198,  4203,  4209,  4213,
+    4221,  4229,  4234,  4240,  4244,  4249,  4254,  4260,  4264,  4272,
+    4276,  4284,  4289,  4295,  4299,  4303,  4307,  4312,  4318,  4326,
+    4334,  4338,  4342,  4346,  4350,  4358,  4363,  4369,  4374,  4380,
+    4388,  4392,  4400,  4404,  4408,  4416,  4421,  4427,  4431,  4436,
+    4442,  4446,  4450,  4455,  4461,  4466,  4472,  4477,  4483,  4491,
+    4495,  4503,  4507,  4515,  4519,  4523,  4531,  4535,  4543,  4551,
+    4555,  4560,  4566,  4570,  4578,  4586,  4591,  4597,  4605,  4609,
+    4617,  4621,  4629,  4634,  4640,  4645,  4651,  4655,  4663,  4667,
+    4671,  4675,  4679,  4683,  4687,  4691,  4695,  4699,  4703,  4707,
+    4711,  4715,  4723,  4728,  4734,  4738,  4742,  4746,  4754,  4758,
+    4766,  4770,  4778,  4783,  4789,  4793,  4801,  4806,  4812,  4816,
+    4824,  4829,  4835,  4840,  4846,  4854,  4859,  4865,  4869,  4877,
+    4881,  4889,  4894,  4900,  4904,  4908,  4913,  4921,  4929,  4934,
+    4940,  4948,  4952,  4956,  4960,  4964,  4968,  4972,  4976,  4980,
+    4984,  4988,  4992,  4996,  5004,  5012,  5016,  5020,  5024,  5032,
+    5036,  5044,  5049,  5055,  5059,  5067,  5072,  5078,  5082,  5090,
+    5098,  5102,  5110,  5114,  5118,  5122,  5130,  5138,  5146,  5154,
+    5158,  5166,  5171,  5177,  5181,  5189,  5194,  5200,  5204,  5208,
+    5216,  5220,  5224,  5228,  5236,  5244,  5248,  5256,  5261,  5267,
+    5271,  5279,  5283,  5291,  5295,  5303,  5311,  5319,  5327,  5332,
+    5338,  5343,  5349,  5354,  5360,  5365,  5371,  5376,  5382,  5387,
+    5393,  5397,  5401,  5405,  5409,  5417,  5425,  5429,  5437,  5441,
+    5449,  5453,  5457,  5465,  5469,  5477,  5481,  5485,  5489,  5493,
+    5501,  5506,  5512,  5516,  5524,  5532,  5536,  5544,  5548,  5556,
+    5564,  5569,  5575,  5580,  5586,  5590,  5598,  5603,  5609,  5613,
+    5621,  5625,  5630,  5636,  5640,  5644,  5648,  5656,  5661,  5668,
+    5670,  5678,  5682,  5686,  5690,  5694,  5698,  5706,  5710,  5718,
+    5722,  5730,  5738,  5742,  5750,  5758,  5762,  5766,  5770,  5778,
+    5787,  5791,  5795,  5799,  5803,  5807,  5811,  5815,  5819,  5823,
+    5827,  5831,  5835,  5839,  5843,  5847,  5855,  5863,  5867,  5875,
+    5879,  5887,  5891,  5895,  5899,  5903,  5907,  5915,  5923,  5927,
+    5935,  5943,  5948,  5954,  5958,  5966,  5970,  5974,  5978,  5986,
+    5991,  5997,  6005,  6009,  6017,  6021,  6025,  6029,  6033,  6041,
+    6046,  6052,  6057,  6063,  6067,  6072,  6078,  6084,  6090,  6098,
+    6102,  6110,  6114,  6122,  6126,  6134,  6138,  6146,  6150,  6158,
+    6166,  6174,  6178,  6182,  6186,  6190,  6194,  6198,  6202,  6206,
+    6210,  6214,  6218,  6226,  6230,  6234,  6238,  6242,  6246,  6250,
+    6254,  6258,  6262,  6266,  6270,  6274,  6282,  6286,  6290,  6294,
+    6298,  6306,  6310,  6314,  6318,  6322,  6326,  6330,  6334,  6342,
+    6346,  6350,  6358,  6362,  6370,  6374,  6382,  6386,  6394,  6398,
+    6406,  6414,  6418,  6423,  6429,  6433,  6437,  6441,  6445,  6449,
+    6453,  6457,  6461,  6465,  6469,  6473,  6477,  6481,  6485,  6489,
+    6493,  6497,  6505,  6509,  6517,  6521,  6525,  6529,  6533,  6537,
+    6541,  6545,  6549,  6553,  6561,  6566,  6572,  6576,  6584,  6588,
+    6592,  6596,  6605,  6614,  6623,  6632,  6641,  6650,  6659,  6672,
+    6686,  6700,  6714,  6728,  6742,  6756,  6775,  6794,  6813,  6827,
+    6846,  6860,  6879,  6897,  6901,  6909,  6914,  6920,  6928,  6932,
+    6940,  6944,  6948,  6952,  6956,  6964,  6968,  6976,  6980,  6984,
+    6988,  6992,  7000,  7004,  7012,  7016,  7024,  7028,  7032,  7036,
+    7040,  7044,  7048,  7052,  7056,  7060,  7064,  7068,  7072,  7076,
+    7080,  7084,  7088,  7092,  7096,  7100,  7104,  7112,  7116,  7124,
+    7128,  7136,  7141,  7147,  7151,  7159,  7163,  7171,  7175,  7183,
+    7191,  7195,  7199,  7207,  7212,  7218,  7226,  7231,  7237,  7241,
+    7245,  7253,  7257,  7261,  7269,  7273,  7277,  7281,  7285,  7289,
+    7297,  7301,  7309,  7314,  7320,  7325,  7331,  7335,  7343,  7347,
+    7355,  7359,  7363,  7371,  7376,  7382,  7386,  7394,  7399,  7405,
+    7409,  7414,  7420,  7424,  7429,  7435,  7439,  7443,  7447,  7455,
+    7460,  7466,  7470,  7478,  7482,  7490,  7494,  7502,  7506,  7510,
+    7514,  7522,  7526,  7534,  7538,  7546,  7550,  7554,  7558,  7562,
+    7570,  7574,  7578,  7582,  7586,  7594,  7602,  7610,  7614,  7618,
+    7626,  7630,  7634,  7642,  7650,  7654,  7658,  7662,  7670,  7674,
+    7682,  7690,  7694,  7702,  7707,  7713,  7717,  7725,  7729,  7733,
+    7737,  7741,  7745,  7749,  7753,  7757,  7761,  7765,  7769,  7773,
+    7777,  7781,  7785,  7789,  7797,  7801,  7805,  7809,  7813,  7821,
+    7825,  7833,  7841,  7845,  7850,  7856,  7861,  7867,  7871,  7879,
+    7883,  7891,  7896,  7902,  7910,  7914,  7922,  7926,  7930,  7938,
+    7942,  7950,  7955,  7961,  7965,  7969,  7973,  7977,  7981,  7989,
+    7993,  8001,  8005,  8013,  8017,  8021,  8025,  8033,  8037,  8045,
+    8049,  8057,  8065,  8073,  8077,  8085,  8089,  8097,  8101,  8105,
+    8113,  8117,  8122,  8128,  8136,  8141,  8147,  8155,  8159,  8163,
+    8167,  8175,  8183,  8187,  8191,  8199,  8203,  8211,  8215,  8223,
+    8228,  8234,  8238,  8246,  8250,  8254,  8258,  8262,  8266,  8270,
+    8274,  8278,  8282,  8286,  8290,  8294,  8298,  8302,  8306,  8310,
+    8314,  8318,  8322,  8326,  8330,  8334,  8338,  8342,  8346,  8350,
+    8354,  8358,  8362,  8366,  8370,  8374,  8378,  8382,  8386,  8390,
+    8394,  8398,  8402,  8406,  8410,  8414,  8418,  8422,  8426,  8430,
+    8434,  8438,  8442,  8446,  8450,  8454,  8458,  8462,  8470,  8475,
+    8481,  8486,  8492,  8496,  8500,  8504,  8508,  8512,  8520,  8525,
+    8531,  8535,  8539,  8543,  8547,  8551,  8555,  8559,  8563,  8567,
+    8571,  8575,  8579,  8583,  8587,  8591,  8595,  8599,  8603,  8607,
+    8611,  8615,  8619,  8623,  8627,  8631,  8635,  8643,  8651,  8655,
+    8663,  8667,  8675,  8679,  8683,  8687,  8691,  8699,  8707,  8711,
+    8715,  8719,  8723,  8727,  8731,  8735,  8739,  8743,  8747,  8751,
+    8755,  8759,  8763,  8767,  8771,  8775,  8779,  8783,  8787,  8791,
+    8795,  8799,  8807,  8811,  8815,  8823,  8827,  8831,  8835,  8839,
+    8843,  8847,  8855,  8859,  8867,  8871,  8875,  8879,  8887,  8895,
+    8899,  8903,  8907,  8911,  8915,  8919,  8923,  8927,  8935,  8939,
+    8947,  8955,  8959,  8963,  8971,  8975,  8983,  8987,  8991,  8995,
+    8999,  9007,  9012,  9018,  9022,  9026,  9030,  9038,  9042,  9047,
+    9053,  9061,  9066,  9072,  9080,  9084,  9092,  9096,  9100,  9104,
+    9108,  9112,  9116,  9120,  9124,  9128,  9132,  9136,  9144,  9148,
+    9156,  9160,  9165,  9171,  9175,  9179,  9183,  9187,  9195,  9199,
+    9203,  9211,  9216,  9222,  9226,  9231,  9237,  9241,  9245,  9249,
+    9257,  9261,  9265,  9270,  9276,  9284,  9292,  9297,  9303,  9307,
+    9315,  9319,  9323,  9331,  9335,  9339,  9343,  9347,  9351,  9355,
+    9363,  9368,  9374,  9378,  9382,  9386,  9394,  9402,  9406,  9410,
+    9414,  9422,  9426,  9434,  9442,  9450,  9454,  9462,  9470,  9474,
+    9478,  9482,  9486,  9490,  9494,  9502,  9507,  9513,  9521,  9525,
+    9529,  9533,  9537,  9541,  9549,  9553,  9561,  9569,  9573,  9577,
+    9581,  9589,  9594,  9600,  9604,  9612,  9616,  9624,  9628,  9636,
+    9640,  9648,  9656,  9660,  9664,  9672,  9676,  9681,  9687,  9692,
+    9698,  9703,  9709,  9714,  9720,  9725,  9731,  9736,  9742,  9750,
+    9754,  9762,  9767,  9773,  9777,  9781,  9785,  9793,  9797,  9801,
+    9805,  9809,  9813,  9817,  9821,  9825,  9829,  9837,  9843,  9853,
+    9858,  9864,  9868,  9872,  9876,  9880,  9888,  9893,  9897,  9905,
+    9910,  9916,  9924,  9928,  9936,  9940,  9944,  9948,  9952,  9960,
+    9964,  9972,  9976,  9984,  9992,  9996, 10001, 10007, 10011, 10016,
+   10022, 10027, 10033, 10041, 10046, 10052, 10060, 10065, 10071, 10075,
+   10079, 10083, 10087, 10091, 10095, 10099, 10107, 10112, 10118, 10122,
+   10127, 10133, 10141, 10145, 10153, 10157, 10165, 10173, 10177, 10185,
+   10193, 10197, 10205, 10209, 10213, 10217, 10221, 10229, 10234, 10240,
+   10248, 10256, 10260, 10264, 10268, 10272, 10280, 10288, 10339, 10343,
+   10356, 10358, 10362, 10366, 10370, 10374, 10383, 10389, 10393, 10401,
+   10405, 10413, 10417, 10425, 10429, 10433, 10437, 10441, 10445, 10449,
+   10453, 10461, 10465, 10473, 10477, 10481, 10485, 10489, 10493, 10497,
+   10505, 10509, 10513, 10521, 10525, 10533, 10541, 10545, 10550, 10556,
+   10560, 10565, 10571, 10575, 10580, 10586, 10591, 10597, 10602, 10604,
+   10610, 10614, 10618, 10622, 10626, 10630, 10634, 10638, 10642, 10650,
+   10655, 10661, 10665, 10670, 10676, 10680, 10688, 10693, 10699, 10704,
+   10710, 10718, 10722, 10730, 10734, 10742, 10746, 10750, 10754, 10762,
+   10767, 10773, 10777, 10782, 10786, 10790, 10794, 10802, 10806, 10814,
+   10818, 10826, 10834, 10838, 10842, 10850, 10854, 10862, 10866, 10874,
+   10878, 10886, 10891, 10897, 10901, 10909, 10913, 10917, 10921, 10925,
+   10933, 10941, 10949, 10957, 10965, 10970, 10976, 10980, 10988, 10993,
+   10999, 11003, 11011, 11019, 11023, 11027, 11031, 11039, 11044, 11050,
+   11054, 11062, 11067, 11073, 11077, 11085, 11089, 11093, 11097, 11101,
+   11105, 11109, 11113, 11117, 11121, 11129, 11133, 11137, 11141, 11145,
+   11149, 11157, 11161, 11165, 11169, 11177, 11182, 11188, 11193, 11199,
+   11203, 11207, 11211, 11216, 11222, 11226, 11230, 11234, 11242, 11247,
+   11253, 11257, 11265, 11269, 11277, 11281, 11285, 11293, 11297, 11305,
+   11309, 11313, 11321, 11329, 11334, 11340, 11344, 11352, 11360, 11364,
+   11372, 11377, 11383, 11388, 11394, 11399, 11405, 11409, 11415, 11421,
+   11426, 11432, 11436, 11444, 11452, 11456, 11464, 11468, 11476, 11480,
+   11484, 11492, 11496, 11504, 11508, 11512, 11516, 11524, 11528, 11536,
+   11540, 11548, 11550, 11552, 11556, 11560, 11564, 11572, 11582, 11593,
+   11602, 11606, 11610, 11614, 11618, 11622, 11626, 11634, 11638, 11642,
+   11646, 11654, 11658, 11666, 11671, 11677, 11681, 11685, 11689, 11693,
+   11697, 11701, 11705, 11709, 11713, 11717, 11725, 11730, 11736, 11740,
+   11748, 11752, 11760, 11768, 11776, 11780, 11788, 11792, 11800, 11808,
+   11816, 11820, 11824, 11828, 11832, 11836, 11844, 11849, 11855, 11859,
+   11863, 11867, 11875, 11883, 11887, 11892, 11898, 11902, 11906, 11910,
+   11914, 11918, 11922, 11926, 11930, 11934, 11938, 11942, 11946, 11951,
+   11957, 11961, 11969, 11973, 11977, 11981, 11985, 11989, 11993, 11997,
+   12001, 12005, 12009, 12013, 12017, 12021, 12025, 12029, 12033, 12037,
+   12041, 12045, 12049, 12053, 12057, 12061, 12065, 12069, 12073, 12077,
+   12081, 12085, 12089, 12093, 12097, 12101, 12105, 12109, 12113, 12117,
+   12121, 12125, 12129, 12133, 12137, 12141, 12145, 12149, 12153, 12157,
+   12161, 12165, 12169, 12173, 12177, 12181, 12185, 12189, 12193, 12197,
+   12202, 12206, 12210, 12214, 12218, 12222, 12226, 12230, 12234, 12242,
+   12246, 12250, 12254, 12258, 12262, 12266, 12270, 12274, 12278, 12282,
+   12286, 12290, 12294, 12298, 12302, 12306, 12310, 12314, 12318, 12322,
+   12326, 12334, 12338, 12342, 12346, 12350, 12354, 12358, 12362, 12366,
+   12370, 12374, 12378, 12382, 12386, 12394, 12398, 12402, 12406, 12410,
+   12414, 12418, 12426, 12430, 12434, 12442, 12446, 12450, 12458, 12462,
+   12466, 12470, 12474, 12478, 12482, 12486, 12490, 12494, 12498, 12502,
+   12506, 12510, 12514, 12518, 12522, 12526, 12530, 12534, 12538, 12542,
+   12546, 12550, 12554, 12558, 12562, 12566, 12570, 12574, 12578, 12582,
+   12586, 12590, 12594, 12598, 12602, 12606, 12610, 12614, 12618, 12622,
+   12626, 12630, 12634, 12638, 12642, 12646, 12650, 12654, 12658, 12662,
+   12666, 12674, 12678, 12686, 12690, 12694, 12699, 12705, 12713, 12717,
+   12725, 12729, 12737, 12741, 12749, 12753, 12758, 12764, 12768, 12773,
+   12779, 12783, 12787, 12791, 12799, 12803, 12811, 12816, 12822, 12827,
+   12833, 12838, 12844, 12848, 12856, 12864, 12868, 12873, 12879, 12887,
+   12891, 12898, 12903, 12909, 12913, 12917, 12922, 12928, 12932, 12940,
+   12944, 12948, 12952, 12956, 12964, 12968, 12972, 12976, 12981, 12987,
+   12991, 12995, 13003, 13007, 13015, 13023, 13027, 13031, 13039, 13043,
+   13051, 13055, 13059, 13063, 13067, 13071, 13075, 13079, 13083, 13087,
+   13091, 13095, 13103, 13107, 13115, 13119, 13127, 13131, 13135, 13139,
+   13143, 13147, 13155, 13159, 13167, 13171, 13179, 13183, 13187, 13195,
+   13200, 13206, 13210, 13218, 13222, 13226, 13234, 13238, 13246, 13254,
+   13258, 13262, 13266, 13270, 13274, 13278, 13282, 13290, 13294, 13298,
+   13302, 13310, 13314, 13322, 13330, 13334, 13338, 13342, 13346, 13354,
+   13358, 13362, 13370, 13374, 13382, 13390, 13394, 13402, 13410, 13415,
+   13421, 13426, 13432, 13436, 13444, 13448, 13452, 13456, 13464, 13469,
+   13475, 13479, 13488, 13490, 13498, 13503, 13509, 13517, 13522, 13528,
+   13533, 13539, 13544, 13550, 13554, 13558, 13562, 13566, 13574, 13578,
+   13582, 13586, 13590, 13597, 13601, 13609, 13613, 13621, 13625, 13630,
+   13636, 13640, 13645, 13651, 13655, 13663, 13667, 13675, 13680, 13686,
+   13691, 13697, 13701, 13709, 13713, 13717, 13721, 13729, 13733, 13741,
+   13745, 13753, 13757, 13765, 13773, 13781, 13789, 13793, 13801, 13805,
+   13809, 13813, 13817, 13821, 13825, 13829, 13833, 13837, 13841, 13845,
+   13849, 13853, 13854, 13859, 13865, 13869, 13870, 13874, 13882, 13890,
+   13894, 13898, 13902, 13910, 13914, 13922, 13926, 13930, 13934, 13942,
+   13946, 13954, 13958, 13962, 13966, 13970, 13974, 13978, 13982, 13986,
+   13990, 13994, 13998, 14002, 14006, 14010, 14014, 14018, 14022, 14026,
+   14030, 14034, 14038, 14042, 14046, 14050, 14054, 14058, 14062, 14066,
+   14070, 14074, 14078, 14082, 14086, 14090, 14094, 14098, 14102, 14106,
+   14110, 14114, 14118, 14122, 14126, 14130, 14134, 14138, 14142, 14146,
+   14150, 14154, 14158, 14162, 14166, 14170, 14174, 14178, 14182, 14186,
+   14190, 14194, 14198, 14202, 14206, 14210, 14214, 14218, 14222, 14226,
+   14230, 14234, 14238, 14242, 14246, 14250, 14254, 14258, 14262, 14266,
+   14270, 14274, 14278, 14282, 14286, 14290, 14294, 14298, 14302, 14306,
+   14310, 14314, 14318, 14322, 14326, 14330, 14334, 14338, 14342, 14346,
+   14350, 14354, 14358, 14362, 14366, 14370, 14374, 14378, 14382, 14386,
+   14390, 14394, 14398, 14402, 14406, 14410, 14414, 14418, 14422, 14426,
+   14430, 14434, 14438, 14442, 14446, 14450, 14454, 14458, 14462, 14466,
+   14470, 14474, 14478, 14482, 14486, 14490, 14494, 14498, 14502, 14506,
+   14510, 14514, 14518, 14522, 14526, 14530, 14534, 14538, 14542, 14546,
+   14550, 14554, 14558, 14562, 14566, 14570, 14574, 14578, 14582, 14586,
+   14590, 14594, 14598, 14602, 14606, 14610, 14614, 14618, 14622, 14626,
+   14630, 14634, 14638, 14642, 14646, 14650, 14654, 14658, 14662, 14666,
+   14670, 14674, 14678, 14682, 14686, 14690, 14694, 14698, 14702, 14706,
+   14710, 14714, 14718, 14722, 14726, 14730, 14734, 14738, 14742, 14746,
+   14750, 14754, 14758, 14762, 14766, 14770, 14774, 14778, 14782, 14786,
+   14790, 14794, 14798, 14802, 14806, 14810, 14814, 14818, 14822, 14826,
+   14830, 14834, 14838, 14842, 14846, 14850, 14854, 14858, 14862, 14866,
+   14870, 14874, 14878, 14882, 14886, 14890, 14894, 14898, 14902, 14906,
+   14910, 14914, 14918, 14922, 14926, 14930, 14934, 14938, 14942, 14946,
+   14950, 14954, 14958, 14962, 14966, 14970, 14974, 14978, 14982, 14986,
+   14990, 14994, 14998, 15002, 15006, 15010, 15014, 15018, 15022, 15026,
+   15030, 15034, 15038, 15042, 15046, 15050, 15054, 15058, 15062, 15066,
+   15070, 15074, 15078, 15082, 15086, 15090, 15094, 15098, 15102, 15106,
+   15110, 15114, 15118, 15122, 15126, 15130, 15134, 15138, 15142, 15146,
+   15150, 15154, 15158, 15162, 15166, 15170, 15174, 15182, 15186, 15190,
+   15194, 15198, 15202, 15206, 15210, 15214, 15218, 15222, 15226, 15230,
+   15234, 15238, 15242, 15246, 15250, 15254, 15258, 15262, 15266, 15270,
+   15274, 15278, 15282, 15286, 15290, 15294, 15298, 15302, 15306, 15310,
+   15314, 15318, 15322, 15326, 15330, 15334, 15338, 15342, 15346, 15350,
+   15354, 15358, 15362, 15366, 15370, 15374, 15378, 15382, 15386, 15394,
+   15398, 15402, 15406, 15410, 15414, 15418, 15422, 15426, 15430, 15434,
+   15438, 15442, 15446, 15450, 15454, 15458, 15462, 15466, 15470, 15474,
+   15478, 15482, 15490, 15494, 15498, 15502, 15506, 15510, 15514, 15518,
+   15522, 15526, 15530, 15534, 15538, 15542, 15546, 15550, 15554, 15558,
+   15562, 15566, 15570, 15574, 15578, 15582, 15586, 15590, 15594, 15598,
+   15602, 15606, 15610, 15614, 15618, 15622, 15626, 15630, 15634, 15638,
+   15642, 15646, 15650, 15654, 15658, 15662, 15666, 15670, 15674, 15678,
+   15682, 15686, 15690, 15694, 15698, 15702, 15706, 15710, 15714, 15718,
+   15722, 15726, 15730, 15734, 15738, 15742, 15746, 15750, 15754, 15758,
+   15762, 15766, 15770, 15774, 15778, 15782, 15786, 15790, 15798, 15802,
+   15806, 15810, 15814, 15818, 15822, 15826, 15830, 15834, 15838, 15842,
+   15846, 15850, 15854, 15858, 15862, 15866, 15870, 15874, 15878, 15882,
+   15886, 15890, 15894, 15898, 15902, 15906, 15910, 15914, 15918, 15922,
+   15926, 15930, 15934, 15938, 15942, 15946, 15950, 15954, 15958, 15962,
+   15966, 15970, 15974, 15978, 15982, 15986, 15990, 15994, 15998, 16002,
+   16006, 16010, 16014, 16018, 16022, 16026, 16030, 16034, 16038, 16042,
+   16046, 16050, 16054, 16058, 16062, 16066, 16070, 16074, 16078, 16082,
+   16086, 16090, 16094, 16098, 16102, 16106, 16110, 16114, 16118, 16122,
+   16126, 16130, 16134, 16138, 16142, 16146, 16150, 16154, 16158, 16162,
+   16166, 16170, 16174, 16178, 16182, 16186, 16190, 16194, 16198, 16202,
+   16206, 16210, 16214, 16218, 16222, 16226, 16230, 16234, 16238, 16242,
+   16246, 16250, 16254, 16258, 16262, 16266, 16270, 16274, 16278, 16282,
+   16286, 16290, 16294, 16298, 16302, 16306, 16310, 16314, 16318, 16322,
+   16326, 16330, 16334, 16338, 16342, 16346, 16350, 16354, 16358, 16362,
+   16366, 16370, 16374, 16378, 16382, 16386, 16390, 16394, 16398, 16402,
+   16406, 16410, 16414, 16418, 16422, 16426, 16430, 16434, 16438, 16442,
+   16446, 16450, 16454, 16458, 16462, 16466, 16470, 16474, 16478, 16482,
+   16486, 16490, 16494, 16498, 16502, 16506, 16510, 16514, 16518, 16522,
+   16526, 16530, 16534, 16538, 16542, 16546, 16550, 16554, 16558, 16562,
+   16566, 16570, 16574, 16578, 16582, 16586, 16590, 16594, 16598, 16602,
+   16606, 16610, 16614, 16618, 16622, 16626, 16630, 16634, 16638, 16642,
+   16646, 16650, 16654, 16658, 16662, 16666, 16670, 16674, 16678, 16682,
+   16686, 16690, 16694, 16698, 16702, 16706, 16710, 16714, 16718, 16722,
+   16726, 16730, 16734, 16738, 16742, 16746, 16750, 16754, 16758, 16762,
+   16766, 16770, 16774, 16778, 16782, 16786, 16790, 16794, 16798, 16802,
+   16806, 16810, 16814, 16818, 16822, 16826, 16830, 16834, 16838, 16842,
+   16846, 16850, 16854, 16858, 16862, 16866, 16870, 16874, 16878, 16882,
+   16886, 16890, 16894, 16898, 16902, 16906, 16910, 16914, 16918, 16922,
+   16926, 16930, 16934, 16938, 16942, 16946, 16950, 16954, 16958, 16962,
+   16966, 16970, 16974, 16978, 16982, 16986, 16990, 16994, 16998, 17002,
+   17006, 17010, 17014, 17018, 17022, 17026, 17030, 17034, 17038, 17042,
+   17046, 17050, 17054, 17058, 17062, 17066, 17070, 17074, 17078, 17082,
+   17086, 17090, 17094, 17098, 17102, 17106, 17110, 17114, 17118, 17122,
+   17126, 17130, 17134, 17138, 17142, 17146, 17150, 17154, 17158, 17162,
+   17166, 17170, 17174, 17178, 17182, 17186, 17190, 17194, 17198, 17202,
+   17206, 17210, 17214, 17218, 17222, 17226, 17230, 17234, 17238, 17242,
+   17246, 17250, 17254, 17258, 17262, 17266, 17270, 17274, 17278, 17282,
+   17286, 17290, 17294, 17298, 17302, 17306, 17310, 17314, 17318, 17322,
+   17326, 17330, 17334, 17338, 17342, 17346, 17350, 17354, 17358, 17362,
+   17366, 17370, 17374, 17378, 17382, 17386, 17390, 17394, 17398, 17402,
+   17406, 17410, 17414, 17418, 17422, 17426, 17430, 17434, 17438, 17442,
+   17446, 17450, 17454, 17458, 17462, 17466, 17470, 17474, 17478, 17482,
+   17486, 17490, 17494, 17498, 17502, 17506, 17510, 17514, 17518, 17522,
+   17532, 17533, 17536, 17542, 17548, 17554, 17555, 17556, 17557, 17558,
+   17571, 17571, 17578, 17578, 17587, 17602, 17604, 17607, 17609, 17613,
+   17625, 17641, 17645, 17656, 17657, 17660, 17672, 17681, 17682, 17685,
+   17686, 17687, 17690, 17691, 17694, 17695, 17698, 17699, 17702, 17704,
+   17706, 17708, 17712, 17719, 17726, 17742, 17776, 17786, 17789, 17793,
+   17806, 17807, 17809, 17811, 17815, 17829, 17835, 17872, 17934, 17943,
+   17945, 17946, 17949, 17951, 17952, 17955, 17956, 17957, 17958, 17959,
+   17966, 17965, 17975, 17977, 17979, 17980, 17983, 17984, 17985, 17986,
+   17989, 17990, 17994, 17993, 18010, 18009, 18025, 18024, 18039, 18045,
+   18046, 18049, 18051, 18052, 18055, 18056, 18057, 18058, 18061, 18062,
+   18065, 18073, 18090, 18098, 18106, 18114, 18142, 18150, 18159, 18167,
+   18175, 18183, 18191, 18311, 18345, 18347, 18349, 18353, 18357, 18356,
+   18407, 18409, 18408, 18423, 18429, 18436, 18441, 18447, 18448, 18451,
+   18452, 18453, 18454, 18455, 18456, 18457, 18458, 18459, 18462, 18463,
+   18464, 18465, 18466, 18467, 18468, 18469, 18470, 18471, 18474, 18475,
+   18478, 18480, 18489, 18589, 18590, 18597, 18598, 18599, 18605, 18614,
+   18617, 18618, 18619, 18620, 18623, 18624, 18625, 18628, 18630, 18638,
+   18639, 18645, 18653, 18654, 18657, 18658, 18661, 18666, 18673, 18678,
+   18685, 18692, 18692, 18694, 18701, 18702, 18705, 18706, 18707, 18708,
+   18709, 18710, 18711, 18712, 18713, 18719, 18724, 18734, 18739, 18744,
+   18751, 18752, 18764, 18775, 18786, 18790, 18791, 18794, 18799, 18803,
+   18804, 18807, 18813, 18821, 18827, 18834, 18838, 18839, 18842, 18845,
+   18849, 18850, 18853, 18859, 18868, 18873, 18883, 18893, 18905, 18906,
+   18907, 18908, 18909, 18910, 18911, 18912, 18913, 18914, 18915, 18916,
+   18917, 18918, 18919, 18926, 18927, 18930, 18931, 18938, 18939, 18940,
+   18947, 18946, 18963, 18964, 18971, 18970, 19041, 19047, 19053, 19061,
+   19067, 19073, 19079, 19085, 19091, 19097, 19103, 19109, 19115, 19126,
+   19127, 19130, 19131, 19132, 19133, 19134, 19135, 19136, 19137, 19138,
+   19139, 19140, 19141, 19142, 19143, 19144, 19145, 19146, 19147, 19148,
+   19149, 19150, 19151, 19154, 19155, 19156, 19157, 19158, 19159, 19163,
+   19164, 19165, 19166, 19167, 19168, 19169, 19172, 19175, 19176, 19177,
+   19178, 19179, 19180, 19181, 19182, 19195, 19196, 19197, 19198, 19199,
+   19200, 19201, 19206, 19207, 19208, 19209, 19210, 19211, 19217, 19218,
+   19219, 19220, 19221, 19222, 19223, 19224, 19225, 19226, 19227, 19230,
+   19231, 19232, 19233, 19234, 19235, 19236, 19237, 19240, 19241, 19242,
+   19243, 19244, 19245, 19246, 19263, 19264, 19265, 19268, 19269, 19270,
+   19271, 19272, 19273, 19277, 19277, 19280, 19286, 19287, 19290, 19292,
+   19297, 19307, 19318, 19325, 19326, 19327, 19330, 19363, 19365, 19367,
+   19369, 19371, 19373, 19374, 19377, 19379, 19387, 19388, 19389, 19393,
+   19394, 19398, 19399, 19402, 19403, 19406, 19407, 19408, 19409, 19410,
+   19413, 19414, 19415, 19416, 19417, 19418, 19419, 19420, 19421, 19422,
+   19423, 19424, 19425, 19426, 19427, 19428, 19429, 19430, 19431, 19432,
+   19433, 19434, 19435, 19436, 19437, 19438, 19439, 19440, 19441, 19442,
+   19443, 19444, 19445, 19446, 19447, 19448, 19449, 19450, 19451, 19452,
+   19453, 19454, 19455, 19456, 19457, 19458, 19459, 19460, 19461, 19462,
+   19463, 19464, 19465, 19466, 19467, 19468, 19471, 19472, 19473, 19474,
+   19477, 19478, 19479, 19480, 19481, 19482, 19483, 19484, 19485, 19486,
+   19493, 19494, 19495, 19496, 19499, 19500, 19503, 19504, 19507, 19508,
+   19519, 19520
 };
 #endif
 
@@ -39140,295 +39140,293 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
   case 204: /* CreateSchemaStmt: CREATE SCHEMA IF_P NOT EXISTS opt_single_name AUTHORIZATION RoleSpec OptSchemaEltList  */
 #line 2471 "preproc.y"
  { 
-mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
  (yyval.str) = cat_str(5,mm_strdup("create schema if not exists"),(yyvsp[-3].str),mm_strdup("authorization"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39147 "preproc.c"
+#line 39146 "preproc.c"
     break;
 
   case 205: /* CreateSchemaStmt: CREATE SCHEMA IF_P NOT EXISTS ColId OptSchemaEltList  */
-#line 2476 "preproc.y"
+#line 2475 "preproc.y"
  { 
-mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
  (yyval.str) = cat_str(3,mm_strdup("create schema if not exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39156 "preproc.c"
+#line 39154 "preproc.c"
     break;
 
   case 206: /* OptSchemaEltList: OptSchemaEltList schema_stmt  */
-#line 2485 "preproc.y"
+#line 2483 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39164 "preproc.c"
+#line 39162 "preproc.c"
     break;
 
   case 207: /* OptSchemaEltList: %empty  */
-#line 2489 "preproc.y"
+#line 2487 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 39171 "preproc.c"
+#line 39169 "preproc.c"
     break;
 
   case 208: /* schema_stmt: CreateStmt  */
-#line 2496 "preproc.y"
+#line 2494 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 39179 "preproc.c"
+#line 39177 "preproc.c"
     break;
 
   case 209: /* schema_stmt: IndexStmt  */
-#line 2500 "preproc.y"
+#line 2498 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 39187 "preproc.c"
+#line 39185 "preproc.c"
     break;
 
   case 210: /* schema_stmt: CreateSeqStmt  */
-#line 2504 "preproc.y"
+#line 2502 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 39195 "preproc.c"
+#line 39193 "preproc.c"
     break;
 
   case 211: /* schema_stmt: CreateTrigStmt  */
-#line 2508 "preproc.y"
+#line 2506 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 39203 "preproc.c"
+#line 39201 "preproc.c"
     break;
 
   case 212: /* schema_stmt: GrantStmt  */
-#line 2512 "preproc.y"
+#line 2510 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 39211 "preproc.c"
+#line 39209 "preproc.c"
     break;
 
   case 213: /* schema_stmt: ViewStmt  */
-#line 2516 "preproc.y"
+#line 2514 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 39219 "preproc.c"
+#line 39217 "preproc.c"
     break;
 
   case 214: /* VariableSetStmt: SET set_rest  */
-#line 2524 "preproc.y"
+#line 2522 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("set"),(yyvsp[0].str));
 }
-#line 39227 "preproc.c"
+#line 39225 "preproc.c"
     break;
 
   case 215: /* VariableSetStmt: SET LOCAL set_rest  */
-#line 2528 "preproc.y"
+#line 2526 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("set local"),(yyvsp[0].str));
 }
-#line 39235 "preproc.c"
+#line 39233 "preproc.c"
     break;
 
   case 216: /* VariableSetStmt: SET SESSION set_rest  */
-#line 2532 "preproc.y"
+#line 2530 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("set session"),(yyvsp[0].str));
 }
-#line 39243 "preproc.c"
+#line 39241 "preproc.c"
     break;
 
   case 217: /* set_rest: TRANSACTION transaction_mode_list  */
-#line 2540 "preproc.y"
+#line 2538 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("transaction"),(yyvsp[0].str));
 }
-#line 39251 "preproc.c"
+#line 39249 "preproc.c"
     break;
 
   case 218: /* set_rest: SESSION CHARACTERISTICS AS TRANSACTION transaction_mode_list  */
-#line 2544 "preproc.y"
+#line 2542 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("session characteristics as transaction"),(yyvsp[0].str));
 }
-#line 39259 "preproc.c"
+#line 39257 "preproc.c"
     break;
 
   case 219: /* set_rest: set_rest_more  */
-#line 2548 "preproc.y"
+#line 2546 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 39267 "preproc.c"
+#line 39265 "preproc.c"
     break;
 
   case 220: /* generic_set: var_name TO var_list  */
-#line 2556 "preproc.y"
+#line 2554 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 39275 "preproc.c"
+#line 39273 "preproc.c"
     break;
 
   case 221: /* generic_set: var_name '=' var_list  */
-#line 2560 "preproc.y"
+#line 2558 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
 }
-#line 39283 "preproc.c"
+#line 39281 "preproc.c"
     break;
 
   case 222: /* generic_set: var_name TO DEFAULT  */
-#line 2564 "preproc.y"
+#line 2562 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("to default"));
 }
-#line 39291 "preproc.c"
+#line 39289 "preproc.c"
     break;
 
   case 223: /* generic_set: var_name '=' DEFAULT  */
-#line 2568 "preproc.y"
+#line 2566 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("= default"));
 }
-#line 39299 "preproc.c"
+#line 39297 "preproc.c"
     break;
 
   case 224: /* set_rest_more: generic_set  */
-#line 2576 "preproc.y"
+#line 2574 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 39307 "preproc.c"
+#line 39305 "preproc.c"
     break;
 
   case 225: /* set_rest_more: var_name FROM CURRENT_P  */
-#line 2580 "preproc.y"
+#line 2578 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("from current"));
 }
-#line 39315 "preproc.c"
+#line 39313 "preproc.c"
     break;
 
   case 226: /* set_rest_more: TIME ZONE zone_value  */
-#line 2584 "preproc.y"
+#line 2582 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("time zone"),(yyvsp[0].str));
 }
-#line 39323 "preproc.c"
+#line 39321 "preproc.c"
     break;
 
   case 227: /* set_rest_more: CATALOG_P ecpg_sconst  */
-#line 2588 "preproc.y"
+#line 2586 "preproc.y"
  { 
 mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
  (yyval.str) = cat_str(2,mm_strdup("catalog"),(yyvsp[0].str));
 }
-#line 39332 "preproc.c"
+#line 39330 "preproc.c"
     break;
 
   case 228: /* set_rest_more: SCHEMA ecpg_sconst  */
-#line 2593 "preproc.y"
+#line 2591 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("schema"),(yyvsp[0].str));
 }
-#line 39340 "preproc.c"
+#line 39338 "preproc.c"
     break;
 
   case 229: /* set_rest_more: NAMES opt_encoding  */
-#line 2597 "preproc.y"
+#line 2595 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("names"),(yyvsp[0].str));
 }
-#line 39348 "preproc.c"
+#line 39346 "preproc.c"
     break;
 
   case 230: /* set_rest_more: ROLE NonReservedWord_or_Sconst  */
-#line 2601 "preproc.y"
+#line 2599 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("role"),(yyvsp[0].str));
 }
-#line 39356 "preproc.c"
+#line 39354 "preproc.c"
     break;
 
   case 231: /* set_rest_more: SESSION AUTHORIZATION NonReservedWord_or_Sconst  */
-#line 2605 "preproc.y"
+#line 2603 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("session authorization"),(yyvsp[0].str));
 }
-#line 39364 "preproc.c"
+#line 39362 "preproc.c"
     break;
 
   case 232: /* set_rest_more: SESSION AUTHORIZATION DEFAULT  */
-#line 2609 "preproc.y"
+#line 2607 "preproc.y"
  { 
  (yyval.str) = mm_strdup("session authorization default");
 }
-#line 39372 "preproc.c"
+#line 39370 "preproc.c"
     break;
 
   case 233: /* set_rest_more: XML_P OPTION document_or_content  */
-#line 2613 "preproc.y"
+#line 2611 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("xml option"),(yyvsp[0].str));
 }
-#line 39380 "preproc.c"
+#line 39378 "preproc.c"
     break;
 
   case 234: /* set_rest_more: TRANSACTION SNAPSHOT ecpg_sconst  */
-#line 2617 "preproc.y"
+#line 2615 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("transaction snapshot"),(yyvsp[0].str));
 }
-#line 39388 "preproc.c"
+#line 39386 "preproc.c"
     break;
 
   case 235: /* var_name: ECPGColId  */
-#line 2625 "preproc.y"
+#line 2623 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 39396 "preproc.c"
+#line 39394 "preproc.c"
     break;
 
   case 236: /* var_name: var_name '.' ColId  */
-#line 2629 "preproc.y"
+#line 2627 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("."),(yyvsp[0].str));
 }
-#line 39404 "preproc.c"
+#line 39402 "preproc.c"
     break;
 
   case 237: /* var_list: var_value  */
-#line 2637 "preproc.y"
+#line 2635 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 39412 "preproc.c"
+#line 39410 "preproc.c"
     break;
 
   case 238: /* var_list: var_list ',' var_value  */
-#line 2641 "preproc.y"
+#line 2639 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 39420 "preproc.c"
+#line 39418 "preproc.c"
     break;
 
   case 239: /* var_value: opt_boolean_or_string  */
-#line 2649 "preproc.y"
+#line 2647 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 39428 "preproc.c"
+#line 39426 "preproc.c"
     break;
 
   case 240: /* var_value: NumericOnly  */
-#line 2653 "preproc.y"
+#line 2651 "preproc.y"
  { 
 		if ((yyvsp[0].str)[0] == '$')
 		{
@@ -39438,1392 +39436,1392 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 39442 "preproc.c"
+#line 39440 "preproc.c"
     break;
 
   case 241: /* iso_level: READ UNCOMMITTED  */
-#line 2667 "preproc.y"
+#line 2665 "preproc.y"
  { 
  (yyval.str) = mm_strdup("read uncommitted");
 }
-#line 39450 "preproc.c"
+#line 39448 "preproc.c"
     break;
 
   case 242: /* iso_level: READ COMMITTED  */
-#line 2671 "preproc.y"
+#line 2669 "preproc.y"
  { 
  (yyval.str) = mm_strdup("read committed");
 }
-#line 39458 "preproc.c"
+#line 39456 "preproc.c"
     break;
 
   case 243: /* iso_level: REPEATABLE READ  */
-#line 2675 "preproc.y"
+#line 2673 "preproc.y"
  { 
  (yyval.str) = mm_strdup("repeatable read");
 }
-#line 39466 "preproc.c"
+#line 39464 "preproc.c"
     break;
 
   case 244: /* iso_level: SERIALIZABLE  */
-#line 2679 "preproc.y"
+#line 2677 "preproc.y"
  { 
  (yyval.str) = mm_strdup("serializable");
 }
-#line 39474 "preproc.c"
+#line 39472 "preproc.c"
     break;
 
   case 245: /* opt_boolean_or_string: TRUE_P  */
-#line 2687 "preproc.y"
+#line 2685 "preproc.y"
  { 
  (yyval.str) = mm_strdup("true");
 }
-#line 39482 "preproc.c"
+#line 39480 "preproc.c"
     break;
 
   case 246: /* opt_boolean_or_string: FALSE_P  */
-#line 2691 "preproc.y"
+#line 2689 "preproc.y"
  { 
  (yyval.str) = mm_strdup("false");
 }
-#line 39490 "preproc.c"
+#line 39488 "preproc.c"
     break;
 
   case 247: /* opt_boolean_or_string: ON  */
-#line 2695 "preproc.y"
+#line 2693 "preproc.y"
  { 
  (yyval.str) = mm_strdup("on");
 }
-#line 39498 "preproc.c"
+#line 39496 "preproc.c"
     break;
 
   case 248: /* opt_boolean_or_string: NonReservedWord_or_Sconst  */
-#line 2699 "preproc.y"
+#line 2697 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 39506 "preproc.c"
+#line 39504 "preproc.c"
     break;
 
   case 249: /* zone_value: ecpg_sconst  */
-#line 2707 "preproc.y"
+#line 2705 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 39514 "preproc.c"
+#line 39512 "preproc.c"
     break;
 
   case 250: /* zone_value: ecpg_ident  */
-#line 2711 "preproc.y"
+#line 2709 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 39522 "preproc.c"
+#line 39520 "preproc.c"
     break;
 
   case 251: /* zone_value: ConstInterval ecpg_sconst opt_interval  */
-#line 2715 "preproc.y"
+#line 2713 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39530 "preproc.c"
+#line 39528 "preproc.c"
     break;
 
   case 252: /* zone_value: ConstInterval '(' Iconst ')' ecpg_sconst  */
-#line 2719 "preproc.y"
+#line 2717 "preproc.y"
  { 
  (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 39538 "preproc.c"
+#line 39536 "preproc.c"
     break;
 
   case 253: /* zone_value: NumericOnly  */
-#line 2723 "preproc.y"
+#line 2721 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 39546 "preproc.c"
+#line 39544 "preproc.c"
     break;
 
   case 254: /* zone_value: DEFAULT  */
-#line 2727 "preproc.y"
+#line 2725 "preproc.y"
  { 
  (yyval.str) = mm_strdup("default");
 }
-#line 39554 "preproc.c"
+#line 39552 "preproc.c"
     break;
 
   case 255: /* zone_value: LOCAL  */
-#line 2731 "preproc.y"
+#line 2729 "preproc.y"
  { 
  (yyval.str) = mm_strdup("local");
 }
-#line 39562 "preproc.c"
+#line 39560 "preproc.c"
     break;
 
   case 256: /* opt_encoding: ecpg_sconst  */
-#line 2739 "preproc.y"
+#line 2737 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 39570 "preproc.c"
+#line 39568 "preproc.c"
     break;
 
   case 257: /* opt_encoding: DEFAULT  */
-#line 2743 "preproc.y"
+#line 2741 "preproc.y"
  { 
  (yyval.str) = mm_strdup("default");
 }
-#line 39578 "preproc.c"
+#line 39576 "preproc.c"
     break;
 
   case 258: /* opt_encoding: %empty  */
-#line 2747 "preproc.y"
+#line 2745 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 39585 "preproc.c"
+#line 39583 "preproc.c"
     break;
 
   case 259: /* NonReservedWord_or_Sconst: NonReservedWord  */
-#line 2754 "preproc.y"
+#line 2752 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 39593 "preproc.c"
+#line 39591 "preproc.c"
     break;
 
   case 260: /* NonReservedWord_or_Sconst: ecpg_sconst  */
-#line 2758 "preproc.y"
+#line 2756 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 39601 "preproc.c"
+#line 39599 "preproc.c"
     break;
 
   case 261: /* VariableResetStmt: RESET reset_rest  */
-#line 2766 "preproc.y"
+#line 2764 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("reset"),(yyvsp[0].str));
 }
-#line 39609 "preproc.c"
+#line 39607 "preproc.c"
     break;
 
   case 262: /* reset_rest: generic_reset  */
-#line 2774 "preproc.y"
+#line 2772 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 39617 "preproc.c"
+#line 39615 "preproc.c"
     break;
 
   case 263: /* reset_rest: TIME ZONE  */
-#line 2778 "preproc.y"
+#line 2776 "preproc.y"
  { 
  (yyval.str) = mm_strdup("time zone");
 }
-#line 39625 "preproc.c"
+#line 39623 "preproc.c"
     break;
 
   case 264: /* reset_rest: TRANSACTION ISOLATION LEVEL  */
-#line 2782 "preproc.y"
+#line 2780 "preproc.y"
  { 
  (yyval.str) = mm_strdup("transaction isolation level");
 }
-#line 39633 "preproc.c"
+#line 39631 "preproc.c"
     break;
 
   case 265: /* reset_rest: SESSION AUTHORIZATION  */
-#line 2786 "preproc.y"
+#line 2784 "preproc.y"
  { 
  (yyval.str) = mm_strdup("session authorization");
 }
-#line 39641 "preproc.c"
+#line 39639 "preproc.c"
     break;
 
   case 266: /* generic_reset: var_name  */
-#line 2794 "preproc.y"
+#line 2792 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 39649 "preproc.c"
+#line 39647 "preproc.c"
     break;
 
   case 267: /* generic_reset: ALL  */
-#line 2798 "preproc.y"
+#line 2796 "preproc.y"
  { 
  (yyval.str) = mm_strdup("all");
 }
-#line 39657 "preproc.c"
+#line 39655 "preproc.c"
     break;
 
   case 268: /* SetResetClause: SET set_rest  */
-#line 2806 "preproc.y"
+#line 2804 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("set"),(yyvsp[0].str));
 }
-#line 39665 "preproc.c"
+#line 39663 "preproc.c"
     break;
 
   case 269: /* SetResetClause: VariableResetStmt  */
-#line 2810 "preproc.y"
+#line 2808 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 39673 "preproc.c"
+#line 39671 "preproc.c"
     break;
 
   case 270: /* FunctionSetResetClause: SET set_rest_more  */
-#line 2818 "preproc.y"
+#line 2816 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("set"),(yyvsp[0].str));
 }
-#line 39681 "preproc.c"
+#line 39679 "preproc.c"
     break;
 
   case 271: /* FunctionSetResetClause: VariableResetStmt  */
-#line 2822 "preproc.y"
+#line 2820 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 39689 "preproc.c"
+#line 39687 "preproc.c"
     break;
 
   case 272: /* VariableShowStmt: SHOW var_name ecpg_into  */
-#line 2830 "preproc.y"
+#line 2828 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("show"),(yyvsp[-1].str));
 }
-#line 39697 "preproc.c"
+#line 39695 "preproc.c"
     break;
 
   case 273: /* VariableShowStmt: SHOW TIME ZONE ecpg_into  */
-#line 2834 "preproc.y"
+#line 2832 "preproc.y"
  { 
  (yyval.str) = mm_strdup("show time zone");
 }
-#line 39705 "preproc.c"
+#line 39703 "preproc.c"
     break;
 
   case 274: /* VariableShowStmt: SHOW TRANSACTION ISOLATION LEVEL ecpg_into  */
-#line 2838 "preproc.y"
+#line 2836 "preproc.y"
  { 
  (yyval.str) = mm_strdup("show transaction isolation level");
 }
-#line 39713 "preproc.c"
+#line 39711 "preproc.c"
     break;
 
   case 275: /* VariableShowStmt: SHOW SESSION AUTHORIZATION ecpg_into  */
-#line 2842 "preproc.y"
+#line 2840 "preproc.y"
  { 
  (yyval.str) = mm_strdup("show session authorization");
 }
-#line 39721 "preproc.c"
+#line 39719 "preproc.c"
     break;
 
   case 276: /* VariableShowStmt: SHOW ALL  */
-#line 2846 "preproc.y"
+#line 2844 "preproc.y"
         {
 		mmerror(PARSE_ERROR, ET_ERROR, "SHOW ALL is not implemented");
 		(yyval.str) = EMPTY;
 	}
-#line 39730 "preproc.c"
+#line 39728 "preproc.c"
     break;
 
   case 277: /* ConstraintsSetStmt: SET CONSTRAINTS constraints_set_list constraints_set_mode  */
-#line 2855 "preproc.y"
+#line 2853 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("set constraints"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39738 "preproc.c"
+#line 39736 "preproc.c"
     break;
 
   case 278: /* constraints_set_list: ALL  */
-#line 2863 "preproc.y"
+#line 2861 "preproc.y"
  { 
  (yyval.str) = mm_strdup("all");
 }
-#line 39746 "preproc.c"
+#line 39744 "preproc.c"
     break;
 
   case 279: /* constraints_set_list: qualified_name_list  */
-#line 2867 "preproc.y"
+#line 2865 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 39754 "preproc.c"
+#line 39752 "preproc.c"
     break;
 
   case 280: /* constraints_set_mode: DEFERRED  */
-#line 2875 "preproc.y"
+#line 2873 "preproc.y"
  { 
  (yyval.str) = mm_strdup("deferred");
 }
-#line 39762 "preproc.c"
+#line 39760 "preproc.c"
     break;
 
   case 281: /* constraints_set_mode: IMMEDIATE  */
-#line 2879 "preproc.y"
+#line 2877 "preproc.y"
  { 
  (yyval.str) = mm_strdup("immediate");
 }
-#line 39770 "preproc.c"
+#line 39768 "preproc.c"
     break;
 
   case 282: /* CheckPointStmt: CHECKPOINT  */
-#line 2887 "preproc.y"
+#line 2885 "preproc.y"
  { 
  (yyval.str) = mm_strdup("checkpoint");
 }
-#line 39778 "preproc.c"
+#line 39776 "preproc.c"
     break;
 
   case 283: /* DiscardStmt: DISCARD ALL  */
-#line 2895 "preproc.y"
+#line 2893 "preproc.y"
  { 
  (yyval.str) = mm_strdup("discard all");
 }
-#line 39786 "preproc.c"
+#line 39784 "preproc.c"
     break;
 
   case 284: /* DiscardStmt: DISCARD TEMP  */
-#line 2899 "preproc.y"
+#line 2897 "preproc.y"
  { 
  (yyval.str) = mm_strdup("discard temp");
 }
-#line 39794 "preproc.c"
+#line 39792 "preproc.c"
     break;
 
   case 285: /* DiscardStmt: DISCARD TEMPORARY  */
-#line 2903 "preproc.y"
+#line 2901 "preproc.y"
  { 
  (yyval.str) = mm_strdup("discard temporary");
 }
-#line 39802 "preproc.c"
+#line 39800 "preproc.c"
     break;
 
   case 286: /* DiscardStmt: DISCARD PLANS  */
-#line 2907 "preproc.y"
+#line 2905 "preproc.y"
  { 
  (yyval.str) = mm_strdup("discard plans");
 }
-#line 39810 "preproc.c"
+#line 39808 "preproc.c"
     break;
 
   case 287: /* DiscardStmt: DISCARD SEQUENCES  */
-#line 2911 "preproc.y"
+#line 2909 "preproc.y"
  { 
  (yyval.str) = mm_strdup("discard sequences");
 }
-#line 39818 "preproc.c"
+#line 39816 "preproc.c"
     break;
 
   case 288: /* AlterTableStmt: ALTER TABLE relation_expr alter_table_cmds  */
-#line 2919 "preproc.y"
+#line 2917 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter table"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39826 "preproc.c"
+#line 39824 "preproc.c"
     break;
 
   case 289: /* AlterTableStmt: ALTER TABLE IF_P EXISTS relation_expr alter_table_cmds  */
-#line 2923 "preproc.y"
+#line 2921 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter table if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39834 "preproc.c"
+#line 39832 "preproc.c"
     break;
 
   case 290: /* AlterTableStmt: ALTER TABLE relation_expr partition_cmd  */
-#line 2927 "preproc.y"
+#line 2925 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter table"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39842 "preproc.c"
+#line 39840 "preproc.c"
     break;
 
   case 291: /* AlterTableStmt: ALTER TABLE IF_P EXISTS relation_expr partition_cmd  */
-#line 2931 "preproc.y"
+#line 2929 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter table if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39850 "preproc.c"
+#line 39848 "preproc.c"
     break;
 
   case 292: /* AlterTableStmt: ALTER TABLE ALL IN_P TABLESPACE name SET TABLESPACE name opt_nowait  */
-#line 2935 "preproc.y"
+#line 2933 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter table all in tablespace"),(yyvsp[-4].str),mm_strdup("set tablespace"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39858 "preproc.c"
+#line 39856 "preproc.c"
     break;
 
   case 293: /* AlterTableStmt: ALTER TABLE ALL IN_P TABLESPACE name OWNED BY role_list SET TABLESPACE name opt_nowait  */
-#line 2939 "preproc.y"
+#line 2937 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("alter table all in tablespace"),(yyvsp[-7].str),mm_strdup("owned by"),(yyvsp[-4].str),mm_strdup("set tablespace"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39866 "preproc.c"
+#line 39864 "preproc.c"
     break;
 
   case 294: /* AlterTableStmt: ALTER INDEX qualified_name alter_table_cmds  */
-#line 2943 "preproc.y"
+#line 2941 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter index"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39874 "preproc.c"
+#line 39872 "preproc.c"
     break;
 
   case 295: /* AlterTableStmt: ALTER INDEX IF_P EXISTS qualified_name alter_table_cmds  */
-#line 2947 "preproc.y"
+#line 2945 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter index if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39882 "preproc.c"
+#line 39880 "preproc.c"
     break;
 
   case 296: /* AlterTableStmt: ALTER INDEX qualified_name index_partition_cmd  */
-#line 2951 "preproc.y"
+#line 2949 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter index"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39890 "preproc.c"
+#line 39888 "preproc.c"
     break;
 
   case 297: /* AlterTableStmt: ALTER INDEX ALL IN_P TABLESPACE name SET TABLESPACE name opt_nowait  */
-#line 2955 "preproc.y"
+#line 2953 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter index all in tablespace"),(yyvsp[-4].str),mm_strdup("set tablespace"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39898 "preproc.c"
+#line 39896 "preproc.c"
     break;
 
   case 298: /* AlterTableStmt: ALTER INDEX ALL IN_P TABLESPACE name OWNED BY role_list SET TABLESPACE name opt_nowait  */
-#line 2959 "preproc.y"
+#line 2957 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("alter index all in tablespace"),(yyvsp[-7].str),mm_strdup("owned by"),(yyvsp[-4].str),mm_strdup("set tablespace"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39906 "preproc.c"
+#line 39904 "preproc.c"
     break;
 
   case 299: /* AlterTableStmt: ALTER SEQUENCE qualified_name alter_table_cmds  */
-#line 2963 "preproc.y"
+#line 2961 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter sequence"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39914 "preproc.c"
+#line 39912 "preproc.c"
     break;
 
   case 300: /* AlterTableStmt: ALTER SEQUENCE IF_P EXISTS qualified_name alter_table_cmds  */
-#line 2967 "preproc.y"
+#line 2965 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter sequence if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39922 "preproc.c"
+#line 39920 "preproc.c"
     break;
 
   case 301: /* AlterTableStmt: ALTER VIEW qualified_name alter_table_cmds  */
-#line 2971 "preproc.y"
+#line 2969 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter view"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39930 "preproc.c"
+#line 39928 "preproc.c"
     break;
 
   case 302: /* AlterTableStmt: ALTER VIEW IF_P EXISTS qualified_name alter_table_cmds  */
-#line 2975 "preproc.y"
+#line 2973 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter view if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39938 "preproc.c"
+#line 39936 "preproc.c"
     break;
 
   case 303: /* AlterTableStmt: ALTER MATERIALIZED VIEW qualified_name alter_table_cmds  */
-#line 2979 "preproc.y"
+#line 2977 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter materialized view"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39946 "preproc.c"
+#line 39944 "preproc.c"
     break;
 
   case 304: /* AlterTableStmt: ALTER MATERIALIZED VIEW IF_P EXISTS qualified_name alter_table_cmds  */
-#line 2983 "preproc.y"
+#line 2981 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter materialized view if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39954 "preproc.c"
+#line 39952 "preproc.c"
     break;
 
   case 305: /* AlterTableStmt: ALTER MATERIALIZED VIEW ALL IN_P TABLESPACE name SET TABLESPACE name opt_nowait  */
-#line 2987 "preproc.y"
+#line 2985 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter materialized view all in tablespace"),(yyvsp[-4].str),mm_strdup("set tablespace"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39962 "preproc.c"
+#line 39960 "preproc.c"
     break;
 
   case 306: /* AlterTableStmt: ALTER MATERIALIZED VIEW ALL IN_P TABLESPACE name OWNED BY role_list SET TABLESPACE name opt_nowait  */
-#line 2991 "preproc.y"
+#line 2989 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("alter materialized view all in tablespace"),(yyvsp[-7].str),mm_strdup("owned by"),(yyvsp[-4].str),mm_strdup("set tablespace"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39970 "preproc.c"
+#line 39968 "preproc.c"
     break;
 
   case 307: /* AlterTableStmt: ALTER FOREIGN TABLE relation_expr alter_table_cmds  */
-#line 2995 "preproc.y"
+#line 2993 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter foreign table"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39978 "preproc.c"
+#line 39976 "preproc.c"
     break;
 
   case 308: /* AlterTableStmt: ALTER FOREIGN TABLE IF_P EXISTS relation_expr alter_table_cmds  */
-#line 2999 "preproc.y"
+#line 2997 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter foreign table if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 39986 "preproc.c"
+#line 39984 "preproc.c"
     break;
 
   case 309: /* alter_table_cmds: alter_table_cmd  */
-#line 3007 "preproc.y"
+#line 3005 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 39994 "preproc.c"
+#line 39992 "preproc.c"
     break;
 
   case 310: /* alter_table_cmds: alter_table_cmds ',' alter_table_cmd  */
-#line 3011 "preproc.y"
+#line 3009 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 40002 "preproc.c"
+#line 40000 "preproc.c"
     break;
 
   case 311: /* partition_cmd: ATTACH PARTITION qualified_name PartitionBoundSpec  */
-#line 3019 "preproc.y"
+#line 3017 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("attach partition"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40010 "preproc.c"
+#line 40008 "preproc.c"
     break;
 
   case 312: /* partition_cmd: DETACH PARTITION qualified_name opt_concurrently  */
-#line 3023 "preproc.y"
+#line 3021 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("detach partition"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40018 "preproc.c"
+#line 40016 "preproc.c"
     break;
 
   case 313: /* partition_cmd: DETACH PARTITION qualified_name FINALIZE  */
-#line 3027 "preproc.y"
+#line 3025 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("detach partition"),(yyvsp[-1].str),mm_strdup("finalize"));
 }
-#line 40026 "preproc.c"
+#line 40024 "preproc.c"
     break;
 
   case 314: /* index_partition_cmd: ATTACH PARTITION qualified_name  */
-#line 3035 "preproc.y"
+#line 3033 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("attach partition"),(yyvsp[0].str));
 }
-#line 40034 "preproc.c"
+#line 40032 "preproc.c"
     break;
 
   case 315: /* alter_table_cmd: ADD_P columnDef  */
-#line 3043 "preproc.y"
+#line 3041 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("add"),(yyvsp[0].str));
 }
-#line 40042 "preproc.c"
+#line 40040 "preproc.c"
     break;
 
   case 316: /* alter_table_cmd: ADD_P IF_P NOT EXISTS columnDef  */
-#line 3047 "preproc.y"
+#line 3045 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("add if not exists"),(yyvsp[0].str));
 }
-#line 40050 "preproc.c"
+#line 40048 "preproc.c"
     break;
 
   case 317: /* alter_table_cmd: ADD_P COLUMN columnDef  */
-#line 3051 "preproc.y"
+#line 3049 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("add column"),(yyvsp[0].str));
 }
-#line 40058 "preproc.c"
+#line 40056 "preproc.c"
     break;
 
   case 318: /* alter_table_cmd: ADD_P COLUMN IF_P NOT EXISTS columnDef  */
-#line 3055 "preproc.y"
+#line 3053 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("add column if not exists"),(yyvsp[0].str));
 }
-#line 40066 "preproc.c"
+#line 40064 "preproc.c"
     break;
 
   case 319: /* alter_table_cmd: ALTER opt_column ColId alter_column_default  */
-#line 3059 "preproc.y"
+#line 3057 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40074 "preproc.c"
+#line 40072 "preproc.c"
     break;
 
   case 320: /* alter_table_cmd: ALTER opt_column ColId DROP NOT NULL_P  */
-#line 3063 "preproc.y"
+#line 3061 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("drop not null"));
 }
-#line 40082 "preproc.c"
+#line 40080 "preproc.c"
     break;
 
   case 321: /* alter_table_cmd: ALTER opt_column ColId SET NOT NULL_P  */
-#line 3067 "preproc.y"
+#line 3065 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("set not null"));
 }
-#line 40090 "preproc.c"
+#line 40088 "preproc.c"
     break;
 
   case 322: /* alter_table_cmd: ALTER opt_column ColId DROP EXPRESSION  */
-#line 3071 "preproc.y"
+#line 3069 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("drop expression"));
 }
-#line 40098 "preproc.c"
+#line 40096 "preproc.c"
     break;
 
   case 323: /* alter_table_cmd: ALTER opt_column ColId DROP EXPRESSION IF_P EXISTS  */
-#line 3075 "preproc.y"
+#line 3073 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("drop expression if exists"));
 }
-#line 40106 "preproc.c"
+#line 40104 "preproc.c"
     break;
 
   case 324: /* alter_table_cmd: ALTER opt_column ColId SET STATISTICS SignedIconst  */
-#line 3079 "preproc.y"
+#line 3077 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("set statistics"),(yyvsp[0].str));
 }
-#line 40114 "preproc.c"
+#line 40112 "preproc.c"
     break;
 
   case 325: /* alter_table_cmd: ALTER opt_column Iconst SET STATISTICS SignedIconst  */
-#line 3083 "preproc.y"
+#line 3081 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("set statistics"),(yyvsp[0].str));
 }
-#line 40122 "preproc.c"
+#line 40120 "preproc.c"
     break;
 
   case 326: /* alter_table_cmd: ALTER opt_column ColId SET reloptions  */
-#line 3087 "preproc.y"
+#line 3085 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("set"),(yyvsp[0].str));
 }
-#line 40130 "preproc.c"
+#line 40128 "preproc.c"
     break;
 
   case 327: /* alter_table_cmd: ALTER opt_column ColId RESET reloptions  */
-#line 3091 "preproc.y"
+#line 3089 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("reset"),(yyvsp[0].str));
 }
-#line 40138 "preproc.c"
+#line 40136 "preproc.c"
     break;
 
   case 328: /* alter_table_cmd: ALTER opt_column ColId SET column_storage  */
-#line 3095 "preproc.y"
+#line 3093 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("set"),(yyvsp[0].str));
 }
-#line 40146 "preproc.c"
+#line 40144 "preproc.c"
     break;
 
   case 329: /* alter_table_cmd: ALTER opt_column ColId SET column_compression  */
-#line 3099 "preproc.y"
+#line 3097 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("set"),(yyvsp[0].str));
 }
-#line 40154 "preproc.c"
+#line 40152 "preproc.c"
     break;
 
   case 330: /* alter_table_cmd: ALTER opt_column ColId ADD_P GENERATED generated_when AS IDENTITY_P OptParenthesizedSeqOptList  */
-#line 3103 "preproc.y"
+#line 3101 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("alter"),(yyvsp[-7].str),(yyvsp[-6].str),mm_strdup("add generated"),(yyvsp[-3].str),mm_strdup("as identity"),(yyvsp[0].str));
 }
-#line 40162 "preproc.c"
+#line 40160 "preproc.c"
     break;
 
   case 331: /* alter_table_cmd: ALTER opt_column ColId alter_identity_column_option_list  */
-#line 3107 "preproc.y"
+#line 3105 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40170 "preproc.c"
+#line 40168 "preproc.c"
     break;
 
   case 332: /* alter_table_cmd: ALTER opt_column ColId DROP IDENTITY_P  */
-#line 3111 "preproc.y"
+#line 3109 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("drop identity"));
 }
-#line 40178 "preproc.c"
+#line 40176 "preproc.c"
     break;
 
   case 333: /* alter_table_cmd: ALTER opt_column ColId DROP IDENTITY_P IF_P EXISTS  */
-#line 3115 "preproc.y"
+#line 3113 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("drop identity if exists"));
 }
-#line 40186 "preproc.c"
+#line 40184 "preproc.c"
     break;
 
   case 334: /* alter_table_cmd: DROP opt_column IF_P EXISTS ColId opt_drop_behavior  */
-#line 3119 "preproc.y"
+#line 3117 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("drop"),(yyvsp[-4].str),mm_strdup("if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40194 "preproc.c"
+#line 40192 "preproc.c"
     break;
 
   case 335: /* alter_table_cmd: DROP opt_column ColId opt_drop_behavior  */
-#line 3123 "preproc.y"
+#line 3121 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("drop"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40202 "preproc.c"
+#line 40200 "preproc.c"
     break;
 
   case 336: /* alter_table_cmd: ALTER opt_column ColId opt_set_data TYPE_P Typename opt_collate_clause alter_using  */
-#line 3127 "preproc.y"
+#line 3125 "preproc.y"
  { 
  (yyval.str) = cat_str(8,mm_strdup("alter"),(yyvsp[-6].str),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("type"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40210 "preproc.c"
+#line 40208 "preproc.c"
     break;
 
   case 337: /* alter_table_cmd: ALTER opt_column ColId alter_generic_options  */
-#line 3131 "preproc.y"
+#line 3129 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40218 "preproc.c"
+#line 40216 "preproc.c"
     break;
 
   case 338: /* alter_table_cmd: ADD_P TableConstraint  */
-#line 3135 "preproc.y"
+#line 3133 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("add"),(yyvsp[0].str));
 }
-#line 40226 "preproc.c"
+#line 40224 "preproc.c"
     break;
 
   case 339: /* alter_table_cmd: ALTER CONSTRAINT name ConstraintAttributeSpec  */
-#line 3139 "preproc.y"
+#line 3137 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter constraint"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40234 "preproc.c"
+#line 40232 "preproc.c"
     break;
 
   case 340: /* alter_table_cmd: VALIDATE CONSTRAINT name  */
-#line 3143 "preproc.y"
+#line 3141 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("validate constraint"),(yyvsp[0].str));
 }
-#line 40242 "preproc.c"
+#line 40240 "preproc.c"
     break;
 
   case 341: /* alter_table_cmd: DROP CONSTRAINT IF_P EXISTS name opt_drop_behavior  */
-#line 3147 "preproc.y"
+#line 3145 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("drop constraint if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40250 "preproc.c"
+#line 40248 "preproc.c"
     break;
 
   case 342: /* alter_table_cmd: DROP CONSTRAINT name opt_drop_behavior  */
-#line 3151 "preproc.y"
+#line 3149 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("drop constraint"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40258 "preproc.c"
+#line 40256 "preproc.c"
     break;
 
   case 343: /* alter_table_cmd: SET WITHOUT OIDS  */
-#line 3155 "preproc.y"
+#line 3153 "preproc.y"
  { 
  (yyval.str) = mm_strdup("set without oids");
 }
-#line 40266 "preproc.c"
+#line 40264 "preproc.c"
     break;
 
   case 344: /* alter_table_cmd: CLUSTER ON name  */
-#line 3159 "preproc.y"
+#line 3157 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("cluster on"),(yyvsp[0].str));
 }
-#line 40274 "preproc.c"
+#line 40272 "preproc.c"
     break;
 
   case 345: /* alter_table_cmd: SET WITHOUT CLUSTER  */
-#line 3163 "preproc.y"
+#line 3161 "preproc.y"
  { 
  (yyval.str) = mm_strdup("set without cluster");
 }
-#line 40282 "preproc.c"
+#line 40280 "preproc.c"
     break;
 
   case 346: /* alter_table_cmd: SET LOGGED  */
-#line 3167 "preproc.y"
+#line 3165 "preproc.y"
  { 
  (yyval.str) = mm_strdup("set logged");
 }
-#line 40290 "preproc.c"
+#line 40288 "preproc.c"
     break;
 
   case 347: /* alter_table_cmd: SET UNLOGGED  */
-#line 3171 "preproc.y"
+#line 3169 "preproc.y"
  { 
  (yyval.str) = mm_strdup("set unlogged");
 }
-#line 40298 "preproc.c"
+#line 40296 "preproc.c"
     break;
 
   case 348: /* alter_table_cmd: ENABLE_P TRIGGER name  */
-#line 3175 "preproc.y"
+#line 3173 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("enable trigger"),(yyvsp[0].str));
 }
-#line 40306 "preproc.c"
+#line 40304 "preproc.c"
     break;
 
   case 349: /* alter_table_cmd: ENABLE_P ALWAYS TRIGGER name  */
-#line 3179 "preproc.y"
+#line 3177 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("enable always trigger"),(yyvsp[0].str));
 }
-#line 40314 "preproc.c"
+#line 40312 "preproc.c"
     break;
 
   case 350: /* alter_table_cmd: ENABLE_P REPLICA TRIGGER name  */
-#line 3183 "preproc.y"
+#line 3181 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("enable replica trigger"),(yyvsp[0].str));
 }
-#line 40322 "preproc.c"
+#line 40320 "preproc.c"
     break;
 
   case 351: /* alter_table_cmd: ENABLE_P TRIGGER ALL  */
-#line 3187 "preproc.y"
+#line 3185 "preproc.y"
  { 
  (yyval.str) = mm_strdup("enable trigger all");
 }
-#line 40330 "preproc.c"
+#line 40328 "preproc.c"
     break;
 
   case 352: /* alter_table_cmd: ENABLE_P TRIGGER USER  */
-#line 3191 "preproc.y"
+#line 3189 "preproc.y"
  { 
  (yyval.str) = mm_strdup("enable trigger user");
 }
-#line 40338 "preproc.c"
+#line 40336 "preproc.c"
     break;
 
   case 353: /* alter_table_cmd: DISABLE_P TRIGGER name  */
-#line 3195 "preproc.y"
+#line 3193 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("disable trigger"),(yyvsp[0].str));
 }
-#line 40346 "preproc.c"
+#line 40344 "preproc.c"
     break;
 
   case 354: /* alter_table_cmd: DISABLE_P TRIGGER ALL  */
-#line 3199 "preproc.y"
+#line 3197 "preproc.y"
  { 
  (yyval.str) = mm_strdup("disable trigger all");
 }
-#line 40354 "preproc.c"
+#line 40352 "preproc.c"
     break;
 
   case 355: /* alter_table_cmd: DISABLE_P TRIGGER USER  */
-#line 3203 "preproc.y"
+#line 3201 "preproc.y"
  { 
  (yyval.str) = mm_strdup("disable trigger user");
 }
-#line 40362 "preproc.c"
+#line 40360 "preproc.c"
     break;
 
   case 356: /* alter_table_cmd: ENABLE_P RULE name  */
-#line 3207 "preproc.y"
+#line 3205 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("enable rule"),(yyvsp[0].str));
 }
-#line 40370 "preproc.c"
+#line 40368 "preproc.c"
     break;
 
   case 357: /* alter_table_cmd: ENABLE_P ALWAYS RULE name  */
-#line 3211 "preproc.y"
+#line 3209 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("enable always rule"),(yyvsp[0].str));
 }
-#line 40378 "preproc.c"
+#line 40376 "preproc.c"
     break;
 
   case 358: /* alter_table_cmd: ENABLE_P REPLICA RULE name  */
-#line 3215 "preproc.y"
+#line 3213 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("enable replica rule"),(yyvsp[0].str));
 }
-#line 40386 "preproc.c"
+#line 40384 "preproc.c"
     break;
 
   case 359: /* alter_table_cmd: DISABLE_P RULE name  */
-#line 3219 "preproc.y"
+#line 3217 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("disable rule"),(yyvsp[0].str));
 }
-#line 40394 "preproc.c"
+#line 40392 "preproc.c"
     break;
 
   case 360: /* alter_table_cmd: INHERIT qualified_name  */
-#line 3223 "preproc.y"
+#line 3221 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("inherit"),(yyvsp[0].str));
 }
-#line 40402 "preproc.c"
+#line 40400 "preproc.c"
     break;
 
   case 361: /* alter_table_cmd: NO INHERIT qualified_name  */
-#line 3227 "preproc.y"
+#line 3225 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("no inherit"),(yyvsp[0].str));
 }
-#line 40410 "preproc.c"
+#line 40408 "preproc.c"
     break;
 
   case 362: /* alter_table_cmd: OF any_name  */
-#line 3231 "preproc.y"
+#line 3229 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("of"),(yyvsp[0].str));
 }
-#line 40418 "preproc.c"
+#line 40416 "preproc.c"
     break;
 
   case 363: /* alter_table_cmd: NOT OF  */
-#line 3235 "preproc.y"
+#line 3233 "preproc.y"
  { 
  (yyval.str) = mm_strdup("not of");
 }
-#line 40426 "preproc.c"
+#line 40424 "preproc.c"
     break;
 
   case 364: /* alter_table_cmd: OWNER TO RoleSpec  */
-#line 3239 "preproc.y"
+#line 3237 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 40434 "preproc.c"
+#line 40432 "preproc.c"
     break;
 
   case 365: /* alter_table_cmd: SET ACCESS METHOD name  */
-#line 3243 "preproc.y"
+#line 3241 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("set access method"),(yyvsp[0].str));
 }
-#line 40442 "preproc.c"
+#line 40440 "preproc.c"
     break;
 
   case 366: /* alter_table_cmd: SET TABLESPACE name  */
-#line 3247 "preproc.y"
+#line 3245 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("set tablespace"),(yyvsp[0].str));
 }
-#line 40450 "preproc.c"
+#line 40448 "preproc.c"
     break;
 
   case 367: /* alter_table_cmd: SET reloptions  */
-#line 3251 "preproc.y"
+#line 3249 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("set"),(yyvsp[0].str));
 }
-#line 40458 "preproc.c"
+#line 40456 "preproc.c"
     break;
 
   case 368: /* alter_table_cmd: RESET reloptions  */
-#line 3255 "preproc.y"
+#line 3253 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("reset"),(yyvsp[0].str));
 }
-#line 40466 "preproc.c"
+#line 40464 "preproc.c"
     break;
 
   case 369: /* alter_table_cmd: REPLICA IDENTITY_P replica_identity  */
-#line 3259 "preproc.y"
+#line 3257 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("replica identity"),(yyvsp[0].str));
 }
-#line 40474 "preproc.c"
+#line 40472 "preproc.c"
     break;
 
   case 370: /* alter_table_cmd: ENABLE_P ROW LEVEL SECURITY  */
-#line 3263 "preproc.y"
+#line 3261 "preproc.y"
  { 
  (yyval.str) = mm_strdup("enable row level security");
 }
-#line 40482 "preproc.c"
+#line 40480 "preproc.c"
     break;
 
   case 371: /* alter_table_cmd: DISABLE_P ROW LEVEL SECURITY  */
-#line 3267 "preproc.y"
+#line 3265 "preproc.y"
  { 
  (yyval.str) = mm_strdup("disable row level security");
 }
-#line 40490 "preproc.c"
+#line 40488 "preproc.c"
     break;
 
   case 372: /* alter_table_cmd: FORCE ROW LEVEL SECURITY  */
-#line 3271 "preproc.y"
+#line 3269 "preproc.y"
  { 
  (yyval.str) = mm_strdup("force row level security");
 }
-#line 40498 "preproc.c"
+#line 40496 "preproc.c"
     break;
 
   case 373: /* alter_table_cmd: NO FORCE ROW LEVEL SECURITY  */
-#line 3275 "preproc.y"
+#line 3273 "preproc.y"
  { 
  (yyval.str) = mm_strdup("no force row level security");
 }
-#line 40506 "preproc.c"
+#line 40504 "preproc.c"
     break;
 
   case 374: /* alter_table_cmd: alter_generic_options  */
-#line 3279 "preproc.y"
+#line 3277 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 40514 "preproc.c"
+#line 40512 "preproc.c"
     break;
 
   case 375: /* alter_column_default: SET DEFAULT a_expr  */
-#line 3287 "preproc.y"
+#line 3285 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("set default"),(yyvsp[0].str));
 }
-#line 40522 "preproc.c"
+#line 40520 "preproc.c"
     break;
 
   case 376: /* alter_column_default: DROP DEFAULT  */
-#line 3291 "preproc.y"
+#line 3289 "preproc.y"
  { 
  (yyval.str) = mm_strdup("drop default");
 }
-#line 40530 "preproc.c"
+#line 40528 "preproc.c"
     break;
 
   case 377: /* opt_collate_clause: COLLATE any_name  */
-#line 3299 "preproc.y"
+#line 3297 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("collate"),(yyvsp[0].str));
 }
-#line 40538 "preproc.c"
+#line 40536 "preproc.c"
     break;
 
   case 378: /* opt_collate_clause: %empty  */
-#line 3303 "preproc.y"
+#line 3301 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 40545 "preproc.c"
+#line 40543 "preproc.c"
     break;
 
   case 379: /* alter_using: USING a_expr  */
-#line 3310 "preproc.y"
+#line 3308 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("using"),(yyvsp[0].str));
 }
-#line 40553 "preproc.c"
+#line 40551 "preproc.c"
     break;
 
   case 380: /* alter_using: %empty  */
-#line 3314 "preproc.y"
+#line 3312 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 40560 "preproc.c"
+#line 40558 "preproc.c"
     break;
 
   case 381: /* replica_identity: NOTHING  */
-#line 3321 "preproc.y"
+#line 3319 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nothing");
 }
-#line 40568 "preproc.c"
+#line 40566 "preproc.c"
     break;
 
   case 382: /* replica_identity: FULL  */
-#line 3325 "preproc.y"
+#line 3323 "preproc.y"
  { 
  (yyval.str) = mm_strdup("full");
 }
-#line 40576 "preproc.c"
+#line 40574 "preproc.c"
     break;
 
   case 383: /* replica_identity: DEFAULT  */
-#line 3329 "preproc.y"
+#line 3327 "preproc.y"
  { 
  (yyval.str) = mm_strdup("default");
 }
-#line 40584 "preproc.c"
+#line 40582 "preproc.c"
     break;
 
   case 384: /* replica_identity: USING INDEX name  */
-#line 3333 "preproc.y"
+#line 3331 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("using index"),(yyvsp[0].str));
 }
-#line 40592 "preproc.c"
+#line 40590 "preproc.c"
     break;
 
   case 385: /* reloptions: '(' reloption_list ')'  */
-#line 3341 "preproc.y"
+#line 3339 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 40600 "preproc.c"
+#line 40598 "preproc.c"
     break;
 
   case 386: /* opt_reloptions: WITH reloptions  */
-#line 3349 "preproc.y"
+#line 3347 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("with"),(yyvsp[0].str));
 }
-#line 40608 "preproc.c"
+#line 40606 "preproc.c"
     break;
 
   case 387: /* opt_reloptions: %empty  */
-#line 3353 "preproc.y"
+#line 3351 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 40615 "preproc.c"
+#line 40613 "preproc.c"
     break;
 
   case 388: /* reloption_list: reloption_elem  */
-#line 3360 "preproc.y"
+#line 3358 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 40623 "preproc.c"
+#line 40621 "preproc.c"
     break;
 
   case 389: /* reloption_list: reloption_list ',' reloption_elem  */
-#line 3364 "preproc.y"
+#line 3362 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 40631 "preproc.c"
+#line 40629 "preproc.c"
     break;
 
   case 390: /* reloption_elem: ColLabel '=' def_arg  */
-#line 3372 "preproc.y"
+#line 3370 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
 }
-#line 40639 "preproc.c"
+#line 40637 "preproc.c"
     break;
 
   case 391: /* reloption_elem: ColLabel  */
-#line 3376 "preproc.y"
+#line 3374 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 40647 "preproc.c"
+#line 40645 "preproc.c"
     break;
 
   case 392: /* reloption_elem: ColLabel '.' ColLabel '=' def_arg  */
-#line 3380 "preproc.y"
+#line 3378 "preproc.y"
  { 
  (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("."),(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
 }
-#line 40655 "preproc.c"
+#line 40653 "preproc.c"
     break;
 
   case 393: /* reloption_elem: ColLabel '.' ColLabel  */
-#line 3384 "preproc.y"
+#line 3382 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("."),(yyvsp[0].str));
 }
-#line 40663 "preproc.c"
+#line 40661 "preproc.c"
     break;
 
   case 394: /* alter_identity_column_option_list: alter_identity_column_option  */
-#line 3392 "preproc.y"
+#line 3390 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 40671 "preproc.c"
+#line 40669 "preproc.c"
     break;
 
   case 395: /* alter_identity_column_option_list: alter_identity_column_option_list alter_identity_column_option  */
-#line 3396 "preproc.y"
+#line 3394 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40679 "preproc.c"
+#line 40677 "preproc.c"
     break;
 
   case 396: /* alter_identity_column_option: RESTART  */
-#line 3404 "preproc.y"
+#line 3402 "preproc.y"
  { 
  (yyval.str) = mm_strdup("restart");
 }
-#line 40687 "preproc.c"
+#line 40685 "preproc.c"
     break;
 
   case 397: /* alter_identity_column_option: RESTART opt_with NumericOnly  */
-#line 3408 "preproc.y"
+#line 3406 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("restart"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40695 "preproc.c"
+#line 40693 "preproc.c"
     break;
 
   case 398: /* alter_identity_column_option: SET SeqOptElem  */
-#line 3412 "preproc.y"
+#line 3410 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("set"),(yyvsp[0].str));
 }
-#line 40703 "preproc.c"
+#line 40701 "preproc.c"
     break;
 
   case 399: /* alter_identity_column_option: SET GENERATED generated_when  */
-#line 3416 "preproc.y"
+#line 3414 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("set generated"),(yyvsp[0].str));
 }
-#line 40711 "preproc.c"
+#line 40709 "preproc.c"
     break;
 
   case 400: /* PartitionBoundSpec: FOR VALUES WITH '(' hash_partbound ')'  */
-#line 3424 "preproc.y"
+#line 3422 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("for values with ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 40719 "preproc.c"
+#line 40717 "preproc.c"
     break;
 
   case 401: /* PartitionBoundSpec: FOR VALUES IN_P '(' expr_list ')'  */
-#line 3428 "preproc.y"
+#line 3426 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("for values in ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 40727 "preproc.c"
+#line 40725 "preproc.c"
     break;
 
   case 402: /* PartitionBoundSpec: FOR VALUES FROM '(' expr_list ')' TO '(' expr_list ')'  */
-#line 3432 "preproc.y"
+#line 3430 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("for values from ("),(yyvsp[-5].str),mm_strdup(") to ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 40735 "preproc.c"
+#line 40733 "preproc.c"
     break;
 
   case 403: /* PartitionBoundSpec: DEFAULT  */
-#line 3436 "preproc.y"
+#line 3434 "preproc.y"
  { 
  (yyval.str) = mm_strdup("default");
 }
-#line 40743 "preproc.c"
+#line 40741 "preproc.c"
     break;
 
   case 404: /* hash_partbound_elem: NonReservedWord Iconst  */
-#line 3444 "preproc.y"
+#line 3442 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40751 "preproc.c"
+#line 40749 "preproc.c"
     break;
 
   case 405: /* hash_partbound: hash_partbound_elem  */
-#line 3452 "preproc.y"
+#line 3450 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 40759 "preproc.c"
+#line 40757 "preproc.c"
     break;
 
   case 406: /* hash_partbound: hash_partbound ',' hash_partbound_elem  */
-#line 3456 "preproc.y"
+#line 3454 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 40767 "preproc.c"
+#line 40765 "preproc.c"
     break;
 
   case 407: /* AlterCompositeTypeStmt: ALTER TYPE_P any_name alter_type_cmds  */
-#line 3464 "preproc.y"
+#line 3462 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter type"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40775 "preproc.c"
+#line 40773 "preproc.c"
     break;
 
   case 408: /* alter_type_cmds: alter_type_cmd  */
-#line 3472 "preproc.y"
+#line 3470 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 40783 "preproc.c"
+#line 40781 "preproc.c"
     break;
 
   case 409: /* alter_type_cmds: alter_type_cmds ',' alter_type_cmd  */
-#line 3476 "preproc.y"
+#line 3474 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 40791 "preproc.c"
+#line 40789 "preproc.c"
     break;
 
   case 410: /* alter_type_cmd: ADD_P ATTRIBUTE TableFuncElement opt_drop_behavior  */
-#line 3484 "preproc.y"
+#line 3482 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("add attribute"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40799 "preproc.c"
+#line 40797 "preproc.c"
     break;
 
   case 411: /* alter_type_cmd: DROP ATTRIBUTE IF_P EXISTS ColId opt_drop_behavior  */
-#line 3488 "preproc.y"
+#line 3486 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("drop attribute if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40807 "preproc.c"
+#line 40805 "preproc.c"
     break;
 
   case 412: /* alter_type_cmd: DROP ATTRIBUTE ColId opt_drop_behavior  */
-#line 3492 "preproc.y"
+#line 3490 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("drop attribute"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40815 "preproc.c"
+#line 40813 "preproc.c"
     break;
 
   case 413: /* alter_type_cmd: ALTER ATTRIBUTE ColId opt_set_data TYPE_P Typename opt_collate_clause opt_drop_behavior  */
-#line 3496 "preproc.y"
+#line 3494 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("alter attribute"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("type"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40823 "preproc.c"
+#line 40821 "preproc.c"
     break;
 
   case 414: /* ClosePortalStmt: CLOSE cursor_name  */
-#line 3504 "preproc.y"
+#line 3502 "preproc.y"
         {
 		char *cursor_marker = (yyvsp[0].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[0].str);
 		struct cursor *ptr = NULL;
@@ -40839,19 +40837,19 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 		}
 		(yyval.str) = cat2_str(mm_strdup("close"), cursor_marker);
 	}
-#line 40843 "preproc.c"
+#line 40841 "preproc.c"
     break;
 
   case 415: /* ClosePortalStmt: CLOSE ALL  */
-#line 3520 "preproc.y"
+#line 3518 "preproc.y"
  { 
  (yyval.str) = mm_strdup("close all");
 }
-#line 40851 "preproc.c"
+#line 40849 "preproc.c"
     break;
 
   case 416: /* CopyStmt: COPY opt_binary qualified_name opt_column_list copy_from opt_program copy_file_name copy_delimiter opt_with copy_options where_clause  */
-#line 3528 "preproc.y"
+#line 3526 "preproc.y"
  { 
 			if (strcmp((yyvsp[-5].str), "from") == 0 &&
 			   (strcmp((yyvsp[-4].str), "stdin") == 0 || strcmp((yyvsp[-4].str), "stdout") == 0))
@@ -40859,4544 +40857,4542 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
  (yyval.str) = cat_str(11,mm_strdup("copy"),(yyvsp[-9].str),(yyvsp[-8].str),(yyvsp[-7].str),(yyvsp[-6].str),(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40863 "preproc.c"
+#line 40861 "preproc.c"
     break;
 
   case 417: /* CopyStmt: COPY '(' PreparableStmt ')' TO opt_program copy_file_name opt_with copy_options  */
-#line 3536 "preproc.y"
+#line 3534 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("copy ("),(yyvsp[-6].str),mm_strdup(") to"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40871 "preproc.c"
+#line 40869 "preproc.c"
     break;
 
   case 418: /* copy_from: FROM  */
-#line 3544 "preproc.y"
+#line 3542 "preproc.y"
  { 
  (yyval.str) = mm_strdup("from");
 }
-#line 40879 "preproc.c"
+#line 40877 "preproc.c"
     break;
 
   case 419: /* copy_from: TO  */
-#line 3548 "preproc.y"
+#line 3546 "preproc.y"
  { 
  (yyval.str) = mm_strdup("to");
 }
-#line 40887 "preproc.c"
+#line 40885 "preproc.c"
     break;
 
   case 420: /* opt_program: PROGRAM  */
-#line 3556 "preproc.y"
+#line 3554 "preproc.y"
  { 
  (yyval.str) = mm_strdup("program");
 }
-#line 40895 "preproc.c"
+#line 40893 "preproc.c"
     break;
 
   case 421: /* opt_program: %empty  */
-#line 3560 "preproc.y"
+#line 3558 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 40902 "preproc.c"
+#line 40900 "preproc.c"
     break;
 
   case 422: /* copy_file_name: ecpg_sconst  */
-#line 3567 "preproc.y"
+#line 3565 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 40910 "preproc.c"
+#line 40908 "preproc.c"
     break;
 
   case 423: /* copy_file_name: STDIN  */
-#line 3571 "preproc.y"
+#line 3569 "preproc.y"
  { 
  (yyval.str) = mm_strdup("stdin");
 }
-#line 40918 "preproc.c"
+#line 40916 "preproc.c"
     break;
 
   case 424: /* copy_file_name: STDOUT  */
-#line 3575 "preproc.y"
+#line 3573 "preproc.y"
  { 
  (yyval.str) = mm_strdup("stdout");
 }
-#line 40926 "preproc.c"
+#line 40924 "preproc.c"
     break;
 
   case 425: /* copy_options: copy_opt_list  */
-#line 3583 "preproc.y"
+#line 3581 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 40934 "preproc.c"
+#line 40932 "preproc.c"
     break;
 
   case 426: /* copy_options: '(' copy_generic_opt_list ')'  */
-#line 3587 "preproc.y"
+#line 3585 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 40942 "preproc.c"
+#line 40940 "preproc.c"
     break;
 
   case 427: /* copy_opt_list: copy_opt_list copy_opt_item  */
-#line 3595 "preproc.y"
+#line 3593 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40950 "preproc.c"
+#line 40948 "preproc.c"
     break;
 
   case 428: /* copy_opt_list: %empty  */
-#line 3599 "preproc.y"
+#line 3597 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 40957 "preproc.c"
+#line 40955 "preproc.c"
     break;
 
   case 429: /* copy_opt_item: BINARY  */
-#line 3606 "preproc.y"
+#line 3604 "preproc.y"
  { 
  (yyval.str) = mm_strdup("binary");
 }
-#line 40965 "preproc.c"
+#line 40963 "preproc.c"
     break;
 
   case 430: /* copy_opt_item: FREEZE  */
-#line 3610 "preproc.y"
+#line 3608 "preproc.y"
  { 
  (yyval.str) = mm_strdup("freeze");
 }
-#line 40973 "preproc.c"
+#line 40971 "preproc.c"
     break;
 
   case 431: /* copy_opt_item: DELIMITER opt_as ecpg_sconst  */
-#line 3614 "preproc.y"
+#line 3612 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("delimiter"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40981 "preproc.c"
+#line 40979 "preproc.c"
     break;
 
   case 432: /* copy_opt_item: NULL_P opt_as ecpg_sconst  */
-#line 3618 "preproc.y"
+#line 3616 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("null"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 40989 "preproc.c"
+#line 40987 "preproc.c"
     break;
 
   case 433: /* copy_opt_item: CSV  */
-#line 3622 "preproc.y"
+#line 3620 "preproc.y"
  { 
  (yyval.str) = mm_strdup("csv");
 }
-#line 40997 "preproc.c"
+#line 40995 "preproc.c"
     break;
 
   case 434: /* copy_opt_item: HEADER_P  */
-#line 3626 "preproc.y"
+#line 3624 "preproc.y"
  { 
  (yyval.str) = mm_strdup("header");
 }
-#line 41005 "preproc.c"
+#line 41003 "preproc.c"
     break;
 
   case 435: /* copy_opt_item: QUOTE opt_as ecpg_sconst  */
-#line 3630 "preproc.y"
+#line 3628 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("quote"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41013 "preproc.c"
+#line 41011 "preproc.c"
     break;
 
   case 436: /* copy_opt_item: ESCAPE opt_as ecpg_sconst  */
-#line 3634 "preproc.y"
+#line 3632 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("escape"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41021 "preproc.c"
+#line 41019 "preproc.c"
     break;
 
   case 437: /* copy_opt_item: FORCE QUOTE columnList  */
-#line 3638 "preproc.y"
+#line 3636 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("force quote"),(yyvsp[0].str));
 }
-#line 41029 "preproc.c"
+#line 41027 "preproc.c"
     break;
 
   case 438: /* copy_opt_item: FORCE QUOTE '*'  */
-#line 3642 "preproc.y"
+#line 3640 "preproc.y"
  { 
  (yyval.str) = mm_strdup("force quote *");
 }
-#line 41037 "preproc.c"
+#line 41035 "preproc.c"
     break;
 
   case 439: /* copy_opt_item: FORCE NOT NULL_P columnList  */
-#line 3646 "preproc.y"
+#line 3644 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("force not null"),(yyvsp[0].str));
 }
-#line 41045 "preproc.c"
+#line 41043 "preproc.c"
     break;
 
   case 440: /* copy_opt_item: FORCE NULL_P columnList  */
-#line 3650 "preproc.y"
+#line 3648 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("force null"),(yyvsp[0].str));
 }
-#line 41053 "preproc.c"
+#line 41051 "preproc.c"
     break;
 
   case 441: /* copy_opt_item: ENCODING ecpg_sconst  */
-#line 3654 "preproc.y"
+#line 3652 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("encoding"),(yyvsp[0].str));
 }
-#line 41061 "preproc.c"
+#line 41059 "preproc.c"
     break;
 
   case 442: /* opt_binary: BINARY  */
-#line 3662 "preproc.y"
+#line 3660 "preproc.y"
  { 
  (yyval.str) = mm_strdup("binary");
 }
-#line 41069 "preproc.c"
+#line 41067 "preproc.c"
     break;
 
   case 443: /* opt_binary: %empty  */
-#line 3666 "preproc.y"
+#line 3664 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 41076 "preproc.c"
+#line 41074 "preproc.c"
     break;
 
   case 444: /* copy_delimiter: opt_using DELIMITERS ecpg_sconst  */
-#line 3673 "preproc.y"
+#line 3671 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("delimiters"),(yyvsp[0].str));
 }
-#line 41084 "preproc.c"
+#line 41082 "preproc.c"
     break;
 
   case 445: /* copy_delimiter: %empty  */
-#line 3677 "preproc.y"
+#line 3675 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 41091 "preproc.c"
+#line 41089 "preproc.c"
     break;
 
   case 446: /* opt_using: USING  */
-#line 3684 "preproc.y"
+#line 3682 "preproc.y"
  { 
  (yyval.str) = mm_strdup("using");
 }
-#line 41099 "preproc.c"
+#line 41097 "preproc.c"
     break;
 
   case 447: /* opt_using: %empty  */
-#line 3688 "preproc.y"
+#line 3686 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 41106 "preproc.c"
+#line 41104 "preproc.c"
     break;
 
   case 448: /* copy_generic_opt_list: copy_generic_opt_elem  */
-#line 3695 "preproc.y"
+#line 3693 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41114 "preproc.c"
+#line 41112 "preproc.c"
     break;
 
   case 449: /* copy_generic_opt_list: copy_generic_opt_list ',' copy_generic_opt_elem  */
-#line 3699 "preproc.y"
+#line 3697 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 41122 "preproc.c"
+#line 41120 "preproc.c"
     break;
 
   case 450: /* copy_generic_opt_elem: ColLabel copy_generic_opt_arg  */
-#line 3707 "preproc.y"
+#line 3705 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41130 "preproc.c"
+#line 41128 "preproc.c"
     break;
 
   case 451: /* copy_generic_opt_arg: opt_boolean_or_string  */
-#line 3715 "preproc.y"
+#line 3713 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41138 "preproc.c"
+#line 41136 "preproc.c"
     break;
 
   case 452: /* copy_generic_opt_arg: NumericOnly  */
-#line 3719 "preproc.y"
+#line 3717 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41146 "preproc.c"
+#line 41144 "preproc.c"
     break;
 
   case 453: /* copy_generic_opt_arg: '*'  */
-#line 3723 "preproc.y"
+#line 3721 "preproc.y"
  { 
  (yyval.str) = mm_strdup("*");
 }
-#line 41154 "preproc.c"
+#line 41152 "preproc.c"
     break;
 
   case 454: /* copy_generic_opt_arg: '(' copy_generic_opt_arg_list ')'  */
-#line 3727 "preproc.y"
+#line 3725 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 41162 "preproc.c"
+#line 41160 "preproc.c"
     break;
 
   case 455: /* copy_generic_opt_arg: %empty  */
-#line 3731 "preproc.y"
+#line 3729 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 41169 "preproc.c"
+#line 41167 "preproc.c"
     break;
 
   case 456: /* copy_generic_opt_arg_list: copy_generic_opt_arg_list_item  */
-#line 3738 "preproc.y"
+#line 3736 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41177 "preproc.c"
+#line 41175 "preproc.c"
     break;
 
   case 457: /* copy_generic_opt_arg_list: copy_generic_opt_arg_list ',' copy_generic_opt_arg_list_item  */
-#line 3742 "preproc.y"
+#line 3740 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 41185 "preproc.c"
+#line 41183 "preproc.c"
     break;
 
   case 458: /* copy_generic_opt_arg_list_item: opt_boolean_or_string  */
-#line 3750 "preproc.y"
+#line 3748 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41193 "preproc.c"
+#line 41191 "preproc.c"
     break;
 
   case 459: /* CreateStmt: CREATE OptTemp TABLE qualified_name '(' OptTableElementList ')' OptInherit OptPartitionSpec table_access_method_clause OptWith OnCommitOption OptTableSpace  */
-#line 3758 "preproc.y"
+#line 3756 "preproc.y"
  { 
  (yyval.str) = cat_str(13,mm_strdup("create"),(yyvsp[-11].str),mm_strdup("table"),(yyvsp[-9].str),mm_strdup("("),(yyvsp[-7].str),mm_strdup(")"),(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41201 "preproc.c"
+#line 41199 "preproc.c"
     break;
 
   case 460: /* CreateStmt: CREATE OptTemp TABLE IF_P NOT EXISTS qualified_name '(' OptTableElementList ')' OptInherit OptPartitionSpec table_access_method_clause OptWith OnCommitOption OptTableSpace  */
-#line 3762 "preproc.y"
+#line 3760 "preproc.y"
  { 
  (yyval.str) = cat_str(13,mm_strdup("create"),(yyvsp[-14].str),mm_strdup("table if not exists"),(yyvsp[-9].str),mm_strdup("("),(yyvsp[-7].str),mm_strdup(")"),(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41209 "preproc.c"
+#line 41207 "preproc.c"
     break;
 
   case 461: /* CreateStmt: CREATE OptTemp TABLE qualified_name OF any_name OptTypedTableElementList OptPartitionSpec table_access_method_clause OptWith OnCommitOption OptTableSpace  */
-#line 3766 "preproc.y"
+#line 3764 "preproc.y"
  { 
  (yyval.str) = cat_str(12,mm_strdup("create"),(yyvsp[-10].str),mm_strdup("table"),(yyvsp[-8].str),mm_strdup("of"),(yyvsp[-6].str),(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41217 "preproc.c"
+#line 41215 "preproc.c"
     break;
 
   case 462: /* CreateStmt: CREATE OptTemp TABLE IF_P NOT EXISTS qualified_name OF any_name OptTypedTableElementList OptPartitionSpec table_access_method_clause OptWith OnCommitOption OptTableSpace  */
-#line 3770 "preproc.y"
+#line 3768 "preproc.y"
  { 
  (yyval.str) = cat_str(12,mm_strdup("create"),(yyvsp[-13].str),mm_strdup("table if not exists"),(yyvsp[-8].str),mm_strdup("of"),(yyvsp[-6].str),(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41225 "preproc.c"
+#line 41223 "preproc.c"
     break;
 
   case 463: /* CreateStmt: CREATE OptTemp TABLE qualified_name PARTITION OF qualified_name OptTypedTableElementList PartitionBoundSpec OptPartitionSpec table_access_method_clause OptWith OnCommitOption OptTableSpace  */
-#line 3774 "preproc.y"
+#line 3772 "preproc.y"
  { 
  (yyval.str) = cat_str(13,mm_strdup("create"),(yyvsp[-12].str),mm_strdup("table"),(yyvsp[-10].str),mm_strdup("partition of"),(yyvsp[-7].str),(yyvsp[-6].str),(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41233 "preproc.c"
+#line 41231 "preproc.c"
     break;
 
   case 464: /* CreateStmt: CREATE OptTemp TABLE IF_P NOT EXISTS qualified_name PARTITION OF qualified_name OptTypedTableElementList PartitionBoundSpec OptPartitionSpec table_access_method_clause OptWith OnCommitOption OptTableSpace  */
-#line 3778 "preproc.y"
+#line 3776 "preproc.y"
  { 
  (yyval.str) = cat_str(13,mm_strdup("create"),(yyvsp[-15].str),mm_strdup("table if not exists"),(yyvsp[-10].str),mm_strdup("partition of"),(yyvsp[-7].str),(yyvsp[-6].str),(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41241 "preproc.c"
+#line 41239 "preproc.c"
     break;
 
   case 465: /* OptTemp: TEMPORARY  */
-#line 3786 "preproc.y"
+#line 3784 "preproc.y"
  { 
  (yyval.str) = mm_strdup("temporary");
 }
-#line 41249 "preproc.c"
+#line 41247 "preproc.c"
     break;
 
   case 466: /* OptTemp: TEMP  */
-#line 3790 "preproc.y"
+#line 3788 "preproc.y"
  { 
  (yyval.str) = mm_strdup("temp");
 }
-#line 41257 "preproc.c"
+#line 41255 "preproc.c"
     break;
 
   case 467: /* OptTemp: LOCAL TEMPORARY  */
-#line 3794 "preproc.y"
+#line 3792 "preproc.y"
  { 
  (yyval.str) = mm_strdup("local temporary");
 }
-#line 41265 "preproc.c"
+#line 41263 "preproc.c"
     break;
 
   case 468: /* OptTemp: LOCAL TEMP  */
-#line 3798 "preproc.y"
+#line 3796 "preproc.y"
  { 
  (yyval.str) = mm_strdup("local temp");
 }
-#line 41273 "preproc.c"
+#line 41271 "preproc.c"
     break;
 
   case 469: /* OptTemp: GLOBAL TEMPORARY  */
-#line 3802 "preproc.y"
+#line 3800 "preproc.y"
  { 
  (yyval.str) = mm_strdup("global temporary");
 }
-#line 41281 "preproc.c"
+#line 41279 "preproc.c"
     break;
 
   case 470: /* OptTemp: GLOBAL TEMP  */
-#line 3806 "preproc.y"
+#line 3804 "preproc.y"
  { 
  (yyval.str) = mm_strdup("global temp");
 }
-#line 41289 "preproc.c"
+#line 41287 "preproc.c"
     break;
 
   case 471: /* OptTemp: UNLOGGED  */
-#line 3810 "preproc.y"
+#line 3808 "preproc.y"
  { 
  (yyval.str) = mm_strdup("unlogged");
 }
-#line 41297 "preproc.c"
+#line 41295 "preproc.c"
     break;
 
   case 472: /* OptTemp: %empty  */
-#line 3814 "preproc.y"
+#line 3812 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 41304 "preproc.c"
+#line 41302 "preproc.c"
     break;
 
   case 473: /* OptTableElementList: TableElementList  */
-#line 3821 "preproc.y"
+#line 3819 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41312 "preproc.c"
+#line 41310 "preproc.c"
     break;
 
   case 474: /* OptTableElementList: %empty  */
-#line 3825 "preproc.y"
+#line 3823 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 41319 "preproc.c"
+#line 41317 "preproc.c"
     break;
 
   case 475: /* OptTypedTableElementList: '(' TypedTableElementList ')'  */
-#line 3832 "preproc.y"
+#line 3830 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 41327 "preproc.c"
+#line 41325 "preproc.c"
     break;
 
   case 476: /* OptTypedTableElementList: %empty  */
-#line 3836 "preproc.y"
+#line 3834 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 41334 "preproc.c"
+#line 41332 "preproc.c"
     break;
 
   case 477: /* TableElementList: TableElement  */
-#line 3843 "preproc.y"
+#line 3841 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41342 "preproc.c"
+#line 41340 "preproc.c"
     break;
 
   case 478: /* TableElementList: TableElementList ',' TableElement  */
-#line 3847 "preproc.y"
+#line 3845 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 41350 "preproc.c"
+#line 41348 "preproc.c"
     break;
 
   case 479: /* TypedTableElementList: TypedTableElement  */
-#line 3855 "preproc.y"
+#line 3853 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41358 "preproc.c"
+#line 41356 "preproc.c"
     break;
 
   case 480: /* TypedTableElementList: TypedTableElementList ',' TypedTableElement  */
-#line 3859 "preproc.y"
+#line 3857 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 41366 "preproc.c"
+#line 41364 "preproc.c"
     break;
 
   case 481: /* TableElement: columnDef  */
-#line 3867 "preproc.y"
+#line 3865 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41374 "preproc.c"
+#line 41372 "preproc.c"
     break;
 
   case 482: /* TableElement: TableLikeClause  */
-#line 3871 "preproc.y"
+#line 3869 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41382 "preproc.c"
+#line 41380 "preproc.c"
     break;
 
   case 483: /* TableElement: TableConstraint  */
-#line 3875 "preproc.y"
+#line 3873 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41390 "preproc.c"
+#line 41388 "preproc.c"
     break;
 
   case 484: /* TypedTableElement: columnOptions  */
-#line 3883 "preproc.y"
+#line 3881 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41398 "preproc.c"
+#line 41396 "preproc.c"
     break;
 
   case 485: /* TypedTableElement: TableConstraint  */
-#line 3887 "preproc.y"
+#line 3885 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41406 "preproc.c"
+#line 41404 "preproc.c"
     break;
 
   case 486: /* columnDef: ColId Typename opt_column_storage opt_column_compression create_generic_options ColQualList  */
-#line 3895 "preproc.y"
+#line 3893 "preproc.y"
  { 
  (yyval.str) = cat_str(6,(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41414 "preproc.c"
+#line 41412 "preproc.c"
     break;
 
   case 487: /* columnOptions: ColId ColQualList  */
-#line 3903 "preproc.y"
+#line 3901 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41422 "preproc.c"
+#line 41420 "preproc.c"
     break;
 
   case 488: /* columnOptions: ColId WITH OPTIONS ColQualList  */
-#line 3907 "preproc.y"
+#line 3905 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-3].str),mm_strdup("with options"),(yyvsp[0].str));
 }
-#line 41430 "preproc.c"
+#line 41428 "preproc.c"
     break;
 
   case 489: /* column_compression: COMPRESSION ColId  */
-#line 3915 "preproc.y"
+#line 3913 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("compression"),(yyvsp[0].str));
 }
-#line 41438 "preproc.c"
+#line 41436 "preproc.c"
     break;
 
   case 490: /* column_compression: COMPRESSION DEFAULT  */
-#line 3919 "preproc.y"
+#line 3917 "preproc.y"
  { 
  (yyval.str) = mm_strdup("compression default");
 }
-#line 41446 "preproc.c"
+#line 41444 "preproc.c"
     break;
 
   case 491: /* opt_column_compression: column_compression  */
-#line 3927 "preproc.y"
+#line 3925 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41454 "preproc.c"
+#line 41452 "preproc.c"
     break;
 
   case 492: /* opt_column_compression: %empty  */
-#line 3931 "preproc.y"
+#line 3929 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 41461 "preproc.c"
+#line 41459 "preproc.c"
     break;
 
   case 493: /* column_storage: STORAGE ColId  */
-#line 3938 "preproc.y"
+#line 3936 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("storage"),(yyvsp[0].str));
 }
-#line 41469 "preproc.c"
+#line 41467 "preproc.c"
     break;
 
   case 494: /* column_storage: STORAGE DEFAULT  */
-#line 3942 "preproc.y"
+#line 3940 "preproc.y"
  { 
  (yyval.str) = mm_strdup("storage default");
 }
-#line 41477 "preproc.c"
+#line 41475 "preproc.c"
     break;
 
   case 495: /* opt_column_storage: column_storage  */
-#line 3950 "preproc.y"
+#line 3948 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41485 "preproc.c"
+#line 41483 "preproc.c"
     break;
 
   case 496: /* opt_column_storage: %empty  */
-#line 3954 "preproc.y"
+#line 3952 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 41492 "preproc.c"
+#line 41490 "preproc.c"
     break;
 
   case 497: /* ColQualList: ColQualList ColConstraint  */
-#line 3961 "preproc.y"
+#line 3959 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41500 "preproc.c"
+#line 41498 "preproc.c"
     break;
 
   case 498: /* ColQualList: %empty  */
-#line 3965 "preproc.y"
+#line 3963 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 41507 "preproc.c"
+#line 41505 "preproc.c"
     break;
 
   case 499: /* ColConstraint: CONSTRAINT name ColConstraintElem  */
-#line 3972 "preproc.y"
+#line 3970 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("constraint"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41515 "preproc.c"
+#line 41513 "preproc.c"
     break;
 
   case 500: /* ColConstraint: ColConstraintElem  */
-#line 3976 "preproc.y"
+#line 3974 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41523 "preproc.c"
+#line 41521 "preproc.c"
     break;
 
   case 501: /* ColConstraint: ConstraintAttr  */
-#line 3980 "preproc.y"
+#line 3978 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41531 "preproc.c"
+#line 41529 "preproc.c"
     break;
 
   case 502: /* ColConstraint: COLLATE any_name  */
-#line 3984 "preproc.y"
+#line 3982 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("collate"),(yyvsp[0].str));
 }
-#line 41539 "preproc.c"
+#line 41537 "preproc.c"
     break;
 
   case 503: /* ColConstraintElem: NOT NULL_P  */
-#line 3992 "preproc.y"
+#line 3990 "preproc.y"
  { 
  (yyval.str) = mm_strdup("not null");
 }
-#line 41547 "preproc.c"
+#line 41545 "preproc.c"
     break;
 
   case 504: /* ColConstraintElem: NULL_P  */
-#line 3996 "preproc.y"
+#line 3994 "preproc.y"
  { 
  (yyval.str) = mm_strdup("null");
 }
-#line 41555 "preproc.c"
+#line 41553 "preproc.c"
     break;
 
   case 505: /* ColConstraintElem: UNIQUE opt_unique_null_treatment opt_definition OptConsTableSpace  */
-#line 4000 "preproc.y"
+#line 3998 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("unique"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41563 "preproc.c"
+#line 41561 "preproc.c"
     break;
 
   case 506: /* ColConstraintElem: PRIMARY KEY opt_definition OptConsTableSpace  */
-#line 4004 "preproc.y"
+#line 4002 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("primary key"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41571 "preproc.c"
+#line 41569 "preproc.c"
     break;
 
   case 507: /* ColConstraintElem: CHECK '(' a_expr ')' opt_no_inherit  */
-#line 4008 "preproc.y"
+#line 4006 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("check ("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 41579 "preproc.c"
+#line 41577 "preproc.c"
     break;
 
   case 508: /* ColConstraintElem: DEFAULT b_expr  */
-#line 4012 "preproc.y"
+#line 4010 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("default"),(yyvsp[0].str));
 }
-#line 41587 "preproc.c"
+#line 41585 "preproc.c"
     break;
 
   case 509: /* ColConstraintElem: GENERATED generated_when AS IDENTITY_P OptParenthesizedSeqOptList  */
-#line 4016 "preproc.y"
+#line 4014 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("generated"),(yyvsp[-3].str),mm_strdup("as identity"),(yyvsp[0].str));
 }
-#line 41595 "preproc.c"
+#line 41593 "preproc.c"
     break;
 
   case 510: /* ColConstraintElem: GENERATED generated_when AS '(' a_expr ')' STORED  */
-#line 4020 "preproc.y"
+#line 4018 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("generated"),(yyvsp[-5].str),mm_strdup("as ("),(yyvsp[-2].str),mm_strdup(") stored"));
 }
-#line 41603 "preproc.c"
+#line 41601 "preproc.c"
     break;
 
   case 511: /* ColConstraintElem: REFERENCES qualified_name opt_column_list key_match key_actions  */
-#line 4024 "preproc.y"
+#line 4022 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("references"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41611 "preproc.c"
+#line 41609 "preproc.c"
     break;
 
   case 512: /* opt_unique_null_treatment: NULLS_P DISTINCT  */
-#line 4032 "preproc.y"
+#line 4030 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nulls distinct");
 }
-#line 41619 "preproc.c"
+#line 41617 "preproc.c"
     break;
 
   case 513: /* opt_unique_null_treatment: NULLS_P NOT DISTINCT  */
-#line 4036 "preproc.y"
+#line 4034 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nulls not distinct");
 }
-#line 41627 "preproc.c"
+#line 41625 "preproc.c"
     break;
 
   case 514: /* opt_unique_null_treatment: %empty  */
-#line 4040 "preproc.y"
+#line 4038 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 41634 "preproc.c"
+#line 41632 "preproc.c"
     break;
 
   case 515: /* generated_when: ALWAYS  */
-#line 4047 "preproc.y"
+#line 4045 "preproc.y"
  { 
  (yyval.str) = mm_strdup("always");
 }
-#line 41642 "preproc.c"
+#line 41640 "preproc.c"
     break;
 
   case 516: /* generated_when: BY DEFAULT  */
-#line 4051 "preproc.y"
+#line 4049 "preproc.y"
  { 
  (yyval.str) = mm_strdup("by default");
 }
-#line 41650 "preproc.c"
+#line 41648 "preproc.c"
     break;
 
   case 517: /* ConstraintAttr: DEFERRABLE  */
-#line 4059 "preproc.y"
+#line 4057 "preproc.y"
  { 
  (yyval.str) = mm_strdup("deferrable");
 }
-#line 41658 "preproc.c"
+#line 41656 "preproc.c"
     break;
 
   case 518: /* ConstraintAttr: NOT DEFERRABLE  */
-#line 4063 "preproc.y"
+#line 4061 "preproc.y"
  { 
  (yyval.str) = mm_strdup("not deferrable");
 }
-#line 41666 "preproc.c"
+#line 41664 "preproc.c"
     break;
 
   case 519: /* ConstraintAttr: INITIALLY DEFERRED  */
-#line 4067 "preproc.y"
+#line 4065 "preproc.y"
  { 
  (yyval.str) = mm_strdup("initially deferred");
 }
-#line 41674 "preproc.c"
+#line 41672 "preproc.c"
     break;
 
   case 520: /* ConstraintAttr: INITIALLY IMMEDIATE  */
-#line 4071 "preproc.y"
+#line 4069 "preproc.y"
  { 
  (yyval.str) = mm_strdup("initially immediate");
 }
-#line 41682 "preproc.c"
+#line 41680 "preproc.c"
     break;
 
   case 521: /* TableLikeClause: LIKE qualified_name TableLikeOptionList  */
-#line 4079 "preproc.y"
+#line 4077 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("like"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41690 "preproc.c"
+#line 41688 "preproc.c"
     break;
 
   case 522: /* TableLikeOptionList: TableLikeOptionList INCLUDING TableLikeOption  */
-#line 4087 "preproc.y"
+#line 4085 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("including"),(yyvsp[0].str));
 }
-#line 41698 "preproc.c"
+#line 41696 "preproc.c"
     break;
 
   case 523: /* TableLikeOptionList: TableLikeOptionList EXCLUDING TableLikeOption  */
-#line 4091 "preproc.y"
+#line 4089 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("excluding"),(yyvsp[0].str));
 }
-#line 41706 "preproc.c"
+#line 41704 "preproc.c"
     break;
 
   case 524: /* TableLikeOptionList: %empty  */
-#line 4095 "preproc.y"
+#line 4093 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 41713 "preproc.c"
+#line 41711 "preproc.c"
     break;
 
   case 525: /* TableLikeOption: COMMENTS  */
-#line 4102 "preproc.y"
+#line 4100 "preproc.y"
  { 
  (yyval.str) = mm_strdup("comments");
 }
-#line 41721 "preproc.c"
+#line 41719 "preproc.c"
     break;
 
   case 526: /* TableLikeOption: COMPRESSION  */
-#line 4106 "preproc.y"
+#line 4104 "preproc.y"
  { 
  (yyval.str) = mm_strdup("compression");
 }
-#line 41729 "preproc.c"
+#line 41727 "preproc.c"
     break;
 
   case 527: /* TableLikeOption: CONSTRAINTS  */
-#line 4110 "preproc.y"
+#line 4108 "preproc.y"
  { 
  (yyval.str) = mm_strdup("constraints");
 }
-#line 41737 "preproc.c"
+#line 41735 "preproc.c"
     break;
 
   case 528: /* TableLikeOption: DEFAULTS  */
-#line 4114 "preproc.y"
+#line 4112 "preproc.y"
  { 
  (yyval.str) = mm_strdup("defaults");
 }
-#line 41745 "preproc.c"
+#line 41743 "preproc.c"
     break;
 
   case 529: /* TableLikeOption: IDENTITY_P  */
-#line 4118 "preproc.y"
+#line 4116 "preproc.y"
  { 
  (yyval.str) = mm_strdup("identity");
 }
-#line 41753 "preproc.c"
+#line 41751 "preproc.c"
     break;
 
   case 530: /* TableLikeOption: GENERATED  */
-#line 4122 "preproc.y"
+#line 4120 "preproc.y"
  { 
  (yyval.str) = mm_strdup("generated");
 }
-#line 41761 "preproc.c"
+#line 41759 "preproc.c"
     break;
 
   case 531: /* TableLikeOption: INDEXES  */
-#line 4126 "preproc.y"
+#line 4124 "preproc.y"
  { 
  (yyval.str) = mm_strdup("indexes");
 }
-#line 41769 "preproc.c"
+#line 41767 "preproc.c"
     break;
 
   case 532: /* TableLikeOption: STATISTICS  */
-#line 4130 "preproc.y"
+#line 4128 "preproc.y"
  { 
  (yyval.str) = mm_strdup("statistics");
 }
-#line 41777 "preproc.c"
+#line 41775 "preproc.c"
     break;
 
   case 533: /* TableLikeOption: STORAGE  */
-#line 4134 "preproc.y"
+#line 4132 "preproc.y"
  { 
  (yyval.str) = mm_strdup("storage");
 }
-#line 41785 "preproc.c"
+#line 41783 "preproc.c"
     break;
 
   case 534: /* TableLikeOption: ALL  */
-#line 4138 "preproc.y"
+#line 4136 "preproc.y"
  { 
  (yyval.str) = mm_strdup("all");
 }
-#line 41793 "preproc.c"
+#line 41791 "preproc.c"
     break;
 
   case 535: /* TableConstraint: CONSTRAINT name ConstraintElem  */
-#line 4146 "preproc.y"
+#line 4144 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("constraint"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41801 "preproc.c"
+#line 41799 "preproc.c"
     break;
 
   case 536: /* TableConstraint: ConstraintElem  */
-#line 4150 "preproc.y"
+#line 4148 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41809 "preproc.c"
+#line 41807 "preproc.c"
     break;
 
   case 537: /* ConstraintElem: CHECK '(' a_expr ')' ConstraintAttributeSpec  */
-#line 4158 "preproc.y"
+#line 4156 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("check ("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 41817 "preproc.c"
+#line 41815 "preproc.c"
     break;
 
   case 538: /* ConstraintElem: UNIQUE opt_unique_null_treatment '(' columnList ')' opt_c_include opt_definition OptConsTableSpace ConstraintAttributeSpec  */
-#line 4162 "preproc.y"
+#line 4160 "preproc.y"
  { 
  (yyval.str) = cat_str(9,mm_strdup("unique"),(yyvsp[-7].str),mm_strdup("("),(yyvsp[-5].str),mm_strdup(")"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41825 "preproc.c"
+#line 41823 "preproc.c"
     break;
 
   case 539: /* ConstraintElem: UNIQUE ExistingIndex ConstraintAttributeSpec  */
-#line 4166 "preproc.y"
+#line 4164 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("unique"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41833 "preproc.c"
+#line 41831 "preproc.c"
     break;
 
   case 540: /* ConstraintElem: PRIMARY KEY '(' columnList ')' opt_c_include opt_definition OptConsTableSpace ConstraintAttributeSpec  */
-#line 4170 "preproc.y"
+#line 4168 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("primary key ("),(yyvsp[-5].str),mm_strdup(")"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41841 "preproc.c"
+#line 41839 "preproc.c"
     break;
 
   case 541: /* ConstraintElem: PRIMARY KEY ExistingIndex ConstraintAttributeSpec  */
-#line 4174 "preproc.y"
+#line 4172 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("primary key"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41849 "preproc.c"
+#line 41847 "preproc.c"
     break;
 
   case 542: /* ConstraintElem: EXCLUDE access_method_clause '(' ExclusionConstraintList ')' opt_c_include opt_definition OptConsTableSpace OptWhereClause ConstraintAttributeSpec  */
-#line 4178 "preproc.y"
+#line 4176 "preproc.y"
  { 
  (yyval.str) = cat_str(10,mm_strdup("exclude"),(yyvsp[-8].str),mm_strdup("("),(yyvsp[-6].str),mm_strdup(")"),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41857 "preproc.c"
+#line 41855 "preproc.c"
     break;
 
   case 543: /* ConstraintElem: FOREIGN KEY '(' columnList ')' REFERENCES qualified_name opt_column_list key_match key_actions ConstraintAttributeSpec  */
-#line 4182 "preproc.y"
+#line 4180 "preproc.y"
  { 
  (yyval.str) = cat_str(8,mm_strdup("foreign key ("),(yyvsp[-7].str),mm_strdup(") references"),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 41865 "preproc.c"
+#line 41863 "preproc.c"
     break;
 
   case 544: /* opt_no_inherit: NO INHERIT  */
-#line 4190 "preproc.y"
+#line 4188 "preproc.y"
  { 
  (yyval.str) = mm_strdup("no inherit");
 }
-#line 41873 "preproc.c"
+#line 41871 "preproc.c"
     break;
 
   case 545: /* opt_no_inherit: %empty  */
-#line 4194 "preproc.y"
+#line 4192 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 41880 "preproc.c"
+#line 41878 "preproc.c"
     break;
 
   case 546: /* opt_column_list: '(' columnList ')'  */
-#line 4201 "preproc.y"
+#line 4199 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 41888 "preproc.c"
+#line 41886 "preproc.c"
     break;
 
   case 547: /* opt_column_list: %empty  */
-#line 4205 "preproc.y"
+#line 4203 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 41895 "preproc.c"
+#line 41893 "preproc.c"
     break;
 
   case 548: /* columnList: columnElem  */
-#line 4212 "preproc.y"
+#line 4210 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41903 "preproc.c"
+#line 41901 "preproc.c"
     break;
 
   case 549: /* columnList: columnList ',' columnElem  */
-#line 4216 "preproc.y"
+#line 4214 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 41911 "preproc.c"
+#line 41909 "preproc.c"
     break;
 
   case 550: /* columnElem: ColId  */
-#line 4224 "preproc.y"
+#line 4222 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41919 "preproc.c"
+#line 41917 "preproc.c"
     break;
 
   case 551: /* opt_c_include: INCLUDE '(' columnList ')'  */
-#line 4232 "preproc.y"
+#line 4230 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("include ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 41927 "preproc.c"
+#line 41925 "preproc.c"
     break;
 
   case 552: /* opt_c_include: %empty  */
-#line 4236 "preproc.y"
+#line 4234 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 41934 "preproc.c"
+#line 41932 "preproc.c"
     break;
 
   case 553: /* key_match: MATCH FULL  */
-#line 4243 "preproc.y"
+#line 4241 "preproc.y"
  { 
  (yyval.str) = mm_strdup("match full");
 }
-#line 41942 "preproc.c"
+#line 41940 "preproc.c"
     break;
 
   case 554: /* key_match: MATCH PARTIAL  */
-#line 4247 "preproc.y"
+#line 4245 "preproc.y"
  { 
 mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
  (yyval.str) = mm_strdup("match partial");
 }
-#line 41951 "preproc.c"
+#line 41949 "preproc.c"
     break;
 
   case 555: /* key_match: MATCH SIMPLE  */
-#line 4252 "preproc.y"
+#line 4250 "preproc.y"
  { 
  (yyval.str) = mm_strdup("match simple");
 }
-#line 41959 "preproc.c"
+#line 41957 "preproc.c"
     break;
 
   case 556: /* key_match: %empty  */
-#line 4256 "preproc.y"
+#line 4254 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 41966 "preproc.c"
+#line 41964 "preproc.c"
     break;
 
   case 557: /* ExclusionConstraintList: ExclusionConstraintElem  */
-#line 4263 "preproc.y"
+#line 4261 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 41974 "preproc.c"
+#line 41972 "preproc.c"
     break;
 
   case 558: /* ExclusionConstraintList: ExclusionConstraintList ',' ExclusionConstraintElem  */
-#line 4267 "preproc.y"
+#line 4265 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 41982 "preproc.c"
+#line 41980 "preproc.c"
     break;
 
   case 559: /* ExclusionConstraintElem: index_elem WITH any_operator  */
-#line 4275 "preproc.y"
+#line 4273 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("with"),(yyvsp[0].str));
 }
-#line 41990 "preproc.c"
+#line 41988 "preproc.c"
     break;
 
   case 560: /* ExclusionConstraintElem: index_elem WITH OPERATOR '(' any_operator ')'  */
-#line 4279 "preproc.y"
+#line 4277 "preproc.y"
  { 
  (yyval.str) = cat_str(4,(yyvsp[-5].str),mm_strdup("with operator ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 41998 "preproc.c"
+#line 41996 "preproc.c"
     break;
 
   case 561: /* OptWhereClause: WHERE '(' a_expr ')'  */
-#line 4287 "preproc.y"
+#line 4285 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("where ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 42006 "preproc.c"
+#line 42004 "preproc.c"
     break;
 
   case 562: /* OptWhereClause: %empty  */
-#line 4291 "preproc.y"
+#line 4289 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 42013 "preproc.c"
+#line 42011 "preproc.c"
     break;
 
   case 563: /* key_actions: key_update  */
-#line 4298 "preproc.y"
+#line 4296 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 42021 "preproc.c"
+#line 42019 "preproc.c"
     break;
 
   case 564: /* key_actions: key_delete  */
-#line 4302 "preproc.y"
+#line 4300 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 42029 "preproc.c"
+#line 42027 "preproc.c"
     break;
 
   case 565: /* key_actions: key_update key_delete  */
-#line 4306 "preproc.y"
+#line 4304 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42037 "preproc.c"
+#line 42035 "preproc.c"
     break;
 
   case 566: /* key_actions: key_delete key_update  */
-#line 4310 "preproc.y"
+#line 4308 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42045 "preproc.c"
+#line 42043 "preproc.c"
     break;
 
   case 567: /* key_actions: %empty  */
-#line 4314 "preproc.y"
+#line 4312 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 42052 "preproc.c"
+#line 42050 "preproc.c"
     break;
 
   case 568: /* key_update: ON UPDATE key_action  */
-#line 4321 "preproc.y"
+#line 4319 "preproc.y"
  { 
-mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
  (yyval.str) = cat_str(2,mm_strdup("on update"),(yyvsp[0].str));
 }
-#line 42061 "preproc.c"
+#line 42058 "preproc.c"
     break;
 
   case 569: /* key_delete: ON DELETE_P key_action  */
-#line 4330 "preproc.y"
+#line 4327 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("on delete"),(yyvsp[0].str));
 }
-#line 42069 "preproc.c"
+#line 42066 "preproc.c"
     break;
 
   case 570: /* key_action: NO ACTION  */
-#line 4338 "preproc.y"
+#line 4335 "preproc.y"
  { 
  (yyval.str) = mm_strdup("no action");
 }
-#line 42077 "preproc.c"
+#line 42074 "preproc.c"
     break;
 
   case 571: /* key_action: RESTRICT  */
-#line 4342 "preproc.y"
+#line 4339 "preproc.y"
  { 
  (yyval.str) = mm_strdup("restrict");
 }
-#line 42085 "preproc.c"
+#line 42082 "preproc.c"
     break;
 
   case 572: /* key_action: CASCADE  */
-#line 4346 "preproc.y"
+#line 4343 "preproc.y"
  { 
  (yyval.str) = mm_strdup("cascade");
 }
-#line 42093 "preproc.c"
+#line 42090 "preproc.c"
     break;
 
   case 573: /* key_action: SET NULL_P opt_column_list  */
-#line 4350 "preproc.y"
+#line 4347 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("set null"),(yyvsp[0].str));
 }
-#line 42101 "preproc.c"
+#line 42098 "preproc.c"
     break;
 
   case 574: /* key_action: SET DEFAULT opt_column_list  */
-#line 4354 "preproc.y"
+#line 4351 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("set default"),(yyvsp[0].str));
 }
-#line 42109 "preproc.c"
+#line 42106 "preproc.c"
     break;
 
   case 575: /* OptInherit: INHERITS '(' qualified_name_list ')'  */
-#line 4362 "preproc.y"
+#line 4359 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("inherits ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 42117 "preproc.c"
+#line 42114 "preproc.c"
     break;
 
   case 576: /* OptInherit: %empty  */
-#line 4366 "preproc.y"
+#line 4363 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 42124 "preproc.c"
+#line 42121 "preproc.c"
     break;
 
   case 577: /* OptPartitionSpec: PartitionSpec  */
-#line 4373 "preproc.y"
+#line 4370 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 42132 "preproc.c"
+#line 42129 "preproc.c"
     break;
 
   case 578: /* OptPartitionSpec: %empty  */
-#line 4377 "preproc.y"
+#line 4374 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 42139 "preproc.c"
+#line 42136 "preproc.c"
     break;
 
   case 579: /* PartitionSpec: PARTITION BY ColId '(' part_params ')'  */
-#line 4384 "preproc.y"
+#line 4381 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("partition by"),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 42147 "preproc.c"
+#line 42144 "preproc.c"
     break;
 
   case 580: /* part_params: part_elem  */
-#line 4392 "preproc.y"
+#line 4389 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 42155 "preproc.c"
+#line 42152 "preproc.c"
     break;
 
   case 581: /* part_params: part_params ',' part_elem  */
-#line 4396 "preproc.y"
+#line 4393 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 42163 "preproc.c"
+#line 42160 "preproc.c"
     break;
 
   case 582: /* part_elem: ColId opt_collate opt_qualified_name  */
-#line 4404 "preproc.y"
+#line 4401 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42171 "preproc.c"
+#line 42168 "preproc.c"
     break;
 
   case 583: /* part_elem: func_expr_windowless opt_collate opt_qualified_name  */
-#line 4408 "preproc.y"
+#line 4405 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42179 "preproc.c"
+#line 42176 "preproc.c"
     break;
 
   case 584: /* part_elem: '(' a_expr ')' opt_collate opt_qualified_name  */
-#line 4412 "preproc.y"
+#line 4409 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("("),(yyvsp[-3].str),mm_strdup(")"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42187 "preproc.c"
+#line 42184 "preproc.c"
     break;
 
   case 585: /* table_access_method_clause: USING name  */
-#line 4420 "preproc.y"
+#line 4417 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("using"),(yyvsp[0].str));
 }
-#line 42195 "preproc.c"
+#line 42192 "preproc.c"
     break;
 
   case 586: /* table_access_method_clause: %empty  */
-#line 4424 "preproc.y"
+#line 4421 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 42202 "preproc.c"
+#line 42199 "preproc.c"
     break;
 
   case 587: /* OptWith: WITH reloptions  */
-#line 4431 "preproc.y"
+#line 4428 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("with"),(yyvsp[0].str));
 }
-#line 42210 "preproc.c"
+#line 42207 "preproc.c"
     break;
 
   case 588: /* OptWith: WITHOUT OIDS  */
-#line 4435 "preproc.y"
+#line 4432 "preproc.y"
  { 
  (yyval.str) = mm_strdup("without oids");
 }
-#line 42218 "preproc.c"
+#line 42215 "preproc.c"
     break;
 
   case 589: /* OptWith: %empty  */
-#line 4439 "preproc.y"
+#line 4436 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 42225 "preproc.c"
+#line 42222 "preproc.c"
     break;
 
   case 590: /* OnCommitOption: ON COMMIT DROP  */
-#line 4446 "preproc.y"
+#line 4443 "preproc.y"
  { 
  (yyval.str) = mm_strdup("on commit drop");
 }
-#line 42233 "preproc.c"
+#line 42230 "preproc.c"
     break;
 
   case 591: /* OnCommitOption: ON COMMIT DELETE_P ROWS  */
-#line 4450 "preproc.y"
+#line 4447 "preproc.y"
  { 
  (yyval.str) = mm_strdup("on commit delete rows");
 }
-#line 42241 "preproc.c"
+#line 42238 "preproc.c"
     break;
 
   case 592: /* OnCommitOption: ON COMMIT PRESERVE ROWS  */
-#line 4454 "preproc.y"
+#line 4451 "preproc.y"
  { 
  (yyval.str) = mm_strdup("on commit preserve rows");
 }
-#line 42249 "preproc.c"
+#line 42246 "preproc.c"
     break;
 
   case 593: /* OnCommitOption: %empty  */
-#line 4458 "preproc.y"
+#line 4455 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 42256 "preproc.c"
+#line 42253 "preproc.c"
     break;
 
   case 594: /* OptTableSpace: TABLESPACE name  */
-#line 4465 "preproc.y"
+#line 4462 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("tablespace"),(yyvsp[0].str));
 }
-#line 42264 "preproc.c"
+#line 42261 "preproc.c"
     break;
 
   case 595: /* OptTableSpace: %empty  */
-#line 4469 "preproc.y"
+#line 4466 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 42271 "preproc.c"
+#line 42268 "preproc.c"
     break;
 
   case 596: /* OptConsTableSpace: USING INDEX TABLESPACE name  */
-#line 4476 "preproc.y"
+#line 4473 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("using index tablespace"),(yyvsp[0].str));
 }
-#line 42279 "preproc.c"
+#line 42276 "preproc.c"
     break;
 
   case 597: /* OptConsTableSpace: %empty  */
-#line 4480 "preproc.y"
+#line 4477 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 42286 "preproc.c"
+#line 42283 "preproc.c"
     break;
 
   case 598: /* ExistingIndex: USING INDEX name  */
-#line 4487 "preproc.y"
+#line 4484 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("using index"),(yyvsp[0].str));
 }
-#line 42294 "preproc.c"
+#line 42291 "preproc.c"
     break;
 
   case 599: /* CreateStatsStmt: CREATE STATISTICS opt_qualified_name opt_name_list ON stats_params FROM from_list  */
-#line 4495 "preproc.y"
+#line 4492 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("create statistics"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("on"),(yyvsp[-2].str),mm_strdup("from"),(yyvsp[0].str));
 }
-#line 42302 "preproc.c"
+#line 42299 "preproc.c"
     break;
 
   case 600: /* CreateStatsStmt: CREATE STATISTICS IF_P NOT EXISTS any_name opt_name_list ON stats_params FROM from_list  */
-#line 4499 "preproc.y"
+#line 4496 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("create statistics if not exists"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("on"),(yyvsp[-2].str),mm_strdup("from"),(yyvsp[0].str));
 }
-#line 42310 "preproc.c"
+#line 42307 "preproc.c"
     break;
 
   case 601: /* stats_params: stats_param  */
-#line 4507 "preproc.y"
+#line 4504 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 42318 "preproc.c"
+#line 42315 "preproc.c"
     break;
 
   case 602: /* stats_params: stats_params ',' stats_param  */
-#line 4511 "preproc.y"
+#line 4508 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 42326 "preproc.c"
+#line 42323 "preproc.c"
     break;
 
   case 603: /* stats_param: ColId  */
-#line 4519 "preproc.y"
+#line 4516 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 42334 "preproc.c"
+#line 42331 "preproc.c"
     break;
 
   case 604: /* stats_param: func_expr_windowless  */
-#line 4523 "preproc.y"
+#line 4520 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 42342 "preproc.c"
+#line 42339 "preproc.c"
     break;
 
   case 605: /* stats_param: '(' a_expr ')'  */
-#line 4527 "preproc.y"
+#line 4524 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 42350 "preproc.c"
+#line 42347 "preproc.c"
     break;
 
   case 606: /* AlterStatsStmt: ALTER STATISTICS any_name SET STATISTICS SignedIconst  */
-#line 4535 "preproc.y"
+#line 4532 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter statistics"),(yyvsp[-3].str),mm_strdup("set statistics"),(yyvsp[0].str));
 }
-#line 42358 "preproc.c"
+#line 42355 "preproc.c"
     break;
 
   case 607: /* AlterStatsStmt: ALTER STATISTICS IF_P EXISTS any_name SET STATISTICS SignedIconst  */
-#line 4539 "preproc.y"
+#line 4536 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter statistics if exists"),(yyvsp[-3].str),mm_strdup("set statistics"),(yyvsp[0].str));
 }
-#line 42366 "preproc.c"
+#line 42363 "preproc.c"
     break;
 
   case 608: /* create_as_target: qualified_name opt_column_list table_access_method_clause OptWith OnCommitOption OptTableSpace  */
-#line 4547 "preproc.y"
+#line 4544 "preproc.y"
  { 
  (yyval.str) = cat_str(6,(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42374 "preproc.c"
+#line 42371 "preproc.c"
     break;
 
   case 609: /* opt_with_data: WITH DATA_P  */
-#line 4555 "preproc.y"
+#line 4552 "preproc.y"
  { 
  (yyval.str) = mm_strdup("with data");
 }
-#line 42382 "preproc.c"
+#line 42379 "preproc.c"
     break;
 
   case 610: /* opt_with_data: WITH NO DATA_P  */
-#line 4559 "preproc.y"
+#line 4556 "preproc.y"
  { 
  (yyval.str) = mm_strdup("with no data");
 }
-#line 42390 "preproc.c"
+#line 42387 "preproc.c"
     break;
 
   case 611: /* opt_with_data: %empty  */
-#line 4563 "preproc.y"
+#line 4560 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 42397 "preproc.c"
+#line 42394 "preproc.c"
     break;
 
   case 612: /* CreateMatViewStmt: CREATE OptNoLog MATERIALIZED VIEW create_mv_target AS SelectStmt opt_with_data  */
-#line 4570 "preproc.y"
+#line 4567 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("create"),(yyvsp[-6].str),mm_strdup("materialized view"),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42405 "preproc.c"
+#line 42402 "preproc.c"
     break;
 
   case 613: /* CreateMatViewStmt: CREATE OptNoLog MATERIALIZED VIEW IF_P NOT EXISTS create_mv_target AS SelectStmt opt_with_data  */
-#line 4574 "preproc.y"
+#line 4571 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("create"),(yyvsp[-9].str),mm_strdup("materialized view if not exists"),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42413 "preproc.c"
+#line 42410 "preproc.c"
     break;
 
   case 614: /* create_mv_target: qualified_name opt_column_list table_access_method_clause opt_reloptions OptTableSpace  */
-#line 4582 "preproc.y"
+#line 4579 "preproc.y"
  { 
  (yyval.str) = cat_str(5,(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42421 "preproc.c"
+#line 42418 "preproc.c"
     break;
 
   case 615: /* OptNoLog: UNLOGGED  */
-#line 4590 "preproc.y"
+#line 4587 "preproc.y"
  { 
  (yyval.str) = mm_strdup("unlogged");
 }
-#line 42429 "preproc.c"
+#line 42426 "preproc.c"
     break;
 
   case 616: /* OptNoLog: %empty  */
-#line 4594 "preproc.y"
+#line 4591 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 42436 "preproc.c"
+#line 42433 "preproc.c"
     break;
 
   case 617: /* RefreshMatViewStmt: REFRESH MATERIALIZED VIEW opt_concurrently qualified_name opt_with_data  */
-#line 4601 "preproc.y"
+#line 4598 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("refresh materialized view"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42444 "preproc.c"
+#line 42441 "preproc.c"
     break;
 
   case 618: /* CreateSeqStmt: CREATE OptTemp SEQUENCE qualified_name OptSeqOptList  */
-#line 4609 "preproc.y"
+#line 4606 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("create"),(yyvsp[-3].str),mm_strdup("sequence"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42452 "preproc.c"
+#line 42449 "preproc.c"
     break;
 
   case 619: /* CreateSeqStmt: CREATE OptTemp SEQUENCE IF_P NOT EXISTS qualified_name OptSeqOptList  */
-#line 4613 "preproc.y"
+#line 4610 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("create"),(yyvsp[-6].str),mm_strdup("sequence if not exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42460 "preproc.c"
+#line 42457 "preproc.c"
     break;
 
   case 620: /* AlterSeqStmt: ALTER SEQUENCE qualified_name SeqOptList  */
-#line 4621 "preproc.y"
+#line 4618 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter sequence"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42468 "preproc.c"
+#line 42465 "preproc.c"
     break;
 
   case 621: /* AlterSeqStmt: ALTER SEQUENCE IF_P EXISTS qualified_name SeqOptList  */
-#line 4625 "preproc.y"
+#line 4622 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter sequence if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42476 "preproc.c"
+#line 42473 "preproc.c"
     break;
 
   case 622: /* OptSeqOptList: SeqOptList  */
-#line 4633 "preproc.y"
+#line 4630 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 42484 "preproc.c"
+#line 42481 "preproc.c"
     break;
 
   case 623: /* OptSeqOptList: %empty  */
-#line 4637 "preproc.y"
+#line 4634 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 42491 "preproc.c"
+#line 42488 "preproc.c"
     break;
 
   case 624: /* OptParenthesizedSeqOptList: '(' SeqOptList ')'  */
-#line 4644 "preproc.y"
+#line 4641 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 42499 "preproc.c"
+#line 42496 "preproc.c"
     break;
 
   case 625: /* OptParenthesizedSeqOptList: %empty  */
-#line 4648 "preproc.y"
+#line 4645 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 42506 "preproc.c"
+#line 42503 "preproc.c"
     break;
 
   case 626: /* SeqOptList: SeqOptElem  */
-#line 4655 "preproc.y"
+#line 4652 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 42514 "preproc.c"
+#line 42511 "preproc.c"
     break;
 
   case 627: /* SeqOptList: SeqOptList SeqOptElem  */
-#line 4659 "preproc.y"
+#line 4656 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42522 "preproc.c"
+#line 42519 "preproc.c"
     break;
 
   case 628: /* SeqOptElem: AS SimpleTypename  */
-#line 4667 "preproc.y"
+#line 4664 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("as"),(yyvsp[0].str));
 }
-#line 42530 "preproc.c"
+#line 42527 "preproc.c"
     break;
 
   case 629: /* SeqOptElem: CACHE NumericOnly  */
-#line 4671 "preproc.y"
+#line 4668 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("cache"),(yyvsp[0].str));
 }
-#line 42538 "preproc.c"
+#line 42535 "preproc.c"
     break;
 
   case 630: /* SeqOptElem: CYCLE  */
-#line 4675 "preproc.y"
+#line 4672 "preproc.y"
  { 
  (yyval.str) = mm_strdup("cycle");
 }
-#line 42546 "preproc.c"
+#line 42543 "preproc.c"
     break;
 
   case 631: /* SeqOptElem: NO CYCLE  */
-#line 4679 "preproc.y"
+#line 4676 "preproc.y"
  { 
  (yyval.str) = mm_strdup("no cycle");
 }
-#line 42554 "preproc.c"
+#line 42551 "preproc.c"
     break;
 
   case 632: /* SeqOptElem: INCREMENT opt_by NumericOnly  */
-#line 4683 "preproc.y"
+#line 4680 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("increment"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42562 "preproc.c"
+#line 42559 "preproc.c"
     break;
 
   case 633: /* SeqOptElem: MAXVALUE NumericOnly  */
-#line 4687 "preproc.y"
+#line 4684 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("maxvalue"),(yyvsp[0].str));
 }
-#line 42570 "preproc.c"
+#line 42567 "preproc.c"
     break;
 
   case 634: /* SeqOptElem: MINVALUE NumericOnly  */
-#line 4691 "preproc.y"
+#line 4688 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("minvalue"),(yyvsp[0].str));
 }
-#line 42578 "preproc.c"
+#line 42575 "preproc.c"
     break;
 
   case 635: /* SeqOptElem: NO MAXVALUE  */
-#line 4695 "preproc.y"
+#line 4692 "preproc.y"
  { 
  (yyval.str) = mm_strdup("no maxvalue");
 }
-#line 42586 "preproc.c"
+#line 42583 "preproc.c"
     break;
 
   case 636: /* SeqOptElem: NO MINVALUE  */
-#line 4699 "preproc.y"
+#line 4696 "preproc.y"
  { 
  (yyval.str) = mm_strdup("no minvalue");
 }
-#line 42594 "preproc.c"
+#line 42591 "preproc.c"
     break;
 
   case 637: /* SeqOptElem: OWNED BY any_name  */
-#line 4703 "preproc.y"
+#line 4700 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("owned by"),(yyvsp[0].str));
 }
-#line 42602 "preproc.c"
+#line 42599 "preproc.c"
     break;
 
   case 638: /* SeqOptElem: SEQUENCE NAME_P any_name  */
-#line 4707 "preproc.y"
+#line 4704 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("sequence name"),(yyvsp[0].str));
 }
-#line 42610 "preproc.c"
+#line 42607 "preproc.c"
     break;
 
   case 639: /* SeqOptElem: START opt_with NumericOnly  */
-#line 4711 "preproc.y"
+#line 4708 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("start"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42618 "preproc.c"
+#line 42615 "preproc.c"
     break;
 
   case 640: /* SeqOptElem: RESTART  */
-#line 4715 "preproc.y"
+#line 4712 "preproc.y"
  { 
  (yyval.str) = mm_strdup("restart");
 }
-#line 42626 "preproc.c"
+#line 42623 "preproc.c"
     break;
 
   case 641: /* SeqOptElem: RESTART opt_with NumericOnly  */
-#line 4719 "preproc.y"
+#line 4716 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("restart"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42634 "preproc.c"
+#line 42631 "preproc.c"
     break;
 
   case 642: /* opt_by: BY  */
-#line 4727 "preproc.y"
+#line 4724 "preproc.y"
  { 
  (yyval.str) = mm_strdup("by");
 }
-#line 42642 "preproc.c"
+#line 42639 "preproc.c"
     break;
 
   case 643: /* opt_by: %empty  */
-#line 4731 "preproc.y"
+#line 4728 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 42649 "preproc.c"
+#line 42646 "preproc.c"
     break;
 
   case 644: /* NumericOnly: ecpg_fconst  */
-#line 4738 "preproc.y"
+#line 4735 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 42657 "preproc.c"
+#line 42654 "preproc.c"
     break;
 
   case 645: /* NumericOnly: '+' ecpg_fconst  */
-#line 4742 "preproc.y"
+#line 4739 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("+"),(yyvsp[0].str));
 }
-#line 42665 "preproc.c"
+#line 42662 "preproc.c"
     break;
 
   case 646: /* NumericOnly: '-' ecpg_fconst  */
-#line 4746 "preproc.y"
+#line 4743 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("-"),(yyvsp[0].str));
 }
-#line 42673 "preproc.c"
+#line 42670 "preproc.c"
     break;
 
   case 647: /* NumericOnly: SignedIconst  */
-#line 4750 "preproc.y"
+#line 4747 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 42681 "preproc.c"
+#line 42678 "preproc.c"
     break;
 
   case 648: /* NumericOnly_list: NumericOnly  */
-#line 4758 "preproc.y"
+#line 4755 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 42689 "preproc.c"
+#line 42686 "preproc.c"
     break;
 
   case 649: /* NumericOnly_list: NumericOnly_list ',' NumericOnly  */
-#line 4762 "preproc.y"
+#line 4759 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 42697 "preproc.c"
+#line 42694 "preproc.c"
     break;
 
   case 650: /* CreatePLangStmt: CREATE opt_or_replace opt_trusted opt_procedural LANGUAGE name  */
-#line 4770 "preproc.y"
+#line 4767 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("create"),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("language"),(yyvsp[0].str));
 }
-#line 42705 "preproc.c"
+#line 42702 "preproc.c"
     break;
 
   case 651: /* CreatePLangStmt: CREATE opt_or_replace opt_trusted opt_procedural LANGUAGE name HANDLER handler_name opt_inline_handler opt_validator  */
-#line 4774 "preproc.y"
+#line 4771 "preproc.y"
  { 
  (yyval.str) = cat_str(10,mm_strdup("create"),(yyvsp[-8].str),(yyvsp[-7].str),(yyvsp[-6].str),mm_strdup("language"),(yyvsp[-4].str),mm_strdup("handler"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42713 "preproc.c"
+#line 42710 "preproc.c"
     break;
 
   case 652: /* opt_trusted: TRUSTED  */
-#line 4782 "preproc.y"
+#line 4779 "preproc.y"
  { 
  (yyval.str) = mm_strdup("trusted");
 }
-#line 42721 "preproc.c"
+#line 42718 "preproc.c"
     break;
 
   case 653: /* opt_trusted: %empty  */
-#line 4786 "preproc.y"
+#line 4783 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 42728 "preproc.c"
+#line 42725 "preproc.c"
     break;
 
   case 654: /* handler_name: name  */
-#line 4793 "preproc.y"
+#line 4790 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 42736 "preproc.c"
+#line 42733 "preproc.c"
     break;
 
   case 655: /* handler_name: name attrs  */
-#line 4797 "preproc.y"
+#line 4794 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42744 "preproc.c"
+#line 42741 "preproc.c"
     break;
 
   case 656: /* opt_inline_handler: INLINE_P handler_name  */
-#line 4805 "preproc.y"
+#line 4802 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("inline"),(yyvsp[0].str));
 }
-#line 42752 "preproc.c"
+#line 42749 "preproc.c"
     break;
 
   case 657: /* opt_inline_handler: %empty  */
-#line 4809 "preproc.y"
+#line 4806 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 42759 "preproc.c"
+#line 42756 "preproc.c"
     break;
 
   case 658: /* validator_clause: VALIDATOR handler_name  */
-#line 4816 "preproc.y"
+#line 4813 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("validator"),(yyvsp[0].str));
 }
-#line 42767 "preproc.c"
+#line 42764 "preproc.c"
     break;
 
   case 659: /* validator_clause: NO VALIDATOR  */
-#line 4820 "preproc.y"
+#line 4817 "preproc.y"
  { 
  (yyval.str) = mm_strdup("no validator");
 }
-#line 42775 "preproc.c"
+#line 42772 "preproc.c"
     break;
 
   case 660: /* opt_validator: validator_clause  */
-#line 4828 "preproc.y"
+#line 4825 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 42783 "preproc.c"
+#line 42780 "preproc.c"
     break;
 
   case 661: /* opt_validator: %empty  */
-#line 4832 "preproc.y"
+#line 4829 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 42790 "preproc.c"
+#line 42787 "preproc.c"
     break;
 
   case 662: /* opt_procedural: PROCEDURAL  */
-#line 4839 "preproc.y"
+#line 4836 "preproc.y"
  { 
  (yyval.str) = mm_strdup("procedural");
 }
-#line 42798 "preproc.c"
+#line 42795 "preproc.c"
     break;
 
   case 663: /* opt_procedural: %empty  */
-#line 4843 "preproc.y"
+#line 4840 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 42805 "preproc.c"
+#line 42802 "preproc.c"
     break;
 
   case 664: /* CreateTableSpaceStmt: CREATE TABLESPACE name OptTableSpaceOwner LOCATION ecpg_sconst opt_reloptions  */
-#line 4850 "preproc.y"
+#line 4847 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("create tablespace"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("location"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42813 "preproc.c"
+#line 42810 "preproc.c"
     break;
 
   case 665: /* OptTableSpaceOwner: OWNER RoleSpec  */
-#line 4858 "preproc.y"
+#line 4855 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("owner"),(yyvsp[0].str));
 }
-#line 42821 "preproc.c"
+#line 42818 "preproc.c"
     break;
 
   case 666: /* OptTableSpaceOwner: %empty  */
-#line 4862 "preproc.y"
+#line 4859 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 42828 "preproc.c"
+#line 42825 "preproc.c"
     break;
 
   case 667: /* DropTableSpaceStmt: DROP TABLESPACE name  */
-#line 4869 "preproc.y"
+#line 4866 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("drop tablespace"),(yyvsp[0].str));
 }
-#line 42836 "preproc.c"
+#line 42833 "preproc.c"
     break;
 
   case 668: /* DropTableSpaceStmt: DROP TABLESPACE IF_P EXISTS name  */
-#line 4873 "preproc.y"
+#line 4870 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("drop tablespace if exists"),(yyvsp[0].str));
 }
-#line 42844 "preproc.c"
+#line 42841 "preproc.c"
     break;
 
   case 669: /* CreateExtensionStmt: CREATE EXTENSION name opt_with create_extension_opt_list  */
-#line 4881 "preproc.y"
+#line 4878 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("create extension"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42852 "preproc.c"
+#line 42849 "preproc.c"
     break;
 
   case 670: /* CreateExtensionStmt: CREATE EXTENSION IF_P NOT EXISTS name opt_with create_extension_opt_list  */
-#line 4885 "preproc.y"
+#line 4882 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("create extension if not exists"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42860 "preproc.c"
+#line 42857 "preproc.c"
     break;
 
   case 671: /* create_extension_opt_list: create_extension_opt_list create_extension_opt_item  */
-#line 4893 "preproc.y"
+#line 4890 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42868 "preproc.c"
+#line 42865 "preproc.c"
     break;
 
   case 672: /* create_extension_opt_list: %empty  */
-#line 4897 "preproc.y"
+#line 4894 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 42875 "preproc.c"
+#line 42872 "preproc.c"
     break;
 
   case 673: /* create_extension_opt_item: SCHEMA name  */
-#line 4904 "preproc.y"
+#line 4901 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("schema"),(yyvsp[0].str));
 }
-#line 42883 "preproc.c"
+#line 42880 "preproc.c"
     break;
 
   case 674: /* create_extension_opt_item: VERSION_P NonReservedWord_or_Sconst  */
-#line 4908 "preproc.y"
+#line 4905 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("version"),(yyvsp[0].str));
 }
-#line 42891 "preproc.c"
+#line 42888 "preproc.c"
     break;
 
   case 675: /* create_extension_opt_item: FROM NonReservedWord_or_Sconst  */
-#line 4912 "preproc.y"
+#line 4909 "preproc.y"
  { 
 mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
  (yyval.str) = cat_str(2,mm_strdup("from"),(yyvsp[0].str));
 }
-#line 42900 "preproc.c"
+#line 42897 "preproc.c"
     break;
 
   case 676: /* create_extension_opt_item: CASCADE  */
-#line 4917 "preproc.y"
+#line 4914 "preproc.y"
  { 
  (yyval.str) = mm_strdup("cascade");
 }
-#line 42908 "preproc.c"
+#line 42905 "preproc.c"
     break;
 
   case 677: /* AlterExtensionStmt: ALTER EXTENSION name UPDATE alter_extension_opt_list  */
-#line 4925 "preproc.y"
+#line 4922 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter extension"),(yyvsp[-2].str),mm_strdup("update"),(yyvsp[0].str));
 }
-#line 42916 "preproc.c"
+#line 42913 "preproc.c"
     break;
 
   case 678: /* alter_extension_opt_list: alter_extension_opt_list alter_extension_opt_item  */
-#line 4933 "preproc.y"
+#line 4930 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42924 "preproc.c"
+#line 42921 "preproc.c"
     break;
 
   case 679: /* alter_extension_opt_list: %empty  */
-#line 4937 "preproc.y"
+#line 4934 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 42931 "preproc.c"
+#line 42928 "preproc.c"
     break;
 
   case 680: /* alter_extension_opt_item: TO NonReservedWord_or_Sconst  */
-#line 4944 "preproc.y"
+#line 4941 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("to"),(yyvsp[0].str));
 }
-#line 42939 "preproc.c"
+#line 42936 "preproc.c"
     break;
 
   case 681: /* AlterExtensionContentsStmt: ALTER EXTENSION name add_drop object_type_name name  */
-#line 4952 "preproc.y"
+#line 4949 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42947 "preproc.c"
+#line 42944 "preproc.c"
     break;
 
   case 682: /* AlterExtensionContentsStmt: ALTER EXTENSION name add_drop object_type_any_name any_name  */
-#line 4956 "preproc.y"
+#line 4953 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 42955 "preproc.c"
+#line 42952 "preproc.c"
     break;
 
   case 683: /* AlterExtensionContentsStmt: ALTER EXTENSION name add_drop AGGREGATE aggregate_with_argtypes  */
-#line 4960 "preproc.y"
+#line 4957 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("aggregate"),(yyvsp[0].str));
 }
-#line 42963 "preproc.c"
+#line 42960 "preproc.c"
     break;
 
   case 684: /* AlterExtensionContentsStmt: ALTER EXTENSION name add_drop CAST '(' Typename AS Typename ')'  */
-#line 4964 "preproc.y"
+#line 4961 "preproc.y"
  { 
  (yyval.str) = cat_str(8,mm_strdup("alter extension"),(yyvsp[-7].str),(yyvsp[-6].str),mm_strdup("cast ("),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 42971 "preproc.c"
+#line 42968 "preproc.c"
     break;
 
   case 685: /* AlterExtensionContentsStmt: ALTER EXTENSION name add_drop DOMAIN_P Typename  */
-#line 4968 "preproc.y"
+#line 4965 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("domain"),(yyvsp[0].str));
 }
-#line 42979 "preproc.c"
+#line 42976 "preproc.c"
     break;
 
   case 686: /* AlterExtensionContentsStmt: ALTER EXTENSION name add_drop FUNCTION function_with_argtypes  */
-#line 4972 "preproc.y"
+#line 4969 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("function"),(yyvsp[0].str));
 }
-#line 42987 "preproc.c"
+#line 42984 "preproc.c"
     break;
 
   case 687: /* AlterExtensionContentsStmt: ALTER EXTENSION name add_drop OPERATOR operator_with_argtypes  */
-#line 4976 "preproc.y"
+#line 4973 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("operator"),(yyvsp[0].str));
 }
-#line 42995 "preproc.c"
+#line 42992 "preproc.c"
     break;
 
   case 688: /* AlterExtensionContentsStmt: ALTER EXTENSION name add_drop OPERATOR CLASS any_name USING name  */
-#line 4980 "preproc.y"
+#line 4977 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("alter extension"),(yyvsp[-6].str),(yyvsp[-5].str),mm_strdup("operator class"),(yyvsp[-2].str),mm_strdup("using"),(yyvsp[0].str));
 }
-#line 43003 "preproc.c"
+#line 43000 "preproc.c"
     break;
 
   case 689: /* AlterExtensionContentsStmt: ALTER EXTENSION name add_drop OPERATOR FAMILY any_name USING name  */
-#line 4984 "preproc.y"
+#line 4981 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("alter extension"),(yyvsp[-6].str),(yyvsp[-5].str),mm_strdup("operator family"),(yyvsp[-2].str),mm_strdup("using"),(yyvsp[0].str));
 }
-#line 43011 "preproc.c"
+#line 43008 "preproc.c"
     break;
 
   case 690: /* AlterExtensionContentsStmt: ALTER EXTENSION name add_drop PROCEDURE function_with_argtypes  */
-#line 4988 "preproc.y"
+#line 4985 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("procedure"),(yyvsp[0].str));
 }
-#line 43019 "preproc.c"
+#line 43016 "preproc.c"
     break;
 
   case 691: /* AlterExtensionContentsStmt: ALTER EXTENSION name add_drop ROUTINE function_with_argtypes  */
-#line 4992 "preproc.y"
+#line 4989 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("routine"),(yyvsp[0].str));
 }
-#line 43027 "preproc.c"
+#line 43024 "preproc.c"
     break;
 
   case 692: /* AlterExtensionContentsStmt: ALTER EXTENSION name add_drop TRANSFORM FOR Typename LANGUAGE name  */
-#line 4996 "preproc.y"
+#line 4993 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("alter extension"),(yyvsp[-6].str),(yyvsp[-5].str),mm_strdup("transform for"),(yyvsp[-2].str),mm_strdup("language"),(yyvsp[0].str));
 }
-#line 43035 "preproc.c"
+#line 43032 "preproc.c"
     break;
 
   case 693: /* AlterExtensionContentsStmt: ALTER EXTENSION name add_drop TYPE_P Typename  */
-#line 5000 "preproc.y"
+#line 4997 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("type"),(yyvsp[0].str));
 }
-#line 43043 "preproc.c"
+#line 43040 "preproc.c"
     break;
 
   case 694: /* CreateFdwStmt: CREATE FOREIGN DATA_P WRAPPER name opt_fdw_options create_generic_options  */
-#line 5008 "preproc.y"
+#line 5005 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("create foreign data wrapper"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43051 "preproc.c"
+#line 43048 "preproc.c"
     break;
 
   case 695: /* fdw_option: HANDLER handler_name  */
-#line 5016 "preproc.y"
+#line 5013 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("handler"),(yyvsp[0].str));
 }
-#line 43059 "preproc.c"
+#line 43056 "preproc.c"
     break;
 
   case 696: /* fdw_option: NO HANDLER  */
-#line 5020 "preproc.y"
+#line 5017 "preproc.y"
  { 
  (yyval.str) = mm_strdup("no handler");
 }
-#line 43067 "preproc.c"
+#line 43064 "preproc.c"
     break;
 
   case 697: /* fdw_option: VALIDATOR handler_name  */
-#line 5024 "preproc.y"
+#line 5021 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("validator"),(yyvsp[0].str));
 }
-#line 43075 "preproc.c"
+#line 43072 "preproc.c"
     break;
 
   case 698: /* fdw_option: NO VALIDATOR  */
-#line 5028 "preproc.y"
+#line 5025 "preproc.y"
  { 
  (yyval.str) = mm_strdup("no validator");
 }
-#line 43083 "preproc.c"
+#line 43080 "preproc.c"
     break;
 
   case 699: /* fdw_options: fdw_option  */
-#line 5036 "preproc.y"
+#line 5033 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43091 "preproc.c"
+#line 43088 "preproc.c"
     break;
 
   case 700: /* fdw_options: fdw_options fdw_option  */
-#line 5040 "preproc.y"
+#line 5037 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43099 "preproc.c"
+#line 43096 "preproc.c"
     break;
 
   case 701: /* opt_fdw_options: fdw_options  */
-#line 5048 "preproc.y"
+#line 5045 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43107 "preproc.c"
+#line 43104 "preproc.c"
     break;
 
   case 702: /* opt_fdw_options: %empty  */
-#line 5052 "preproc.y"
+#line 5049 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 43114 "preproc.c"
+#line 43111 "preproc.c"
     break;
 
   case 703: /* AlterFdwStmt: ALTER FOREIGN DATA_P WRAPPER name opt_fdw_options alter_generic_options  */
-#line 5059 "preproc.y"
+#line 5056 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter foreign data wrapper"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43122 "preproc.c"
+#line 43119 "preproc.c"
     break;
 
   case 704: /* AlterFdwStmt: ALTER FOREIGN DATA_P WRAPPER name fdw_options  */
-#line 5063 "preproc.y"
+#line 5060 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter foreign data wrapper"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43130 "preproc.c"
+#line 43127 "preproc.c"
     break;
 
   case 705: /* create_generic_options: OPTIONS '(' generic_option_list ')'  */
-#line 5071 "preproc.y"
+#line 5068 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("options ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 43138 "preproc.c"
+#line 43135 "preproc.c"
     break;
 
   case 706: /* create_generic_options: %empty  */
-#line 5075 "preproc.y"
+#line 5072 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 43145 "preproc.c"
+#line 43142 "preproc.c"
     break;
 
   case 707: /* generic_option_list: generic_option_elem  */
-#line 5082 "preproc.y"
+#line 5079 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43153 "preproc.c"
+#line 43150 "preproc.c"
     break;
 
   case 708: /* generic_option_list: generic_option_list ',' generic_option_elem  */
-#line 5086 "preproc.y"
+#line 5083 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 43161 "preproc.c"
+#line 43158 "preproc.c"
     break;
 
   case 709: /* alter_generic_options: OPTIONS '(' alter_generic_option_list ')'  */
-#line 5094 "preproc.y"
+#line 5091 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("options ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 43169 "preproc.c"
+#line 43166 "preproc.c"
     break;
 
   case 710: /* alter_generic_option_list: alter_generic_option_elem  */
-#line 5102 "preproc.y"
+#line 5099 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43177 "preproc.c"
+#line 43174 "preproc.c"
     break;
 
   case 711: /* alter_generic_option_list: alter_generic_option_list ',' alter_generic_option_elem  */
-#line 5106 "preproc.y"
+#line 5103 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 43185 "preproc.c"
+#line 43182 "preproc.c"
     break;
 
   case 712: /* alter_generic_option_elem: generic_option_elem  */
-#line 5114 "preproc.y"
+#line 5111 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43193 "preproc.c"
+#line 43190 "preproc.c"
     break;
 
   case 713: /* alter_generic_option_elem: SET generic_option_elem  */
-#line 5118 "preproc.y"
+#line 5115 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("set"),(yyvsp[0].str));
 }
-#line 43201 "preproc.c"
+#line 43198 "preproc.c"
     break;
 
   case 714: /* alter_generic_option_elem: ADD_P generic_option_elem  */
-#line 5122 "preproc.y"
+#line 5119 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("add"),(yyvsp[0].str));
 }
-#line 43209 "preproc.c"
+#line 43206 "preproc.c"
     break;
 
   case 715: /* alter_generic_option_elem: DROP generic_option_name  */
-#line 5126 "preproc.y"
+#line 5123 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("drop"),(yyvsp[0].str));
 }
-#line 43217 "preproc.c"
+#line 43214 "preproc.c"
     break;
 
   case 716: /* generic_option_elem: generic_option_name generic_option_arg  */
-#line 5134 "preproc.y"
+#line 5131 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43225 "preproc.c"
+#line 43222 "preproc.c"
     break;
 
   case 717: /* generic_option_name: ColLabel  */
-#line 5142 "preproc.y"
+#line 5139 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43233 "preproc.c"
+#line 43230 "preproc.c"
     break;
 
   case 718: /* generic_option_arg: ecpg_sconst  */
-#line 5150 "preproc.y"
+#line 5147 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43241 "preproc.c"
+#line 43238 "preproc.c"
     break;
 
   case 719: /* CreateForeignServerStmt: CREATE SERVER name opt_type opt_foreign_server_version FOREIGN DATA_P WRAPPER name create_generic_options  */
-#line 5158 "preproc.y"
+#line 5155 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("create server"),(yyvsp[-7].str),(yyvsp[-6].str),(yyvsp[-5].str),mm_strdup("foreign data wrapper"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43249 "preproc.c"
+#line 43246 "preproc.c"
     break;
 
   case 720: /* CreateForeignServerStmt: CREATE SERVER IF_P NOT EXISTS name opt_type opt_foreign_server_version FOREIGN DATA_P WRAPPER name create_generic_options  */
-#line 5162 "preproc.y"
+#line 5159 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("create server if not exists"),(yyvsp[-7].str),(yyvsp[-6].str),(yyvsp[-5].str),mm_strdup("foreign data wrapper"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43257 "preproc.c"
+#line 43254 "preproc.c"
     break;
 
   case 721: /* opt_type: TYPE_P ecpg_sconst  */
-#line 5170 "preproc.y"
+#line 5167 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("type"),(yyvsp[0].str));
 }
-#line 43265 "preproc.c"
+#line 43262 "preproc.c"
     break;
 
   case 722: /* opt_type: %empty  */
-#line 5174 "preproc.y"
+#line 5171 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 43272 "preproc.c"
+#line 43269 "preproc.c"
     break;
 
   case 723: /* foreign_server_version: VERSION_P ecpg_sconst  */
-#line 5181 "preproc.y"
+#line 5178 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("version"),(yyvsp[0].str));
 }
-#line 43280 "preproc.c"
+#line 43277 "preproc.c"
     break;
 
   case 724: /* foreign_server_version: VERSION_P NULL_P  */
-#line 5185 "preproc.y"
+#line 5182 "preproc.y"
  { 
  (yyval.str) = mm_strdup("version null");
 }
-#line 43288 "preproc.c"
+#line 43285 "preproc.c"
     break;
 
   case 725: /* opt_foreign_server_version: foreign_server_version  */
-#line 5193 "preproc.y"
+#line 5190 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43296 "preproc.c"
+#line 43293 "preproc.c"
     break;
 
   case 726: /* opt_foreign_server_version: %empty  */
-#line 5197 "preproc.y"
+#line 5194 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 43303 "preproc.c"
+#line 43300 "preproc.c"
     break;
 
   case 727: /* AlterForeignServerStmt: ALTER SERVER name foreign_server_version alter_generic_options  */
-#line 5204 "preproc.y"
+#line 5201 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter server"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43311 "preproc.c"
+#line 43308 "preproc.c"
     break;
 
   case 728: /* AlterForeignServerStmt: ALTER SERVER name foreign_server_version  */
-#line 5208 "preproc.y"
+#line 5205 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter server"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43319 "preproc.c"
+#line 43316 "preproc.c"
     break;
 
   case 729: /* AlterForeignServerStmt: ALTER SERVER name alter_generic_options  */
-#line 5212 "preproc.y"
+#line 5209 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter server"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43327 "preproc.c"
+#line 43324 "preproc.c"
     break;
 
   case 730: /* CreateForeignTableStmt: CREATE FOREIGN TABLE qualified_name '(' OptTableElementList ')' OptInherit SERVER name create_generic_options  */
-#line 5220 "preproc.y"
+#line 5217 "preproc.y"
  { 
  (yyval.str) = cat_str(9,mm_strdup("create foreign table"),(yyvsp[-7].str),mm_strdup("("),(yyvsp[-5].str),mm_strdup(")"),(yyvsp[-3].str),mm_strdup("server"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43335 "preproc.c"
+#line 43332 "preproc.c"
     break;
 
   case 731: /* CreateForeignTableStmt: CREATE FOREIGN TABLE IF_P NOT EXISTS qualified_name '(' OptTableElementList ')' OptInherit SERVER name create_generic_options  */
-#line 5224 "preproc.y"
+#line 5221 "preproc.y"
  { 
  (yyval.str) = cat_str(9,mm_strdup("create foreign table if not exists"),(yyvsp[-7].str),mm_strdup("("),(yyvsp[-5].str),mm_strdup(")"),(yyvsp[-3].str),mm_strdup("server"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43343 "preproc.c"
+#line 43340 "preproc.c"
     break;
 
   case 732: /* CreateForeignTableStmt: CREATE FOREIGN TABLE qualified_name PARTITION OF qualified_name OptTypedTableElementList PartitionBoundSpec SERVER name create_generic_options  */
-#line 5228 "preproc.y"
+#line 5225 "preproc.y"
  { 
  (yyval.str) = cat_str(9,mm_strdup("create foreign table"),(yyvsp[-8].str),mm_strdup("partition of"),(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("server"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43351 "preproc.c"
+#line 43348 "preproc.c"
     break;
 
   case 733: /* CreateForeignTableStmt: CREATE FOREIGN TABLE IF_P NOT EXISTS qualified_name PARTITION OF qualified_name OptTypedTableElementList PartitionBoundSpec SERVER name create_generic_options  */
-#line 5232 "preproc.y"
+#line 5229 "preproc.y"
  { 
  (yyval.str) = cat_str(9,mm_strdup("create foreign table if not exists"),(yyvsp[-8].str),mm_strdup("partition of"),(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("server"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43359 "preproc.c"
+#line 43356 "preproc.c"
     break;
 
   case 734: /* ImportForeignSchemaStmt: IMPORT_P FOREIGN SCHEMA name import_qualification FROM SERVER name INTO name create_generic_options  */
-#line 5240 "preproc.y"
+#line 5237 "preproc.y"
  { 
  (yyval.str) = cat_str(8,mm_strdup("import foreign schema"),(yyvsp[-7].str),(yyvsp[-6].str),mm_strdup("from server"),(yyvsp[-3].str),mm_strdup("into"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43367 "preproc.c"
+#line 43364 "preproc.c"
     break;
 
   case 735: /* import_qualification_type: LIMIT TO  */
-#line 5248 "preproc.y"
+#line 5245 "preproc.y"
  { 
  (yyval.str) = mm_strdup("limit to");
 }
-#line 43375 "preproc.c"
+#line 43372 "preproc.c"
     break;
 
   case 736: /* import_qualification_type: EXCEPT  */
-#line 5252 "preproc.y"
+#line 5249 "preproc.y"
  { 
  (yyval.str) = mm_strdup("except");
 }
-#line 43383 "preproc.c"
+#line 43380 "preproc.c"
     break;
 
   case 737: /* import_qualification: import_qualification_type '(' relation_expr_list ')'  */
-#line 5260 "preproc.y"
+#line 5257 "preproc.y"
  { 
  (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 43391 "preproc.c"
+#line 43388 "preproc.c"
     break;
 
   case 738: /* import_qualification: %empty  */
-#line 5264 "preproc.y"
+#line 5261 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 43398 "preproc.c"
+#line 43395 "preproc.c"
     break;
 
   case 739: /* CreateUserMappingStmt: CREATE USER MAPPING FOR auth_ident SERVER name create_generic_options  */
-#line 5271 "preproc.y"
+#line 5268 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("create user mapping for"),(yyvsp[-3].str),mm_strdup("server"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43406 "preproc.c"
+#line 43403 "preproc.c"
     break;
 
   case 740: /* CreateUserMappingStmt: CREATE USER MAPPING IF_P NOT EXISTS FOR auth_ident SERVER name create_generic_options  */
-#line 5275 "preproc.y"
+#line 5272 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("create user mapping if not exists for"),(yyvsp[-3].str),mm_strdup("server"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43414 "preproc.c"
+#line 43411 "preproc.c"
     break;
 
   case 741: /* auth_ident: RoleSpec  */
-#line 5283 "preproc.y"
+#line 5280 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43422 "preproc.c"
+#line 43419 "preproc.c"
     break;
 
   case 742: /* auth_ident: USER  */
-#line 5287 "preproc.y"
+#line 5284 "preproc.y"
  { 
  (yyval.str) = mm_strdup("user");
 }
-#line 43430 "preproc.c"
+#line 43427 "preproc.c"
     break;
 
   case 743: /* DropUserMappingStmt: DROP USER MAPPING FOR auth_ident SERVER name  */
-#line 5295 "preproc.y"
+#line 5292 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("drop user mapping for"),(yyvsp[-2].str),mm_strdup("server"),(yyvsp[0].str));
 }
-#line 43438 "preproc.c"
+#line 43435 "preproc.c"
     break;
 
   case 744: /* DropUserMappingStmt: DROP USER MAPPING IF_P EXISTS FOR auth_ident SERVER name  */
-#line 5299 "preproc.y"
+#line 5296 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("drop user mapping if exists for"),(yyvsp[-2].str),mm_strdup("server"),(yyvsp[0].str));
 }
-#line 43446 "preproc.c"
+#line 43443 "preproc.c"
     break;
 
   case 745: /* AlterUserMappingStmt: ALTER USER MAPPING FOR auth_ident SERVER name alter_generic_options  */
-#line 5307 "preproc.y"
+#line 5304 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter user mapping for"),(yyvsp[-3].str),mm_strdup("server"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43454 "preproc.c"
+#line 43451 "preproc.c"
     break;
 
   case 746: /* CreatePolicyStmt: CREATE POLICY name ON qualified_name RowSecurityDefaultPermissive RowSecurityDefaultForCmd RowSecurityDefaultToRole RowSecurityOptionalExpr RowSecurityOptionalWithCheck  */
-#line 5315 "preproc.y"
+#line 5312 "preproc.y"
  { 
  (yyval.str) = cat_str(9,mm_strdup("create policy"),(yyvsp[-7].str),mm_strdup("on"),(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43462 "preproc.c"
+#line 43459 "preproc.c"
     break;
 
   case 747: /* AlterPolicyStmt: ALTER POLICY name ON qualified_name RowSecurityOptionalToRole RowSecurityOptionalExpr RowSecurityOptionalWithCheck  */
-#line 5323 "preproc.y"
+#line 5320 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("alter policy"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43470 "preproc.c"
+#line 43467 "preproc.c"
     break;
 
   case 748: /* RowSecurityOptionalExpr: USING '(' a_expr ')'  */
-#line 5331 "preproc.y"
+#line 5328 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("using ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 43478 "preproc.c"
+#line 43475 "preproc.c"
     break;
 
   case 749: /* RowSecurityOptionalExpr: %empty  */
-#line 5335 "preproc.y"
+#line 5332 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 43485 "preproc.c"
+#line 43482 "preproc.c"
     break;
 
   case 750: /* RowSecurityOptionalWithCheck: WITH CHECK '(' a_expr ')'  */
-#line 5342 "preproc.y"
+#line 5339 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("with check ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 43493 "preproc.c"
+#line 43490 "preproc.c"
     break;
 
   case 751: /* RowSecurityOptionalWithCheck: %empty  */
-#line 5346 "preproc.y"
+#line 5343 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 43500 "preproc.c"
+#line 43497 "preproc.c"
     break;
 
   case 752: /* RowSecurityDefaultToRole: TO role_list  */
-#line 5353 "preproc.y"
+#line 5350 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("to"),(yyvsp[0].str));
 }
-#line 43508 "preproc.c"
+#line 43505 "preproc.c"
     break;
 
   case 753: /* RowSecurityDefaultToRole: %empty  */
-#line 5357 "preproc.y"
+#line 5354 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 43515 "preproc.c"
+#line 43512 "preproc.c"
     break;
 
   case 754: /* RowSecurityOptionalToRole: TO role_list  */
-#line 5364 "preproc.y"
+#line 5361 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("to"),(yyvsp[0].str));
 }
-#line 43523 "preproc.c"
+#line 43520 "preproc.c"
     break;
 
   case 755: /* RowSecurityOptionalToRole: %empty  */
-#line 5368 "preproc.y"
+#line 5365 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 43530 "preproc.c"
+#line 43527 "preproc.c"
     break;
 
   case 756: /* RowSecurityDefaultPermissive: AS ecpg_ident  */
-#line 5375 "preproc.y"
+#line 5372 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("as"),(yyvsp[0].str));
 }
-#line 43538 "preproc.c"
+#line 43535 "preproc.c"
     break;
 
   case 757: /* RowSecurityDefaultPermissive: %empty  */
-#line 5379 "preproc.y"
+#line 5376 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 43545 "preproc.c"
+#line 43542 "preproc.c"
     break;
 
   case 758: /* RowSecurityDefaultForCmd: FOR row_security_cmd  */
-#line 5386 "preproc.y"
+#line 5383 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("for"),(yyvsp[0].str));
 }
-#line 43553 "preproc.c"
+#line 43550 "preproc.c"
     break;
 
   case 759: /* RowSecurityDefaultForCmd: %empty  */
-#line 5390 "preproc.y"
+#line 5387 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 43560 "preproc.c"
+#line 43557 "preproc.c"
     break;
 
   case 760: /* row_security_cmd: ALL  */
-#line 5397 "preproc.y"
+#line 5394 "preproc.y"
  { 
  (yyval.str) = mm_strdup("all");
 }
-#line 43568 "preproc.c"
+#line 43565 "preproc.c"
     break;
 
   case 761: /* row_security_cmd: SELECT  */
-#line 5401 "preproc.y"
+#line 5398 "preproc.y"
  { 
  (yyval.str) = mm_strdup("select");
 }
-#line 43576 "preproc.c"
+#line 43573 "preproc.c"
     break;
 
   case 762: /* row_security_cmd: INSERT  */
-#line 5405 "preproc.y"
+#line 5402 "preproc.y"
  { 
  (yyval.str) = mm_strdup("insert");
 }
-#line 43584 "preproc.c"
+#line 43581 "preproc.c"
     break;
 
   case 763: /* row_security_cmd: UPDATE  */
-#line 5409 "preproc.y"
+#line 5406 "preproc.y"
  { 
  (yyval.str) = mm_strdup("update");
 }
-#line 43592 "preproc.c"
+#line 43589 "preproc.c"
     break;
 
   case 764: /* row_security_cmd: DELETE_P  */
-#line 5413 "preproc.y"
+#line 5410 "preproc.y"
  { 
  (yyval.str) = mm_strdup("delete");
 }
-#line 43600 "preproc.c"
+#line 43597 "preproc.c"
     break;
 
   case 765: /* CreateAmStmt: CREATE ACCESS METHOD name TYPE_P am_type HANDLER handler_name  */
-#line 5421 "preproc.y"
+#line 5418 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("create access method"),(yyvsp[-4].str),mm_strdup("type"),(yyvsp[-2].str),mm_strdup("handler"),(yyvsp[0].str));
 }
-#line 43608 "preproc.c"
+#line 43605 "preproc.c"
     break;
 
   case 766: /* am_type: INDEX  */
-#line 5429 "preproc.y"
+#line 5426 "preproc.y"
  { 
  (yyval.str) = mm_strdup("index");
 }
-#line 43616 "preproc.c"
+#line 43613 "preproc.c"
     break;
 
   case 767: /* am_type: TABLE  */
-#line 5433 "preproc.y"
+#line 5430 "preproc.y"
  { 
  (yyval.str) = mm_strdup("table");
 }
-#line 43624 "preproc.c"
+#line 43621 "preproc.c"
     break;
 
   case 768: /* CreateTrigStmt: CREATE opt_or_replace TRIGGER name TriggerActionTime TriggerEvents ON qualified_name TriggerReferencing TriggerForSpec TriggerWhen EXECUTE FUNCTION_or_PROCEDURE func_name '(' TriggerFuncArgs ')'  */
-#line 5441 "preproc.y"
+#line 5438 "preproc.y"
  { 
  (yyval.str) = cat_str(17,mm_strdup("create"),(yyvsp[-15].str),mm_strdup("trigger"),(yyvsp[-13].str),(yyvsp[-12].str),(yyvsp[-11].str),mm_strdup("on"),(yyvsp[-9].str),(yyvsp[-8].str),(yyvsp[-7].str),(yyvsp[-6].str),mm_strdup("execute"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 43632 "preproc.c"
+#line 43629 "preproc.c"
     break;
 
   case 769: /* CreateTrigStmt: CREATE opt_or_replace CONSTRAINT TRIGGER name AFTER TriggerEvents ON qualified_name OptConstrFromTable ConstraintAttributeSpec FOR EACH ROW TriggerWhen EXECUTE FUNCTION_or_PROCEDURE func_name '(' TriggerFuncArgs ')'  */
-#line 5445 "preproc.y"
+#line 5442 "preproc.y"
  { 
-mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
  (yyval.str) = cat_str(18,mm_strdup("create"),(yyvsp[-19].str),mm_strdup("constraint trigger"),(yyvsp[-16].str),mm_strdup("after"),(yyvsp[-14].str),mm_strdup("on"),(yyvsp[-12].str),(yyvsp[-11].str),(yyvsp[-10].str),mm_strdup("for each row"),(yyvsp[-6].str),mm_strdup("execute"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 43641 "preproc.c"
+#line 43637 "preproc.c"
     break;
 
   case 770: /* TriggerActionTime: BEFORE  */
-#line 5454 "preproc.y"
+#line 5450 "preproc.y"
  { 
  (yyval.str) = mm_strdup("before");
 }
-#line 43649 "preproc.c"
+#line 43645 "preproc.c"
     break;
 
   case 771: /* TriggerActionTime: AFTER  */
-#line 5458 "preproc.y"
+#line 5454 "preproc.y"
  { 
  (yyval.str) = mm_strdup("after");
 }
-#line 43657 "preproc.c"
+#line 43653 "preproc.c"
     break;
 
   case 772: /* TriggerActionTime: INSTEAD OF  */
-#line 5462 "preproc.y"
+#line 5458 "preproc.y"
  { 
  (yyval.str) = mm_strdup("instead of");
 }
-#line 43665 "preproc.c"
+#line 43661 "preproc.c"
     break;
 
   case 773: /* TriggerEvents: TriggerOneEvent  */
-#line 5470 "preproc.y"
+#line 5466 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43673 "preproc.c"
+#line 43669 "preproc.c"
     break;
 
   case 774: /* TriggerEvents: TriggerEvents OR TriggerOneEvent  */
-#line 5474 "preproc.y"
+#line 5470 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("or"),(yyvsp[0].str));
 }
-#line 43681 "preproc.c"
+#line 43677 "preproc.c"
     break;
 
   case 775: /* TriggerOneEvent: INSERT  */
-#line 5482 "preproc.y"
+#line 5478 "preproc.y"
  { 
  (yyval.str) = mm_strdup("insert");
 }
-#line 43689 "preproc.c"
+#line 43685 "preproc.c"
     break;
 
   case 776: /* TriggerOneEvent: DELETE_P  */
-#line 5486 "preproc.y"
+#line 5482 "preproc.y"
  { 
  (yyval.str) = mm_strdup("delete");
 }
-#line 43697 "preproc.c"
+#line 43693 "preproc.c"
     break;
 
   case 777: /* TriggerOneEvent: UPDATE  */
-#line 5490 "preproc.y"
+#line 5486 "preproc.y"
  { 
  (yyval.str) = mm_strdup("update");
 }
-#line 43705 "preproc.c"
+#line 43701 "preproc.c"
     break;
 
   case 778: /* TriggerOneEvent: UPDATE OF columnList  */
-#line 5494 "preproc.y"
+#line 5490 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("update of"),(yyvsp[0].str));
 }
-#line 43713 "preproc.c"
+#line 43709 "preproc.c"
     break;
 
   case 779: /* TriggerOneEvent: TRUNCATE  */
-#line 5498 "preproc.y"
+#line 5494 "preproc.y"
  { 
  (yyval.str) = mm_strdup("truncate");
 }
-#line 43721 "preproc.c"
+#line 43717 "preproc.c"
     break;
 
   case 780: /* TriggerReferencing: REFERENCING TriggerTransitions  */
-#line 5506 "preproc.y"
+#line 5502 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("referencing"),(yyvsp[0].str));
 }
-#line 43729 "preproc.c"
+#line 43725 "preproc.c"
     break;
 
   case 781: /* TriggerReferencing: %empty  */
-#line 5510 "preproc.y"
+#line 5506 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 43736 "preproc.c"
+#line 43732 "preproc.c"
     break;
 
   case 782: /* TriggerTransitions: TriggerTransition  */
-#line 5517 "preproc.y"
+#line 5513 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43744 "preproc.c"
+#line 43740 "preproc.c"
     break;
 
   case 783: /* TriggerTransitions: TriggerTransitions TriggerTransition  */
-#line 5521 "preproc.y"
+#line 5517 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43752 "preproc.c"
+#line 43748 "preproc.c"
     break;
 
   case 784: /* TriggerTransition: TransitionOldOrNew TransitionRowOrTable opt_as TransitionRelName  */
-#line 5529 "preproc.y"
+#line 5525 "preproc.y"
  { 
  (yyval.str) = cat_str(4,(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43760 "preproc.c"
+#line 43756 "preproc.c"
     break;
 
   case 785: /* TransitionOldOrNew: NEW  */
-#line 5537 "preproc.y"
+#line 5533 "preproc.y"
  { 
  (yyval.str) = mm_strdup("new");
 }
-#line 43768 "preproc.c"
+#line 43764 "preproc.c"
     break;
 
   case 786: /* TransitionOldOrNew: OLD  */
-#line 5541 "preproc.y"
+#line 5537 "preproc.y"
  { 
  (yyval.str) = mm_strdup("old");
 }
-#line 43776 "preproc.c"
+#line 43772 "preproc.c"
     break;
 
   case 787: /* TransitionRowOrTable: TABLE  */
-#line 5549 "preproc.y"
+#line 5545 "preproc.y"
  { 
  (yyval.str) = mm_strdup("table");
 }
-#line 43784 "preproc.c"
+#line 43780 "preproc.c"
     break;
 
   case 788: /* TransitionRowOrTable: ROW  */
-#line 5553 "preproc.y"
+#line 5549 "preproc.y"
  { 
  (yyval.str) = mm_strdup("row");
 }
-#line 43792 "preproc.c"
+#line 43788 "preproc.c"
     break;
 
   case 789: /* TransitionRelName: ColId  */
-#line 5561 "preproc.y"
+#line 5557 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43800 "preproc.c"
+#line 43796 "preproc.c"
     break;
 
   case 790: /* TriggerForSpec: FOR TriggerForOptEach TriggerForType  */
-#line 5569 "preproc.y"
+#line 5565 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("for"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43808 "preproc.c"
+#line 43804 "preproc.c"
     break;
 
   case 791: /* TriggerForSpec: %empty  */
-#line 5573 "preproc.y"
+#line 5569 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 43815 "preproc.c"
+#line 43811 "preproc.c"
     break;
 
   case 792: /* TriggerForOptEach: EACH  */
-#line 5580 "preproc.y"
+#line 5576 "preproc.y"
  { 
  (yyval.str) = mm_strdup("each");
 }
-#line 43823 "preproc.c"
+#line 43819 "preproc.c"
     break;
 
   case 793: /* TriggerForOptEach: %empty  */
-#line 5584 "preproc.y"
+#line 5580 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 43830 "preproc.c"
+#line 43826 "preproc.c"
     break;
 
   case 794: /* TriggerForType: ROW  */
-#line 5591 "preproc.y"
+#line 5587 "preproc.y"
  { 
  (yyval.str) = mm_strdup("row");
 }
-#line 43838 "preproc.c"
+#line 43834 "preproc.c"
     break;
 
   case 795: /* TriggerForType: STATEMENT  */
-#line 5595 "preproc.y"
+#line 5591 "preproc.y"
  { 
  (yyval.str) = mm_strdup("statement");
 }
-#line 43846 "preproc.c"
+#line 43842 "preproc.c"
     break;
 
   case 796: /* TriggerWhen: WHEN '(' a_expr ')'  */
-#line 5603 "preproc.y"
+#line 5599 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("when ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 43854 "preproc.c"
+#line 43850 "preproc.c"
     break;
 
   case 797: /* TriggerWhen: %empty  */
-#line 5607 "preproc.y"
+#line 5603 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 43861 "preproc.c"
+#line 43857 "preproc.c"
     break;
 
   case 798: /* FUNCTION_or_PROCEDURE: FUNCTION  */
-#line 5614 "preproc.y"
+#line 5610 "preproc.y"
  { 
  (yyval.str) = mm_strdup("function");
 }
-#line 43869 "preproc.c"
+#line 43865 "preproc.c"
     break;
 
   case 799: /* FUNCTION_or_PROCEDURE: PROCEDURE  */
-#line 5618 "preproc.y"
+#line 5614 "preproc.y"
  { 
  (yyval.str) = mm_strdup("procedure");
 }
-#line 43877 "preproc.c"
+#line 43873 "preproc.c"
     break;
 
   case 800: /* TriggerFuncArgs: TriggerFuncArg  */
-#line 5626 "preproc.y"
+#line 5622 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43885 "preproc.c"
+#line 43881 "preproc.c"
     break;
 
   case 801: /* TriggerFuncArgs: TriggerFuncArgs ',' TriggerFuncArg  */
-#line 5630 "preproc.y"
+#line 5626 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 43893 "preproc.c"
+#line 43889 "preproc.c"
     break;
 
   case 802: /* TriggerFuncArgs: %empty  */
-#line 5634 "preproc.y"
+#line 5630 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 43900 "preproc.c"
+#line 43896 "preproc.c"
     break;
 
   case 803: /* TriggerFuncArg: Iconst  */
-#line 5641 "preproc.y"
+#line 5637 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43908 "preproc.c"
+#line 43904 "preproc.c"
     break;
 
   case 804: /* TriggerFuncArg: ecpg_fconst  */
-#line 5645 "preproc.y"
+#line 5641 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43916 "preproc.c"
+#line 43912 "preproc.c"
     break;
 
   case 805: /* TriggerFuncArg: ecpg_sconst  */
-#line 5649 "preproc.y"
+#line 5645 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43924 "preproc.c"
+#line 43920 "preproc.c"
     break;
 
   case 806: /* TriggerFuncArg: ColLabel  */
-#line 5653 "preproc.y"
+#line 5649 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 43932 "preproc.c"
+#line 43928 "preproc.c"
     break;
 
   case 807: /* OptConstrFromTable: FROM qualified_name  */
-#line 5661 "preproc.y"
+#line 5657 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("from"),(yyvsp[0].str));
 }
-#line 43940 "preproc.c"
+#line 43936 "preproc.c"
     break;
 
   case 808: /* OptConstrFromTable: %empty  */
-#line 5665 "preproc.y"
+#line 5661 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 43947 "preproc.c"
+#line 43943 "preproc.c"
     break;
 
   case 809: /* ConstraintAttributeSpec: %empty  */
-#line 5672 "preproc.y"
+#line 5668 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 43954 "preproc.c"
+#line 43950 "preproc.c"
     break;
 
   case 810: /* ConstraintAttributeSpec: ConstraintAttributeSpec ConstraintAttributeElem  */
-#line 5675 "preproc.y"
+#line 5671 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 43962 "preproc.c"
+#line 43958 "preproc.c"
     break;
 
   case 811: /* ConstraintAttributeElem: NOT DEFERRABLE  */
-#line 5683 "preproc.y"
+#line 5679 "preproc.y"
  { 
  (yyval.str) = mm_strdup("not deferrable");
 }
-#line 43970 "preproc.c"
+#line 43966 "preproc.c"
     break;
 
   case 812: /* ConstraintAttributeElem: DEFERRABLE  */
-#line 5687 "preproc.y"
+#line 5683 "preproc.y"
  { 
  (yyval.str) = mm_strdup("deferrable");
 }
-#line 43978 "preproc.c"
+#line 43974 "preproc.c"
     break;
 
   case 813: /* ConstraintAttributeElem: INITIALLY IMMEDIATE  */
-#line 5691 "preproc.y"
+#line 5687 "preproc.y"
  { 
  (yyval.str) = mm_strdup("initially immediate");
 }
-#line 43986 "preproc.c"
+#line 43982 "preproc.c"
     break;
 
   case 814: /* ConstraintAttributeElem: INITIALLY DEFERRED  */
-#line 5695 "preproc.y"
+#line 5691 "preproc.y"
  { 
  (yyval.str) = mm_strdup("initially deferred");
 }
-#line 43994 "preproc.c"
+#line 43990 "preproc.c"
     break;
 
   case 815: /* ConstraintAttributeElem: NOT VALID  */
-#line 5699 "preproc.y"
+#line 5695 "preproc.y"
  { 
  (yyval.str) = mm_strdup("not valid");
 }
-#line 44002 "preproc.c"
+#line 43998 "preproc.c"
     break;
 
   case 816: /* ConstraintAttributeElem: NO INHERIT  */
-#line 5703 "preproc.y"
+#line 5699 "preproc.y"
  { 
  (yyval.str) = mm_strdup("no inherit");
 }
-#line 44010 "preproc.c"
+#line 44006 "preproc.c"
     break;
 
   case 817: /* CreateEventTrigStmt: CREATE EVENT TRIGGER name ON ColLabel EXECUTE FUNCTION_or_PROCEDURE func_name '(' ')'  */
-#line 5711 "preproc.y"
+#line 5707 "preproc.y"
  { 
  (yyval.str) = cat_str(8,mm_strdup("create event trigger"),(yyvsp[-7].str),mm_strdup("on"),(yyvsp[-5].str),mm_strdup("execute"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("( )"));
 }
-#line 44018 "preproc.c"
+#line 44014 "preproc.c"
     break;
 
   case 818: /* CreateEventTrigStmt: CREATE EVENT TRIGGER name ON ColLabel WHEN event_trigger_when_list EXECUTE FUNCTION_or_PROCEDURE func_name '(' ')'  */
-#line 5715 "preproc.y"
+#line 5711 "preproc.y"
  { 
  (yyval.str) = cat_str(10,mm_strdup("create event trigger"),(yyvsp[-9].str),mm_strdup("on"),(yyvsp[-7].str),mm_strdup("when"),(yyvsp[-5].str),mm_strdup("execute"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("( )"));
 }
-#line 44026 "preproc.c"
+#line 44022 "preproc.c"
     break;
 
   case 819: /* event_trigger_when_list: event_trigger_when_item  */
-#line 5723 "preproc.y"
+#line 5719 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 44034 "preproc.c"
+#line 44030 "preproc.c"
     break;
 
   case 820: /* event_trigger_when_list: event_trigger_when_list AND event_trigger_when_item  */
-#line 5727 "preproc.y"
+#line 5723 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("and"),(yyvsp[0].str));
 }
-#line 44042 "preproc.c"
+#line 44038 "preproc.c"
     break;
 
   case 821: /* event_trigger_when_item: ColId IN_P '(' event_trigger_value_list ')'  */
-#line 5735 "preproc.y"
+#line 5731 "preproc.y"
  { 
  (yyval.str) = cat_str(4,(yyvsp[-4].str),mm_strdup("in ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 44050 "preproc.c"
+#line 44046 "preproc.c"
     break;
 
   case 822: /* event_trigger_value_list: SCONST  */
-#line 5743 "preproc.y"
+#line 5739 "preproc.y"
  { 
  (yyval.str) = mm_strdup("sconst");
 }
-#line 44058 "preproc.c"
+#line 44054 "preproc.c"
     break;
 
   case 823: /* event_trigger_value_list: event_trigger_value_list ',' SCONST  */
-#line 5747 "preproc.y"
+#line 5743 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup(", sconst"));
 }
-#line 44066 "preproc.c"
+#line 44062 "preproc.c"
     break;
 
   case 824: /* AlterEventTrigStmt: ALTER EVENT TRIGGER name enable_trigger  */
-#line 5755 "preproc.y"
+#line 5751 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter event trigger"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44074 "preproc.c"
+#line 44070 "preproc.c"
     break;
 
   case 825: /* enable_trigger: ENABLE_P  */
-#line 5763 "preproc.y"
+#line 5759 "preproc.y"
  { 
  (yyval.str) = mm_strdup("enable");
 }
-#line 44082 "preproc.c"
+#line 44078 "preproc.c"
     break;
 
   case 826: /* enable_trigger: ENABLE_P REPLICA  */
-#line 5767 "preproc.y"
+#line 5763 "preproc.y"
  { 
  (yyval.str) = mm_strdup("enable replica");
 }
-#line 44090 "preproc.c"
+#line 44086 "preproc.c"
     break;
 
   case 827: /* enable_trigger: ENABLE_P ALWAYS  */
-#line 5771 "preproc.y"
+#line 5767 "preproc.y"
  { 
  (yyval.str) = mm_strdup("enable always");
 }
-#line 44098 "preproc.c"
+#line 44094 "preproc.c"
     break;
 
   case 828: /* enable_trigger: DISABLE_P  */
-#line 5775 "preproc.y"
+#line 5771 "preproc.y"
  { 
  (yyval.str) = mm_strdup("disable");
 }
-#line 44106 "preproc.c"
+#line 44102 "preproc.c"
     break;
 
   case 829: /* CreateAssertionStmt: CREATE ASSERTION any_name CHECK '(' a_expr ')' ConstraintAttributeSpec  */
-#line 5783 "preproc.y"
+#line 5779 "preproc.y"
  { 
 mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
  (yyval.str) = cat_str(6,mm_strdup("create assertion"),(yyvsp[-5].str),mm_strdup("check ("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 44115 "preproc.c"
+#line 44111 "preproc.c"
     break;
 
   case 830: /* DefineStmt: CREATE opt_or_replace AGGREGATE func_name aggr_args definition  */
-#line 5792 "preproc.y"
+#line 5788 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("create"),(yyvsp[-4].str),mm_strdup("aggregate"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44123 "preproc.c"
+#line 44119 "preproc.c"
     break;
 
   case 831: /* DefineStmt: CREATE opt_or_replace AGGREGATE func_name old_aggr_definition  */
-#line 5796 "preproc.y"
+#line 5792 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("create"),(yyvsp[-3].str),mm_strdup("aggregate"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44131 "preproc.c"
+#line 44127 "preproc.c"
     break;
 
   case 832: /* DefineStmt: CREATE OPERATOR any_operator definition  */
-#line 5800 "preproc.y"
+#line 5796 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("create operator"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44139 "preproc.c"
+#line 44135 "preproc.c"
     break;
 
   case 833: /* DefineStmt: CREATE TYPE_P any_name definition  */
-#line 5804 "preproc.y"
+#line 5800 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("create type"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44147 "preproc.c"
+#line 44143 "preproc.c"
     break;
 
   case 834: /* DefineStmt: CREATE TYPE_P any_name  */
-#line 5808 "preproc.y"
+#line 5804 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("create type"),(yyvsp[0].str));
 }
-#line 44155 "preproc.c"
+#line 44151 "preproc.c"
     break;
 
   case 835: /* DefineStmt: CREATE TYPE_P any_name AS '(' OptTableFuncElementList ')'  */
-#line 5812 "preproc.y"
+#line 5808 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("create type"),(yyvsp[-4].str),mm_strdup("as ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 44163 "preproc.c"
+#line 44159 "preproc.c"
     break;
 
   case 836: /* DefineStmt: CREATE TYPE_P any_name AS ENUM_P '(' opt_enum_val_list ')'  */
-#line 5816 "preproc.y"
+#line 5812 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("create type"),(yyvsp[-5].str),mm_strdup("as enum ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 44171 "preproc.c"
+#line 44167 "preproc.c"
     break;
 
   case 837: /* DefineStmt: CREATE TYPE_P any_name AS RANGE definition  */
-#line 5820 "preproc.y"
+#line 5816 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("create type"),(yyvsp[-3].str),mm_strdup("as range"),(yyvsp[0].str));
 }
-#line 44179 "preproc.c"
+#line 44175 "preproc.c"
     break;
 
   case 838: /* DefineStmt: CREATE TEXT_P SEARCH PARSER any_name definition  */
-#line 5824 "preproc.y"
+#line 5820 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("create text search parser"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44187 "preproc.c"
+#line 44183 "preproc.c"
     break;
 
   case 839: /* DefineStmt: CREATE TEXT_P SEARCH DICTIONARY any_name definition  */
-#line 5828 "preproc.y"
+#line 5824 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("create text search dictionary"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44195 "preproc.c"
+#line 44191 "preproc.c"
     break;
 
   case 840: /* DefineStmt: CREATE TEXT_P SEARCH TEMPLATE any_name definition  */
-#line 5832 "preproc.y"
+#line 5828 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("create text search template"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44203 "preproc.c"
+#line 44199 "preproc.c"
     break;
 
   case 841: /* DefineStmt: CREATE TEXT_P SEARCH CONFIGURATION any_name definition  */
-#line 5836 "preproc.y"
+#line 5832 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("create text search configuration"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44211 "preproc.c"
+#line 44207 "preproc.c"
     break;
 
   case 842: /* DefineStmt: CREATE COLLATION any_name definition  */
-#line 5840 "preproc.y"
+#line 5836 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("create collation"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44219 "preproc.c"
+#line 44215 "preproc.c"
     break;
 
   case 843: /* DefineStmt: CREATE COLLATION IF_P NOT EXISTS any_name definition  */
-#line 5844 "preproc.y"
+#line 5840 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("create collation if not exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44227 "preproc.c"
+#line 44223 "preproc.c"
     break;
 
   case 844: /* DefineStmt: CREATE COLLATION any_name FROM any_name  */
-#line 5848 "preproc.y"
+#line 5844 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("create collation"),(yyvsp[-2].str),mm_strdup("from"),(yyvsp[0].str));
 }
-#line 44235 "preproc.c"
+#line 44231 "preproc.c"
     break;
 
   case 845: /* DefineStmt: CREATE COLLATION IF_P NOT EXISTS any_name FROM any_name  */
-#line 5852 "preproc.y"
+#line 5848 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("create collation if not exists"),(yyvsp[-2].str),mm_strdup("from"),(yyvsp[0].str));
 }
-#line 44243 "preproc.c"
+#line 44239 "preproc.c"
     break;
 
   case 846: /* definition: '(' def_list ')'  */
-#line 5860 "preproc.y"
+#line 5856 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 44251 "preproc.c"
+#line 44247 "preproc.c"
     break;
 
   case 847: /* def_list: def_elem  */
-#line 5868 "preproc.y"
+#line 5864 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 44259 "preproc.c"
+#line 44255 "preproc.c"
     break;
 
   case 848: /* def_list: def_list ',' def_elem  */
-#line 5872 "preproc.y"
+#line 5868 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 44267 "preproc.c"
+#line 44263 "preproc.c"
     break;
 
   case 849: /* def_elem: ColLabel '=' def_arg  */
-#line 5880 "preproc.y"
+#line 5876 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
 }
-#line 44275 "preproc.c"
+#line 44271 "preproc.c"
     break;
 
   case 850: /* def_elem: ColLabel  */
-#line 5884 "preproc.y"
+#line 5880 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 44283 "preproc.c"
+#line 44279 "preproc.c"
     break;
 
   case 851: /* def_arg: func_type  */
-#line 5892 "preproc.y"
+#line 5888 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 44291 "preproc.c"
+#line 44287 "preproc.c"
     break;
 
   case 852: /* def_arg: reserved_keyword  */
-#line 5896 "preproc.y"
+#line 5892 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 44299 "preproc.c"
+#line 44295 "preproc.c"
     break;
 
   case 853: /* def_arg: qual_all_Op  */
-#line 5900 "preproc.y"
+#line 5896 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 44307 "preproc.c"
+#line 44303 "preproc.c"
     break;
 
   case 854: /* def_arg: NumericOnly  */
-#line 5904 "preproc.y"
+#line 5900 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 44315 "preproc.c"
+#line 44311 "preproc.c"
     break;
 
   case 855: /* def_arg: ecpg_sconst  */
-#line 5908 "preproc.y"
+#line 5904 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 44323 "preproc.c"
+#line 44319 "preproc.c"
     break;
 
   case 856: /* def_arg: NONE  */
-#line 5912 "preproc.y"
+#line 5908 "preproc.y"
  { 
  (yyval.str) = mm_strdup("none");
 }
-#line 44331 "preproc.c"
+#line 44327 "preproc.c"
     break;
 
   case 857: /* old_aggr_definition: '(' old_aggr_list ')'  */
-#line 5920 "preproc.y"
+#line 5916 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 44339 "preproc.c"
+#line 44335 "preproc.c"
     break;
 
   case 858: /* old_aggr_list: old_aggr_elem  */
-#line 5928 "preproc.y"
+#line 5924 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 44347 "preproc.c"
+#line 44343 "preproc.c"
     break;
 
   case 859: /* old_aggr_list: old_aggr_list ',' old_aggr_elem  */
-#line 5932 "preproc.y"
+#line 5928 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 44355 "preproc.c"
+#line 44351 "preproc.c"
     break;
 
   case 860: /* old_aggr_elem: ecpg_ident '=' def_arg  */
-#line 5940 "preproc.y"
+#line 5936 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
 }
-#line 44363 "preproc.c"
+#line 44359 "preproc.c"
     break;
 
   case 861: /* opt_enum_val_list: enum_val_list  */
-#line 5948 "preproc.y"
+#line 5944 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 44371 "preproc.c"
+#line 44367 "preproc.c"
     break;
 
   case 862: /* opt_enum_val_list: %empty  */
-#line 5952 "preproc.y"
+#line 5948 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 44378 "preproc.c"
+#line 44374 "preproc.c"
     break;
 
   case 863: /* enum_val_list: ecpg_sconst  */
-#line 5959 "preproc.y"
+#line 5955 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 44386 "preproc.c"
+#line 44382 "preproc.c"
     break;
 
   case 864: /* enum_val_list: enum_val_list ',' ecpg_sconst  */
-#line 5963 "preproc.y"
+#line 5959 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 44394 "preproc.c"
+#line 44390 "preproc.c"
     break;
 
   case 865: /* AlterEnumStmt: ALTER TYPE_P any_name ADD_P VALUE_P opt_if_not_exists ecpg_sconst  */
-#line 5971 "preproc.y"
+#line 5967 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter type"),(yyvsp[-4].str),mm_strdup("add value"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44402 "preproc.c"
+#line 44398 "preproc.c"
     break;
 
   case 866: /* AlterEnumStmt: ALTER TYPE_P any_name ADD_P VALUE_P opt_if_not_exists ecpg_sconst BEFORE ecpg_sconst  */
-#line 5975 "preproc.y"
+#line 5971 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("alter type"),(yyvsp[-6].str),mm_strdup("add value"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("before"),(yyvsp[0].str));
 }
-#line 44410 "preproc.c"
+#line 44406 "preproc.c"
     break;
 
   case 867: /* AlterEnumStmt: ALTER TYPE_P any_name ADD_P VALUE_P opt_if_not_exists ecpg_sconst AFTER ecpg_sconst  */
-#line 5979 "preproc.y"
+#line 5975 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("alter type"),(yyvsp[-6].str),mm_strdup("add value"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("after"),(yyvsp[0].str));
 }
-#line 44418 "preproc.c"
+#line 44414 "preproc.c"
     break;
 
   case 868: /* AlterEnumStmt: ALTER TYPE_P any_name RENAME VALUE_P ecpg_sconst TO ecpg_sconst  */
-#line 5983 "preproc.y"
+#line 5979 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("alter type"),(yyvsp[-5].str),mm_strdup("rename value"),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 44426 "preproc.c"
+#line 44422 "preproc.c"
     break;
 
   case 869: /* opt_if_not_exists: IF_P NOT EXISTS  */
-#line 5991 "preproc.y"
+#line 5987 "preproc.y"
  { 
  (yyval.str) = mm_strdup("if not exists");
 }
-#line 44434 "preproc.c"
+#line 44430 "preproc.c"
     break;
 
   case 870: /* opt_if_not_exists: %empty  */
-#line 5995 "preproc.y"
+#line 5991 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 44441 "preproc.c"
+#line 44437 "preproc.c"
     break;
 
   case 871: /* CreateOpClassStmt: CREATE OPERATOR CLASS any_name opt_default FOR TYPE_P Typename USING name opt_opfamily AS opclass_item_list  */
-#line 6002 "preproc.y"
+#line 5998 "preproc.y"
  { 
  (yyval.str) = cat_str(10,mm_strdup("create operator class"),(yyvsp[-9].str),(yyvsp[-8].str),mm_strdup("for type"),(yyvsp[-5].str),mm_strdup("using"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("as"),(yyvsp[0].str));
 }
-#line 44449 "preproc.c"
+#line 44445 "preproc.c"
     break;
 
   case 872: /* opclass_item_list: opclass_item  */
-#line 6010 "preproc.y"
+#line 6006 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 44457 "preproc.c"
+#line 44453 "preproc.c"
     break;
 
   case 873: /* opclass_item_list: opclass_item_list ',' opclass_item  */
-#line 6014 "preproc.y"
+#line 6010 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 44465 "preproc.c"
+#line 44461 "preproc.c"
     break;
 
   case 874: /* opclass_item: OPERATOR Iconst any_operator opclass_purpose opt_recheck  */
-#line 6022 "preproc.y"
+#line 6018 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("operator"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44473 "preproc.c"
+#line 44469 "preproc.c"
     break;
 
   case 875: /* opclass_item: OPERATOR Iconst operator_with_argtypes opclass_purpose opt_recheck  */
-#line 6026 "preproc.y"
+#line 6022 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("operator"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44481 "preproc.c"
+#line 44477 "preproc.c"
     break;
 
   case 876: /* opclass_item: FUNCTION Iconst function_with_argtypes  */
-#line 6030 "preproc.y"
+#line 6026 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("function"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44489 "preproc.c"
+#line 44485 "preproc.c"
     break;
 
   case 877: /* opclass_item: FUNCTION Iconst '(' type_list ')' function_with_argtypes  */
-#line 6034 "preproc.y"
+#line 6030 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("function"),(yyvsp[-4].str),mm_strdup("("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 44497 "preproc.c"
+#line 44493 "preproc.c"
     break;
 
   case 878: /* opclass_item: STORAGE Typename  */
-#line 6038 "preproc.y"
+#line 6034 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("storage"),(yyvsp[0].str));
 }
-#line 44505 "preproc.c"
+#line 44501 "preproc.c"
     break;
 
   case 879: /* opt_default: DEFAULT  */
-#line 6046 "preproc.y"
+#line 6042 "preproc.y"
  { 
  (yyval.str) = mm_strdup("default");
 }
-#line 44513 "preproc.c"
+#line 44509 "preproc.c"
     break;
 
   case 880: /* opt_default: %empty  */
-#line 6050 "preproc.y"
+#line 6046 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 44520 "preproc.c"
+#line 44516 "preproc.c"
     break;
 
   case 881: /* opt_opfamily: FAMILY any_name  */
-#line 6057 "preproc.y"
+#line 6053 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("family"),(yyvsp[0].str));
 }
-#line 44528 "preproc.c"
+#line 44524 "preproc.c"
     break;
 
   case 882: /* opt_opfamily: %empty  */
-#line 6061 "preproc.y"
+#line 6057 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 44535 "preproc.c"
+#line 44531 "preproc.c"
     break;
 
   case 883: /* opclass_purpose: FOR SEARCH  */
-#line 6068 "preproc.y"
+#line 6064 "preproc.y"
  { 
  (yyval.str) = mm_strdup("for search");
 }
-#line 44543 "preproc.c"
+#line 44539 "preproc.c"
     break;
 
   case 884: /* opclass_purpose: FOR ORDER BY any_name  */
-#line 6072 "preproc.y"
+#line 6068 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("for order by"),(yyvsp[0].str));
 }
-#line 44551 "preproc.c"
+#line 44547 "preproc.c"
     break;
 
   case 885: /* opclass_purpose: %empty  */
-#line 6076 "preproc.y"
+#line 6072 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 44558 "preproc.c"
+#line 44554 "preproc.c"
     break;
 
   case 886: /* opt_recheck: RECHECK  */
-#line 6083 "preproc.y"
+#line 6079 "preproc.y"
  { 
 mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
  (yyval.str) = mm_strdup("recheck");
 }
-#line 44567 "preproc.c"
+#line 44563 "preproc.c"
     break;
 
   case 887: /* opt_recheck: %empty  */
-#line 6088 "preproc.y"
+#line 6084 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 44574 "preproc.c"
+#line 44570 "preproc.c"
     break;
 
   case 888: /* CreateOpFamilyStmt: CREATE OPERATOR FAMILY any_name USING name  */
-#line 6095 "preproc.y"
+#line 6091 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("create operator family"),(yyvsp[-2].str),mm_strdup("using"),(yyvsp[0].str));
 }
-#line 44582 "preproc.c"
+#line 44578 "preproc.c"
     break;
 
   case 889: /* AlterOpFamilyStmt: ALTER OPERATOR FAMILY any_name USING name ADD_P opclass_item_list  */
-#line 6103 "preproc.y"
+#line 6099 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("alter operator family"),(yyvsp[-4].str),mm_strdup("using"),(yyvsp[-2].str),mm_strdup("add"),(yyvsp[0].str));
 }
-#line 44590 "preproc.c"
+#line 44586 "preproc.c"
     break;
 
   case 890: /* AlterOpFamilyStmt: ALTER OPERATOR FAMILY any_name USING name DROP opclass_drop_list  */
-#line 6107 "preproc.y"
+#line 6103 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("alter operator family"),(yyvsp[-4].str),mm_strdup("using"),(yyvsp[-2].str),mm_strdup("drop"),(yyvsp[0].str));
 }
-#line 44598 "preproc.c"
+#line 44594 "preproc.c"
     break;
 
   case 891: /* opclass_drop_list: opclass_drop  */
-#line 6115 "preproc.y"
+#line 6111 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 44606 "preproc.c"
+#line 44602 "preproc.c"
     break;
 
   case 892: /* opclass_drop_list: opclass_drop_list ',' opclass_drop  */
-#line 6119 "preproc.y"
+#line 6115 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 44614 "preproc.c"
+#line 44610 "preproc.c"
     break;
 
   case 893: /* opclass_drop: OPERATOR Iconst '(' type_list ')'  */
-#line 6127 "preproc.y"
+#line 6123 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("operator"),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 44622 "preproc.c"
+#line 44618 "preproc.c"
     break;
 
   case 894: /* opclass_drop: FUNCTION Iconst '(' type_list ')'  */
-#line 6131 "preproc.y"
+#line 6127 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("function"),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 44630 "preproc.c"
+#line 44626 "preproc.c"
     break;
 
   case 895: /* DropOpClassStmt: DROP OPERATOR CLASS any_name USING name opt_drop_behavior  */
-#line 6139 "preproc.y"
+#line 6135 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("drop operator class"),(yyvsp[-3].str),mm_strdup("using"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44638 "preproc.c"
+#line 44634 "preproc.c"
     break;
 
   case 896: /* DropOpClassStmt: DROP OPERATOR CLASS IF_P EXISTS any_name USING name opt_drop_behavior  */
-#line 6143 "preproc.y"
+#line 6139 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("drop operator class if exists"),(yyvsp[-3].str),mm_strdup("using"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44646 "preproc.c"
+#line 44642 "preproc.c"
     break;
 
   case 897: /* DropOpFamilyStmt: DROP OPERATOR FAMILY any_name USING name opt_drop_behavior  */
-#line 6151 "preproc.y"
+#line 6147 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("drop operator family"),(yyvsp[-3].str),mm_strdup("using"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44654 "preproc.c"
+#line 44650 "preproc.c"
     break;
 
   case 898: /* DropOpFamilyStmt: DROP OPERATOR FAMILY IF_P EXISTS any_name USING name opt_drop_behavior  */
-#line 6155 "preproc.y"
+#line 6151 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("drop operator family if exists"),(yyvsp[-3].str),mm_strdup("using"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44662 "preproc.c"
+#line 44658 "preproc.c"
     break;
 
   case 899: /* DropOwnedStmt: DROP OWNED BY role_list opt_drop_behavior  */
-#line 6163 "preproc.y"
+#line 6159 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("drop owned by"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44670 "preproc.c"
+#line 44666 "preproc.c"
     break;
 
   case 900: /* ReassignOwnedStmt: REASSIGN OWNED BY role_list TO RoleSpec  */
-#line 6171 "preproc.y"
+#line 6167 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("reassign owned by"),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 44678 "preproc.c"
+#line 44674 "preproc.c"
     break;
 
   case 901: /* DropStmt: DROP object_type_any_name IF_P EXISTS any_name_list opt_drop_behavior  */
-#line 6179 "preproc.y"
+#line 6175 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("drop"),(yyvsp[-4].str),mm_strdup("if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44686 "preproc.c"
+#line 44682 "preproc.c"
     break;
 
   case 902: /* DropStmt: DROP object_type_any_name any_name_list opt_drop_behavior  */
-#line 6183 "preproc.y"
+#line 6179 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("drop"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44694 "preproc.c"
+#line 44690 "preproc.c"
     break;
 
   case 903: /* DropStmt: DROP drop_type_name IF_P EXISTS name_list opt_drop_behavior  */
-#line 6187 "preproc.y"
+#line 6183 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("drop"),(yyvsp[-4].str),mm_strdup("if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44702 "preproc.c"
+#line 44698 "preproc.c"
     break;
 
   case 904: /* DropStmt: DROP drop_type_name name_list opt_drop_behavior  */
-#line 6191 "preproc.y"
+#line 6187 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("drop"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44710 "preproc.c"
+#line 44706 "preproc.c"
     break;
 
   case 905: /* DropStmt: DROP object_type_name_on_any_name name ON any_name opt_drop_behavior  */
-#line 6195 "preproc.y"
+#line 6191 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("drop"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("on"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44718 "preproc.c"
+#line 44714 "preproc.c"
     break;
 
   case 906: /* DropStmt: DROP object_type_name_on_any_name IF_P EXISTS name ON any_name opt_drop_behavior  */
-#line 6199 "preproc.y"
+#line 6195 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("drop"),(yyvsp[-6].str),mm_strdup("if exists"),(yyvsp[-3].str),mm_strdup("on"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44726 "preproc.c"
+#line 44722 "preproc.c"
     break;
 
   case 907: /* DropStmt: DROP TYPE_P type_name_list opt_drop_behavior  */
-#line 6203 "preproc.y"
+#line 6199 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("drop type"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44734 "preproc.c"
+#line 44730 "preproc.c"
     break;
 
   case 908: /* DropStmt: DROP TYPE_P IF_P EXISTS type_name_list opt_drop_behavior  */
-#line 6207 "preproc.y"
+#line 6203 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("drop type if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44742 "preproc.c"
+#line 44738 "preproc.c"
     break;
 
   case 909: /* DropStmt: DROP DOMAIN_P type_name_list opt_drop_behavior  */
-#line 6211 "preproc.y"
+#line 6207 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("drop domain"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44750 "preproc.c"
+#line 44746 "preproc.c"
     break;
 
   case 910: /* DropStmt: DROP DOMAIN_P IF_P EXISTS type_name_list opt_drop_behavior  */
-#line 6215 "preproc.y"
+#line 6211 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("drop domain if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44758 "preproc.c"
+#line 44754 "preproc.c"
     break;
 
   case 911: /* DropStmt: DROP INDEX CONCURRENTLY any_name_list opt_drop_behavior  */
-#line 6219 "preproc.y"
+#line 6215 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("drop index concurrently"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44766 "preproc.c"
+#line 44762 "preproc.c"
     break;
 
   case 912: /* DropStmt: DROP INDEX CONCURRENTLY IF_P EXISTS any_name_list opt_drop_behavior  */
-#line 6223 "preproc.y"
+#line 6219 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("drop index concurrently if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 44774 "preproc.c"
+#line 44770 "preproc.c"
     break;
 
   case 913: /* object_type_any_name: TABLE  */
-#line 6231 "preproc.y"
+#line 6227 "preproc.y"
  { 
  (yyval.str) = mm_strdup("table");
 }
-#line 44782 "preproc.c"
+#line 44778 "preproc.c"
     break;
 
   case 914: /* object_type_any_name: SEQUENCE  */
-#line 6235 "preproc.y"
+#line 6231 "preproc.y"
  { 
  (yyval.str) = mm_strdup("sequence");
 }
-#line 44790 "preproc.c"
+#line 44786 "preproc.c"
     break;
 
   case 915: /* object_type_any_name: VIEW  */
-#line 6239 "preproc.y"
+#line 6235 "preproc.y"
  { 
  (yyval.str) = mm_strdup("view");
 }
-#line 44798 "preproc.c"
+#line 44794 "preproc.c"
     break;
 
   case 916: /* object_type_any_name: MATERIALIZED VIEW  */
-#line 6243 "preproc.y"
+#line 6239 "preproc.y"
  { 
  (yyval.str) = mm_strdup("materialized view");
 }
-#line 44806 "preproc.c"
+#line 44802 "preproc.c"
     break;
 
   case 917: /* object_type_any_name: INDEX  */
-#line 6247 "preproc.y"
+#line 6243 "preproc.y"
  { 
  (yyval.str) = mm_strdup("index");
 }
-#line 44814 "preproc.c"
+#line 44810 "preproc.c"
     break;
 
   case 918: /* object_type_any_name: FOREIGN TABLE  */
-#line 6251 "preproc.y"
+#line 6247 "preproc.y"
  { 
  (yyval.str) = mm_strdup("foreign table");
 }
-#line 44822 "preproc.c"
+#line 44818 "preproc.c"
     break;
 
   case 919: /* object_type_any_name: COLLATION  */
-#line 6255 "preproc.y"
+#line 6251 "preproc.y"
  { 
  (yyval.str) = mm_strdup("collation");
 }
-#line 44830 "preproc.c"
+#line 44826 "preproc.c"
     break;
 
   case 920: /* object_type_any_name: CONVERSION_P  */
-#line 6259 "preproc.y"
+#line 6255 "preproc.y"
  { 
  (yyval.str) = mm_strdup("conversion");
 }
-#line 44838 "preproc.c"
+#line 44834 "preproc.c"
     break;
 
   case 921: /* object_type_any_name: STATISTICS  */
-#line 6263 "preproc.y"
+#line 6259 "preproc.y"
  { 
  (yyval.str) = mm_strdup("statistics");
 }
-#line 44846 "preproc.c"
+#line 44842 "preproc.c"
     break;
 
   case 922: /* object_type_any_name: TEXT_P SEARCH PARSER  */
-#line 6267 "preproc.y"
+#line 6263 "preproc.y"
  { 
  (yyval.str) = mm_strdup("text search parser");
 }
-#line 44854 "preproc.c"
+#line 44850 "preproc.c"
     break;
 
   case 923: /* object_type_any_name: TEXT_P SEARCH DICTIONARY  */
-#line 6271 "preproc.y"
+#line 6267 "preproc.y"
  { 
  (yyval.str) = mm_strdup("text search dictionary");
 }
-#line 44862 "preproc.c"
+#line 44858 "preproc.c"
     break;
 
   case 924: /* object_type_any_name: TEXT_P SEARCH TEMPLATE  */
-#line 6275 "preproc.y"
+#line 6271 "preproc.y"
  { 
  (yyval.str) = mm_strdup("text search template");
 }
-#line 44870 "preproc.c"
+#line 44866 "preproc.c"
     break;
 
   case 925: /* object_type_any_name: TEXT_P SEARCH CONFIGURATION  */
-#line 6279 "preproc.y"
+#line 6275 "preproc.y"
  { 
  (yyval.str) = mm_strdup("text search configuration");
 }
-#line 44878 "preproc.c"
+#line 44874 "preproc.c"
     break;
 
   case 926: /* object_type_name: drop_type_name  */
-#line 6287 "preproc.y"
+#line 6283 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 44886 "preproc.c"
+#line 44882 "preproc.c"
     break;
 
   case 927: /* object_type_name: DATABASE  */
-#line 6291 "preproc.y"
+#line 6287 "preproc.y"
  { 
  (yyval.str) = mm_strdup("database");
 }
-#line 44894 "preproc.c"
+#line 44890 "preproc.c"
     break;
 
   case 928: /* object_type_name: ROLE  */
-#line 6295 "preproc.y"
+#line 6291 "preproc.y"
  { 
  (yyval.str) = mm_strdup("role");
 }
-#line 44902 "preproc.c"
+#line 44898 "preproc.c"
     break;
 
   case 929: /* object_type_name: SUBSCRIPTION  */
-#line 6299 "preproc.y"
+#line 6295 "preproc.y"
  { 
  (yyval.str) = mm_strdup("subscription");
 }
-#line 44910 "preproc.c"
+#line 44906 "preproc.c"
     break;
 
   case 930: /* object_type_name: TABLESPACE  */
-#line 6303 "preproc.y"
+#line 6299 "preproc.y"
  { 
  (yyval.str) = mm_strdup("tablespace");
 }
-#line 44918 "preproc.c"
+#line 44914 "preproc.c"
     break;
 
   case 931: /* drop_type_name: ACCESS METHOD  */
-#line 6311 "preproc.y"
+#line 6307 "preproc.y"
  { 
  (yyval.str) = mm_strdup("access method");
 }
-#line 44926 "preproc.c"
+#line 44922 "preproc.c"
     break;
 
   case 932: /* drop_type_name: EVENT TRIGGER  */
-#line 6315 "preproc.y"
+#line 6311 "preproc.y"
  { 
  (yyval.str) = mm_strdup("event trigger");
 }
-#line 44934 "preproc.c"
+#line 44930 "preproc.c"
     break;
 
   case 933: /* drop_type_name: EXTENSION  */
-#line 6319 "preproc.y"
+#line 6315 "preproc.y"
  { 
  (yyval.str) = mm_strdup("extension");
 }
-#line 44942 "preproc.c"
+#line 44938 "preproc.c"
     break;
 
   case 934: /* drop_type_name: FOREIGN DATA_P WRAPPER  */
-#line 6323 "preproc.y"
+#line 6319 "preproc.y"
  { 
  (yyval.str) = mm_strdup("foreign data wrapper");
 }
-#line 44950 "preproc.c"
+#line 44946 "preproc.c"
     break;
 
   case 935: /* drop_type_name: opt_procedural LANGUAGE  */
-#line 6327 "preproc.y"
+#line 6323 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),mm_strdup("language"));
 }
-#line 44958 "preproc.c"
+#line 44954 "preproc.c"
     break;
 
   case 936: /* drop_type_name: PUBLICATION  */
-#line 6331 "preproc.y"
+#line 6327 "preproc.y"
  { 
  (yyval.str) = mm_strdup("publication");
 }
-#line 44966 "preproc.c"
+#line 44962 "preproc.c"
     break;
 
   case 937: /* drop_type_name: SCHEMA  */
-#line 6335 "preproc.y"
+#line 6331 "preproc.y"
  { 
  (yyval.str) = mm_strdup("schema");
 }
-#line 44974 "preproc.c"
+#line 44970 "preproc.c"
     break;
 
   case 938: /* drop_type_name: SERVER  */
-#line 6339 "preproc.y"
+#line 6335 "preproc.y"
  { 
  (yyval.str) = mm_strdup("server");
 }
-#line 44982 "preproc.c"
+#line 44978 "preproc.c"
     break;
 
   case 939: /* object_type_name_on_any_name: POLICY  */
-#line 6347 "preproc.y"
+#line 6343 "preproc.y"
  { 
  (yyval.str) = mm_strdup("policy");
 }
-#line 44990 "preproc.c"
+#line 44986 "preproc.c"
     break;
 
   case 940: /* object_type_name_on_any_name: RULE  */
-#line 6351 "preproc.y"
+#line 6347 "preproc.y"
  { 
  (yyval.str) = mm_strdup("rule");
 }
-#line 44998 "preproc.c"
+#line 44994 "preproc.c"
     break;
 
   case 941: /* object_type_name_on_any_name: TRIGGER  */
-#line 6355 "preproc.y"
+#line 6351 "preproc.y"
  { 
  (yyval.str) = mm_strdup("trigger");
 }
-#line 45006 "preproc.c"
+#line 45002 "preproc.c"
     break;
 
   case 942: /* any_name_list: any_name  */
-#line 6363 "preproc.y"
+#line 6359 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 45014 "preproc.c"
+#line 45010 "preproc.c"
     break;
 
   case 943: /* any_name_list: any_name_list ',' any_name  */
-#line 6367 "preproc.y"
+#line 6363 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 45022 "preproc.c"
+#line 45018 "preproc.c"
     break;
 
   case 944: /* any_name: ColId  */
-#line 6375 "preproc.y"
+#line 6371 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 45030 "preproc.c"
+#line 45026 "preproc.c"
     break;
 
   case 945: /* any_name: ColId attrs  */
-#line 6379 "preproc.y"
+#line 6375 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 45038 "preproc.c"
+#line 45034 "preproc.c"
     break;
 
   case 946: /* attrs: '.' attr_name  */
-#line 6387 "preproc.y"
+#line 6383 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("."),(yyvsp[0].str));
 }
-#line 45046 "preproc.c"
+#line 45042 "preproc.c"
     break;
 
   case 947: /* attrs: attrs '.' attr_name  */
-#line 6391 "preproc.y"
+#line 6387 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("."),(yyvsp[0].str));
 }
-#line 45054 "preproc.c"
+#line 45050 "preproc.c"
     break;
 
   case 948: /* type_name_list: Typename  */
-#line 6399 "preproc.y"
+#line 6395 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 45062 "preproc.c"
+#line 45058 "preproc.c"
     break;
 
   case 949: /* type_name_list: type_name_list ',' Typename  */
-#line 6403 "preproc.y"
+#line 6399 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 45070 "preproc.c"
+#line 45066 "preproc.c"
     break;
 
   case 950: /* TruncateStmt: TRUNCATE opt_table relation_expr_list opt_restart_seqs opt_drop_behavior  */
-#line 6411 "preproc.y"
+#line 6407 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("truncate"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 45078 "preproc.c"
+#line 45074 "preproc.c"
     break;
 
   case 951: /* opt_restart_seqs: CONTINUE_P IDENTITY_P  */
-#line 6419 "preproc.y"
+#line 6415 "preproc.y"
  { 
  (yyval.str) = mm_strdup("continue identity");
 }
-#line 45086 "preproc.c"
+#line 45082 "preproc.c"
     break;
 
   case 952: /* opt_restart_seqs: RESTART IDENTITY_P  */
-#line 6423 "preproc.y"
+#line 6419 "preproc.y"
  { 
  (yyval.str) = mm_strdup("restart identity");
 }
-#line 45094 "preproc.c"
+#line 45090 "preproc.c"
     break;
 
   case 953: /* opt_restart_seqs: %empty  */
-#line 6427 "preproc.y"
+#line 6423 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 45101 "preproc.c"
+#line 45097 "preproc.c"
     break;
 
   case 954: /* CommentStmt: COMMENT ON object_type_any_name any_name IS comment_text  */
-#line 6434 "preproc.y"
+#line 6430 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("comment on"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45109 "preproc.c"
+#line 45105 "preproc.c"
     break;
 
   case 955: /* CommentStmt: COMMENT ON COLUMN any_name IS comment_text  */
-#line 6438 "preproc.y"
+#line 6434 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("comment on column"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45117 "preproc.c"
+#line 45113 "preproc.c"
     break;
 
   case 956: /* CommentStmt: COMMENT ON object_type_name name IS comment_text  */
-#line 6442 "preproc.y"
+#line 6438 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("comment on"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45125 "preproc.c"
+#line 45121 "preproc.c"
     break;
 
   case 957: /* CommentStmt: COMMENT ON TYPE_P Typename IS comment_text  */
-#line 6446 "preproc.y"
+#line 6442 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("comment on type"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45133 "preproc.c"
+#line 45129 "preproc.c"
     break;
 
   case 958: /* CommentStmt: COMMENT ON DOMAIN_P Typename IS comment_text  */
-#line 6450 "preproc.y"
+#line 6446 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("comment on domain"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45141 "preproc.c"
+#line 45137 "preproc.c"
     break;
 
   case 959: /* CommentStmt: COMMENT ON AGGREGATE aggregate_with_argtypes IS comment_text  */
-#line 6454 "preproc.y"
+#line 6450 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("comment on aggregate"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45149 "preproc.c"
+#line 45145 "preproc.c"
     break;
 
   case 960: /* CommentStmt: COMMENT ON FUNCTION function_with_argtypes IS comment_text  */
-#line 6458 "preproc.y"
+#line 6454 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("comment on function"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45157 "preproc.c"
+#line 45153 "preproc.c"
     break;
 
   case 961: /* CommentStmt: COMMENT ON OPERATOR operator_with_argtypes IS comment_text  */
-#line 6462 "preproc.y"
+#line 6458 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("comment on operator"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45165 "preproc.c"
+#line 45161 "preproc.c"
     break;
 
   case 962: /* CommentStmt: COMMENT ON CONSTRAINT name ON any_name IS comment_text  */
-#line 6466 "preproc.y"
+#line 6462 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("comment on constraint"),(yyvsp[-4].str),mm_strdup("on"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45173 "preproc.c"
+#line 45169 "preproc.c"
     break;
 
   case 963: /* CommentStmt: COMMENT ON CONSTRAINT name ON DOMAIN_P any_name IS comment_text  */
-#line 6470 "preproc.y"
+#line 6466 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("comment on constraint"),(yyvsp[-5].str),mm_strdup("on domain"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45181 "preproc.c"
+#line 45177 "preproc.c"
     break;
 
   case 964: /* CommentStmt: COMMENT ON object_type_name_on_any_name name ON any_name IS comment_text  */
-#line 6474 "preproc.y"
+#line 6470 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("comment on"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("on"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45189 "preproc.c"
+#line 45185 "preproc.c"
     break;
 
   case 965: /* CommentStmt: COMMENT ON PROCEDURE function_with_argtypes IS comment_text  */
-#line 6478 "preproc.y"
+#line 6474 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("comment on procedure"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45197 "preproc.c"
+#line 45193 "preproc.c"
     break;
 
   case 966: /* CommentStmt: COMMENT ON ROUTINE function_with_argtypes IS comment_text  */
-#line 6482 "preproc.y"
+#line 6478 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("comment on routine"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45205 "preproc.c"
+#line 45201 "preproc.c"
     break;
 
   case 967: /* CommentStmt: COMMENT ON TRANSFORM FOR Typename LANGUAGE name IS comment_text  */
-#line 6486 "preproc.y"
+#line 6482 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("comment on transform for"),(yyvsp[-4].str),mm_strdup("language"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45213 "preproc.c"
+#line 45209 "preproc.c"
     break;
 
   case 968: /* CommentStmt: COMMENT ON OPERATOR CLASS any_name USING name IS comment_text  */
-#line 6490 "preproc.y"
+#line 6486 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("comment on operator class"),(yyvsp[-4].str),mm_strdup("using"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45221 "preproc.c"
+#line 45217 "preproc.c"
     break;
 
   case 969: /* CommentStmt: COMMENT ON OPERATOR FAMILY any_name USING name IS comment_text  */
-#line 6494 "preproc.y"
+#line 6490 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("comment on operator family"),(yyvsp[-4].str),mm_strdup("using"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45229 "preproc.c"
+#line 45225 "preproc.c"
     break;
 
   case 970: /* CommentStmt: COMMENT ON LARGE_P OBJECT_P NumericOnly IS comment_text  */
-#line 6498 "preproc.y"
+#line 6494 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("comment on large object"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45237 "preproc.c"
+#line 45233 "preproc.c"
     break;
 
   case 971: /* CommentStmt: COMMENT ON CAST '(' Typename AS Typename ')' IS comment_text  */
-#line 6502 "preproc.y"
+#line 6498 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("comment on cast ("),(yyvsp[-5].str),mm_strdup("as"),(yyvsp[-3].str),mm_strdup(") is"),(yyvsp[0].str));
 }
-#line 45245 "preproc.c"
+#line 45241 "preproc.c"
     break;
 
   case 972: /* comment_text: ecpg_sconst  */
-#line 6510 "preproc.y"
+#line 6506 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 45253 "preproc.c"
+#line 45249 "preproc.c"
     break;
 
   case 973: /* comment_text: NULL_P  */
-#line 6514 "preproc.y"
+#line 6510 "preproc.y"
  { 
  (yyval.str) = mm_strdup("null");
 }
-#line 45261 "preproc.c"
+#line 45257 "preproc.c"
     break;
 
   case 974: /* SecLabelStmt: SECURITY LABEL opt_provider ON object_type_any_name any_name IS security_label  */
-#line 6522 "preproc.y"
+#line 6518 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("security label"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45269 "preproc.c"
+#line 45265 "preproc.c"
     break;
 
   case 975: /* SecLabelStmt: SECURITY LABEL opt_provider ON COLUMN any_name IS security_label  */
-#line 6526 "preproc.y"
+#line 6522 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("security label"),(yyvsp[-5].str),mm_strdup("on column"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45277 "preproc.c"
+#line 45273 "preproc.c"
     break;
 
   case 976: /* SecLabelStmt: SECURITY LABEL opt_provider ON object_type_name name IS security_label  */
-#line 6530 "preproc.y"
+#line 6526 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("security label"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45285 "preproc.c"
+#line 45281 "preproc.c"
     break;
 
   case 977: /* SecLabelStmt: SECURITY LABEL opt_provider ON TYPE_P Typename IS security_label  */
-#line 6534 "preproc.y"
+#line 6530 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("security label"),(yyvsp[-5].str),mm_strdup("on type"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45293 "preproc.c"
+#line 45289 "preproc.c"
     break;
 
   case 978: /* SecLabelStmt: SECURITY LABEL opt_provider ON DOMAIN_P Typename IS security_label  */
-#line 6538 "preproc.y"
+#line 6534 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("security label"),(yyvsp[-5].str),mm_strdup("on domain"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45301 "preproc.c"
+#line 45297 "preproc.c"
     break;
 
   case 979: /* SecLabelStmt: SECURITY LABEL opt_provider ON AGGREGATE aggregate_with_argtypes IS security_label  */
-#line 6542 "preproc.y"
+#line 6538 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("security label"),(yyvsp[-5].str),mm_strdup("on aggregate"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45309 "preproc.c"
+#line 45305 "preproc.c"
     break;
 
   case 980: /* SecLabelStmt: SECURITY LABEL opt_provider ON FUNCTION function_with_argtypes IS security_label  */
-#line 6546 "preproc.y"
+#line 6542 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("security label"),(yyvsp[-5].str),mm_strdup("on function"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45317 "preproc.c"
+#line 45313 "preproc.c"
     break;
 
   case 981: /* SecLabelStmt: SECURITY LABEL opt_provider ON LARGE_P OBJECT_P NumericOnly IS security_label  */
-#line 6550 "preproc.y"
+#line 6546 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("security label"),(yyvsp[-6].str),mm_strdup("on large object"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45325 "preproc.c"
+#line 45321 "preproc.c"
     break;
 
   case 982: /* SecLabelStmt: SECURITY LABEL opt_provider ON PROCEDURE function_with_argtypes IS security_label  */
-#line 6554 "preproc.y"
+#line 6550 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("security label"),(yyvsp[-5].str),mm_strdup("on procedure"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45333 "preproc.c"
+#line 45329 "preproc.c"
     break;
 
   case 983: /* SecLabelStmt: SECURITY LABEL opt_provider ON ROUTINE function_with_argtypes IS security_label  */
-#line 6558 "preproc.y"
+#line 6554 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("security label"),(yyvsp[-5].str),mm_strdup("on routine"),(yyvsp[-2].str),mm_strdup("is"),(yyvsp[0].str));
 }
-#line 45341 "preproc.c"
+#line 45337 "preproc.c"
     break;
 
   case 984: /* opt_provider: FOR NonReservedWord_or_Sconst  */
-#line 6566 "preproc.y"
+#line 6562 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("for"),(yyvsp[0].str));
 }
-#line 45349 "preproc.c"
+#line 45345 "preproc.c"
     break;
 
   case 985: /* opt_provider: %empty  */
-#line 6570 "preproc.y"
+#line 6566 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 45356 "preproc.c"
+#line 45352 "preproc.c"
     break;
 
   case 986: /* security_label: ecpg_sconst  */
-#line 6577 "preproc.y"
+#line 6573 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 45364 "preproc.c"
+#line 45360 "preproc.c"
     break;
 
   case 987: /* security_label: NULL_P  */
-#line 6581 "preproc.y"
+#line 6577 "preproc.y"
  { 
  (yyval.str) = mm_strdup("null");
 }
-#line 45372 "preproc.c"
+#line 45368 "preproc.c"
     break;
 
   case 988: /* FetchStmt: FETCH fetch_args  */
-#line 6589 "preproc.y"
+#line 6585 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("fetch"),(yyvsp[0].str));
 }
-#line 45380 "preproc.c"
+#line 45376 "preproc.c"
     break;
 
   case 989: /* FetchStmt: MOVE fetch_args  */
-#line 6593 "preproc.y"
+#line 6589 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("move"),(yyvsp[0].str));
 }
-#line 45388 "preproc.c"
+#line 45384 "preproc.c"
     break;
 
   case 990: /* FetchStmt: FETCH fetch_args ecpg_fetch_into  */
-#line 6597 "preproc.y"
+#line 6593 "preproc.y"
         {
 		(yyval.str) = cat2_str(mm_strdup("fetch"), (yyvsp[-1].str));
 	}
-#line 45396 "preproc.c"
+#line 45392 "preproc.c"
     break;
 
   case 991: /* FetchStmt: FETCH FORWARD cursor_name opt_ecpg_fetch_into  */
-#line 6601 "preproc.y"
+#line 6597 "preproc.y"
         {
 		char *cursor_marker = (yyvsp[-1].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[-1].str);
 		struct cursor *ptr = add_additional_variables((yyvsp[-1].str), false);
@@ -45405,11 +45401,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
 		(yyval.str) = cat_str(2, mm_strdup("fetch forward"), cursor_marker);
 	}
-#line 45409 "preproc.c"
+#line 45405 "preproc.c"
     break;
 
   case 992: /* FetchStmt: FETCH FORWARD from_in cursor_name opt_ecpg_fetch_into  */
-#line 6610 "preproc.y"
+#line 6606 "preproc.y"
         {
 		char *cursor_marker = (yyvsp[-1].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[-1].str);
 		struct cursor *ptr = add_additional_variables((yyvsp[-1].str), false);
@@ -45418,11 +45414,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
 		(yyval.str) = cat_str(2, mm_strdup("fetch forward from"), cursor_marker);
 	}
-#line 45422 "preproc.c"
+#line 45418 "preproc.c"
     break;
 
   case 993: /* FetchStmt: FETCH BACKWARD cursor_name opt_ecpg_fetch_into  */
-#line 6619 "preproc.y"
+#line 6615 "preproc.y"
         {
 		char *cursor_marker = (yyvsp[-1].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[-1].str);
 		struct cursor *ptr = add_additional_variables((yyvsp[-1].str), false);
@@ -45431,11 +45427,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
 		(yyval.str) = cat_str(2, mm_strdup("fetch backward"), cursor_marker);
 	}
-#line 45435 "preproc.c"
+#line 45431 "preproc.c"
     break;
 
   case 994: /* FetchStmt: FETCH BACKWARD from_in cursor_name opt_ecpg_fetch_into  */
-#line 6628 "preproc.y"
+#line 6624 "preproc.y"
         {
 		char *cursor_marker = (yyvsp[-1].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[-1].str);
 		struct cursor *ptr = add_additional_variables((yyvsp[-1].str), false);
@@ -45444,11 +45440,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
 		(yyval.str) = cat_str(2, mm_strdup("fetch backward from"), cursor_marker);
 	}
-#line 45448 "preproc.c"
+#line 45444 "preproc.c"
     break;
 
   case 995: /* FetchStmt: MOVE FORWARD cursor_name  */
-#line 6637 "preproc.y"
+#line 6633 "preproc.y"
         {
 		char *cursor_marker = (yyvsp[0].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[0].str);
 		struct cursor *ptr = add_additional_variables((yyvsp[0].str), false);
@@ -45457,11 +45453,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
 		(yyval.str) = cat_str(2, mm_strdup("move forward"), cursor_marker);
 	}
-#line 45461 "preproc.c"
+#line 45457 "preproc.c"
     break;
 
   case 996: /* FetchStmt: MOVE FORWARD from_in cursor_name  */
-#line 6646 "preproc.y"
+#line 6642 "preproc.y"
         {
 		char *cursor_marker = (yyvsp[0].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[0].str);
 		struct cursor *ptr = add_additional_variables((yyvsp[0].str), false);
@@ -45470,11 +45466,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
 		(yyval.str) = cat_str(2, mm_strdup("move forward from"), cursor_marker);
 	}
-#line 45474 "preproc.c"
+#line 45470 "preproc.c"
     break;
 
   case 997: /* FetchStmt: MOVE BACKWARD cursor_name  */
-#line 6655 "preproc.y"
+#line 6651 "preproc.y"
         {
 		char *cursor_marker = (yyvsp[0].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[0].str);
 		struct cursor *ptr = add_additional_variables((yyvsp[0].str), false);
@@ -45483,11 +45479,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
 		(yyval.str) = cat_str(2, mm_strdup("move backward"), cursor_marker);
 	}
-#line 45487 "preproc.c"
+#line 45483 "preproc.c"
     break;
 
   case 998: /* FetchStmt: MOVE BACKWARD from_in cursor_name  */
-#line 6664 "preproc.y"
+#line 6660 "preproc.y"
         {
 		char *cursor_marker = (yyvsp[0].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[0].str);
 		struct cursor *ptr = add_additional_variables((yyvsp[0].str), false);
@@ -45496,11 +45492,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
 		(yyval.str) = cat_str(2, mm_strdup("move backward from"), cursor_marker);
 	}
-#line 45500 "preproc.c"
+#line 45496 "preproc.c"
     break;
 
   case 999: /* fetch_args: cursor_name  */
-#line 6677 "preproc.y"
+#line 6673 "preproc.y"
  { 
 		struct cursor *ptr = add_additional_variables((yyvsp[0].str), false);
 		if (ptr -> connection)
@@ -45514,11 +45510,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 45518 "preproc.c"
+#line 45514 "preproc.c"
     break;
 
   case 1000: /* fetch_args: from_in cursor_name  */
-#line 6691 "preproc.y"
+#line 6687 "preproc.y"
  { 
 		struct cursor *ptr = add_additional_variables((yyvsp[0].str), false);
 		if (ptr -> connection)
@@ -45532,11 +45528,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 45536 "preproc.c"
+#line 45532 "preproc.c"
     break;
 
   case 1001: /* fetch_args: NEXT opt_from_in cursor_name  */
-#line 6705 "preproc.y"
+#line 6701 "preproc.y"
  { 
 		struct cursor *ptr = add_additional_variables((yyvsp[0].str), false);
 		if (ptr -> connection)
@@ -45550,11 +45546,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
  (yyval.str) = cat_str(3,mm_strdup("next"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 45554 "preproc.c"
+#line 45550 "preproc.c"
     break;
 
   case 1002: /* fetch_args: PRIOR opt_from_in cursor_name  */
-#line 6719 "preproc.y"
+#line 6715 "preproc.y"
  { 
 		struct cursor *ptr = add_additional_variables((yyvsp[0].str), false);
 		if (ptr -> connection)
@@ -45568,11 +45564,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
  (yyval.str) = cat_str(3,mm_strdup("prior"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 45572 "preproc.c"
+#line 45568 "preproc.c"
     break;
 
   case 1003: /* fetch_args: FIRST_P opt_from_in cursor_name  */
-#line 6733 "preproc.y"
+#line 6729 "preproc.y"
  { 
 		struct cursor *ptr = add_additional_variables((yyvsp[0].str), false);
 		if (ptr -> connection)
@@ -45586,11 +45582,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
  (yyval.str) = cat_str(3,mm_strdup("first"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 45590 "preproc.c"
+#line 45586 "preproc.c"
     break;
 
   case 1004: /* fetch_args: LAST_P opt_from_in cursor_name  */
-#line 6747 "preproc.y"
+#line 6743 "preproc.y"
  { 
 		struct cursor *ptr = add_additional_variables((yyvsp[0].str), false);
 		if (ptr -> connection)
@@ -45604,11 +45600,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
  (yyval.str) = cat_str(3,mm_strdup("last"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 45608 "preproc.c"
+#line 45604 "preproc.c"
     break;
 
   case 1005: /* fetch_args: ABSOLUTE_P SignedIconst opt_from_in cursor_name  */
-#line 6761 "preproc.y"
+#line 6757 "preproc.y"
  { 
 		struct cursor *ptr = add_additional_variables((yyvsp[0].str), false);
 		if (ptr -> connection)
@@ -45627,11 +45623,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
  (yyval.str) = cat_str(4,mm_strdup("absolute"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 45631 "preproc.c"
+#line 45627 "preproc.c"
     break;
 
   case 1006: /* fetch_args: RELATIVE_P SignedIconst opt_from_in cursor_name  */
-#line 6780 "preproc.y"
+#line 6776 "preproc.y"
  { 
 		struct cursor *ptr = add_additional_variables((yyvsp[0].str), false);
 		if (ptr -> connection)
@@ -45650,11 +45646,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
  (yyval.str) = cat_str(4,mm_strdup("relative"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 45654 "preproc.c"
+#line 45650 "preproc.c"
     break;
 
   case 1007: /* fetch_args: SignedIconst opt_from_in cursor_name  */
-#line 6799 "preproc.y"
+#line 6795 "preproc.y"
  { 
 		struct cursor *ptr = add_additional_variables((yyvsp[0].str), false);
 		if (ptr -> connection)
@@ -45673,11 +45669,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 45677 "preproc.c"
+#line 45673 "preproc.c"
     break;
 
   case 1008: /* fetch_args: ALL opt_from_in cursor_name  */
-#line 6818 "preproc.y"
+#line 6814 "preproc.y"
  { 
 		struct cursor *ptr = add_additional_variables((yyvsp[0].str), false);
 		if (ptr -> connection)
@@ -45691,11 +45687,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
  (yyval.str) = cat_str(3,mm_strdup("all"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 45695 "preproc.c"
+#line 45691 "preproc.c"
     break;
 
   case 1009: /* fetch_args: FORWARD SignedIconst opt_from_in cursor_name  */
-#line 6832 "preproc.y"
+#line 6828 "preproc.y"
  { 
 		struct cursor *ptr = add_additional_variables((yyvsp[0].str), false);
 		if (ptr -> connection)
@@ -45714,11 +45710,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
  (yyval.str) = cat_str(4,mm_strdup("forward"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 45718 "preproc.c"
+#line 45714 "preproc.c"
     break;
 
   case 1010: /* fetch_args: FORWARD ALL opt_from_in cursor_name  */
-#line 6851 "preproc.y"
+#line 6847 "preproc.y"
  { 
 		struct cursor *ptr = add_additional_variables((yyvsp[0].str), false);
 		if (ptr -> connection)
@@ -45732,11 +45728,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
  (yyval.str) = cat_str(3,mm_strdup("forward all"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 45736 "preproc.c"
+#line 45732 "preproc.c"
     break;
 
   case 1011: /* fetch_args: BACKWARD SignedIconst opt_from_in cursor_name  */
-#line 6865 "preproc.y"
+#line 6861 "preproc.y"
  { 
 		struct cursor *ptr = add_additional_variables((yyvsp[0].str), false);
 		if (ptr -> connection)
@@ -45755,11 +45751,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
  (yyval.str) = cat_str(4,mm_strdup("backward"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 45759 "preproc.c"
+#line 45755 "preproc.c"
     break;
 
   case 1012: /* fetch_args: BACKWARD ALL opt_from_in cursor_name  */
-#line 6884 "preproc.y"
+#line 6880 "preproc.y"
  { 
 		struct cursor *ptr = add_additional_variables((yyvsp[0].str), false);
 		if (ptr -> connection)
@@ -45773,5201 +45769,5198 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
  (yyval.str) = cat_str(3,mm_strdup("backward all"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 45777 "preproc.c"
+#line 45773 "preproc.c"
     break;
 
   case 1013: /* from_in: FROM  */
-#line 6902 "preproc.y"
+#line 6898 "preproc.y"
  { 
  (yyval.str) = mm_strdup("from");
 }
-#line 45785 "preproc.c"
+#line 45781 "preproc.c"
     break;
 
   case 1014: /* from_in: IN_P  */
-#line 6906 "preproc.y"
+#line 6902 "preproc.y"
  { 
  (yyval.str) = mm_strdup("in");
 }
-#line 45793 "preproc.c"
+#line 45789 "preproc.c"
     break;
 
   case 1015: /* opt_from_in: from_in  */
-#line 6914 "preproc.y"
+#line 6910 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 45801 "preproc.c"
+#line 45797 "preproc.c"
     break;
 
   case 1016: /* opt_from_in: %empty  */
-#line 6918 "preproc.y"
+#line 6914 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 45808 "preproc.c"
+#line 45804 "preproc.c"
     break;
 
   case 1017: /* GrantStmt: GRANT privileges ON privilege_target TO grantee_list opt_grant_grant_option opt_granted_by  */
-#line 6925 "preproc.y"
+#line 6921 "preproc.y"
  { 
  (yyval.str) = cat_str(8,mm_strdup("grant"),(yyvsp[-6].str),mm_strdup("on"),(yyvsp[-4].str),mm_strdup("to"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 45816 "preproc.c"
+#line 45812 "preproc.c"
     break;
 
   case 1018: /* RevokeStmt: REVOKE privileges ON privilege_target FROM grantee_list opt_granted_by opt_drop_behavior  */
-#line 6933 "preproc.y"
+#line 6929 "preproc.y"
  { 
  (yyval.str) = cat_str(8,mm_strdup("revoke"),(yyvsp[-6].str),mm_strdup("on"),(yyvsp[-4].str),mm_strdup("from"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 45824 "preproc.c"
+#line 45820 "preproc.c"
     break;
 
   case 1019: /* RevokeStmt: REVOKE GRANT OPTION FOR privileges ON privilege_target FROM grantee_list opt_granted_by opt_drop_behavior  */
-#line 6937 "preproc.y"
+#line 6933 "preproc.y"
  { 
  (yyval.str) = cat_str(8,mm_strdup("revoke grant option for"),(yyvsp[-6].str),mm_strdup("on"),(yyvsp[-4].str),mm_strdup("from"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 45832 "preproc.c"
+#line 45828 "preproc.c"
     break;
 
   case 1020: /* privileges: privilege_list  */
-#line 6945 "preproc.y"
+#line 6941 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 45840 "preproc.c"
+#line 45836 "preproc.c"
     break;
 
   case 1021: /* privileges: ALL  */
-#line 6949 "preproc.y"
+#line 6945 "preproc.y"
  { 
  (yyval.str) = mm_strdup("all");
 }
-#line 45848 "preproc.c"
+#line 45844 "preproc.c"
     break;
 
   case 1022: /* privileges: ALL PRIVILEGES  */
-#line 6953 "preproc.y"
+#line 6949 "preproc.y"
  { 
  (yyval.str) = mm_strdup("all privileges");
 }
-#line 45856 "preproc.c"
+#line 45852 "preproc.c"
     break;
 
   case 1023: /* privileges: ALL '(' columnList ')'  */
-#line 6957 "preproc.y"
+#line 6953 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("all ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45864 "preproc.c"
+#line 45860 "preproc.c"
     break;
 
   case 1024: /* privileges: ALL PRIVILEGES '(' columnList ')'  */
-#line 6961 "preproc.y"
+#line 6957 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("all privileges ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 45872 "preproc.c"
+#line 45868 "preproc.c"
     break;
 
   case 1025: /* privilege_list: privilege  */
-#line 6969 "preproc.y"
+#line 6965 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 45880 "preproc.c"
+#line 45876 "preproc.c"
     break;
 
   case 1026: /* privilege_list: privilege_list ',' privilege  */
-#line 6973 "preproc.y"
+#line 6969 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 45888 "preproc.c"
+#line 45884 "preproc.c"
     break;
 
   case 1027: /* privilege: SELECT opt_column_list  */
-#line 6981 "preproc.y"
+#line 6977 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("select"),(yyvsp[0].str));
 }
-#line 45896 "preproc.c"
+#line 45892 "preproc.c"
     break;
 
   case 1028: /* privilege: REFERENCES opt_column_list  */
-#line 6985 "preproc.y"
+#line 6981 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("references"),(yyvsp[0].str));
 }
-#line 45904 "preproc.c"
+#line 45900 "preproc.c"
     break;
 
   case 1029: /* privilege: CREATE opt_column_list  */
-#line 6989 "preproc.y"
+#line 6985 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("create"),(yyvsp[0].str));
 }
-#line 45912 "preproc.c"
+#line 45908 "preproc.c"
     break;
 
   case 1030: /* privilege: ALTER SYSTEM_P  */
-#line 6993 "preproc.y"
+#line 6989 "preproc.y"
  { 
  (yyval.str) = mm_strdup("alter system");
 }
-#line 45920 "preproc.c"
+#line 45916 "preproc.c"
     break;
 
   case 1031: /* privilege: ColId opt_column_list  */
-#line 6997 "preproc.y"
+#line 6993 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 45928 "preproc.c"
+#line 45924 "preproc.c"
     break;
 
   case 1032: /* parameter_name_list: parameter_name  */
-#line 7005 "preproc.y"
+#line 7001 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 45936 "preproc.c"
+#line 45932 "preproc.c"
     break;
 
   case 1033: /* parameter_name_list: parameter_name_list ',' parameter_name  */
-#line 7009 "preproc.y"
+#line 7005 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 45944 "preproc.c"
+#line 45940 "preproc.c"
     break;
 
   case 1034: /* parameter_name: ColId  */
-#line 7017 "preproc.y"
+#line 7013 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 45952 "preproc.c"
+#line 45948 "preproc.c"
     break;
 
   case 1035: /* parameter_name: parameter_name '.' ColId  */
-#line 7021 "preproc.y"
+#line 7017 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("."),(yyvsp[0].str));
 }
-#line 45960 "preproc.c"
+#line 45956 "preproc.c"
     break;
 
   case 1036: /* privilege_target: qualified_name_list  */
-#line 7029 "preproc.y"
+#line 7025 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 45968 "preproc.c"
+#line 45964 "preproc.c"
     break;
 
   case 1037: /* privilege_target: TABLE qualified_name_list  */
-#line 7033 "preproc.y"
+#line 7029 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("table"),(yyvsp[0].str));
 }
-#line 45976 "preproc.c"
+#line 45972 "preproc.c"
     break;
 
   case 1038: /* privilege_target: SEQUENCE qualified_name_list  */
-#line 7037 "preproc.y"
+#line 7033 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("sequence"),(yyvsp[0].str));
 }
-#line 45984 "preproc.c"
+#line 45980 "preproc.c"
     break;
 
   case 1039: /* privilege_target: FOREIGN DATA_P WRAPPER name_list  */
-#line 7041 "preproc.y"
+#line 7037 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("foreign data wrapper"),(yyvsp[0].str));
 }
-#line 45992 "preproc.c"
+#line 45988 "preproc.c"
     break;
 
   case 1040: /* privilege_target: FOREIGN SERVER name_list  */
-#line 7045 "preproc.y"
+#line 7041 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("foreign server"),(yyvsp[0].str));
 }
-#line 46000 "preproc.c"
+#line 45996 "preproc.c"
     break;
 
   case 1041: /* privilege_target: FUNCTION function_with_argtypes_list  */
-#line 7049 "preproc.y"
+#line 7045 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("function"),(yyvsp[0].str));
 }
-#line 46008 "preproc.c"
+#line 46004 "preproc.c"
     break;
 
   case 1042: /* privilege_target: PROCEDURE function_with_argtypes_list  */
-#line 7053 "preproc.y"
+#line 7049 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("procedure"),(yyvsp[0].str));
 }
-#line 46016 "preproc.c"
+#line 46012 "preproc.c"
     break;
 
   case 1043: /* privilege_target: ROUTINE function_with_argtypes_list  */
-#line 7057 "preproc.y"
+#line 7053 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("routine"),(yyvsp[0].str));
 }
-#line 46024 "preproc.c"
+#line 46020 "preproc.c"
     break;
 
   case 1044: /* privilege_target: DATABASE name_list  */
-#line 7061 "preproc.y"
+#line 7057 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("database"),(yyvsp[0].str));
 }
-#line 46032 "preproc.c"
+#line 46028 "preproc.c"
     break;
 
   case 1045: /* privilege_target: DOMAIN_P any_name_list  */
-#line 7065 "preproc.y"
+#line 7061 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("domain"),(yyvsp[0].str));
 }
-#line 46040 "preproc.c"
+#line 46036 "preproc.c"
     break;
 
   case 1046: /* privilege_target: LANGUAGE name_list  */
-#line 7069 "preproc.y"
+#line 7065 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("language"),(yyvsp[0].str));
 }
-#line 46048 "preproc.c"
+#line 46044 "preproc.c"
     break;
 
   case 1047: /* privilege_target: LARGE_P OBJECT_P NumericOnly_list  */
-#line 7073 "preproc.y"
+#line 7069 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("large object"),(yyvsp[0].str));
 }
-#line 46056 "preproc.c"
+#line 46052 "preproc.c"
     break;
 
   case 1048: /* privilege_target: PARAMETER parameter_name_list  */
-#line 7077 "preproc.y"
+#line 7073 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("parameter"),(yyvsp[0].str));
 }
-#line 46064 "preproc.c"
+#line 46060 "preproc.c"
     break;
 
   case 1049: /* privilege_target: SCHEMA name_list  */
-#line 7081 "preproc.y"
+#line 7077 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("schema"),(yyvsp[0].str));
 }
-#line 46072 "preproc.c"
+#line 46068 "preproc.c"
     break;
 
   case 1050: /* privilege_target: TABLESPACE name_list  */
-#line 7085 "preproc.y"
+#line 7081 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("tablespace"),(yyvsp[0].str));
 }
-#line 46080 "preproc.c"
+#line 46076 "preproc.c"
     break;
 
   case 1051: /* privilege_target: TYPE_P any_name_list  */
-#line 7089 "preproc.y"
+#line 7085 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("type"),(yyvsp[0].str));
 }
-#line 46088 "preproc.c"
+#line 46084 "preproc.c"
     break;
 
   case 1052: /* privilege_target: ALL TABLES IN_P SCHEMA name_list  */
-#line 7093 "preproc.y"
+#line 7089 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("all tables in schema"),(yyvsp[0].str));
 }
-#line 46096 "preproc.c"
+#line 46092 "preproc.c"
     break;
 
   case 1053: /* privilege_target: ALL SEQUENCES IN_P SCHEMA name_list  */
-#line 7097 "preproc.y"
+#line 7093 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("all sequences in schema"),(yyvsp[0].str));
 }
-#line 46104 "preproc.c"
+#line 46100 "preproc.c"
     break;
 
   case 1054: /* privilege_target: ALL FUNCTIONS IN_P SCHEMA name_list  */
-#line 7101 "preproc.y"
+#line 7097 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("all functions in schema"),(yyvsp[0].str));
 }
-#line 46112 "preproc.c"
+#line 46108 "preproc.c"
     break;
 
   case 1055: /* privilege_target: ALL PROCEDURES IN_P SCHEMA name_list  */
-#line 7105 "preproc.y"
+#line 7101 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("all procedures in schema"),(yyvsp[0].str));
 }
-#line 46120 "preproc.c"
+#line 46116 "preproc.c"
     break;
 
   case 1056: /* privilege_target: ALL ROUTINES IN_P SCHEMA name_list  */
-#line 7109 "preproc.y"
+#line 7105 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("all routines in schema"),(yyvsp[0].str));
 }
-#line 46128 "preproc.c"
+#line 46124 "preproc.c"
     break;
 
   case 1057: /* grantee_list: grantee  */
-#line 7117 "preproc.y"
+#line 7113 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46136 "preproc.c"
+#line 46132 "preproc.c"
     break;
 
   case 1058: /* grantee_list: grantee_list ',' grantee  */
-#line 7121 "preproc.y"
+#line 7117 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 46144 "preproc.c"
+#line 46140 "preproc.c"
     break;
 
   case 1059: /* grantee: RoleSpec  */
-#line 7129 "preproc.y"
+#line 7125 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46152 "preproc.c"
+#line 46148 "preproc.c"
     break;
 
   case 1060: /* grantee: GROUP_P RoleSpec  */
-#line 7133 "preproc.y"
+#line 7129 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("group"),(yyvsp[0].str));
 }
-#line 46160 "preproc.c"
+#line 46156 "preproc.c"
     break;
 
   case 1061: /* opt_grant_grant_option: WITH GRANT OPTION  */
-#line 7141 "preproc.y"
+#line 7137 "preproc.y"
  { 
  (yyval.str) = mm_strdup("with grant option");
 }
-#line 46168 "preproc.c"
+#line 46164 "preproc.c"
     break;
 
   case 1062: /* opt_grant_grant_option: %empty  */
-#line 7145 "preproc.y"
+#line 7141 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 46175 "preproc.c"
+#line 46171 "preproc.c"
     break;
 
   case 1063: /* GrantRoleStmt: GRANT privilege_list TO role_list opt_granted_by  */
-#line 7152 "preproc.y"
+#line 7148 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("grant"),(yyvsp[-3].str),mm_strdup("to"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46183 "preproc.c"
+#line 46179 "preproc.c"
     break;
 
   case 1064: /* GrantRoleStmt: GRANT privilege_list TO role_list WITH grant_role_opt_list opt_granted_by  */
-#line 7156 "preproc.y"
+#line 7152 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("grant"),(yyvsp[-5].str),mm_strdup("to"),(yyvsp[-3].str),mm_strdup("with"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46191 "preproc.c"
+#line 46187 "preproc.c"
     break;
 
   case 1065: /* RevokeRoleStmt: REVOKE privilege_list FROM role_list opt_granted_by opt_drop_behavior  */
-#line 7164 "preproc.y"
+#line 7160 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("revoke"),(yyvsp[-4].str),mm_strdup("from"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46199 "preproc.c"
+#line 46195 "preproc.c"
     break;
 
   case 1066: /* RevokeRoleStmt: REVOKE ColId OPTION FOR privilege_list FROM role_list opt_granted_by opt_drop_behavior  */
-#line 7168 "preproc.y"
+#line 7164 "preproc.y"
  { 
  (yyval.str) = cat_str(8,mm_strdup("revoke"),(yyvsp[-7].str),mm_strdup("option for"),(yyvsp[-4].str),mm_strdup("from"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46207 "preproc.c"
+#line 46203 "preproc.c"
     break;
 
   case 1067: /* grant_role_opt_list: grant_role_opt_list ',' grant_role_opt  */
-#line 7176 "preproc.y"
+#line 7172 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 46215 "preproc.c"
+#line 46211 "preproc.c"
     break;
 
   case 1068: /* grant_role_opt_list: grant_role_opt  */
-#line 7180 "preproc.y"
+#line 7176 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46223 "preproc.c"
+#line 46219 "preproc.c"
     break;
 
   case 1069: /* grant_role_opt: ColLabel grant_role_opt_value  */
-#line 7188 "preproc.y"
+#line 7184 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46231 "preproc.c"
+#line 46227 "preproc.c"
     break;
 
   case 1070: /* grant_role_opt_value: OPTION  */
-#line 7196 "preproc.y"
+#line 7192 "preproc.y"
  { 
  (yyval.str) = mm_strdup("option");
 }
-#line 46239 "preproc.c"
+#line 46235 "preproc.c"
     break;
 
   case 1071: /* grant_role_opt_value: TRUE_P  */
-#line 7200 "preproc.y"
+#line 7196 "preproc.y"
  { 
  (yyval.str) = mm_strdup("true");
 }
-#line 46247 "preproc.c"
+#line 46243 "preproc.c"
     break;
 
   case 1072: /* grant_role_opt_value: FALSE_P  */
-#line 7204 "preproc.y"
+#line 7200 "preproc.y"
  { 
  (yyval.str) = mm_strdup("false");
 }
-#line 46255 "preproc.c"
+#line 46251 "preproc.c"
     break;
 
   case 1073: /* opt_granted_by: GRANTED BY RoleSpec  */
-#line 7212 "preproc.y"
+#line 7208 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("granted by"),(yyvsp[0].str));
 }
-#line 46263 "preproc.c"
+#line 46259 "preproc.c"
     break;
 
   case 1074: /* opt_granted_by: %empty  */
-#line 7216 "preproc.y"
+#line 7212 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 46270 "preproc.c"
+#line 46266 "preproc.c"
     break;
 
   case 1075: /* AlterDefaultPrivilegesStmt: ALTER DEFAULT PRIVILEGES DefACLOptionList DefACLAction  */
-#line 7223 "preproc.y"
+#line 7219 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter default privileges"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46278 "preproc.c"
+#line 46274 "preproc.c"
     break;
 
   case 1076: /* DefACLOptionList: DefACLOptionList DefACLOption  */
-#line 7231 "preproc.y"
+#line 7227 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46286 "preproc.c"
+#line 46282 "preproc.c"
     break;
 
   case 1077: /* DefACLOptionList: %empty  */
-#line 7235 "preproc.y"
+#line 7231 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 46293 "preproc.c"
+#line 46289 "preproc.c"
     break;
 
   case 1078: /* DefACLOption: IN_P SCHEMA name_list  */
-#line 7242 "preproc.y"
+#line 7238 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("in schema"),(yyvsp[0].str));
 }
-#line 46301 "preproc.c"
+#line 46297 "preproc.c"
     break;
 
   case 1079: /* DefACLOption: FOR ROLE role_list  */
-#line 7246 "preproc.y"
+#line 7242 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("for role"),(yyvsp[0].str));
 }
-#line 46309 "preproc.c"
+#line 46305 "preproc.c"
     break;
 
   case 1080: /* DefACLOption: FOR USER role_list  */
-#line 7250 "preproc.y"
+#line 7246 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("for user"),(yyvsp[0].str));
 }
-#line 46317 "preproc.c"
+#line 46313 "preproc.c"
     break;
 
   case 1081: /* DefACLAction: GRANT privileges ON defacl_privilege_target TO grantee_list opt_grant_grant_option  */
-#line 7258 "preproc.y"
+#line 7254 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("grant"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("to"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46325 "preproc.c"
+#line 46321 "preproc.c"
     break;
 
   case 1082: /* DefACLAction: REVOKE privileges ON defacl_privilege_target FROM grantee_list opt_drop_behavior  */
-#line 7262 "preproc.y"
+#line 7258 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("revoke"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("from"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46333 "preproc.c"
+#line 46329 "preproc.c"
     break;
 
   case 1083: /* DefACLAction: REVOKE GRANT OPTION FOR privileges ON defacl_privilege_target FROM grantee_list opt_drop_behavior  */
-#line 7266 "preproc.y"
+#line 7262 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("revoke grant option for"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("from"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46341 "preproc.c"
+#line 46337 "preproc.c"
     break;
 
   case 1084: /* defacl_privilege_target: TABLES  */
-#line 7274 "preproc.y"
+#line 7270 "preproc.y"
  { 
  (yyval.str) = mm_strdup("tables");
 }
-#line 46349 "preproc.c"
+#line 46345 "preproc.c"
     break;
 
   case 1085: /* defacl_privilege_target: FUNCTIONS  */
-#line 7278 "preproc.y"
+#line 7274 "preproc.y"
  { 
  (yyval.str) = mm_strdup("functions");
 }
-#line 46357 "preproc.c"
+#line 46353 "preproc.c"
     break;
 
   case 1086: /* defacl_privilege_target: ROUTINES  */
-#line 7282 "preproc.y"
+#line 7278 "preproc.y"
  { 
  (yyval.str) = mm_strdup("routines");
 }
-#line 46365 "preproc.c"
+#line 46361 "preproc.c"
     break;
 
   case 1087: /* defacl_privilege_target: SEQUENCES  */
-#line 7286 "preproc.y"
+#line 7282 "preproc.y"
  { 
  (yyval.str) = mm_strdup("sequences");
 }
-#line 46373 "preproc.c"
+#line 46369 "preproc.c"
     break;
 
   case 1088: /* defacl_privilege_target: TYPES_P  */
-#line 7290 "preproc.y"
+#line 7286 "preproc.y"
  { 
  (yyval.str) = mm_strdup("types");
 }
-#line 46381 "preproc.c"
+#line 46377 "preproc.c"
     break;
 
   case 1089: /* defacl_privilege_target: SCHEMAS  */
-#line 7294 "preproc.y"
+#line 7290 "preproc.y"
  { 
  (yyval.str) = mm_strdup("schemas");
 }
-#line 46389 "preproc.c"
+#line 46385 "preproc.c"
     break;
 
   case 1090: /* IndexStmt: CREATE opt_unique INDEX opt_concurrently opt_single_name ON relation_expr access_method_clause '(' index_params ')' opt_include opt_unique_null_treatment opt_reloptions OptTableSpace where_clause  */
-#line 7302 "preproc.y"
+#line 7298 "preproc.y"
  { 
  (yyval.str) = cat_str(16,mm_strdup("create"),(yyvsp[-14].str),mm_strdup("index"),(yyvsp[-12].str),(yyvsp[-11].str),mm_strdup("on"),(yyvsp[-9].str),(yyvsp[-8].str),mm_strdup("("),(yyvsp[-6].str),mm_strdup(")"),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46397 "preproc.c"
+#line 46393 "preproc.c"
     break;
 
   case 1091: /* IndexStmt: CREATE opt_unique INDEX opt_concurrently IF_P NOT EXISTS name ON relation_expr access_method_clause '(' index_params ')' opt_include opt_unique_null_treatment opt_reloptions OptTableSpace where_clause  */
-#line 7306 "preproc.y"
+#line 7302 "preproc.y"
  { 
  (yyval.str) = cat_str(17,mm_strdup("create"),(yyvsp[-17].str),mm_strdup("index"),(yyvsp[-15].str),mm_strdup("if not exists"),(yyvsp[-11].str),mm_strdup("on"),(yyvsp[-9].str),(yyvsp[-8].str),mm_strdup("("),(yyvsp[-6].str),mm_strdup(")"),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46405 "preproc.c"
+#line 46401 "preproc.c"
     break;
 
   case 1092: /* opt_unique: UNIQUE  */
-#line 7314 "preproc.y"
+#line 7310 "preproc.y"
  { 
  (yyval.str) = mm_strdup("unique");
 }
-#line 46413 "preproc.c"
+#line 46409 "preproc.c"
     break;
 
   case 1093: /* opt_unique: %empty  */
-#line 7318 "preproc.y"
+#line 7314 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 46420 "preproc.c"
+#line 46416 "preproc.c"
     break;
 
   case 1094: /* access_method_clause: USING name  */
-#line 7325 "preproc.y"
+#line 7321 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("using"),(yyvsp[0].str));
 }
-#line 46428 "preproc.c"
+#line 46424 "preproc.c"
     break;
 
   case 1095: /* access_method_clause: %empty  */
-#line 7329 "preproc.y"
+#line 7325 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 46435 "preproc.c"
+#line 46431 "preproc.c"
     break;
 
   case 1096: /* index_params: index_elem  */
-#line 7336 "preproc.y"
+#line 7332 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46443 "preproc.c"
+#line 46439 "preproc.c"
     break;
 
   case 1097: /* index_params: index_params ',' index_elem  */
-#line 7340 "preproc.y"
+#line 7336 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 46451 "preproc.c"
+#line 46447 "preproc.c"
     break;
 
   case 1098: /* index_elem_options: opt_collate opt_qualified_name opt_asc_desc opt_nulls_order  */
-#line 7348 "preproc.y"
+#line 7344 "preproc.y"
  { 
  (yyval.str) = cat_str(4,(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46459 "preproc.c"
+#line 46455 "preproc.c"
     break;
 
   case 1099: /* index_elem_options: opt_collate any_name reloptions opt_asc_desc opt_nulls_order  */
-#line 7352 "preproc.y"
+#line 7348 "preproc.y"
  { 
  (yyval.str) = cat_str(5,(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46467 "preproc.c"
+#line 46463 "preproc.c"
     break;
 
   case 1100: /* index_elem: ColId index_elem_options  */
-#line 7360 "preproc.y"
+#line 7356 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46475 "preproc.c"
+#line 46471 "preproc.c"
     break;
 
   case 1101: /* index_elem: func_expr_windowless index_elem_options  */
-#line 7364 "preproc.y"
+#line 7360 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46483 "preproc.c"
+#line 46479 "preproc.c"
     break;
 
   case 1102: /* index_elem: '(' a_expr ')' index_elem_options  */
-#line 7368 "preproc.y"
+#line 7364 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 46491 "preproc.c"
+#line 46487 "preproc.c"
     break;
 
   case 1103: /* opt_include: INCLUDE '(' index_including_params ')'  */
-#line 7376 "preproc.y"
+#line 7372 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("include ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 46499 "preproc.c"
+#line 46495 "preproc.c"
     break;
 
   case 1104: /* opt_include: %empty  */
-#line 7380 "preproc.y"
+#line 7376 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 46506 "preproc.c"
+#line 46502 "preproc.c"
     break;
 
   case 1105: /* index_including_params: index_elem  */
-#line 7387 "preproc.y"
+#line 7383 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46514 "preproc.c"
+#line 46510 "preproc.c"
     break;
 
   case 1106: /* index_including_params: index_including_params ',' index_elem  */
-#line 7391 "preproc.y"
+#line 7387 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 46522 "preproc.c"
+#line 46518 "preproc.c"
     break;
 
   case 1107: /* opt_collate: COLLATE any_name  */
-#line 7399 "preproc.y"
+#line 7395 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("collate"),(yyvsp[0].str));
 }
-#line 46530 "preproc.c"
+#line 46526 "preproc.c"
     break;
 
   case 1108: /* opt_collate: %empty  */
-#line 7403 "preproc.y"
+#line 7399 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 46537 "preproc.c"
+#line 46533 "preproc.c"
     break;
 
   case 1109: /* opt_asc_desc: ASC  */
-#line 7410 "preproc.y"
+#line 7406 "preproc.y"
  { 
  (yyval.str) = mm_strdup("asc");
 }
-#line 46545 "preproc.c"
+#line 46541 "preproc.c"
     break;
 
   case 1110: /* opt_asc_desc: DESC  */
-#line 7414 "preproc.y"
+#line 7410 "preproc.y"
  { 
  (yyval.str) = mm_strdup("desc");
 }
-#line 46553 "preproc.c"
+#line 46549 "preproc.c"
     break;
 
   case 1111: /* opt_asc_desc: %empty  */
-#line 7418 "preproc.y"
+#line 7414 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 46560 "preproc.c"
+#line 46556 "preproc.c"
     break;
 
   case 1112: /* opt_nulls_order: NULLS_LA FIRST_P  */
-#line 7425 "preproc.y"
+#line 7421 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nulls first");
 }
-#line 46568 "preproc.c"
+#line 46564 "preproc.c"
     break;
 
   case 1113: /* opt_nulls_order: NULLS_LA LAST_P  */
-#line 7429 "preproc.y"
+#line 7425 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nulls last");
 }
-#line 46576 "preproc.c"
+#line 46572 "preproc.c"
     break;
 
   case 1114: /* opt_nulls_order: %empty  */
-#line 7433 "preproc.y"
+#line 7429 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 46583 "preproc.c"
+#line 46579 "preproc.c"
     break;
 
   case 1115: /* CreateFunctionStmt: CREATE opt_or_replace FUNCTION func_name func_args_with_defaults RETURNS func_return opt_createfunc_opt_list opt_routine_body  */
-#line 7440 "preproc.y"
+#line 7436 "preproc.y"
  { 
  (yyval.str) = cat_str(9,mm_strdup("create"),(yyvsp[-7].str),mm_strdup("function"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("returns"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46591 "preproc.c"
+#line 46587 "preproc.c"
     break;
 
   case 1116: /* CreateFunctionStmt: CREATE opt_or_replace FUNCTION func_name func_args_with_defaults RETURNS TABLE '(' table_func_column_list ')' opt_createfunc_opt_list opt_routine_body  */
-#line 7444 "preproc.y"
+#line 7440 "preproc.y"
  { 
  (yyval.str) = cat_str(10,mm_strdup("create"),(yyvsp[-10].str),mm_strdup("function"),(yyvsp[-8].str),(yyvsp[-7].str),mm_strdup("returns table ("),(yyvsp[-3].str),mm_strdup(")"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46599 "preproc.c"
+#line 46595 "preproc.c"
     break;
 
   case 1117: /* CreateFunctionStmt: CREATE opt_or_replace FUNCTION func_name func_args_with_defaults opt_createfunc_opt_list opt_routine_body  */
-#line 7448 "preproc.y"
+#line 7444 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("create"),(yyvsp[-5].str),mm_strdup("function"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46607 "preproc.c"
+#line 46603 "preproc.c"
     break;
 
   case 1118: /* CreateFunctionStmt: CREATE opt_or_replace PROCEDURE func_name func_args_with_defaults opt_createfunc_opt_list opt_routine_body  */
-#line 7452 "preproc.y"
+#line 7448 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("create"),(yyvsp[-5].str),mm_strdup("procedure"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46615 "preproc.c"
+#line 46611 "preproc.c"
     break;
 
   case 1119: /* opt_or_replace: OR REPLACE  */
-#line 7460 "preproc.y"
+#line 7456 "preproc.y"
  { 
  (yyval.str) = mm_strdup("or replace");
 }
-#line 46623 "preproc.c"
+#line 46619 "preproc.c"
     break;
 
   case 1120: /* opt_or_replace: %empty  */
-#line 7464 "preproc.y"
+#line 7460 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 46630 "preproc.c"
+#line 46626 "preproc.c"
     break;
 
   case 1121: /* func_args: '(' func_args_list ')'  */
-#line 7471 "preproc.y"
+#line 7467 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 46638 "preproc.c"
+#line 46634 "preproc.c"
     break;
 
   case 1122: /* func_args: '(' ')'  */
-#line 7475 "preproc.y"
+#line 7471 "preproc.y"
  { 
  (yyval.str) = mm_strdup("( )");
 }
-#line 46646 "preproc.c"
+#line 46642 "preproc.c"
     break;
 
   case 1123: /* func_args_list: func_arg  */
-#line 7483 "preproc.y"
+#line 7479 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46654 "preproc.c"
+#line 46650 "preproc.c"
     break;
 
   case 1124: /* func_args_list: func_args_list ',' func_arg  */
-#line 7487 "preproc.y"
+#line 7483 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 46662 "preproc.c"
+#line 46658 "preproc.c"
     break;
 
   case 1125: /* function_with_argtypes_list: function_with_argtypes  */
-#line 7495 "preproc.y"
+#line 7491 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46670 "preproc.c"
+#line 46666 "preproc.c"
     break;
 
   case 1126: /* function_with_argtypes_list: function_with_argtypes_list ',' function_with_argtypes  */
-#line 7499 "preproc.y"
+#line 7495 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 46678 "preproc.c"
+#line 46674 "preproc.c"
     break;
 
   case 1127: /* function_with_argtypes: func_name func_args  */
-#line 7507 "preproc.y"
+#line 7503 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46686 "preproc.c"
+#line 46682 "preproc.c"
     break;
 
   case 1128: /* function_with_argtypes: type_func_name_keyword  */
-#line 7511 "preproc.y"
+#line 7507 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46694 "preproc.c"
+#line 46690 "preproc.c"
     break;
 
   case 1129: /* function_with_argtypes: ColId  */
-#line 7515 "preproc.y"
+#line 7511 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46702 "preproc.c"
+#line 46698 "preproc.c"
     break;
 
   case 1130: /* function_with_argtypes: ColId indirection  */
-#line 7519 "preproc.y"
+#line 7515 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46710 "preproc.c"
+#line 46706 "preproc.c"
     break;
 
   case 1131: /* func_args_with_defaults: '(' func_args_with_defaults_list ')'  */
-#line 7527 "preproc.y"
+#line 7523 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 46718 "preproc.c"
+#line 46714 "preproc.c"
     break;
 
   case 1132: /* func_args_with_defaults: '(' ')'  */
-#line 7531 "preproc.y"
+#line 7527 "preproc.y"
  { 
  (yyval.str) = mm_strdup("( )");
 }
-#line 46726 "preproc.c"
+#line 46722 "preproc.c"
     break;
 
   case 1133: /* func_args_with_defaults_list: func_arg_with_default  */
-#line 7539 "preproc.y"
+#line 7535 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46734 "preproc.c"
+#line 46730 "preproc.c"
     break;
 
   case 1134: /* func_args_with_defaults_list: func_args_with_defaults_list ',' func_arg_with_default  */
-#line 7543 "preproc.y"
+#line 7539 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 46742 "preproc.c"
+#line 46738 "preproc.c"
     break;
 
   case 1135: /* func_arg: arg_class param_name func_type  */
-#line 7551 "preproc.y"
+#line 7547 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46750 "preproc.c"
+#line 46746 "preproc.c"
     break;
 
   case 1136: /* func_arg: param_name arg_class func_type  */
-#line 7555 "preproc.y"
+#line 7551 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46758 "preproc.c"
+#line 46754 "preproc.c"
     break;
 
   case 1137: /* func_arg: param_name func_type  */
-#line 7559 "preproc.y"
+#line 7555 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46766 "preproc.c"
+#line 46762 "preproc.c"
     break;
 
   case 1138: /* func_arg: arg_class func_type  */
-#line 7563 "preproc.y"
+#line 7559 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46774 "preproc.c"
+#line 46770 "preproc.c"
     break;
 
   case 1139: /* func_arg: func_type  */
-#line 7567 "preproc.y"
+#line 7563 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46782 "preproc.c"
+#line 46778 "preproc.c"
     break;
 
   case 1140: /* arg_class: IN_P  */
-#line 7575 "preproc.y"
+#line 7571 "preproc.y"
  { 
  (yyval.str) = mm_strdup("in");
 }
-#line 46790 "preproc.c"
+#line 46786 "preproc.c"
     break;
 
   case 1141: /* arg_class: OUT_P  */
-#line 7579 "preproc.y"
+#line 7575 "preproc.y"
  { 
  (yyval.str) = mm_strdup("out");
 }
-#line 46798 "preproc.c"
+#line 46794 "preproc.c"
     break;
 
   case 1142: /* arg_class: INOUT  */
-#line 7583 "preproc.y"
+#line 7579 "preproc.y"
  { 
  (yyval.str) = mm_strdup("inout");
 }
-#line 46806 "preproc.c"
+#line 46802 "preproc.c"
     break;
 
   case 1143: /* arg_class: IN_P OUT_P  */
-#line 7587 "preproc.y"
+#line 7583 "preproc.y"
  { 
  (yyval.str) = mm_strdup("in out");
 }
-#line 46814 "preproc.c"
+#line 46810 "preproc.c"
     break;
 
   case 1144: /* arg_class: VARIADIC  */
-#line 7591 "preproc.y"
+#line 7587 "preproc.y"
  { 
  (yyval.str) = mm_strdup("variadic");
 }
-#line 46822 "preproc.c"
+#line 46818 "preproc.c"
     break;
 
   case 1145: /* param_name: type_function_name  */
-#line 7599 "preproc.y"
+#line 7595 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46830 "preproc.c"
+#line 46826 "preproc.c"
     break;
 
   case 1146: /* func_return: func_type  */
-#line 7607 "preproc.y"
+#line 7603 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46838 "preproc.c"
+#line 46834 "preproc.c"
     break;
 
   case 1147: /* func_type: Typename  */
-#line 7615 "preproc.y"
+#line 7611 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46846 "preproc.c"
+#line 46842 "preproc.c"
     break;
 
   case 1148: /* func_type: type_function_name attrs '%' TYPE_P  */
-#line 7619 "preproc.y"
+#line 7615 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("% type"));
 }
-#line 46854 "preproc.c"
+#line 46850 "preproc.c"
     break;
 
   case 1149: /* func_type: SETOF type_function_name attrs '%' TYPE_P  */
-#line 7623 "preproc.y"
+#line 7619 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("setof"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("% type"));
 }
-#line 46862 "preproc.c"
+#line 46858 "preproc.c"
     break;
 
   case 1150: /* func_arg_with_default: func_arg  */
-#line 7631 "preproc.y"
+#line 7627 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46870 "preproc.c"
+#line 46866 "preproc.c"
     break;
 
   case 1151: /* func_arg_with_default: func_arg DEFAULT a_expr  */
-#line 7635 "preproc.y"
+#line 7631 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("default"),(yyvsp[0].str));
 }
-#line 46878 "preproc.c"
+#line 46874 "preproc.c"
     break;
 
   case 1152: /* func_arg_with_default: func_arg '=' a_expr  */
-#line 7639 "preproc.y"
+#line 7635 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
 }
-#line 46886 "preproc.c"
+#line 46882 "preproc.c"
     break;
 
   case 1153: /* aggr_arg: func_arg  */
-#line 7647 "preproc.y"
+#line 7643 "preproc.y"
  { 
-mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46895 "preproc.c"
+#line 46890 "preproc.c"
     break;
 
   case 1154: /* aggr_args: '(' '*' ')'  */
-#line 7656 "preproc.y"
+#line 7651 "preproc.y"
  { 
  (yyval.str) = mm_strdup("( * )");
 }
-#line 46903 "preproc.c"
+#line 46898 "preproc.c"
     break;
 
   case 1155: /* aggr_args: '(' aggr_args_list ')'  */
-#line 7660 "preproc.y"
+#line 7655 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 46911 "preproc.c"
+#line 46906 "preproc.c"
     break;
 
   case 1156: /* aggr_args: '(' ORDER BY aggr_args_list ')'  */
-#line 7664 "preproc.y"
+#line 7659 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("( order by"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 46919 "preproc.c"
+#line 46914 "preproc.c"
     break;
 
   case 1157: /* aggr_args: '(' aggr_args_list ORDER BY aggr_args_list ')'  */
-#line 7668 "preproc.y"
+#line 7663 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("("),(yyvsp[-4].str),mm_strdup("order by"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 46927 "preproc.c"
+#line 46922 "preproc.c"
     break;
 
   case 1158: /* aggr_args_list: aggr_arg  */
-#line 7676 "preproc.y"
+#line 7671 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46935 "preproc.c"
+#line 46930 "preproc.c"
     break;
 
   case 1159: /* aggr_args_list: aggr_args_list ',' aggr_arg  */
-#line 7680 "preproc.y"
+#line 7675 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 46943 "preproc.c"
+#line 46938 "preproc.c"
     break;
 
   case 1160: /* aggregate_with_argtypes: func_name aggr_args  */
-#line 7688 "preproc.y"
+#line 7683 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46951 "preproc.c"
+#line 46946 "preproc.c"
     break;
 
   case 1161: /* aggregate_with_argtypes_list: aggregate_with_argtypes  */
-#line 7696 "preproc.y"
+#line 7691 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46959 "preproc.c"
+#line 46954 "preproc.c"
     break;
 
   case 1162: /* aggregate_with_argtypes_list: aggregate_with_argtypes_list ',' aggregate_with_argtypes  */
-#line 7700 "preproc.y"
+#line 7695 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 46967 "preproc.c"
+#line 46962 "preproc.c"
     break;
 
   case 1163: /* opt_createfunc_opt_list: createfunc_opt_list  */
-#line 7708 "preproc.y"
+#line 7703 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46975 "preproc.c"
+#line 46970 "preproc.c"
     break;
 
   case 1164: /* opt_createfunc_opt_list: %empty  */
-#line 7712 "preproc.y"
+#line 7707 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 46982 "preproc.c"
+#line 46977 "preproc.c"
     break;
 
   case 1165: /* createfunc_opt_list: createfunc_opt_item  */
-#line 7719 "preproc.y"
+#line 7714 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 46990 "preproc.c"
+#line 46985 "preproc.c"
     break;
 
   case 1166: /* createfunc_opt_list: createfunc_opt_list createfunc_opt_item  */
-#line 7723 "preproc.y"
+#line 7718 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 46998 "preproc.c"
+#line 46993 "preproc.c"
     break;
 
   case 1167: /* common_func_opt_item: CALLED ON NULL_P INPUT_P  */
-#line 7731 "preproc.y"
+#line 7726 "preproc.y"
  { 
  (yyval.str) = mm_strdup("called on null input");
 }
-#line 47006 "preproc.c"
+#line 47001 "preproc.c"
     break;
 
   case 1168: /* common_func_opt_item: RETURNS NULL_P ON NULL_P INPUT_P  */
-#line 7735 "preproc.y"
+#line 7730 "preproc.y"
  { 
  (yyval.str) = mm_strdup("returns null on null input");
 }
-#line 47014 "preproc.c"
+#line 47009 "preproc.c"
     break;
 
   case 1169: /* common_func_opt_item: STRICT_P  */
-#line 7739 "preproc.y"
+#line 7734 "preproc.y"
  { 
  (yyval.str) = mm_strdup("strict");
 }
-#line 47022 "preproc.c"
+#line 47017 "preproc.c"
     break;
 
   case 1170: /* common_func_opt_item: IMMUTABLE  */
-#line 7743 "preproc.y"
+#line 7738 "preproc.y"
  { 
  (yyval.str) = mm_strdup("immutable");
 }
-#line 47030 "preproc.c"
+#line 47025 "preproc.c"
     break;
 
   case 1171: /* common_func_opt_item: STABLE  */
-#line 7747 "preproc.y"
+#line 7742 "preproc.y"
  { 
  (yyval.str) = mm_strdup("stable");
 }
-#line 47038 "preproc.c"
+#line 47033 "preproc.c"
     break;
 
   case 1172: /* common_func_opt_item: VOLATILE  */
-#line 7751 "preproc.y"
+#line 7746 "preproc.y"
  { 
  (yyval.str) = mm_strdup("volatile");
 }
-#line 47046 "preproc.c"
+#line 47041 "preproc.c"
     break;
 
   case 1173: /* common_func_opt_item: EXTERNAL SECURITY DEFINER  */
-#line 7755 "preproc.y"
+#line 7750 "preproc.y"
  { 
  (yyval.str) = mm_strdup("external security definer");
 }
-#line 47054 "preproc.c"
+#line 47049 "preproc.c"
     break;
 
   case 1174: /* common_func_opt_item: EXTERNAL SECURITY INVOKER  */
-#line 7759 "preproc.y"
+#line 7754 "preproc.y"
  { 
  (yyval.str) = mm_strdup("external security invoker");
 }
-#line 47062 "preproc.c"
+#line 47057 "preproc.c"
     break;
 
   case 1175: /* common_func_opt_item: SECURITY DEFINER  */
-#line 7763 "preproc.y"
+#line 7758 "preproc.y"
  { 
  (yyval.str) = mm_strdup("security definer");
 }
-#line 47070 "preproc.c"
+#line 47065 "preproc.c"
     break;
 
   case 1176: /* common_func_opt_item: SECURITY INVOKER  */
-#line 7767 "preproc.y"
+#line 7762 "preproc.y"
  { 
  (yyval.str) = mm_strdup("security invoker");
 }
-#line 47078 "preproc.c"
+#line 47073 "preproc.c"
     break;
 
   case 1177: /* common_func_opt_item: LEAKPROOF  */
-#line 7771 "preproc.y"
+#line 7766 "preproc.y"
  { 
  (yyval.str) = mm_strdup("leakproof");
 }
-#line 47086 "preproc.c"
+#line 47081 "preproc.c"
     break;
 
   case 1178: /* common_func_opt_item: NOT LEAKPROOF  */
-#line 7775 "preproc.y"
+#line 7770 "preproc.y"
  { 
  (yyval.str) = mm_strdup("not leakproof");
 }
-#line 47094 "preproc.c"
+#line 47089 "preproc.c"
     break;
 
   case 1179: /* common_func_opt_item: COST NumericOnly  */
-#line 7779 "preproc.y"
+#line 7774 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("cost"),(yyvsp[0].str));
 }
-#line 47102 "preproc.c"
+#line 47097 "preproc.c"
     break;
 
   case 1180: /* common_func_opt_item: ROWS NumericOnly  */
-#line 7783 "preproc.y"
+#line 7778 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("rows"),(yyvsp[0].str));
 }
-#line 47110 "preproc.c"
+#line 47105 "preproc.c"
     break;
 
   case 1181: /* common_func_opt_item: SUPPORT any_name  */
-#line 7787 "preproc.y"
+#line 7782 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("support"),(yyvsp[0].str));
 }
-#line 47118 "preproc.c"
+#line 47113 "preproc.c"
     break;
 
   case 1182: /* common_func_opt_item: FunctionSetResetClause  */
-#line 7791 "preproc.y"
+#line 7786 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 47126 "preproc.c"
+#line 47121 "preproc.c"
     break;
 
   case 1183: /* common_func_opt_item: PARALLEL ColId  */
-#line 7795 "preproc.y"
+#line 7790 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("parallel"),(yyvsp[0].str));
 }
-#line 47134 "preproc.c"
+#line 47129 "preproc.c"
     break;
 
   case 1184: /* createfunc_opt_item: AS func_as  */
-#line 7803 "preproc.y"
+#line 7798 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("as"),(yyvsp[0].str));
 }
-#line 47142 "preproc.c"
+#line 47137 "preproc.c"
     break;
 
   case 1185: /* createfunc_opt_item: LANGUAGE NonReservedWord_or_Sconst  */
-#line 7807 "preproc.y"
+#line 7802 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("language"),(yyvsp[0].str));
 }
-#line 47150 "preproc.c"
+#line 47145 "preproc.c"
     break;
 
   case 1186: /* createfunc_opt_item: TRANSFORM transform_type_list  */
-#line 7811 "preproc.y"
+#line 7806 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("transform"),(yyvsp[0].str));
 }
-#line 47158 "preproc.c"
+#line 47153 "preproc.c"
     break;
 
   case 1187: /* createfunc_opt_item: WINDOW  */
-#line 7815 "preproc.y"
+#line 7810 "preproc.y"
  { 
  (yyval.str) = mm_strdup("window");
 }
-#line 47166 "preproc.c"
+#line 47161 "preproc.c"
     break;
 
   case 1188: /* createfunc_opt_item: common_func_opt_item  */
-#line 7819 "preproc.y"
+#line 7814 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 47174 "preproc.c"
+#line 47169 "preproc.c"
     break;
 
   case 1189: /* func_as: ecpg_sconst  */
-#line 7827 "preproc.y"
+#line 7822 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 47182 "preproc.c"
+#line 47177 "preproc.c"
     break;
 
   case 1190: /* func_as: ecpg_sconst ',' ecpg_sconst  */
-#line 7831 "preproc.y"
+#line 7826 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 47190 "preproc.c"
+#line 47185 "preproc.c"
     break;
 
   case 1191: /* ReturnStmt: RETURN a_expr  */
-#line 7839 "preproc.y"
+#line 7834 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("return"),(yyvsp[0].str));
 }
-#line 47198 "preproc.c"
+#line 47193 "preproc.c"
     break;
 
   case 1192: /* opt_routine_body: ReturnStmt  */
-#line 7847 "preproc.y"
+#line 7842 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 47206 "preproc.c"
+#line 47201 "preproc.c"
     break;
 
   case 1193: /* opt_routine_body: BEGIN_P ATOMIC routine_body_stmt_list END_P  */
-#line 7851 "preproc.y"
+#line 7846 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("begin atomic"),(yyvsp[-1].str),mm_strdup("end"));
 }
-#line 47214 "preproc.c"
+#line 47209 "preproc.c"
     break;
 
   case 1194: /* opt_routine_body: %empty  */
-#line 7855 "preproc.y"
+#line 7850 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 47221 "preproc.c"
+#line 47216 "preproc.c"
     break;
 
   case 1195: /* routine_body_stmt_list: routine_body_stmt_list routine_body_stmt ';'  */
-#line 7862 "preproc.y"
+#line 7857 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(";"));
 }
-#line 47229 "preproc.c"
+#line 47224 "preproc.c"
     break;
 
   case 1196: /* routine_body_stmt_list: %empty  */
-#line 7866 "preproc.y"
+#line 7861 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 47236 "preproc.c"
+#line 47231 "preproc.c"
     break;
 
   case 1197: /* routine_body_stmt: stmt  */
-#line 7873 "preproc.y"
+#line 7868 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 47244 "preproc.c"
+#line 47239 "preproc.c"
     break;
 
   case 1198: /* routine_body_stmt: ReturnStmt  */
-#line 7877 "preproc.y"
+#line 7872 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 47252 "preproc.c"
+#line 47247 "preproc.c"
     break;
 
   case 1199: /* transform_type_list: FOR TYPE_P Typename  */
-#line 7885 "preproc.y"
+#line 7880 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("for type"),(yyvsp[0].str));
 }
-#line 47260 "preproc.c"
+#line 47255 "preproc.c"
     break;
 
   case 1200: /* transform_type_list: transform_type_list ',' FOR TYPE_P Typename  */
-#line 7889 "preproc.y"
+#line 7884 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-4].str),mm_strdup(", for type"),(yyvsp[0].str));
 }
-#line 47268 "preproc.c"
+#line 47263 "preproc.c"
     break;
 
   case 1201: /* opt_definition: WITH definition  */
-#line 7897 "preproc.y"
+#line 7892 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("with"),(yyvsp[0].str));
 }
-#line 47276 "preproc.c"
+#line 47271 "preproc.c"
     break;
 
   case 1202: /* opt_definition: %empty  */
-#line 7901 "preproc.y"
+#line 7896 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 47283 "preproc.c"
+#line 47278 "preproc.c"
     break;
 
   case 1203: /* table_func_column: param_name func_type  */
-#line 7908 "preproc.y"
+#line 7903 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 47291 "preproc.c"
+#line 47286 "preproc.c"
     break;
 
   case 1204: /* table_func_column_list: table_func_column  */
-#line 7916 "preproc.y"
+#line 7911 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 47299 "preproc.c"
+#line 47294 "preproc.c"
     break;
 
   case 1205: /* table_func_column_list: table_func_column_list ',' table_func_column  */
-#line 7920 "preproc.y"
+#line 7915 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 47307 "preproc.c"
+#line 47302 "preproc.c"
     break;
 
   case 1206: /* AlterFunctionStmt: ALTER FUNCTION function_with_argtypes alterfunc_opt_list opt_restrict  */
-#line 7928 "preproc.y"
+#line 7923 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter function"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 47315 "preproc.c"
+#line 47310 "preproc.c"
     break;
 
   case 1207: /* AlterFunctionStmt: ALTER PROCEDURE function_with_argtypes alterfunc_opt_list opt_restrict  */
-#line 7932 "preproc.y"
+#line 7927 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter procedure"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 47323 "preproc.c"
+#line 47318 "preproc.c"
     break;
 
   case 1208: /* AlterFunctionStmt: ALTER ROUTINE function_with_argtypes alterfunc_opt_list opt_restrict  */
-#line 7936 "preproc.y"
+#line 7931 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter routine"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 47331 "preproc.c"
+#line 47326 "preproc.c"
     break;
 
   case 1209: /* alterfunc_opt_list: common_func_opt_item  */
-#line 7944 "preproc.y"
+#line 7939 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 47339 "preproc.c"
+#line 47334 "preproc.c"
     break;
 
   case 1210: /* alterfunc_opt_list: alterfunc_opt_list common_func_opt_item  */
-#line 7948 "preproc.y"
+#line 7943 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 47347 "preproc.c"
+#line 47342 "preproc.c"
     break;
 
   case 1211: /* opt_restrict: RESTRICT  */
-#line 7956 "preproc.y"
+#line 7951 "preproc.y"
  { 
  (yyval.str) = mm_strdup("restrict");
 }
-#line 47355 "preproc.c"
+#line 47350 "preproc.c"
     break;
 
   case 1212: /* opt_restrict: %empty  */
-#line 7960 "preproc.y"
+#line 7955 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 47362 "preproc.c"
+#line 47357 "preproc.c"
     break;
 
   case 1213: /* RemoveFuncStmt: DROP FUNCTION function_with_argtypes_list opt_drop_behavior  */
-#line 7967 "preproc.y"
+#line 7962 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("drop function"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 47370 "preproc.c"
+#line 47365 "preproc.c"
     break;
 
   case 1214: /* RemoveFuncStmt: DROP FUNCTION IF_P EXISTS function_with_argtypes_list opt_drop_behavior  */
-#line 7971 "preproc.y"
+#line 7966 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("drop function if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 47378 "preproc.c"
+#line 47373 "preproc.c"
     break;
 
   case 1215: /* RemoveFuncStmt: DROP PROCEDURE function_with_argtypes_list opt_drop_behavior  */
-#line 7975 "preproc.y"
+#line 7970 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("drop procedure"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 47386 "preproc.c"
+#line 47381 "preproc.c"
     break;
 
   case 1216: /* RemoveFuncStmt: DROP PROCEDURE IF_P EXISTS function_with_argtypes_list opt_drop_behavior  */
-#line 7979 "preproc.y"
+#line 7974 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("drop procedure if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 47394 "preproc.c"
+#line 47389 "preproc.c"
     break;
 
   case 1217: /* RemoveFuncStmt: DROP ROUTINE function_with_argtypes_list opt_drop_behavior  */
-#line 7983 "preproc.y"
+#line 7978 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("drop routine"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 47402 "preproc.c"
+#line 47397 "preproc.c"
     break;
 
   case 1218: /* RemoveFuncStmt: DROP ROUTINE IF_P EXISTS function_with_argtypes_list opt_drop_behavior  */
-#line 7987 "preproc.y"
+#line 7982 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("drop routine if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 47410 "preproc.c"
+#line 47405 "preproc.c"
     break;
 
   case 1219: /* RemoveAggrStmt: DROP AGGREGATE aggregate_with_argtypes_list opt_drop_behavior  */
-#line 7995 "preproc.y"
+#line 7990 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("drop aggregate"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 47418 "preproc.c"
+#line 47413 "preproc.c"
     break;
 
   case 1220: /* RemoveAggrStmt: DROP AGGREGATE IF_P EXISTS aggregate_with_argtypes_list opt_drop_behavior  */
-#line 7999 "preproc.y"
+#line 7994 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("drop aggregate if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 47426 "preproc.c"
+#line 47421 "preproc.c"
     break;
 
   case 1221: /* RemoveOperStmt: DROP OPERATOR operator_with_argtypes_list opt_drop_behavior  */
-#line 8007 "preproc.y"
+#line 8002 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("drop operator"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 47434 "preproc.c"
+#line 47429 "preproc.c"
     break;
 
   case 1222: /* RemoveOperStmt: DROP OPERATOR IF_P EXISTS operator_with_argtypes_list opt_drop_behavior  */
-#line 8011 "preproc.y"
+#line 8006 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("drop operator if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 47442 "preproc.c"
+#line 47437 "preproc.c"
     break;
 
   case 1223: /* oper_argtypes: '(' Typename ')'  */
-#line 8019 "preproc.y"
+#line 8014 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 47450 "preproc.c"
+#line 47445 "preproc.c"
     break;
 
   case 1224: /* oper_argtypes: '(' Typename ',' Typename ')'  */
-#line 8023 "preproc.y"
+#line 8018 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("("),(yyvsp[-3].str),mm_strdup(","),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 47458 "preproc.c"
+#line 47453 "preproc.c"
     break;
 
   case 1225: /* oper_argtypes: '(' NONE ',' Typename ')'  */
-#line 8027 "preproc.y"
+#line 8022 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("( none ,"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 47466 "preproc.c"
+#line 47461 "preproc.c"
     break;
 
   case 1226: /* oper_argtypes: '(' Typename ',' NONE ')'  */
-#line 8031 "preproc.y"
+#line 8026 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-3].str),mm_strdup(", none )"));
 }
-#line 47474 "preproc.c"
+#line 47469 "preproc.c"
     break;
 
   case 1227: /* any_operator: all_Op  */
-#line 8039 "preproc.y"
+#line 8034 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 47482 "preproc.c"
+#line 47477 "preproc.c"
     break;
 
   case 1228: /* any_operator: ColId '.' any_operator  */
-#line 8043 "preproc.y"
+#line 8038 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("."),(yyvsp[0].str));
 }
-#line 47490 "preproc.c"
+#line 47485 "preproc.c"
     break;
 
   case 1229: /* operator_with_argtypes_list: operator_with_argtypes  */
-#line 8051 "preproc.y"
+#line 8046 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 47498 "preproc.c"
+#line 47493 "preproc.c"
     break;
 
   case 1230: /* operator_with_argtypes_list: operator_with_argtypes_list ',' operator_with_argtypes  */
-#line 8055 "preproc.y"
+#line 8050 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 47506 "preproc.c"
+#line 47501 "preproc.c"
     break;
 
   case 1231: /* operator_with_argtypes: any_operator oper_argtypes  */
-#line 8063 "preproc.y"
+#line 8058 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 47514 "preproc.c"
+#line 47509 "preproc.c"
     break;
 
   case 1232: /* DoStmt: DO dostmt_opt_list  */
-#line 8071 "preproc.y"
+#line 8066 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("do"),(yyvsp[0].str));
 }
-#line 47522 "preproc.c"
+#line 47517 "preproc.c"
     break;
 
   case 1233: /* dostmt_opt_list: dostmt_opt_item  */
-#line 8079 "preproc.y"
+#line 8074 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 47530 "preproc.c"
+#line 47525 "preproc.c"
     break;
 
   case 1234: /* dostmt_opt_list: dostmt_opt_list dostmt_opt_item  */
-#line 8083 "preproc.y"
+#line 8078 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 47538 "preproc.c"
+#line 47533 "preproc.c"
     break;
 
   case 1235: /* dostmt_opt_item: ecpg_sconst  */
-#line 8091 "preproc.y"
+#line 8086 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 47546 "preproc.c"
+#line 47541 "preproc.c"
     break;
 
   case 1236: /* dostmt_opt_item: LANGUAGE NonReservedWord_or_Sconst  */
-#line 8095 "preproc.y"
+#line 8090 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("language"),(yyvsp[0].str));
 }
-#line 47554 "preproc.c"
+#line 47549 "preproc.c"
     break;
 
   case 1237: /* CreateCastStmt: CREATE CAST '(' Typename AS Typename ')' WITH FUNCTION function_with_argtypes cast_context  */
-#line 8103 "preproc.y"
+#line 8098 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("create cast ("),(yyvsp[-7].str),mm_strdup("as"),(yyvsp[-5].str),mm_strdup(") with function"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 47562 "preproc.c"
+#line 47557 "preproc.c"
     break;
 
   case 1238: /* CreateCastStmt: CREATE CAST '(' Typename AS Typename ')' WITHOUT FUNCTION cast_context  */
-#line 8107 "preproc.y"
+#line 8102 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("create cast ("),(yyvsp[-6].str),mm_strdup("as"),(yyvsp[-4].str),mm_strdup(") without function"),(yyvsp[0].str));
 }
-#line 47570 "preproc.c"
+#line 47565 "preproc.c"
     break;
 
   case 1239: /* CreateCastStmt: CREATE CAST '(' Typename AS Typename ')' WITH INOUT cast_context  */
-#line 8111 "preproc.y"
+#line 8106 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("create cast ("),(yyvsp[-6].str),mm_strdup("as"),(yyvsp[-4].str),mm_strdup(") with inout"),(yyvsp[0].str));
 }
-#line 47578 "preproc.c"
+#line 47573 "preproc.c"
     break;
 
   case 1240: /* cast_context: AS IMPLICIT_P  */
-#line 8119 "preproc.y"
+#line 8114 "preproc.y"
  { 
  (yyval.str) = mm_strdup("as implicit");
 }
-#line 47586 "preproc.c"
+#line 47581 "preproc.c"
     break;
 
   case 1241: /* cast_context: AS ASSIGNMENT  */
-#line 8123 "preproc.y"
+#line 8118 "preproc.y"
  { 
  (yyval.str) = mm_strdup("as assignment");
 }
-#line 47594 "preproc.c"
+#line 47589 "preproc.c"
     break;
 
   case 1242: /* cast_context: %empty  */
-#line 8127 "preproc.y"
+#line 8122 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 47601 "preproc.c"
+#line 47596 "preproc.c"
     break;
 
   case 1243: /* DropCastStmt: DROP CAST opt_if_exists '(' Typename AS Typename ')' opt_drop_behavior  */
-#line 8134 "preproc.y"
+#line 8129 "preproc.y"
  { 
  (yyval.str) = cat_str(8,mm_strdup("drop cast"),(yyvsp[-6].str),mm_strdup("("),(yyvsp[-4].str),mm_strdup("as"),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 47609 "preproc.c"
+#line 47604 "preproc.c"
     break;
 
   case 1244: /* opt_if_exists: IF_P EXISTS  */
-#line 8142 "preproc.y"
+#line 8137 "preproc.y"
  { 
  (yyval.str) = mm_strdup("if exists");
 }
-#line 47617 "preproc.c"
+#line 47612 "preproc.c"
     break;
 
   case 1245: /* opt_if_exists: %empty  */
-#line 8146 "preproc.y"
+#line 8141 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 47624 "preproc.c"
+#line 47619 "preproc.c"
     break;
 
   case 1246: /* CreateTransformStmt: CREATE opt_or_replace TRANSFORM FOR Typename LANGUAGE name '(' transform_element_list ')'  */
-#line 8153 "preproc.y"
+#line 8148 "preproc.y"
  { 
  (yyval.str) = cat_str(9,mm_strdup("create"),(yyvsp[-8].str),mm_strdup("transform for"),(yyvsp[-5].str),mm_strdup("language"),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 47632 "preproc.c"
+#line 47627 "preproc.c"
     break;
 
   case 1247: /* transform_element_list: FROM SQL_P WITH FUNCTION function_with_argtypes ',' TO SQL_P WITH FUNCTION function_with_argtypes  */
-#line 8161 "preproc.y"
+#line 8156 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("from sql with function"),(yyvsp[-6].str),mm_strdup(", to sql with function"),(yyvsp[0].str));
 }
-#line 47640 "preproc.c"
+#line 47635 "preproc.c"
     break;
 
   case 1248: /* transform_element_list: TO SQL_P WITH FUNCTION function_with_argtypes ',' FROM SQL_P WITH FUNCTION function_with_argtypes  */
-#line 8165 "preproc.y"
+#line 8160 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("to sql with function"),(yyvsp[-6].str),mm_strdup(", from sql with function"),(yyvsp[0].str));
 }
-#line 47648 "preproc.c"
+#line 47643 "preproc.c"
     break;
 
   case 1249: /* transform_element_list: FROM SQL_P WITH FUNCTION function_with_argtypes  */
-#line 8169 "preproc.y"
+#line 8164 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("from sql with function"),(yyvsp[0].str));
 }
-#line 47656 "preproc.c"
+#line 47651 "preproc.c"
     break;
 
   case 1250: /* transform_element_list: TO SQL_P WITH FUNCTION function_with_argtypes  */
-#line 8173 "preproc.y"
+#line 8168 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("to sql with function"),(yyvsp[0].str));
 }
-#line 47664 "preproc.c"
+#line 47659 "preproc.c"
     break;
 
   case 1251: /* DropTransformStmt: DROP TRANSFORM opt_if_exists FOR Typename LANGUAGE name opt_drop_behavior  */
-#line 8181 "preproc.y"
+#line 8176 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("drop transform"),(yyvsp[-5].str),mm_strdup("for"),(yyvsp[-3].str),mm_strdup("language"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 47672 "preproc.c"
+#line 47667 "preproc.c"
     break;
 
   case 1252: /* ReindexStmt: REINDEX opt_reindex_option_list reindex_target_relation opt_concurrently qualified_name  */
-#line 8189 "preproc.y"
+#line 8184 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("reindex"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 47680 "preproc.c"
+#line 47675 "preproc.c"
     break;
 
   case 1253: /* ReindexStmt: REINDEX opt_reindex_option_list SCHEMA opt_concurrently name  */
-#line 8193 "preproc.y"
+#line 8188 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("reindex"),(yyvsp[-3].str),mm_strdup("schema"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 47688 "preproc.c"
+#line 47683 "preproc.c"
     break;
 
   case 1254: /* ReindexStmt: REINDEX opt_reindex_option_list reindex_target_all opt_concurrently opt_single_name  */
-#line 8197 "preproc.y"
+#line 8192 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("reindex"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 47696 "preproc.c"
+#line 47691 "preproc.c"
     break;
 
   case 1255: /* reindex_target_relation: INDEX  */
-#line 8205 "preproc.y"
+#line 8200 "preproc.y"
  { 
  (yyval.str) = mm_strdup("index");
 }
-#line 47704 "preproc.c"
+#line 47699 "preproc.c"
     break;
 
   case 1256: /* reindex_target_relation: TABLE  */
-#line 8209 "preproc.y"
+#line 8204 "preproc.y"
  { 
  (yyval.str) = mm_strdup("table");
 }
-#line 47712 "preproc.c"
+#line 47707 "preproc.c"
     break;
 
   case 1257: /* reindex_target_all: SYSTEM_P  */
-#line 8217 "preproc.y"
+#line 8212 "preproc.y"
  { 
  (yyval.str) = mm_strdup("system");
 }
-#line 47720 "preproc.c"
+#line 47715 "preproc.c"
     break;
 
   case 1258: /* reindex_target_all: DATABASE  */
-#line 8221 "preproc.y"
+#line 8216 "preproc.y"
  { 
  (yyval.str) = mm_strdup("database");
 }
-#line 47728 "preproc.c"
+#line 47723 "preproc.c"
     break;
 
   case 1259: /* opt_reindex_option_list: '(' utility_option_list ')'  */
-#line 8229 "preproc.y"
+#line 8224 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 47736 "preproc.c"
+#line 47731 "preproc.c"
     break;
 
   case 1260: /* opt_reindex_option_list: %empty  */
-#line 8233 "preproc.y"
+#line 8228 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 47743 "preproc.c"
+#line 47738 "preproc.c"
     break;
 
   case 1261: /* AlterTblSpcStmt: ALTER TABLESPACE name SET reloptions  */
-#line 8240 "preproc.y"
+#line 8235 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter tablespace"),(yyvsp[-2].str),mm_strdup("set"),(yyvsp[0].str));
 }
-#line 47751 "preproc.c"
+#line 47746 "preproc.c"
     break;
 
   case 1262: /* AlterTblSpcStmt: ALTER TABLESPACE name RESET reloptions  */
-#line 8244 "preproc.y"
+#line 8239 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter tablespace"),(yyvsp[-2].str),mm_strdup("reset"),(yyvsp[0].str));
 }
-#line 47759 "preproc.c"
+#line 47754 "preproc.c"
     break;
 
   case 1263: /* RenameStmt: ALTER AGGREGATE aggregate_with_argtypes RENAME TO name  */
-#line 8252 "preproc.y"
+#line 8247 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter aggregate"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47767 "preproc.c"
+#line 47762 "preproc.c"
     break;
 
   case 1264: /* RenameStmt: ALTER COLLATION any_name RENAME TO name  */
-#line 8256 "preproc.y"
+#line 8251 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter collation"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47775 "preproc.c"
+#line 47770 "preproc.c"
     break;
 
   case 1265: /* RenameStmt: ALTER CONVERSION_P any_name RENAME TO name  */
-#line 8260 "preproc.y"
+#line 8255 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter conversion"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47783 "preproc.c"
+#line 47778 "preproc.c"
     break;
 
   case 1266: /* RenameStmt: ALTER DATABASE name RENAME TO name  */
-#line 8264 "preproc.y"
+#line 8259 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter database"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47791 "preproc.c"
+#line 47786 "preproc.c"
     break;
 
   case 1267: /* RenameStmt: ALTER DOMAIN_P any_name RENAME TO name  */
-#line 8268 "preproc.y"
+#line 8263 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter domain"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47799 "preproc.c"
+#line 47794 "preproc.c"
     break;
 
   case 1268: /* RenameStmt: ALTER DOMAIN_P any_name RENAME CONSTRAINT name TO name  */
-#line 8272 "preproc.y"
+#line 8267 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("alter domain"),(yyvsp[-5].str),mm_strdup("rename constraint"),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 47807 "preproc.c"
+#line 47802 "preproc.c"
     break;
 
   case 1269: /* RenameStmt: ALTER FOREIGN DATA_P WRAPPER name RENAME TO name  */
-#line 8276 "preproc.y"
+#line 8271 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter foreign data wrapper"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47815 "preproc.c"
+#line 47810 "preproc.c"
     break;
 
   case 1270: /* RenameStmt: ALTER FUNCTION function_with_argtypes RENAME TO name  */
-#line 8280 "preproc.y"
+#line 8275 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter function"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47823 "preproc.c"
+#line 47818 "preproc.c"
     break;
 
   case 1271: /* RenameStmt: ALTER GROUP_P RoleId RENAME TO RoleId  */
-#line 8284 "preproc.y"
+#line 8279 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter group"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47831 "preproc.c"
+#line 47826 "preproc.c"
     break;
 
   case 1272: /* RenameStmt: ALTER opt_procedural LANGUAGE name RENAME TO name  */
-#line 8288 "preproc.y"
+#line 8283 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("alter"),(yyvsp[-5].str),mm_strdup("language"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47839 "preproc.c"
+#line 47834 "preproc.c"
     break;
 
   case 1273: /* RenameStmt: ALTER OPERATOR CLASS any_name USING name RENAME TO name  */
-#line 8292 "preproc.y"
+#line 8287 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("alter operator class"),(yyvsp[-5].str),mm_strdup("using"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47847 "preproc.c"
+#line 47842 "preproc.c"
     break;
 
   case 1274: /* RenameStmt: ALTER OPERATOR FAMILY any_name USING name RENAME TO name  */
-#line 8296 "preproc.y"
+#line 8291 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("alter operator family"),(yyvsp[-5].str),mm_strdup("using"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47855 "preproc.c"
+#line 47850 "preproc.c"
     break;
 
   case 1275: /* RenameStmt: ALTER POLICY name ON qualified_name RENAME TO name  */
-#line 8300 "preproc.y"
+#line 8295 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("alter policy"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47863 "preproc.c"
+#line 47858 "preproc.c"
     break;
 
   case 1276: /* RenameStmt: ALTER POLICY IF_P EXISTS name ON qualified_name RENAME TO name  */
-#line 8304 "preproc.y"
+#line 8299 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("alter policy if exists"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47871 "preproc.c"
+#line 47866 "preproc.c"
     break;
 
   case 1277: /* RenameStmt: ALTER PROCEDURE function_with_argtypes RENAME TO name  */
-#line 8308 "preproc.y"
+#line 8303 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter procedure"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47879 "preproc.c"
+#line 47874 "preproc.c"
     break;
 
   case 1278: /* RenameStmt: ALTER PUBLICATION name RENAME TO name  */
-#line 8312 "preproc.y"
+#line 8307 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter publication"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47887 "preproc.c"
+#line 47882 "preproc.c"
     break;
 
   case 1279: /* RenameStmt: ALTER ROUTINE function_with_argtypes RENAME TO name  */
-#line 8316 "preproc.y"
+#line 8311 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter routine"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47895 "preproc.c"
+#line 47890 "preproc.c"
     break;
 
   case 1280: /* RenameStmt: ALTER SCHEMA name RENAME TO name  */
-#line 8320 "preproc.y"
+#line 8315 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter schema"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47903 "preproc.c"
+#line 47898 "preproc.c"
     break;
 
   case 1281: /* RenameStmt: ALTER SERVER name RENAME TO name  */
-#line 8324 "preproc.y"
+#line 8319 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter server"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47911 "preproc.c"
+#line 47906 "preproc.c"
     break;
 
   case 1282: /* RenameStmt: ALTER SUBSCRIPTION name RENAME TO name  */
-#line 8328 "preproc.y"
+#line 8323 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter subscription"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47919 "preproc.c"
+#line 47914 "preproc.c"
     break;
 
   case 1283: /* RenameStmt: ALTER TABLE relation_expr RENAME TO name  */
-#line 8332 "preproc.y"
+#line 8327 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter table"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47927 "preproc.c"
+#line 47922 "preproc.c"
     break;
 
   case 1284: /* RenameStmt: ALTER TABLE IF_P EXISTS relation_expr RENAME TO name  */
-#line 8336 "preproc.y"
+#line 8331 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter table if exists"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47935 "preproc.c"
+#line 47930 "preproc.c"
     break;
 
   case 1285: /* RenameStmt: ALTER SEQUENCE qualified_name RENAME TO name  */
-#line 8340 "preproc.y"
+#line 8335 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter sequence"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47943 "preproc.c"
+#line 47938 "preproc.c"
     break;
 
   case 1286: /* RenameStmt: ALTER SEQUENCE IF_P EXISTS qualified_name RENAME TO name  */
-#line 8344 "preproc.y"
+#line 8339 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter sequence if exists"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47951 "preproc.c"
+#line 47946 "preproc.c"
     break;
 
   case 1287: /* RenameStmt: ALTER VIEW qualified_name RENAME TO name  */
-#line 8348 "preproc.y"
+#line 8343 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter view"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47959 "preproc.c"
+#line 47954 "preproc.c"
     break;
 
   case 1288: /* RenameStmt: ALTER VIEW IF_P EXISTS qualified_name RENAME TO name  */
-#line 8352 "preproc.y"
+#line 8347 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter view if exists"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47967 "preproc.c"
+#line 47962 "preproc.c"
     break;
 
   case 1289: /* RenameStmt: ALTER MATERIALIZED VIEW qualified_name RENAME TO name  */
-#line 8356 "preproc.y"
+#line 8351 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter materialized view"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47975 "preproc.c"
+#line 47970 "preproc.c"
     break;
 
   case 1290: /* RenameStmt: ALTER MATERIALIZED VIEW IF_P EXISTS qualified_name RENAME TO name  */
-#line 8360 "preproc.y"
+#line 8355 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter materialized view if exists"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47983 "preproc.c"
+#line 47978 "preproc.c"
     break;
 
   case 1291: /* RenameStmt: ALTER INDEX qualified_name RENAME TO name  */
-#line 8364 "preproc.y"
+#line 8359 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter index"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47991 "preproc.c"
+#line 47986 "preproc.c"
     break;
 
   case 1292: /* RenameStmt: ALTER INDEX IF_P EXISTS qualified_name RENAME TO name  */
-#line 8368 "preproc.y"
+#line 8363 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter index if exists"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 47999 "preproc.c"
+#line 47994 "preproc.c"
     break;
 
   case 1293: /* RenameStmt: ALTER FOREIGN TABLE relation_expr RENAME TO name  */
-#line 8372 "preproc.y"
+#line 8367 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter foreign table"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 48007 "preproc.c"
+#line 48002 "preproc.c"
     break;
 
   case 1294: /* RenameStmt: ALTER FOREIGN TABLE IF_P EXISTS relation_expr RENAME TO name  */
-#line 8376 "preproc.y"
+#line 8371 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter foreign table if exists"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 48015 "preproc.c"
+#line 48010 "preproc.c"
     break;
 
   case 1295: /* RenameStmt: ALTER TABLE relation_expr RENAME opt_column name TO name  */
-#line 8380 "preproc.y"
+#line 8375 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("alter table"),(yyvsp[-5].str),mm_strdup("rename"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 48023 "preproc.c"
+#line 48018 "preproc.c"
     break;
 
   case 1296: /* RenameStmt: ALTER TABLE IF_P EXISTS relation_expr RENAME opt_column name TO name  */
-#line 8384 "preproc.y"
+#line 8379 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("alter table if exists"),(yyvsp[-5].str),mm_strdup("rename"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 48031 "preproc.c"
+#line 48026 "preproc.c"
     break;
 
   case 1297: /* RenameStmt: ALTER VIEW qualified_name RENAME opt_column name TO name  */
-#line 8388 "preproc.y"
+#line 8383 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("alter view"),(yyvsp[-5].str),mm_strdup("rename"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 48039 "preproc.c"
+#line 48034 "preproc.c"
     break;
 
   case 1298: /* RenameStmt: ALTER VIEW IF_P EXISTS qualified_name RENAME opt_column name TO name  */
-#line 8392 "preproc.y"
+#line 8387 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("alter view if exists"),(yyvsp[-5].str),mm_strdup("rename"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 48047 "preproc.c"
+#line 48042 "preproc.c"
     break;
 
   case 1299: /* RenameStmt: ALTER MATERIALIZED VIEW qualified_name RENAME opt_column name TO name  */
-#line 8396 "preproc.y"
+#line 8391 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("alter materialized view"),(yyvsp[-5].str),mm_strdup("rename"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 48055 "preproc.c"
+#line 48050 "preproc.c"
     break;
 
   case 1300: /* RenameStmt: ALTER MATERIALIZED VIEW IF_P EXISTS qualified_name RENAME opt_column name TO name  */
-#line 8400 "preproc.y"
+#line 8395 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("alter materialized view if exists"),(yyvsp[-5].str),mm_strdup("rename"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 48063 "preproc.c"
+#line 48058 "preproc.c"
     break;
 
   case 1301: /* RenameStmt: ALTER TABLE relation_expr RENAME CONSTRAINT name TO name  */
-#line 8404 "preproc.y"
+#line 8399 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("alter table"),(yyvsp[-5].str),mm_strdup("rename constraint"),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 48071 "preproc.c"
+#line 48066 "preproc.c"
     break;
 
   case 1302: /* RenameStmt: ALTER TABLE IF_P EXISTS relation_expr RENAME CONSTRAINT name TO name  */
-#line 8408 "preproc.y"
+#line 8403 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("alter table if exists"),(yyvsp[-5].str),mm_strdup("rename constraint"),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 48079 "preproc.c"
+#line 48074 "preproc.c"
     break;
 
   case 1303: /* RenameStmt: ALTER FOREIGN TABLE relation_expr RENAME opt_column name TO name  */
-#line 8412 "preproc.y"
+#line 8407 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("alter foreign table"),(yyvsp[-5].str),mm_strdup("rename"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 48087 "preproc.c"
+#line 48082 "preproc.c"
     break;
 
   case 1304: /* RenameStmt: ALTER FOREIGN TABLE IF_P EXISTS relation_expr RENAME opt_column name TO name  */
-#line 8416 "preproc.y"
+#line 8411 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("alter foreign table if exists"),(yyvsp[-5].str),mm_strdup("rename"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 48095 "preproc.c"
+#line 48090 "preproc.c"
     break;
 
   case 1305: /* RenameStmt: ALTER RULE name ON qualified_name RENAME TO name  */
-#line 8420 "preproc.y"
+#line 8415 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("alter rule"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 48103 "preproc.c"
+#line 48098 "preproc.c"
     break;
 
   case 1306: /* RenameStmt: ALTER TRIGGER name ON qualified_name RENAME TO name  */
-#line 8424 "preproc.y"
+#line 8419 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("alter trigger"),(yyvsp[-5].str),mm_strdup("on"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 48111 "preproc.c"
+#line 48106 "preproc.c"
     break;
 
   case 1307: /* RenameStmt: ALTER EVENT TRIGGER name RENAME TO name  */
-#line 8428 "preproc.y"
+#line 8423 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter event trigger"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 48119 "preproc.c"
+#line 48114 "preproc.c"
     break;
 
   case 1308: /* RenameStmt: ALTER ROLE RoleId RENAME TO RoleId  */
-#line 8432 "preproc.y"
+#line 8427 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter role"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 48127 "preproc.c"
+#line 48122 "preproc.c"
     break;
 
   case 1309: /* RenameStmt: ALTER USER RoleId RENAME TO RoleId  */
-#line 8436 "preproc.y"
+#line 8431 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter user"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 48135 "preproc.c"
+#line 48130 "preproc.c"
     break;
 
   case 1310: /* RenameStmt: ALTER TABLESPACE name RENAME TO name  */
-#line 8440 "preproc.y"
+#line 8435 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter tablespace"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 48143 "preproc.c"
+#line 48138 "preproc.c"
     break;
 
   case 1311: /* RenameStmt: ALTER STATISTICS any_name RENAME TO name  */
-#line 8444 "preproc.y"
+#line 8439 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter statistics"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 48151 "preproc.c"
+#line 48146 "preproc.c"
     break;
 
   case 1312: /* RenameStmt: ALTER TEXT_P SEARCH PARSER any_name RENAME TO name  */
-#line 8448 "preproc.y"
+#line 8443 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter text search parser"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 48159 "preproc.c"
+#line 48154 "preproc.c"
     break;
 
   case 1313: /* RenameStmt: ALTER TEXT_P SEARCH DICTIONARY any_name RENAME TO name  */
-#line 8452 "preproc.y"
+#line 8447 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter text search dictionary"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 48167 "preproc.c"
+#line 48162 "preproc.c"
     break;
 
   case 1314: /* RenameStmt: ALTER TEXT_P SEARCH TEMPLATE any_name RENAME TO name  */
-#line 8456 "preproc.y"
+#line 8451 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter text search template"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 48175 "preproc.c"
+#line 48170 "preproc.c"
     break;
 
   case 1315: /* RenameStmt: ALTER TEXT_P SEARCH CONFIGURATION any_name RENAME TO name  */
-#line 8460 "preproc.y"
+#line 8455 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter text search configuration"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 48183 "preproc.c"
+#line 48178 "preproc.c"
     break;
 
   case 1316: /* RenameStmt: ALTER TYPE_P any_name RENAME TO name  */
-#line 8464 "preproc.y"
+#line 8459 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter type"),(yyvsp[-3].str),mm_strdup("rename to"),(yyvsp[0].str));
 }
-#line 48191 "preproc.c"
+#line 48186 "preproc.c"
     break;
 
   case 1317: /* RenameStmt: ALTER TYPE_P any_name RENAME ATTRIBUTE name TO name opt_drop_behavior  */
-#line 8468 "preproc.y"
+#line 8463 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("alter type"),(yyvsp[-6].str),mm_strdup("rename attribute"),(yyvsp[-3].str),mm_strdup("to"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 48199 "preproc.c"
+#line 48194 "preproc.c"
     break;
 
   case 1318: /* opt_column: COLUMN  */
-#line 8476 "preproc.y"
+#line 8471 "preproc.y"
  { 
  (yyval.str) = mm_strdup("column");
 }
-#line 48207 "preproc.c"
+#line 48202 "preproc.c"
     break;
 
   case 1319: /* opt_column: %empty  */
-#line 8480 "preproc.y"
+#line 8475 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 48214 "preproc.c"
+#line 48209 "preproc.c"
     break;
 
   case 1320: /* opt_set_data: SET DATA_P  */
-#line 8487 "preproc.y"
+#line 8482 "preproc.y"
  { 
  (yyval.str) = mm_strdup("set data");
 }
-#line 48222 "preproc.c"
+#line 48217 "preproc.c"
     break;
 
   case 1321: /* opt_set_data: %empty  */
-#line 8491 "preproc.y"
+#line 8486 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 48229 "preproc.c"
+#line 48224 "preproc.c"
     break;
 
   case 1322: /* AlterObjectDependsStmt: ALTER FUNCTION function_with_argtypes opt_no DEPENDS ON EXTENSION name  */
-#line 8498 "preproc.y"
+#line 8493 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter function"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("depends on extension"),(yyvsp[0].str));
 }
-#line 48237 "preproc.c"
+#line 48232 "preproc.c"
     break;
 
   case 1323: /* AlterObjectDependsStmt: ALTER PROCEDURE function_with_argtypes opt_no DEPENDS ON EXTENSION name  */
-#line 8502 "preproc.y"
+#line 8497 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter procedure"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("depends on extension"),(yyvsp[0].str));
 }
-#line 48245 "preproc.c"
+#line 48240 "preproc.c"
     break;
 
   case 1324: /* AlterObjectDependsStmt: ALTER ROUTINE function_with_argtypes opt_no DEPENDS ON EXTENSION name  */
-#line 8506 "preproc.y"
+#line 8501 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter routine"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("depends on extension"),(yyvsp[0].str));
 }
-#line 48253 "preproc.c"
+#line 48248 "preproc.c"
     break;
 
   case 1325: /* AlterObjectDependsStmt: ALTER TRIGGER name ON qualified_name opt_no DEPENDS ON EXTENSION name  */
-#line 8510 "preproc.y"
+#line 8505 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("alter trigger"),(yyvsp[-7].str),mm_strdup("on"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("depends on extension"),(yyvsp[0].str));
 }
-#line 48261 "preproc.c"
+#line 48256 "preproc.c"
     break;
 
   case 1326: /* AlterObjectDependsStmt: ALTER MATERIALIZED VIEW qualified_name opt_no DEPENDS ON EXTENSION name  */
-#line 8514 "preproc.y"
+#line 8509 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter materialized view"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("depends on extension"),(yyvsp[0].str));
 }
-#line 48269 "preproc.c"
+#line 48264 "preproc.c"
     break;
 
   case 1327: /* AlterObjectDependsStmt: ALTER INDEX qualified_name opt_no DEPENDS ON EXTENSION name  */
-#line 8518 "preproc.y"
+#line 8513 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter index"),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("depends on extension"),(yyvsp[0].str));
 }
-#line 48277 "preproc.c"
+#line 48272 "preproc.c"
     break;
 
   case 1328: /* opt_no: NO  */
-#line 8526 "preproc.y"
+#line 8521 "preproc.y"
  { 
  (yyval.str) = mm_strdup("no");
 }
-#line 48285 "preproc.c"
+#line 48280 "preproc.c"
     break;
 
   case 1329: /* opt_no: %empty  */
-#line 8530 "preproc.y"
+#line 8525 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 48292 "preproc.c"
+#line 48287 "preproc.c"
     break;
 
   case 1330: /* AlterObjectSchemaStmt: ALTER AGGREGATE aggregate_with_argtypes SET SCHEMA name  */
-#line 8537 "preproc.y"
+#line 8532 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter aggregate"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48300 "preproc.c"
+#line 48295 "preproc.c"
     break;
 
   case 1331: /* AlterObjectSchemaStmt: ALTER COLLATION any_name SET SCHEMA name  */
-#line 8541 "preproc.y"
+#line 8536 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter collation"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48308 "preproc.c"
+#line 48303 "preproc.c"
     break;
 
   case 1332: /* AlterObjectSchemaStmt: ALTER CONVERSION_P any_name SET SCHEMA name  */
-#line 8545 "preproc.y"
+#line 8540 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter conversion"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48316 "preproc.c"
+#line 48311 "preproc.c"
     break;
 
   case 1333: /* AlterObjectSchemaStmt: ALTER DOMAIN_P any_name SET SCHEMA name  */
-#line 8549 "preproc.y"
+#line 8544 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter domain"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48324 "preproc.c"
+#line 48319 "preproc.c"
     break;
 
   case 1334: /* AlterObjectSchemaStmt: ALTER EXTENSION name SET SCHEMA name  */
-#line 8553 "preproc.y"
+#line 8548 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter extension"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48332 "preproc.c"
+#line 48327 "preproc.c"
     break;
 
   case 1335: /* AlterObjectSchemaStmt: ALTER FUNCTION function_with_argtypes SET SCHEMA name  */
-#line 8557 "preproc.y"
+#line 8552 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter function"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48340 "preproc.c"
+#line 48335 "preproc.c"
     break;
 
   case 1336: /* AlterObjectSchemaStmt: ALTER OPERATOR operator_with_argtypes SET SCHEMA name  */
-#line 8561 "preproc.y"
+#line 8556 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter operator"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48348 "preproc.c"
+#line 48343 "preproc.c"
     break;
 
   case 1337: /* AlterObjectSchemaStmt: ALTER OPERATOR CLASS any_name USING name SET SCHEMA name  */
-#line 8565 "preproc.y"
+#line 8560 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("alter operator class"),(yyvsp[-5].str),mm_strdup("using"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48356 "preproc.c"
+#line 48351 "preproc.c"
     break;
 
   case 1338: /* AlterObjectSchemaStmt: ALTER OPERATOR FAMILY any_name USING name SET SCHEMA name  */
-#line 8569 "preproc.y"
+#line 8564 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("alter operator family"),(yyvsp[-5].str),mm_strdup("using"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48364 "preproc.c"
+#line 48359 "preproc.c"
     break;
 
   case 1339: /* AlterObjectSchemaStmt: ALTER PROCEDURE function_with_argtypes SET SCHEMA name  */
-#line 8573 "preproc.y"
+#line 8568 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter procedure"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48372 "preproc.c"
+#line 48367 "preproc.c"
     break;
 
   case 1340: /* AlterObjectSchemaStmt: ALTER ROUTINE function_with_argtypes SET SCHEMA name  */
-#line 8577 "preproc.y"
+#line 8572 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter routine"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48380 "preproc.c"
+#line 48375 "preproc.c"
     break;
 
   case 1341: /* AlterObjectSchemaStmt: ALTER TABLE relation_expr SET SCHEMA name  */
-#line 8581 "preproc.y"
+#line 8576 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter table"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48388 "preproc.c"
+#line 48383 "preproc.c"
     break;
 
   case 1342: /* AlterObjectSchemaStmt: ALTER TABLE IF_P EXISTS relation_expr SET SCHEMA name  */
-#line 8585 "preproc.y"
+#line 8580 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter table if exists"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48396 "preproc.c"
+#line 48391 "preproc.c"
     break;
 
   case 1343: /* AlterObjectSchemaStmt: ALTER STATISTICS any_name SET SCHEMA name  */
-#line 8589 "preproc.y"
+#line 8584 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter statistics"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48404 "preproc.c"
+#line 48399 "preproc.c"
     break;
 
   case 1344: /* AlterObjectSchemaStmt: ALTER TEXT_P SEARCH PARSER any_name SET SCHEMA name  */
-#line 8593 "preproc.y"
+#line 8588 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter text search parser"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48412 "preproc.c"
+#line 48407 "preproc.c"
     break;
 
   case 1345: /* AlterObjectSchemaStmt: ALTER TEXT_P SEARCH DICTIONARY any_name SET SCHEMA name  */
-#line 8597 "preproc.y"
+#line 8592 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter text search dictionary"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48420 "preproc.c"
+#line 48415 "preproc.c"
     break;
 
   case 1346: /* AlterObjectSchemaStmt: ALTER TEXT_P SEARCH TEMPLATE any_name SET SCHEMA name  */
-#line 8601 "preproc.y"
+#line 8596 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter text search template"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48428 "preproc.c"
+#line 48423 "preproc.c"
     break;
 
   case 1347: /* AlterObjectSchemaStmt: ALTER TEXT_P SEARCH CONFIGURATION any_name SET SCHEMA name  */
-#line 8605 "preproc.y"
+#line 8600 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter text search configuration"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48436 "preproc.c"
+#line 48431 "preproc.c"
     break;
 
   case 1348: /* AlterObjectSchemaStmt: ALTER SEQUENCE qualified_name SET SCHEMA name  */
-#line 8609 "preproc.y"
+#line 8604 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter sequence"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48444 "preproc.c"
+#line 48439 "preproc.c"
     break;
 
   case 1349: /* AlterObjectSchemaStmt: ALTER SEQUENCE IF_P EXISTS qualified_name SET SCHEMA name  */
-#line 8613 "preproc.y"
+#line 8608 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter sequence if exists"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48452 "preproc.c"
+#line 48447 "preproc.c"
     break;
 
   case 1350: /* AlterObjectSchemaStmt: ALTER VIEW qualified_name SET SCHEMA name  */
-#line 8617 "preproc.y"
+#line 8612 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter view"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48460 "preproc.c"
+#line 48455 "preproc.c"
     break;
 
   case 1351: /* AlterObjectSchemaStmt: ALTER VIEW IF_P EXISTS qualified_name SET SCHEMA name  */
-#line 8621 "preproc.y"
+#line 8616 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter view if exists"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48468 "preproc.c"
+#line 48463 "preproc.c"
     break;
 
   case 1352: /* AlterObjectSchemaStmt: ALTER MATERIALIZED VIEW qualified_name SET SCHEMA name  */
-#line 8625 "preproc.y"
+#line 8620 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter materialized view"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48476 "preproc.c"
+#line 48471 "preproc.c"
     break;
 
   case 1353: /* AlterObjectSchemaStmt: ALTER MATERIALIZED VIEW IF_P EXISTS qualified_name SET SCHEMA name  */
-#line 8629 "preproc.y"
+#line 8624 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter materialized view if exists"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48484 "preproc.c"
+#line 48479 "preproc.c"
     break;
 
   case 1354: /* AlterObjectSchemaStmt: ALTER FOREIGN TABLE relation_expr SET SCHEMA name  */
-#line 8633 "preproc.y"
+#line 8628 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter foreign table"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48492 "preproc.c"
+#line 48487 "preproc.c"
     break;
 
   case 1355: /* AlterObjectSchemaStmt: ALTER FOREIGN TABLE IF_P EXISTS relation_expr SET SCHEMA name  */
-#line 8637 "preproc.y"
+#line 8632 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter foreign table if exists"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48500 "preproc.c"
+#line 48495 "preproc.c"
     break;
 
   case 1356: /* AlterObjectSchemaStmt: ALTER TYPE_P any_name SET SCHEMA name  */
-#line 8641 "preproc.y"
+#line 8636 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter type"),(yyvsp[-3].str),mm_strdup("set schema"),(yyvsp[0].str));
 }
-#line 48508 "preproc.c"
+#line 48503 "preproc.c"
     break;
 
   case 1357: /* AlterOperatorStmt: ALTER OPERATOR operator_with_argtypes SET '(' operator_def_list ')'  */
-#line 8649 "preproc.y"
+#line 8644 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter operator"),(yyvsp[-4].str),mm_strdup("set ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 48516 "preproc.c"
+#line 48511 "preproc.c"
     break;
 
   case 1358: /* operator_def_list: operator_def_elem  */
-#line 8657 "preproc.y"
+#line 8652 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 48524 "preproc.c"
+#line 48519 "preproc.c"
     break;
 
   case 1359: /* operator_def_list: operator_def_list ',' operator_def_elem  */
-#line 8661 "preproc.y"
+#line 8656 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 48532 "preproc.c"
+#line 48527 "preproc.c"
     break;
 
   case 1360: /* operator_def_elem: ColLabel '=' NONE  */
-#line 8669 "preproc.y"
+#line 8664 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("= none"));
 }
-#line 48540 "preproc.c"
+#line 48535 "preproc.c"
     break;
 
   case 1361: /* operator_def_elem: ColLabel '=' operator_def_arg  */
-#line 8673 "preproc.y"
+#line 8668 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
 }
-#line 48548 "preproc.c"
+#line 48543 "preproc.c"
     break;
 
   case 1362: /* operator_def_arg: func_type  */
-#line 8681 "preproc.y"
+#line 8676 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 48556 "preproc.c"
+#line 48551 "preproc.c"
     break;
 
   case 1363: /* operator_def_arg: reserved_keyword  */
-#line 8685 "preproc.y"
+#line 8680 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 48564 "preproc.c"
+#line 48559 "preproc.c"
     break;
 
   case 1364: /* operator_def_arg: qual_all_Op  */
-#line 8689 "preproc.y"
+#line 8684 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 48572 "preproc.c"
+#line 48567 "preproc.c"
     break;
 
   case 1365: /* operator_def_arg: NumericOnly  */
-#line 8693 "preproc.y"
+#line 8688 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 48580 "preproc.c"
+#line 48575 "preproc.c"
     break;
 
   case 1366: /* operator_def_arg: ecpg_sconst  */
-#line 8697 "preproc.y"
+#line 8692 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 48588 "preproc.c"
+#line 48583 "preproc.c"
     break;
 
   case 1367: /* AlterTypeStmt: ALTER TYPE_P any_name SET '(' operator_def_list ')'  */
-#line 8705 "preproc.y"
+#line 8700 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter type"),(yyvsp[-4].str),mm_strdup("set ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 48596 "preproc.c"
+#line 48591 "preproc.c"
     break;
 
   case 1368: /* AlterOwnerStmt: ALTER AGGREGATE aggregate_with_argtypes OWNER TO RoleSpec  */
-#line 8713 "preproc.y"
+#line 8708 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter aggregate"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 48604 "preproc.c"
+#line 48599 "preproc.c"
     break;
 
   case 1369: /* AlterOwnerStmt: ALTER COLLATION any_name OWNER TO RoleSpec  */
-#line 8717 "preproc.y"
+#line 8712 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter collation"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 48612 "preproc.c"
+#line 48607 "preproc.c"
     break;
 
   case 1370: /* AlterOwnerStmt: ALTER CONVERSION_P any_name OWNER TO RoleSpec  */
-#line 8721 "preproc.y"
+#line 8716 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter conversion"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 48620 "preproc.c"
+#line 48615 "preproc.c"
     break;
 
   case 1371: /* AlterOwnerStmt: ALTER DATABASE name OWNER TO RoleSpec  */
-#line 8725 "preproc.y"
+#line 8720 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter database"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 48628 "preproc.c"
+#line 48623 "preproc.c"
     break;
 
   case 1372: /* AlterOwnerStmt: ALTER DOMAIN_P any_name OWNER TO RoleSpec  */
-#line 8729 "preproc.y"
+#line 8724 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter domain"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 48636 "preproc.c"
+#line 48631 "preproc.c"
     break;
 
   case 1373: /* AlterOwnerStmt: ALTER FUNCTION function_with_argtypes OWNER TO RoleSpec  */
-#line 8733 "preproc.y"
+#line 8728 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter function"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 48644 "preproc.c"
+#line 48639 "preproc.c"
     break;
 
   case 1374: /* AlterOwnerStmt: ALTER opt_procedural LANGUAGE name OWNER TO RoleSpec  */
-#line 8737 "preproc.y"
+#line 8732 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("alter"),(yyvsp[-5].str),mm_strdup("language"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 48652 "preproc.c"
+#line 48647 "preproc.c"
     break;
 
   case 1375: /* AlterOwnerStmt: ALTER LARGE_P OBJECT_P NumericOnly OWNER TO RoleSpec  */
-#line 8741 "preproc.y"
+#line 8736 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter large object"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 48660 "preproc.c"
+#line 48655 "preproc.c"
     break;
 
   case 1376: /* AlterOwnerStmt: ALTER OPERATOR operator_with_argtypes OWNER TO RoleSpec  */
-#line 8745 "preproc.y"
+#line 8740 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter operator"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 48668 "preproc.c"
+#line 48663 "preproc.c"
     break;
 
   case 1377: /* AlterOwnerStmt: ALTER OPERATOR CLASS any_name USING name OWNER TO RoleSpec  */
-#line 8749 "preproc.y"
+#line 8744 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("alter operator class"),(yyvsp[-5].str),mm_strdup("using"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 48676 "preproc.c"
+#line 48671 "preproc.c"
     break;
 
   case 1378: /* AlterOwnerStmt: ALTER OPERATOR FAMILY any_name USING name OWNER TO RoleSpec  */
-#line 8753 "preproc.y"
+#line 8748 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("alter operator family"),(yyvsp[-5].str),mm_strdup("using"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 48684 "preproc.c"
+#line 48679 "preproc.c"
     break;
 
   case 1379: /* AlterOwnerStmt: ALTER PROCEDURE function_with_argtypes OWNER TO RoleSpec  */
-#line 8757 "preproc.y"
+#line 8752 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter procedure"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 48692 "preproc.c"
+#line 48687 "preproc.c"
     break;
 
   case 1380: /* AlterOwnerStmt: ALTER ROUTINE function_with_argtypes OWNER TO RoleSpec  */
-#line 8761 "preproc.y"
+#line 8756 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter routine"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 48700 "preproc.c"
+#line 48695 "preproc.c"
     break;
 
   case 1381: /* AlterOwnerStmt: ALTER SCHEMA name OWNER TO RoleSpec  */
-#line 8765 "preproc.y"
+#line 8760 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter schema"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 48708 "preproc.c"
+#line 48703 "preproc.c"
     break;
 
   case 1382: /* AlterOwnerStmt: ALTER TYPE_P any_name OWNER TO RoleSpec  */
-#line 8769 "preproc.y"
+#line 8764 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter type"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 48716 "preproc.c"
+#line 48711 "preproc.c"
     break;
 
   case 1383: /* AlterOwnerStmt: ALTER TABLESPACE name OWNER TO RoleSpec  */
-#line 8773 "preproc.y"
+#line 8768 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter tablespace"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 48724 "preproc.c"
+#line 48719 "preproc.c"
     break;
 
   case 1384: /* AlterOwnerStmt: ALTER STATISTICS any_name OWNER TO RoleSpec  */
-#line 8777 "preproc.y"
+#line 8772 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter statistics"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 48732 "preproc.c"
+#line 48727 "preproc.c"
     break;
 
   case 1385: /* AlterOwnerStmt: ALTER TEXT_P SEARCH DICTIONARY any_name OWNER TO RoleSpec  */
-#line 8781 "preproc.y"
+#line 8776 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter text search dictionary"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 48740 "preproc.c"
+#line 48735 "preproc.c"
     break;
 
   case 1386: /* AlterOwnerStmt: ALTER TEXT_P SEARCH CONFIGURATION any_name OWNER TO RoleSpec  */
-#line 8785 "preproc.y"
+#line 8780 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter text search configuration"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 48748 "preproc.c"
+#line 48743 "preproc.c"
     break;
 
   case 1387: /* AlterOwnerStmt: ALTER FOREIGN DATA_P WRAPPER name OWNER TO RoleSpec  */
-#line 8789 "preproc.y"
+#line 8784 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter foreign data wrapper"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 48756 "preproc.c"
+#line 48751 "preproc.c"
     break;
 
   case 1388: /* AlterOwnerStmt: ALTER SERVER name OWNER TO RoleSpec  */
-#line 8793 "preproc.y"
+#line 8788 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter server"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 48764 "preproc.c"
+#line 48759 "preproc.c"
     break;
 
   case 1389: /* AlterOwnerStmt: ALTER EVENT TRIGGER name OWNER TO RoleSpec  */
-#line 8797 "preproc.y"
+#line 8792 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter event trigger"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 48772 "preproc.c"
+#line 48767 "preproc.c"
     break;
 
   case 1390: /* AlterOwnerStmt: ALTER PUBLICATION name OWNER TO RoleSpec  */
-#line 8801 "preproc.y"
+#line 8796 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter publication"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 48780 "preproc.c"
+#line 48775 "preproc.c"
     break;
 
   case 1391: /* AlterOwnerStmt: ALTER SUBSCRIPTION name OWNER TO RoleSpec  */
-#line 8805 "preproc.y"
+#line 8800 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter subscription"),(yyvsp[-3].str),mm_strdup("owner to"),(yyvsp[0].str));
 }
-#line 48788 "preproc.c"
+#line 48783 "preproc.c"
     break;
 
   case 1392: /* CreatePublicationStmt: CREATE PUBLICATION name opt_definition  */
-#line 8813 "preproc.y"
+#line 8808 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("create publication"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 48796 "preproc.c"
+#line 48791 "preproc.c"
     break;
 
   case 1393: /* CreatePublicationStmt: CREATE PUBLICATION name FOR ALL TABLES opt_definition  */
-#line 8817 "preproc.y"
+#line 8812 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("create publication"),(yyvsp[-4].str),mm_strdup("for all tables"),(yyvsp[0].str));
 }
-#line 48804 "preproc.c"
+#line 48799 "preproc.c"
     break;
 
   case 1394: /* CreatePublicationStmt: CREATE PUBLICATION name FOR pub_obj_list opt_definition  */
-#line 8821 "preproc.y"
+#line 8816 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("create publication"),(yyvsp[-3].str),mm_strdup("for"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 48812 "preproc.c"
+#line 48807 "preproc.c"
     break;
 
   case 1395: /* PublicationObjSpec: TABLE relation_expr opt_column_list OptWhereClause  */
-#line 8829 "preproc.y"
+#line 8824 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("table"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 48820 "preproc.c"
+#line 48815 "preproc.c"
     break;
 
   case 1396: /* PublicationObjSpec: TABLES IN_P SCHEMA ColId  */
-#line 8833 "preproc.y"
+#line 8828 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("tables in schema"),(yyvsp[0].str));
 }
-#line 48828 "preproc.c"
+#line 48823 "preproc.c"
     break;
 
   case 1397: /* PublicationObjSpec: TABLES IN_P SCHEMA CURRENT_SCHEMA  */
-#line 8837 "preproc.y"
+#line 8832 "preproc.y"
  { 
  (yyval.str) = mm_strdup("tables in schema current_schema");
 }
-#line 48836 "preproc.c"
+#line 48831 "preproc.c"
     break;
 
   case 1398: /* PublicationObjSpec: ColId opt_column_list OptWhereClause  */
-#line 8841 "preproc.y"
+#line 8836 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 48844 "preproc.c"
+#line 48839 "preproc.c"
     break;
 
   case 1399: /* PublicationObjSpec: ColId indirection opt_column_list OptWhereClause  */
-#line 8845 "preproc.y"
+#line 8840 "preproc.y"
  { 
  (yyval.str) = cat_str(4,(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 48852 "preproc.c"
+#line 48847 "preproc.c"
     break;
 
   case 1400: /* PublicationObjSpec: extended_relation_expr opt_column_list OptWhereClause  */
-#line 8849 "preproc.y"
+#line 8844 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 48860 "preproc.c"
+#line 48855 "preproc.c"
     break;
 
   case 1401: /* PublicationObjSpec: CURRENT_SCHEMA  */
-#line 8853 "preproc.y"
+#line 8848 "preproc.y"
  { 
  (yyval.str) = mm_strdup("current_schema");
 }
-#line 48868 "preproc.c"
+#line 48863 "preproc.c"
     break;
 
   case 1402: /* pub_obj_list: PublicationObjSpec  */
-#line 8861 "preproc.y"
+#line 8856 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 48876 "preproc.c"
+#line 48871 "preproc.c"
     break;
 
   case 1403: /* pub_obj_list: pub_obj_list ',' PublicationObjSpec  */
-#line 8865 "preproc.y"
+#line 8860 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 48884 "preproc.c"
+#line 48879 "preproc.c"
     break;
 
   case 1404: /* AlterPublicationStmt: ALTER PUBLICATION name SET definition  */
-#line 8873 "preproc.y"
+#line 8868 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter publication"),(yyvsp[-2].str),mm_strdup("set"),(yyvsp[0].str));
 }
-#line 48892 "preproc.c"
+#line 48887 "preproc.c"
     break;
 
   case 1405: /* AlterPublicationStmt: ALTER PUBLICATION name ADD_P pub_obj_list  */
-#line 8877 "preproc.y"
+#line 8872 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter publication"),(yyvsp[-2].str),mm_strdup("add"),(yyvsp[0].str));
 }
-#line 48900 "preproc.c"
+#line 48895 "preproc.c"
     break;
 
   case 1406: /* AlterPublicationStmt: ALTER PUBLICATION name SET pub_obj_list  */
-#line 8881 "preproc.y"
+#line 8876 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter publication"),(yyvsp[-2].str),mm_strdup("set"),(yyvsp[0].str));
 }
-#line 48908 "preproc.c"
+#line 48903 "preproc.c"
     break;
 
   case 1407: /* AlterPublicationStmt: ALTER PUBLICATION name DROP pub_obj_list  */
-#line 8885 "preproc.y"
+#line 8880 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter publication"),(yyvsp[-2].str),mm_strdup("drop"),(yyvsp[0].str));
 }
-#line 48916 "preproc.c"
+#line 48911 "preproc.c"
     break;
 
   case 1408: /* CreateSubscriptionStmt: CREATE SUBSCRIPTION name CONNECTION ecpg_sconst PUBLICATION name_list opt_definition  */
-#line 8893 "preproc.y"
+#line 8888 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("create subscription"),(yyvsp[-5].str),mm_strdup("connection"),(yyvsp[-3].str),mm_strdup("publication"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 48924 "preproc.c"
+#line 48919 "preproc.c"
     break;
 
   case 1409: /* AlterSubscriptionStmt: ALTER SUBSCRIPTION name SET definition  */
-#line 8901 "preproc.y"
+#line 8896 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter subscription"),(yyvsp[-2].str),mm_strdup("set"),(yyvsp[0].str));
 }
-#line 48932 "preproc.c"
+#line 48927 "preproc.c"
     break;
 
   case 1410: /* AlterSubscriptionStmt: ALTER SUBSCRIPTION name CONNECTION ecpg_sconst  */
-#line 8905 "preproc.y"
+#line 8900 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter subscription"),(yyvsp[-2].str),mm_strdup("connection"),(yyvsp[0].str));
 }
-#line 48940 "preproc.c"
+#line 48935 "preproc.c"
     break;
 
   case 1411: /* AlterSubscriptionStmt: ALTER SUBSCRIPTION name REFRESH PUBLICATION opt_definition  */
-#line 8909 "preproc.y"
+#line 8904 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter subscription"),(yyvsp[-3].str),mm_strdup("refresh publication"),(yyvsp[0].str));
 }
-#line 48948 "preproc.c"
+#line 48943 "preproc.c"
     break;
 
   case 1412: /* AlterSubscriptionStmt: ALTER SUBSCRIPTION name ADD_P PUBLICATION name_list opt_definition  */
-#line 8913 "preproc.y"
+#line 8908 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter subscription"),(yyvsp[-4].str),mm_strdup("add publication"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 48956 "preproc.c"
+#line 48951 "preproc.c"
     break;
 
   case 1413: /* AlterSubscriptionStmt: ALTER SUBSCRIPTION name DROP PUBLICATION name_list opt_definition  */
-#line 8917 "preproc.y"
+#line 8912 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter subscription"),(yyvsp[-4].str),mm_strdup("drop publication"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 48964 "preproc.c"
+#line 48959 "preproc.c"
     break;
 
   case 1414: /* AlterSubscriptionStmt: ALTER SUBSCRIPTION name SET PUBLICATION name_list opt_definition  */
-#line 8921 "preproc.y"
+#line 8916 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter subscription"),(yyvsp[-4].str),mm_strdup("set publication"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 48972 "preproc.c"
+#line 48967 "preproc.c"
     break;
 
   case 1415: /* AlterSubscriptionStmt: ALTER SUBSCRIPTION name ENABLE_P  */
-#line 8925 "preproc.y"
+#line 8920 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter subscription"),(yyvsp[-1].str),mm_strdup("enable"));
 }
-#line 48980 "preproc.c"
+#line 48975 "preproc.c"
     break;
 
   case 1416: /* AlterSubscriptionStmt: ALTER SUBSCRIPTION name DISABLE_P  */
-#line 8929 "preproc.y"
+#line 8924 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter subscription"),(yyvsp[-1].str),mm_strdup("disable"));
 }
-#line 48988 "preproc.c"
+#line 48983 "preproc.c"
     break;
 
   case 1417: /* AlterSubscriptionStmt: ALTER SUBSCRIPTION name SKIP definition  */
-#line 8933 "preproc.y"
+#line 8928 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter subscription"),(yyvsp[-2].str),mm_strdup("skip"),(yyvsp[0].str));
 }
-#line 48996 "preproc.c"
+#line 48991 "preproc.c"
     break;
 
   case 1418: /* DropSubscriptionStmt: DROP SUBSCRIPTION name opt_drop_behavior  */
-#line 8941 "preproc.y"
+#line 8936 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("drop subscription"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49004 "preproc.c"
+#line 48999 "preproc.c"
     break;
 
   case 1419: /* DropSubscriptionStmt: DROP SUBSCRIPTION IF_P EXISTS name opt_drop_behavior  */
-#line 8945 "preproc.y"
+#line 8940 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("drop subscription if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49012 "preproc.c"
+#line 49007 "preproc.c"
     break;
 
   case 1420: /* RuleStmt: CREATE opt_or_replace RULE name AS ON event TO qualified_name where_clause DO opt_instead RuleActionList  */
-#line 8953 "preproc.y"
+#line 8948 "preproc.y"
  { 
  (yyval.str) = cat_str(12,mm_strdup("create"),(yyvsp[-11].str),mm_strdup("rule"),(yyvsp[-9].str),mm_strdup("as on"),(yyvsp[-6].str),mm_strdup("to"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("do"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49020 "preproc.c"
+#line 49015 "preproc.c"
     break;
 
   case 1421: /* RuleActionList: NOTHING  */
-#line 8961 "preproc.y"
+#line 8956 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nothing");
 }
-#line 49028 "preproc.c"
+#line 49023 "preproc.c"
     break;
 
   case 1422: /* RuleActionList: RuleActionStmt  */
-#line 8965 "preproc.y"
+#line 8960 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 49036 "preproc.c"
+#line 49031 "preproc.c"
     break;
 
   case 1423: /* RuleActionList: '(' RuleActionMulti ')'  */
-#line 8969 "preproc.y"
+#line 8964 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 49044 "preproc.c"
+#line 49039 "preproc.c"
     break;
 
   case 1424: /* RuleActionMulti: RuleActionMulti ';' RuleActionStmtOrEmpty  */
-#line 8977 "preproc.y"
+#line 8972 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(";"),(yyvsp[0].str));
 }
-#line 49052 "preproc.c"
+#line 49047 "preproc.c"
     break;
 
   case 1425: /* RuleActionMulti: RuleActionStmtOrEmpty  */
-#line 8981 "preproc.y"
+#line 8976 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 49060 "preproc.c"
+#line 49055 "preproc.c"
     break;
 
   case 1426: /* RuleActionStmt: SelectStmt  */
-#line 8989 "preproc.y"
+#line 8984 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 49068 "preproc.c"
+#line 49063 "preproc.c"
     break;
 
   case 1427: /* RuleActionStmt: InsertStmt  */
-#line 8993 "preproc.y"
+#line 8988 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 49076 "preproc.c"
+#line 49071 "preproc.c"
     break;
 
   case 1428: /* RuleActionStmt: UpdateStmt  */
-#line 8997 "preproc.y"
+#line 8992 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 49084 "preproc.c"
+#line 49079 "preproc.c"
     break;
 
   case 1429: /* RuleActionStmt: DeleteStmt  */
-#line 9001 "preproc.y"
+#line 8996 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 49092 "preproc.c"
+#line 49087 "preproc.c"
     break;
 
   case 1430: /* RuleActionStmt: NotifyStmt  */
-#line 9005 "preproc.y"
+#line 9000 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 49100 "preproc.c"
+#line 49095 "preproc.c"
     break;
 
   case 1431: /* RuleActionStmtOrEmpty: RuleActionStmt  */
-#line 9013 "preproc.y"
+#line 9008 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 49108 "preproc.c"
+#line 49103 "preproc.c"
     break;
 
   case 1432: /* RuleActionStmtOrEmpty: %empty  */
-#line 9017 "preproc.y"
+#line 9012 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 49115 "preproc.c"
+#line 49110 "preproc.c"
     break;
 
   case 1433: /* event: SELECT  */
-#line 9024 "preproc.y"
+#line 9019 "preproc.y"
  { 
  (yyval.str) = mm_strdup("select");
 }
-#line 49123 "preproc.c"
+#line 49118 "preproc.c"
     break;
 
   case 1434: /* event: UPDATE  */
-#line 9028 "preproc.y"
+#line 9023 "preproc.y"
  { 
  (yyval.str) = mm_strdup("update");
 }
-#line 49131 "preproc.c"
+#line 49126 "preproc.c"
     break;
 
   case 1435: /* event: DELETE_P  */
-#line 9032 "preproc.y"
+#line 9027 "preproc.y"
  { 
  (yyval.str) = mm_strdup("delete");
 }
-#line 49139 "preproc.c"
+#line 49134 "preproc.c"
     break;
 
   case 1436: /* event: INSERT  */
-#line 9036 "preproc.y"
+#line 9031 "preproc.y"
  { 
  (yyval.str) = mm_strdup("insert");
 }
-#line 49147 "preproc.c"
+#line 49142 "preproc.c"
     break;
 
   case 1437: /* opt_instead: INSTEAD  */
-#line 9044 "preproc.y"
+#line 9039 "preproc.y"
  { 
  (yyval.str) = mm_strdup("instead");
 }
-#line 49155 "preproc.c"
+#line 49150 "preproc.c"
     break;
 
   case 1438: /* opt_instead: ALSO  */
-#line 9048 "preproc.y"
+#line 9043 "preproc.y"
  { 
  (yyval.str) = mm_strdup("also");
 }
-#line 49163 "preproc.c"
+#line 49158 "preproc.c"
     break;
 
   case 1439: /* opt_instead: %empty  */
-#line 9052 "preproc.y"
+#line 9047 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 49170 "preproc.c"
+#line 49165 "preproc.c"
     break;
 
   case 1440: /* NotifyStmt: NOTIFY ColId notify_payload  */
-#line 9059 "preproc.y"
+#line 9054 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("notify"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49178 "preproc.c"
+#line 49173 "preproc.c"
     break;
 
   case 1441: /* notify_payload: ',' ecpg_sconst  */
-#line 9067 "preproc.y"
+#line 9062 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup(","),(yyvsp[0].str));
 }
-#line 49186 "preproc.c"
+#line 49181 "preproc.c"
     break;
 
   case 1442: /* notify_payload: %empty  */
-#line 9071 "preproc.y"
+#line 9066 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 49193 "preproc.c"
+#line 49188 "preproc.c"
     break;
 
   case 1443: /* ListenStmt: LISTEN ColId  */
-#line 9078 "preproc.y"
+#line 9073 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("listen"),(yyvsp[0].str));
 }
-#line 49201 "preproc.c"
+#line 49196 "preproc.c"
     break;
 
   case 1444: /* UnlistenStmt: UNLISTEN ColId  */
-#line 9086 "preproc.y"
+#line 9081 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("unlisten"),(yyvsp[0].str));
 }
-#line 49209 "preproc.c"
+#line 49204 "preproc.c"
     break;
 
   case 1445: /* UnlistenStmt: UNLISTEN '*'  */
-#line 9090 "preproc.y"
+#line 9085 "preproc.y"
  { 
  (yyval.str) = mm_strdup("unlisten *");
 }
-#line 49217 "preproc.c"
+#line 49212 "preproc.c"
     break;
 
   case 1446: /* TransactionStmt: ABORT_P opt_transaction opt_transaction_chain  */
-#line 9098 "preproc.y"
+#line 9093 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("abort"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49225 "preproc.c"
+#line 49220 "preproc.c"
     break;
 
   case 1447: /* TransactionStmt: START TRANSACTION transaction_mode_list_or_empty  */
-#line 9102 "preproc.y"
+#line 9097 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("start transaction"),(yyvsp[0].str));
 }
-#line 49233 "preproc.c"
+#line 49228 "preproc.c"
     break;
 
   case 1448: /* TransactionStmt: COMMIT opt_transaction opt_transaction_chain  */
-#line 9106 "preproc.y"
+#line 9101 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("commit"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49241 "preproc.c"
+#line 49236 "preproc.c"
     break;
 
   case 1449: /* TransactionStmt: ROLLBACK opt_transaction opt_transaction_chain  */
-#line 9110 "preproc.y"
+#line 9105 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("rollback"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49249 "preproc.c"
+#line 49244 "preproc.c"
     break;
 
   case 1450: /* TransactionStmt: SAVEPOINT ColId  */
-#line 9114 "preproc.y"
+#line 9109 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("savepoint"),(yyvsp[0].str));
 }
-#line 49257 "preproc.c"
+#line 49252 "preproc.c"
     break;
 
   case 1451: /* TransactionStmt: RELEASE SAVEPOINT ColId  */
-#line 9118 "preproc.y"
+#line 9113 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("release savepoint"),(yyvsp[0].str));
 }
-#line 49265 "preproc.c"
+#line 49260 "preproc.c"
     break;
 
   case 1452: /* TransactionStmt: RELEASE ColId  */
-#line 9122 "preproc.y"
+#line 9117 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("release"),(yyvsp[0].str));
 }
-#line 49273 "preproc.c"
+#line 49268 "preproc.c"
     break;
 
   case 1453: /* TransactionStmt: ROLLBACK opt_transaction TO SAVEPOINT ColId  */
-#line 9126 "preproc.y"
+#line 9121 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("rollback"),(yyvsp[-3].str),mm_strdup("to savepoint"),(yyvsp[0].str));
 }
-#line 49281 "preproc.c"
+#line 49276 "preproc.c"
     break;
 
   case 1454: /* TransactionStmt: ROLLBACK opt_transaction TO ColId  */
-#line 9130 "preproc.y"
+#line 9125 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("rollback"),(yyvsp[-2].str),mm_strdup("to"),(yyvsp[0].str));
 }
-#line 49289 "preproc.c"
+#line 49284 "preproc.c"
     break;
 
   case 1455: /* TransactionStmt: PREPARE TRANSACTION ecpg_sconst  */
-#line 9134 "preproc.y"
+#line 9129 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("prepare transaction"),(yyvsp[0].str));
 }
-#line 49297 "preproc.c"
+#line 49292 "preproc.c"
     break;
 
   case 1456: /* TransactionStmt: COMMIT PREPARED ecpg_sconst  */
-#line 9138 "preproc.y"
+#line 9133 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("commit prepared"),(yyvsp[0].str));
 }
-#line 49305 "preproc.c"
+#line 49300 "preproc.c"
     break;
 
   case 1457: /* TransactionStmt: ROLLBACK PREPARED ecpg_sconst  */
-#line 9142 "preproc.y"
+#line 9137 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("rollback prepared"),(yyvsp[0].str));
 }
-#line 49313 "preproc.c"
+#line 49308 "preproc.c"
     break;
 
   case 1458: /* TransactionStmtLegacy: BEGIN_P opt_transaction transaction_mode_list_or_empty  */
-#line 9150 "preproc.y"
+#line 9145 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("begin"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49321 "preproc.c"
+#line 49316 "preproc.c"
     break;
 
   case 1459: /* TransactionStmtLegacy: END_P opt_transaction opt_transaction_chain  */
-#line 9154 "preproc.y"
+#line 9149 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("end"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49329 "preproc.c"
+#line 49324 "preproc.c"
     break;
 
   case 1460: /* opt_transaction: WORK  */
-#line 9162 "preproc.y"
+#line 9157 "preproc.y"
  { 
  (yyval.str) = mm_strdup("work");
 }
-#line 49337 "preproc.c"
+#line 49332 "preproc.c"
     break;
 
   case 1461: /* opt_transaction: TRANSACTION  */
-#line 9166 "preproc.y"
+#line 9161 "preproc.y"
  { 
  (yyval.str) = mm_strdup("transaction");
 }
-#line 49345 "preproc.c"
+#line 49340 "preproc.c"
     break;
 
   case 1462: /* opt_transaction: %empty  */
-#line 9170 "preproc.y"
+#line 9165 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 49352 "preproc.c"
+#line 49347 "preproc.c"
     break;
 
   case 1463: /* transaction_mode_item: ISOLATION LEVEL iso_level  */
-#line 9177 "preproc.y"
+#line 9172 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("isolation level"),(yyvsp[0].str));
 }
-#line 49360 "preproc.c"
+#line 49355 "preproc.c"
     break;
 
   case 1464: /* transaction_mode_item: READ ONLY  */
-#line 9181 "preproc.y"
+#line 9176 "preproc.y"
  { 
  (yyval.str) = mm_strdup("read only");
 }
-#line 49368 "preproc.c"
+#line 49363 "preproc.c"
     break;
 
   case 1465: /* transaction_mode_item: READ WRITE  */
-#line 9185 "preproc.y"
+#line 9180 "preproc.y"
  { 
  (yyval.str) = mm_strdup("read write");
 }
-#line 49376 "preproc.c"
+#line 49371 "preproc.c"
     break;
 
   case 1466: /* transaction_mode_item: DEFERRABLE  */
-#line 9189 "preproc.y"
+#line 9184 "preproc.y"
  { 
  (yyval.str) = mm_strdup("deferrable");
 }
-#line 49384 "preproc.c"
+#line 49379 "preproc.c"
     break;
 
   case 1467: /* transaction_mode_item: NOT DEFERRABLE  */
-#line 9193 "preproc.y"
+#line 9188 "preproc.y"
  { 
  (yyval.str) = mm_strdup("not deferrable");
 }
-#line 49392 "preproc.c"
+#line 49387 "preproc.c"
     break;
 
   case 1468: /* transaction_mode_list: transaction_mode_item  */
-#line 9201 "preproc.y"
+#line 9196 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 49400 "preproc.c"
+#line 49395 "preproc.c"
     break;
 
   case 1469: /* transaction_mode_list: transaction_mode_list ',' transaction_mode_item  */
-#line 9205 "preproc.y"
+#line 9200 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 49408 "preproc.c"
+#line 49403 "preproc.c"
     break;
 
   case 1470: /* transaction_mode_list: transaction_mode_list transaction_mode_item  */
-#line 9209 "preproc.y"
+#line 9204 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49416 "preproc.c"
+#line 49411 "preproc.c"
     break;
 
   case 1471: /* transaction_mode_list_or_empty: transaction_mode_list  */
-#line 9217 "preproc.y"
+#line 9212 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 49424 "preproc.c"
+#line 49419 "preproc.c"
     break;
 
   case 1472: /* transaction_mode_list_or_empty: %empty  */
-#line 9221 "preproc.y"
+#line 9216 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 49431 "preproc.c"
+#line 49426 "preproc.c"
     break;
 
   case 1473: /* opt_transaction_chain: AND CHAIN  */
-#line 9228 "preproc.y"
+#line 9223 "preproc.y"
  { 
  (yyval.str) = mm_strdup("and chain");
 }
-#line 49439 "preproc.c"
+#line 49434 "preproc.c"
     break;
 
   case 1474: /* opt_transaction_chain: AND NO CHAIN  */
-#line 9232 "preproc.y"
+#line 9227 "preproc.y"
  { 
  (yyval.str) = mm_strdup("and no chain");
 }
-#line 49447 "preproc.c"
+#line 49442 "preproc.c"
     break;
 
   case 1475: /* opt_transaction_chain: %empty  */
-#line 9236 "preproc.y"
+#line 9231 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 49454 "preproc.c"
+#line 49449 "preproc.c"
     break;
 
   case 1476: /* ViewStmt: CREATE OptTemp VIEW qualified_name opt_column_list opt_reloptions AS SelectStmt opt_check_option  */
-#line 9243 "preproc.y"
+#line 9238 "preproc.y"
  { 
  (yyval.str) = cat_str(9,mm_strdup("create"),(yyvsp[-7].str),mm_strdup("view"),(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49462 "preproc.c"
+#line 49457 "preproc.c"
     break;
 
   case 1477: /* ViewStmt: CREATE OR REPLACE OptTemp VIEW qualified_name opt_column_list opt_reloptions AS SelectStmt opt_check_option  */
-#line 9247 "preproc.y"
+#line 9242 "preproc.y"
  { 
  (yyval.str) = cat_str(9,mm_strdup("create or replace"),(yyvsp[-7].str),mm_strdup("view"),(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49470 "preproc.c"
+#line 49465 "preproc.c"
     break;
 
   case 1478: /* ViewStmt: CREATE OptTemp RECURSIVE VIEW qualified_name '(' columnList ')' opt_reloptions AS SelectStmt opt_check_option  */
-#line 9251 "preproc.y"
+#line 9246 "preproc.y"
  { 
-mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
  (yyval.str) = cat_str(11,mm_strdup("create"),(yyvsp[-10].str),mm_strdup("recursive view"),(yyvsp[-7].str),mm_strdup("("),(yyvsp[-5].str),mm_strdup(")"),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49479 "preproc.c"
+#line 49473 "preproc.c"
     break;
 
   case 1479: /* ViewStmt: CREATE OR REPLACE OptTemp RECURSIVE VIEW qualified_name '(' columnList ')' opt_reloptions AS SelectStmt opt_check_option  */
-#line 9256 "preproc.y"
+#line 9250 "preproc.y"
  { 
-mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
  (yyval.str) = cat_str(11,mm_strdup("create or replace"),(yyvsp[-10].str),mm_strdup("recursive view"),(yyvsp[-7].str),mm_strdup("("),(yyvsp[-5].str),mm_strdup(")"),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49488 "preproc.c"
+#line 49481 "preproc.c"
     break;
 
   case 1480: /* opt_check_option: WITH CHECK OPTION  */
-#line 9265 "preproc.y"
+#line 9258 "preproc.y"
  { 
  (yyval.str) = mm_strdup("with check option");
 }
-#line 49496 "preproc.c"
+#line 49489 "preproc.c"
     break;
 
   case 1481: /* opt_check_option: WITH CASCADED CHECK OPTION  */
-#line 9269 "preproc.y"
+#line 9262 "preproc.y"
  { 
  (yyval.str) = mm_strdup("with cascaded check option");
 }
-#line 49504 "preproc.c"
+#line 49497 "preproc.c"
     break;
 
   case 1482: /* opt_check_option: WITH LOCAL CHECK OPTION  */
-#line 9273 "preproc.y"
+#line 9266 "preproc.y"
  { 
  (yyval.str) = mm_strdup("with local check option");
 }
-#line 49512 "preproc.c"
+#line 49505 "preproc.c"
     break;
 
   case 1483: /* opt_check_option: %empty  */
-#line 9277 "preproc.y"
+#line 9270 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 49519 "preproc.c"
+#line 49512 "preproc.c"
     break;
 
   case 1484: /* LoadStmt: LOAD file_name  */
-#line 9284 "preproc.y"
+#line 9277 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("load"),(yyvsp[0].str));
 }
-#line 49527 "preproc.c"
+#line 49520 "preproc.c"
     break;
 
   case 1485: /* CreatedbStmt: CREATE DATABASE name opt_with createdb_opt_list  */
-#line 9292 "preproc.y"
+#line 9285 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("create database"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49535 "preproc.c"
+#line 49528 "preproc.c"
     break;
 
   case 1486: /* createdb_opt_list: createdb_opt_items  */
-#line 9300 "preproc.y"
+#line 9293 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 49543 "preproc.c"
+#line 49536 "preproc.c"
     break;
 
   case 1487: /* createdb_opt_list: %empty  */
-#line 9304 "preproc.y"
+#line 9297 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 49550 "preproc.c"
+#line 49543 "preproc.c"
     break;
 
   case 1488: /* createdb_opt_items: createdb_opt_item  */
-#line 9311 "preproc.y"
+#line 9304 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 49558 "preproc.c"
+#line 49551 "preproc.c"
     break;
 
   case 1489: /* createdb_opt_items: createdb_opt_items createdb_opt_item  */
-#line 9315 "preproc.y"
+#line 9308 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49566 "preproc.c"
+#line 49559 "preproc.c"
     break;
 
   case 1490: /* createdb_opt_item: createdb_opt_name opt_equal NumericOnly  */
-#line 9323 "preproc.y"
+#line 9316 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49574 "preproc.c"
+#line 49567 "preproc.c"
     break;
 
   case 1491: /* createdb_opt_item: createdb_opt_name opt_equal opt_boolean_or_string  */
-#line 9327 "preproc.y"
+#line 9320 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49582 "preproc.c"
+#line 49575 "preproc.c"
     break;
 
   case 1492: /* createdb_opt_item: createdb_opt_name opt_equal DEFAULT  */
-#line 9331 "preproc.y"
+#line 9324 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup("default"));
 }
-#line 49590 "preproc.c"
+#line 49583 "preproc.c"
     break;
 
   case 1493: /* createdb_opt_name: ecpg_ident  */
-#line 9339 "preproc.y"
+#line 9332 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 49598 "preproc.c"
+#line 49591 "preproc.c"
     break;
 
   case 1494: /* createdb_opt_name: CONNECTION LIMIT  */
-#line 9343 "preproc.y"
+#line 9336 "preproc.y"
  { 
  (yyval.str) = mm_strdup("connection limit");
 }
-#line 49606 "preproc.c"
+#line 49599 "preproc.c"
     break;
 
   case 1495: /* createdb_opt_name: ENCODING  */
-#line 9347 "preproc.y"
+#line 9340 "preproc.y"
  { 
  (yyval.str) = mm_strdup("encoding");
 }
-#line 49614 "preproc.c"
+#line 49607 "preproc.c"
     break;
 
   case 1496: /* createdb_opt_name: LOCATION  */
-#line 9351 "preproc.y"
+#line 9344 "preproc.y"
  { 
  (yyval.str) = mm_strdup("location");
 }
-#line 49622 "preproc.c"
+#line 49615 "preproc.c"
     break;
 
   case 1497: /* createdb_opt_name: OWNER  */
-#line 9355 "preproc.y"
+#line 9348 "preproc.y"
  { 
  (yyval.str) = mm_strdup("owner");
 }
-#line 49630 "preproc.c"
+#line 49623 "preproc.c"
     break;
 
   case 1498: /* createdb_opt_name: TABLESPACE  */
-#line 9359 "preproc.y"
+#line 9352 "preproc.y"
  { 
  (yyval.str) = mm_strdup("tablespace");
 }
-#line 49638 "preproc.c"
+#line 49631 "preproc.c"
     break;
 
   case 1499: /* createdb_opt_name: TEMPLATE  */
-#line 9363 "preproc.y"
+#line 9356 "preproc.y"
  { 
  (yyval.str) = mm_strdup("template");
 }
-#line 49646 "preproc.c"
+#line 49639 "preproc.c"
     break;
 
   case 1500: /* opt_equal: '='  */
-#line 9371 "preproc.y"
+#line 9364 "preproc.y"
  { 
  (yyval.str) = mm_strdup("=");
 }
-#line 49654 "preproc.c"
+#line 49647 "preproc.c"
     break;
 
   case 1501: /* opt_equal: %empty  */
-#line 9375 "preproc.y"
+#line 9368 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 49661 "preproc.c"
+#line 49654 "preproc.c"
     break;
 
   case 1502: /* AlterDatabaseStmt: ALTER DATABASE name WITH createdb_opt_list  */
-#line 9382 "preproc.y"
+#line 9375 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter database"),(yyvsp[-2].str),mm_strdup("with"),(yyvsp[0].str));
 }
-#line 49669 "preproc.c"
+#line 49662 "preproc.c"
     break;
 
   case 1503: /* AlterDatabaseStmt: ALTER DATABASE name createdb_opt_list  */
-#line 9386 "preproc.y"
+#line 9379 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter database"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49677 "preproc.c"
+#line 49670 "preproc.c"
     break;
 
   case 1504: /* AlterDatabaseStmt: ALTER DATABASE name SET TABLESPACE name  */
-#line 9390 "preproc.y"
+#line 9383 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter database"),(yyvsp[-3].str),mm_strdup("set tablespace"),(yyvsp[0].str));
 }
-#line 49685 "preproc.c"
+#line 49678 "preproc.c"
     break;
 
   case 1505: /* AlterDatabaseStmt: ALTER DATABASE name REFRESH COLLATION VERSION_P  */
-#line 9394 "preproc.y"
+#line 9387 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter database"),(yyvsp[-3].str),mm_strdup("refresh collation version"));
 }
-#line 49693 "preproc.c"
+#line 49686 "preproc.c"
     break;
 
   case 1506: /* AlterDatabaseSetStmt: ALTER DATABASE name SetResetClause  */
-#line 9402 "preproc.y"
+#line 9395 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter database"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49701 "preproc.c"
+#line 49694 "preproc.c"
     break;
 
   case 1507: /* DropdbStmt: DROP DATABASE name  */
-#line 9410 "preproc.y"
+#line 9403 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("drop database"),(yyvsp[0].str));
 }
-#line 49709 "preproc.c"
+#line 49702 "preproc.c"
     break;
 
   case 1508: /* DropdbStmt: DROP DATABASE IF_P EXISTS name  */
-#line 9414 "preproc.y"
+#line 9407 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("drop database if exists"),(yyvsp[0].str));
 }
-#line 49717 "preproc.c"
+#line 49710 "preproc.c"
     break;
 
   case 1509: /* DropdbStmt: DROP DATABASE name opt_with '(' drop_option_list ')'  */
-#line 9418 "preproc.y"
+#line 9411 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("drop database"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 49725 "preproc.c"
+#line 49718 "preproc.c"
     break;
 
   case 1510: /* DropdbStmt: DROP DATABASE IF_P EXISTS name opt_with '(' drop_option_list ')'  */
-#line 9422 "preproc.y"
+#line 9415 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("drop database if exists"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 49733 "preproc.c"
+#line 49726 "preproc.c"
     break;
 
   case 1511: /* drop_option_list: drop_option  */
-#line 9430 "preproc.y"
+#line 9423 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 49741 "preproc.c"
+#line 49734 "preproc.c"
     break;
 
   case 1512: /* drop_option_list: drop_option_list ',' drop_option  */
-#line 9434 "preproc.y"
+#line 9427 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 49749 "preproc.c"
+#line 49742 "preproc.c"
     break;
 
   case 1513: /* drop_option: FORCE  */
-#line 9442 "preproc.y"
+#line 9435 "preproc.y"
  { 
  (yyval.str) = mm_strdup("force");
 }
-#line 49757 "preproc.c"
+#line 49750 "preproc.c"
     break;
 
   case 1514: /* AlterCollationStmt: ALTER COLLATION any_name REFRESH VERSION_P  */
-#line 9450 "preproc.y"
+#line 9443 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter collation"),(yyvsp[-2].str),mm_strdup("refresh version"));
 }
-#line 49765 "preproc.c"
+#line 49758 "preproc.c"
     break;
 
   case 1515: /* AlterSystemStmt: ALTER SYSTEM_P SET generic_set  */
-#line 9458 "preproc.y"
+#line 9451 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("alter system set"),(yyvsp[0].str));
 }
-#line 49773 "preproc.c"
+#line 49766 "preproc.c"
     break;
 
   case 1516: /* AlterSystemStmt: ALTER SYSTEM_P RESET generic_reset  */
-#line 9462 "preproc.y"
+#line 9455 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("alter system reset"),(yyvsp[0].str));
 }
-#line 49781 "preproc.c"
+#line 49774 "preproc.c"
     break;
 
   case 1517: /* CreateDomainStmt: CREATE DOMAIN_P any_name opt_as Typename ColQualList  */
-#line 9470 "preproc.y"
+#line 9463 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("create domain"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49789 "preproc.c"
+#line 49782 "preproc.c"
     break;
 
   case 1518: /* AlterDomainStmt: ALTER DOMAIN_P any_name alter_column_default  */
-#line 9478 "preproc.y"
+#line 9471 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter domain"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49797 "preproc.c"
+#line 49790 "preproc.c"
     break;
 
   case 1519: /* AlterDomainStmt: ALTER DOMAIN_P any_name DROP NOT NULL_P  */
-#line 9482 "preproc.y"
+#line 9475 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter domain"),(yyvsp[-3].str),mm_strdup("drop not null"));
 }
-#line 49805 "preproc.c"
+#line 49798 "preproc.c"
     break;
 
   case 1520: /* AlterDomainStmt: ALTER DOMAIN_P any_name SET NOT NULL_P  */
-#line 9486 "preproc.y"
+#line 9479 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter domain"),(yyvsp[-3].str),mm_strdup("set not null"));
 }
-#line 49813 "preproc.c"
+#line 49806 "preproc.c"
     break;
 
   case 1521: /* AlterDomainStmt: ALTER DOMAIN_P any_name ADD_P TableConstraint  */
-#line 9490 "preproc.y"
+#line 9483 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter domain"),(yyvsp[-2].str),mm_strdup("add"),(yyvsp[0].str));
 }
-#line 49821 "preproc.c"
+#line 49814 "preproc.c"
     break;
 
   case 1522: /* AlterDomainStmt: ALTER DOMAIN_P any_name DROP CONSTRAINT name opt_drop_behavior  */
-#line 9494 "preproc.y"
+#line 9487 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter domain"),(yyvsp[-4].str),mm_strdup("drop constraint"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49829 "preproc.c"
+#line 49822 "preproc.c"
     break;
 
   case 1523: /* AlterDomainStmt: ALTER DOMAIN_P any_name DROP CONSTRAINT IF_P EXISTS name opt_drop_behavior  */
-#line 9498 "preproc.y"
+#line 9491 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("alter domain"),(yyvsp[-6].str),mm_strdup("drop constraint if exists"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49837 "preproc.c"
+#line 49830 "preproc.c"
     break;
 
   case 1524: /* AlterDomainStmt: ALTER DOMAIN_P any_name VALIDATE CONSTRAINT name  */
-#line 9502 "preproc.y"
+#line 9495 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter domain"),(yyvsp[-3].str),mm_strdup("validate constraint"),(yyvsp[0].str));
 }
-#line 49845 "preproc.c"
+#line 49838 "preproc.c"
     break;
 
   case 1525: /* opt_as: AS  */
-#line 9510 "preproc.y"
+#line 9503 "preproc.y"
  { 
  (yyval.str) = mm_strdup("as");
 }
-#line 49853 "preproc.c"
+#line 49846 "preproc.c"
     break;
 
   case 1526: /* opt_as: %empty  */
-#line 9514 "preproc.y"
+#line 9507 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 49860 "preproc.c"
+#line 49853 "preproc.c"
     break;
 
   case 1527: /* AlterTSDictionaryStmt: ALTER TEXT_P SEARCH DICTIONARY any_name definition  */
-#line 9521 "preproc.y"
+#line 9514 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("alter text search dictionary"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49868 "preproc.c"
+#line 49861 "preproc.c"
     break;
 
   case 1528: /* AlterTSConfigurationStmt: ALTER TEXT_P SEARCH CONFIGURATION any_name ADD_P MAPPING FOR name_list any_with any_name_list  */
-#line 9529 "preproc.y"
+#line 9522 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("alter text search configuration"),(yyvsp[-6].str),mm_strdup("add mapping for"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49876 "preproc.c"
+#line 49869 "preproc.c"
     break;
 
   case 1529: /* AlterTSConfigurationStmt: ALTER TEXT_P SEARCH CONFIGURATION any_name ALTER MAPPING FOR name_list any_with any_name_list  */
-#line 9533 "preproc.y"
+#line 9526 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("alter text search configuration"),(yyvsp[-6].str),mm_strdup("alter mapping for"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49884 "preproc.c"
+#line 49877 "preproc.c"
     break;
 
   case 1530: /* AlterTSConfigurationStmt: ALTER TEXT_P SEARCH CONFIGURATION any_name ALTER MAPPING REPLACE any_name any_with any_name  */
-#line 9537 "preproc.y"
+#line 9530 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("alter text search configuration"),(yyvsp[-6].str),mm_strdup("alter mapping replace"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49892 "preproc.c"
+#line 49885 "preproc.c"
     break;
 
   case 1531: /* AlterTSConfigurationStmt: ALTER TEXT_P SEARCH CONFIGURATION any_name ALTER MAPPING FOR name_list REPLACE any_name any_with any_name  */
-#line 9541 "preproc.y"
+#line 9534 "preproc.y"
  { 
  (yyval.str) = cat_str(8,mm_strdup("alter text search configuration"),(yyvsp[-8].str),mm_strdup("alter mapping for"),(yyvsp[-4].str),mm_strdup("replace"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49900 "preproc.c"
+#line 49893 "preproc.c"
     break;
 
   case 1532: /* AlterTSConfigurationStmt: ALTER TEXT_P SEARCH CONFIGURATION any_name DROP MAPPING FOR name_list  */
-#line 9545 "preproc.y"
+#line 9538 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter text search configuration"),(yyvsp[-4].str),mm_strdup("drop mapping for"),(yyvsp[0].str));
 }
-#line 49908 "preproc.c"
+#line 49901 "preproc.c"
     break;
 
   case 1533: /* AlterTSConfigurationStmt: ALTER TEXT_P SEARCH CONFIGURATION any_name DROP MAPPING IF_P EXISTS FOR name_list  */
-#line 9549 "preproc.y"
+#line 9542 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("alter text search configuration"),(yyvsp[-6].str),mm_strdup("drop mapping if exists for"),(yyvsp[0].str));
 }
-#line 49916 "preproc.c"
+#line 49909 "preproc.c"
     break;
 
   case 1534: /* any_with: WITH  */
-#line 9557 "preproc.y"
+#line 9550 "preproc.y"
  { 
  (yyval.str) = mm_strdup("with");
 }
-#line 49924 "preproc.c"
+#line 49917 "preproc.c"
     break;
 
   case 1535: /* any_with: WITH_LA  */
-#line 9561 "preproc.y"
+#line 9554 "preproc.y"
  { 
  (yyval.str) = mm_strdup("with");
 }
-#line 49932 "preproc.c"
+#line 49925 "preproc.c"
     break;
 
   case 1536: /* CreateConversionStmt: CREATE opt_default CONVERSION_P any_name FOR ecpg_sconst TO ecpg_sconst FROM any_name  */
-#line 9569 "preproc.y"
+#line 9562 "preproc.y"
  { 
  (yyval.str) = cat_str(10,mm_strdup("create"),(yyvsp[-8].str),mm_strdup("conversion"),(yyvsp[-6].str),mm_strdup("for"),(yyvsp[-4].str),mm_strdup("to"),(yyvsp[-2].str),mm_strdup("from"),(yyvsp[0].str));
 }
-#line 49940 "preproc.c"
+#line 49933 "preproc.c"
     break;
 
   case 1537: /* ClusterStmt: CLUSTER opt_verbose qualified_name cluster_index_specification  */
-#line 9577 "preproc.y"
+#line 9570 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("cluster"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49948 "preproc.c"
+#line 49941 "preproc.c"
     break;
 
   case 1538: /* ClusterStmt: CLUSTER '(' utility_option_list ')' qualified_name cluster_index_specification  */
-#line 9581 "preproc.y"
+#line 9574 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("cluster ("),(yyvsp[-3].str),mm_strdup(")"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49956 "preproc.c"
+#line 49949 "preproc.c"
     break;
 
   case 1539: /* ClusterStmt: CLUSTER opt_verbose  */
-#line 9585 "preproc.y"
+#line 9578 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("cluster"),(yyvsp[0].str));
 }
-#line 49964 "preproc.c"
+#line 49957 "preproc.c"
     break;
 
   case 1540: /* ClusterStmt: CLUSTER opt_verbose name ON qualified_name  */
-#line 9589 "preproc.y"
+#line 9582 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("cluster"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("on"),(yyvsp[0].str));
 }
-#line 49972 "preproc.c"
+#line 49965 "preproc.c"
     break;
 
   case 1541: /* cluster_index_specification: USING name  */
-#line 9597 "preproc.y"
+#line 9590 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("using"),(yyvsp[0].str));
 }
-#line 49980 "preproc.c"
+#line 49973 "preproc.c"
     break;
 
   case 1542: /* cluster_index_specification: %empty  */
-#line 9601 "preproc.y"
+#line 9594 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 49987 "preproc.c"
+#line 49980 "preproc.c"
     break;
 
   case 1543: /* VacuumStmt: VACUUM opt_full opt_freeze opt_verbose opt_analyze opt_vacuum_relation_list  */
-#line 9608 "preproc.y"
+#line 9601 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("vacuum"),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 49995 "preproc.c"
+#line 49988 "preproc.c"
     break;
 
   case 1544: /* VacuumStmt: VACUUM '(' utility_option_list ')' opt_vacuum_relation_list  */
-#line 9612 "preproc.y"
+#line 9605 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("vacuum ("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 50003 "preproc.c"
+#line 49996 "preproc.c"
     break;
 
   case 1545: /* AnalyzeStmt: analyze_keyword opt_verbose opt_vacuum_relation_list  */
-#line 9620 "preproc.y"
+#line 9613 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 50011 "preproc.c"
+#line 50004 "preproc.c"
     break;
 
   case 1546: /* AnalyzeStmt: analyze_keyword '(' utility_option_list ')' opt_vacuum_relation_list  */
-#line 9624 "preproc.y"
+#line 9617 "preproc.y"
  { 
  (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 50019 "preproc.c"
+#line 50012 "preproc.c"
     break;
 
   case 1547: /* utility_option_list: utility_option_elem  */
-#line 9632 "preproc.y"
+#line 9625 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50027 "preproc.c"
+#line 50020 "preproc.c"
     break;
 
   case 1548: /* utility_option_list: utility_option_list ',' utility_option_elem  */
-#line 9636 "preproc.y"
+#line 9629 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 50035 "preproc.c"
+#line 50028 "preproc.c"
     break;
 
   case 1549: /* analyze_keyword: ANALYZE  */
-#line 9644 "preproc.y"
+#line 9637 "preproc.y"
  { 
  (yyval.str) = mm_strdup("analyze");
 }
-#line 50043 "preproc.c"
+#line 50036 "preproc.c"
     break;
 
   case 1550: /* analyze_keyword: ANALYSE  */
-#line 9648 "preproc.y"
+#line 9641 "preproc.y"
  { 
  (yyval.str) = mm_strdup("analyse");
 }
-#line 50051 "preproc.c"
+#line 50044 "preproc.c"
     break;
 
   case 1551: /* utility_option_elem: utility_option_name utility_option_arg  */
-#line 9656 "preproc.y"
+#line 9649 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 50059 "preproc.c"
+#line 50052 "preproc.c"
     break;
 
   case 1552: /* utility_option_name: NonReservedWord  */
-#line 9664 "preproc.y"
+#line 9657 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50067 "preproc.c"
+#line 50060 "preproc.c"
     break;
 
   case 1553: /* utility_option_name: analyze_keyword  */
-#line 9668 "preproc.y"
+#line 9661 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50075 "preproc.c"
+#line 50068 "preproc.c"
     break;
 
   case 1554: /* utility_option_name: FORMAT_LA  */
-#line 9672 "preproc.y"
+#line 9665 "preproc.y"
  { 
  (yyval.str) = mm_strdup("format");
 }
-#line 50083 "preproc.c"
+#line 50076 "preproc.c"
     break;
 
   case 1555: /* utility_option_arg: opt_boolean_or_string  */
-#line 9680 "preproc.y"
+#line 9673 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50091 "preproc.c"
+#line 50084 "preproc.c"
     break;
 
   case 1556: /* utility_option_arg: NumericOnly  */
-#line 9684 "preproc.y"
+#line 9677 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50099 "preproc.c"
+#line 50092 "preproc.c"
     break;
 
   case 1557: /* utility_option_arg: %empty  */
-#line 9688 "preproc.y"
+#line 9681 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 50106 "preproc.c"
+#line 50099 "preproc.c"
     break;
 
   case 1558: /* opt_analyze: analyze_keyword  */
-#line 9695 "preproc.y"
+#line 9688 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50114 "preproc.c"
+#line 50107 "preproc.c"
     break;
 
   case 1559: /* opt_analyze: %empty  */
-#line 9699 "preproc.y"
+#line 9692 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 50121 "preproc.c"
+#line 50114 "preproc.c"
     break;
 
   case 1560: /* opt_verbose: VERBOSE  */
-#line 9706 "preproc.y"
+#line 9699 "preproc.y"
  { 
  (yyval.str) = mm_strdup("verbose");
 }
-#line 50129 "preproc.c"
+#line 50122 "preproc.c"
     break;
 
   case 1561: /* opt_verbose: %empty  */
-#line 9710 "preproc.y"
+#line 9703 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 50136 "preproc.c"
+#line 50129 "preproc.c"
     break;
 
   case 1562: /* opt_full: FULL  */
-#line 9717 "preproc.y"
+#line 9710 "preproc.y"
  { 
  (yyval.str) = mm_strdup("full");
 }
-#line 50144 "preproc.c"
+#line 50137 "preproc.c"
     break;
 
   case 1563: /* opt_full: %empty  */
-#line 9721 "preproc.y"
+#line 9714 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 50151 "preproc.c"
+#line 50144 "preproc.c"
     break;
 
   case 1564: /* opt_freeze: FREEZE  */
-#line 9728 "preproc.y"
+#line 9721 "preproc.y"
  { 
  (yyval.str) = mm_strdup("freeze");
 }
-#line 50159 "preproc.c"
+#line 50152 "preproc.c"
     break;
 
   case 1565: /* opt_freeze: %empty  */
-#line 9732 "preproc.y"
+#line 9725 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 50166 "preproc.c"
+#line 50159 "preproc.c"
     break;
 
   case 1566: /* opt_name_list: '(' name_list ')'  */
-#line 9739 "preproc.y"
+#line 9732 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 50174 "preproc.c"
+#line 50167 "preproc.c"
     break;
 
   case 1567: /* opt_name_list: %empty  */
-#line 9743 "preproc.y"
+#line 9736 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 50181 "preproc.c"
+#line 50174 "preproc.c"
     break;
 
   case 1568: /* vacuum_relation: qualified_name opt_name_list  */
-#line 9750 "preproc.y"
+#line 9743 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 50189 "preproc.c"
+#line 50182 "preproc.c"
     break;
 
   case 1569: /* vacuum_relation_list: vacuum_relation  */
-#line 9758 "preproc.y"
+#line 9751 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50197 "preproc.c"
+#line 50190 "preproc.c"
     break;
 
   case 1570: /* vacuum_relation_list: vacuum_relation_list ',' vacuum_relation  */
-#line 9762 "preproc.y"
+#line 9755 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 50205 "preproc.c"
+#line 50198 "preproc.c"
     break;
 
   case 1571: /* opt_vacuum_relation_list: vacuum_relation_list  */
-#line 9770 "preproc.y"
+#line 9763 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50213 "preproc.c"
+#line 50206 "preproc.c"
     break;
 
   case 1572: /* opt_vacuum_relation_list: %empty  */
-#line 9774 "preproc.y"
+#line 9767 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 50220 "preproc.c"
+#line 50213 "preproc.c"
     break;
 
   case 1573: /* ExplainStmt: EXPLAIN ExplainableStmt  */
-#line 9781 "preproc.y"
+#line 9774 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("explain"),(yyvsp[0].str));
 }
-#line 50228 "preproc.c"
+#line 50221 "preproc.c"
     break;
 
   case 1574: /* ExplainStmt: EXPLAIN analyze_keyword opt_verbose ExplainableStmt  */
-#line 9785 "preproc.y"
+#line 9778 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("explain"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 50236 "preproc.c"
+#line 50229 "preproc.c"
     break;
 
   case 1575: /* ExplainStmt: EXPLAIN VERBOSE ExplainableStmt  */
-#line 9789 "preproc.y"
+#line 9782 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("explain verbose"),(yyvsp[0].str));
 }
-#line 50244 "preproc.c"
+#line 50237 "preproc.c"
     break;
 
   case 1576: /* ExplainStmt: EXPLAIN '(' utility_option_list ')' ExplainableStmt  */
-#line 9793 "preproc.y"
+#line 9786 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("explain ("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 50252 "preproc.c"
+#line 50245 "preproc.c"
     break;
 
   case 1577: /* ExplainableStmt: SelectStmt  */
-#line 9801 "preproc.y"
+#line 9794 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50260 "preproc.c"
+#line 50253 "preproc.c"
     break;
 
   case 1578: /* ExplainableStmt: InsertStmt  */
-#line 9805 "preproc.y"
+#line 9798 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50268 "preproc.c"
+#line 50261 "preproc.c"
     break;
 
   case 1579: /* ExplainableStmt: UpdateStmt  */
-#line 9809 "preproc.y"
+#line 9802 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50276 "preproc.c"
+#line 50269 "preproc.c"
     break;
 
   case 1580: /* ExplainableStmt: DeleteStmt  */
-#line 9813 "preproc.y"
+#line 9806 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50284 "preproc.c"
+#line 50277 "preproc.c"
     break;
 
   case 1581: /* ExplainableStmt: MergeStmt  */
-#line 9817 "preproc.y"
+#line 9810 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50292 "preproc.c"
+#line 50285 "preproc.c"
     break;
 
   case 1582: /* ExplainableStmt: DeclareCursorStmt  */
-#line 9821 "preproc.y"
+#line 9814 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50300 "preproc.c"
+#line 50293 "preproc.c"
     break;
 
   case 1583: /* ExplainableStmt: CreateAsStmt  */
-#line 9825 "preproc.y"
+#line 9818 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50308 "preproc.c"
+#line 50301 "preproc.c"
     break;
 
   case 1584: /* ExplainableStmt: CreateMatViewStmt  */
-#line 9829 "preproc.y"
+#line 9822 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50316 "preproc.c"
+#line 50309 "preproc.c"
     break;
 
   case 1585: /* ExplainableStmt: RefreshMatViewStmt  */
-#line 9833 "preproc.y"
+#line 9826 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50324 "preproc.c"
+#line 50317 "preproc.c"
     break;
 
   case 1586: /* ExplainableStmt: ExecuteStmt  */
-#line 9837 "preproc.y"
+#line 9830 "preproc.y"
         {
 		(yyval.str) = (yyvsp[0].exec).name;
 	}
-#line 50332 "preproc.c"
+#line 50325 "preproc.c"
     break;
 
   case 1587: /* PrepareStmt: PREPARE prepared_name prep_type_clause AS PreparableStmt  */
-#line 9845 "preproc.y"
+#line 9838 "preproc.y"
         {
 		(yyval.prep).name = (yyvsp[-3].str);
 		(yyval.prep).type = (yyvsp[-2].str);
 		(yyval.prep).stmt = (yyvsp[0].str);
 	}
-#line 50342 "preproc.c"
+#line 50335 "preproc.c"
     break;
 
   case 1588: /* PrepareStmt: PREPARE prepared_name FROM execstring  */
-#line 9851 "preproc.y"
+#line 9844 "preproc.y"
         {
 		(yyval.prep).name = (yyvsp[-2].str);
 		(yyval.prep).type = NULL;
 		(yyval.prep).stmt = (yyvsp[0].str);
 	}
-#line 50352 "preproc.c"
+#line 50345 "preproc.c"
     break;
 
   case 1589: /* prep_type_clause: '(' type_list ')'  */
-#line 9861 "preproc.y"
+#line 9854 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 50360 "preproc.c"
+#line 50353 "preproc.c"
     break;
 
   case 1590: /* prep_type_clause: %empty  */
-#line 9865 "preproc.y"
+#line 9858 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 50367 "preproc.c"
+#line 50360 "preproc.c"
     break;
 
   case 1591: /* PreparableStmt: SelectStmt  */
-#line 9872 "preproc.y"
+#line 9865 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50375 "preproc.c"
+#line 50368 "preproc.c"
     break;
 
   case 1592: /* PreparableStmt: InsertStmt  */
-#line 9876 "preproc.y"
+#line 9869 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50383 "preproc.c"
+#line 50376 "preproc.c"
     break;
 
   case 1593: /* PreparableStmt: UpdateStmt  */
-#line 9880 "preproc.y"
+#line 9873 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50391 "preproc.c"
+#line 50384 "preproc.c"
     break;
 
   case 1594: /* PreparableStmt: DeleteStmt  */
-#line 9884 "preproc.y"
+#line 9877 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50399 "preproc.c"
+#line 50392 "preproc.c"
     break;
 
   case 1595: /* PreparableStmt: MergeStmt  */
-#line 9888 "preproc.y"
+#line 9881 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50407 "preproc.c"
+#line 50400 "preproc.c"
     break;
 
   case 1596: /* ExecuteStmt: EXECUTE prepared_name execute_param_clause execute_rest  */
-#line 9896 "preproc.y"
+#line 9889 "preproc.y"
         {
 		(yyval.exec).name = (yyvsp[-2].str);
 		(yyval.exec).type = (yyvsp[-1].str);
 	}
-#line 50416 "preproc.c"
+#line 50409 "preproc.c"
     break;
 
   case 1597: /* ExecuteStmt: CREATE OptTemp TABLE create_as_target AS EXECUTE prepared_name execute_param_clause opt_with_data execute_rest  */
-#line 9901 "preproc.y"
+#line 9894 "preproc.y"
         {
 		(yyval.exec).name = cat_str(8,mm_strdup("create"),(yyvsp[-8].str),mm_strdup("table"),(yyvsp[-6].str),mm_strdup("as execute"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str));
 	}
-#line 50424 "preproc.c"
+#line 50417 "preproc.c"
     break;
 
   case 1598: /* ExecuteStmt: CREATE OptTemp TABLE IF_P NOT EXISTS create_as_target AS EXECUTE prepared_name execute_param_clause opt_with_data execute_rest  */
-#line 9905 "preproc.y"
+#line 9898 "preproc.y"
         {
 		(yyval.exec).name = cat_str(8,mm_strdup("create"),(yyvsp[-11].str),mm_strdup("table if not exists"),(yyvsp[-6].str),mm_strdup("as execute"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str));
 	}
-#line 50432 "preproc.c"
+#line 50425 "preproc.c"
     break;
 
   case 1599: /* execute_param_clause: '(' expr_list ')'  */
-#line 9913 "preproc.y"
+#line 9906 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 50440 "preproc.c"
+#line 50433 "preproc.c"
     break;
 
   case 1600: /* execute_param_clause: %empty  */
-#line 9917 "preproc.y"
+#line 9910 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 50447 "preproc.c"
+#line 50440 "preproc.c"
     break;
 
   case 1601: /* InsertStmt: opt_with_clause INSERT INTO insert_target insert_rest opt_on_conflict returning_clause  */
-#line 9924 "preproc.y"
+#line 9917 "preproc.y"
  { 
  (yyval.str) = cat_str(6,(yyvsp[-6].str),mm_strdup("insert into"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 50455 "preproc.c"
+#line 50448 "preproc.c"
     break;
 
   case 1602: /* insert_target: qualified_name  */
-#line 9932 "preproc.y"
+#line 9925 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50463 "preproc.c"
+#line 50456 "preproc.c"
     break;
 
   case 1603: /* insert_target: qualified_name AS ColId  */
-#line 9936 "preproc.y"
+#line 9929 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("as"),(yyvsp[0].str));
 }
-#line 50471 "preproc.c"
+#line 50464 "preproc.c"
     break;
 
   case 1604: /* insert_rest: SelectStmt  */
-#line 9944 "preproc.y"
+#line 9937 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50479 "preproc.c"
+#line 50472 "preproc.c"
     break;
 
   case 1605: /* insert_rest: OVERRIDING override_kind VALUE_P SelectStmt  */
-#line 9948 "preproc.y"
+#line 9941 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("overriding"),(yyvsp[-2].str),mm_strdup("value"),(yyvsp[0].str));
 }
-#line 50487 "preproc.c"
+#line 50480 "preproc.c"
     break;
 
   case 1606: /* insert_rest: '(' insert_column_list ')' SelectStmt  */
-#line 9952 "preproc.y"
+#line 9945 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 50495 "preproc.c"
+#line 50488 "preproc.c"
     break;
 
   case 1607: /* insert_rest: '(' insert_column_list ')' OVERRIDING override_kind VALUE_P SelectStmt  */
-#line 9956 "preproc.y"
+#line 9949 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("("),(yyvsp[-5].str),mm_strdup(") overriding"),(yyvsp[-2].str),mm_strdup("value"),(yyvsp[0].str));
 }
-#line 50503 "preproc.c"
+#line 50496 "preproc.c"
     break;
 
   case 1608: /* insert_rest: DEFAULT VALUES  */
-#line 9960 "preproc.y"
+#line 9953 "preproc.y"
  { 
  (yyval.str) = mm_strdup("default values");
 }
-#line 50511 "preproc.c"
+#line 50504 "preproc.c"
     break;
 
   case 1609: /* override_kind: USER  */
-#line 9968 "preproc.y"
+#line 9961 "preproc.y"
  { 
  (yyval.str) = mm_strdup("user");
 }
-#line 50519 "preproc.c"
+#line 50512 "preproc.c"
     break;
 
   case 1610: /* override_kind: SYSTEM_P  */
-#line 9972 "preproc.y"
+#line 9965 "preproc.y"
  { 
  (yyval.str) = mm_strdup("system");
 }
-#line 50527 "preproc.c"
+#line 50520 "preproc.c"
     break;
 
   case 1611: /* insert_column_list: insert_column_item  */
-#line 9980 "preproc.y"
+#line 9973 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50535 "preproc.c"
+#line 50528 "preproc.c"
     break;
 
   case 1612: /* insert_column_list: insert_column_list ',' insert_column_item  */
-#line 9984 "preproc.y"
+#line 9977 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 50543 "preproc.c"
+#line 50536 "preproc.c"
     break;
 
   case 1613: /* insert_column_item: ColId opt_indirection  */
-#line 9992 "preproc.y"
+#line 9985 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 50551 "preproc.c"
+#line 50544 "preproc.c"
     break;
 
   case 1614: /* opt_on_conflict: ON CONFLICT opt_conf_expr DO UPDATE SET set_clause_list where_clause  */
-#line 10000 "preproc.y"
+#line 9993 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("on conflict"),(yyvsp[-5].str),mm_strdup("do update set"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 50559 "preproc.c"
+#line 50552 "preproc.c"
     break;
 
   case 1615: /* opt_on_conflict: ON CONFLICT opt_conf_expr DO NOTHING  */
-#line 10004 "preproc.y"
+#line 9997 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("on conflict"),(yyvsp[-2].str),mm_strdup("do nothing"));
 }
-#line 50567 "preproc.c"
+#line 50560 "preproc.c"
     break;
 
   case 1616: /* opt_on_conflict: %empty  */
-#line 10008 "preproc.y"
+#line 10001 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 50574 "preproc.c"
+#line 50567 "preproc.c"
     break;
 
   case 1617: /* opt_conf_expr: '(' index_params ')' where_clause  */
-#line 10015 "preproc.y"
+#line 10008 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 50582 "preproc.c"
+#line 50575 "preproc.c"
     break;
 
   case 1618: /* opt_conf_expr: ON CONSTRAINT name  */
-#line 10019 "preproc.y"
+#line 10012 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("on constraint"),(yyvsp[0].str));
 }
-#line 50590 "preproc.c"
+#line 50583 "preproc.c"
     break;
 
   case 1619: /* opt_conf_expr: %empty  */
-#line 10023 "preproc.y"
+#line 10016 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 50597 "preproc.c"
+#line 50590 "preproc.c"
     break;
 
   case 1620: /* returning_clause: RETURNING target_list opt_ecpg_into  */
-#line 10030 "preproc.y"
+#line 10023 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("returning"),(yyvsp[-1].str));
 }
-#line 50605 "preproc.c"
+#line 50598 "preproc.c"
     break;
 
   case 1621: /* returning_clause: %empty  */
-#line 10034 "preproc.y"
+#line 10027 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 50612 "preproc.c"
+#line 50605 "preproc.c"
     break;
 
   case 1622: /* DeleteStmt: opt_with_clause DELETE_P FROM relation_expr_opt_alias using_clause where_or_current_clause returning_clause  */
-#line 10041 "preproc.y"
+#line 10034 "preproc.y"
  { 
  (yyval.str) = cat_str(6,(yyvsp[-6].str),mm_strdup("delete from"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 50620 "preproc.c"
+#line 50613 "preproc.c"
     break;
 
   case 1623: /* using_clause: USING from_list  */
-#line 10049 "preproc.y"
+#line 10042 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("using"),(yyvsp[0].str));
 }
-#line 50628 "preproc.c"
+#line 50621 "preproc.c"
     break;
 
   case 1624: /* using_clause: %empty  */
-#line 10053 "preproc.y"
+#line 10046 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 50635 "preproc.c"
+#line 50628 "preproc.c"
     break;
 
   case 1625: /* LockStmt: LOCK_P opt_table relation_expr_list opt_lock opt_nowait  */
-#line 10060 "preproc.y"
+#line 10053 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("lock"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 50643 "preproc.c"
+#line 50636 "preproc.c"
     break;
 
   case 1626: /* opt_lock: IN_P lock_type MODE  */
-#line 10068 "preproc.y"
+#line 10061 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("in"),(yyvsp[-1].str),mm_strdup("mode"));
 }
-#line 50651 "preproc.c"
+#line 50644 "preproc.c"
     break;
 
   case 1627: /* opt_lock: %empty  */
-#line 10072 "preproc.y"
+#line 10065 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 50658 "preproc.c"
+#line 50651 "preproc.c"
     break;
 
   case 1628: /* lock_type: ACCESS SHARE  */
-#line 10079 "preproc.y"
+#line 10072 "preproc.y"
  { 
  (yyval.str) = mm_strdup("access share");
 }
-#line 50666 "preproc.c"
+#line 50659 "preproc.c"
     break;
 
   case 1629: /* lock_type: ROW SHARE  */
-#line 10083 "preproc.y"
+#line 10076 "preproc.y"
  { 
  (yyval.str) = mm_strdup("row share");
 }
-#line 50674 "preproc.c"
+#line 50667 "preproc.c"
     break;
 
   case 1630: /* lock_type: ROW EXCLUSIVE  */
-#line 10087 "preproc.y"
+#line 10080 "preproc.y"
  { 
  (yyval.str) = mm_strdup("row exclusive");
 }
-#line 50682 "preproc.c"
+#line 50675 "preproc.c"
     break;
 
   case 1631: /* lock_type: SHARE UPDATE EXCLUSIVE  */
-#line 10091 "preproc.y"
+#line 10084 "preproc.y"
  { 
  (yyval.str) = mm_strdup("share update exclusive");
 }
-#line 50690 "preproc.c"
+#line 50683 "preproc.c"
     break;
 
   case 1632: /* lock_type: SHARE  */
-#line 10095 "preproc.y"
+#line 10088 "preproc.y"
  { 
  (yyval.str) = mm_strdup("share");
 }
-#line 50698 "preproc.c"
+#line 50691 "preproc.c"
     break;
 
   case 1633: /* lock_type: SHARE ROW EXCLUSIVE  */
-#line 10099 "preproc.y"
+#line 10092 "preproc.y"
  { 
  (yyval.str) = mm_strdup("share row exclusive");
 }
-#line 50706 "preproc.c"
+#line 50699 "preproc.c"
     break;
 
   case 1634: /* lock_type: EXCLUSIVE  */
-#line 10103 "preproc.y"
+#line 10096 "preproc.y"
  { 
  (yyval.str) = mm_strdup("exclusive");
 }
-#line 50714 "preproc.c"
+#line 50707 "preproc.c"
     break;
 
   case 1635: /* lock_type: ACCESS EXCLUSIVE  */
-#line 10107 "preproc.y"
+#line 10100 "preproc.y"
  { 
  (yyval.str) = mm_strdup("access exclusive");
 }
-#line 50722 "preproc.c"
+#line 50715 "preproc.c"
     break;
 
   case 1636: /* opt_nowait: NOWAIT  */
-#line 10115 "preproc.y"
+#line 10108 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nowait");
 }
-#line 50730 "preproc.c"
+#line 50723 "preproc.c"
     break;
 
   case 1637: /* opt_nowait: %empty  */
-#line 10119 "preproc.y"
+#line 10112 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 50737 "preproc.c"
+#line 50730 "preproc.c"
     break;
 
   case 1638: /* opt_nowait_or_skip: NOWAIT  */
-#line 10126 "preproc.y"
+#line 10119 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nowait");
 }
-#line 50745 "preproc.c"
+#line 50738 "preproc.c"
     break;
 
   case 1639: /* opt_nowait_or_skip: SKIP LOCKED  */
-#line 10130 "preproc.y"
+#line 10123 "preproc.y"
  { 
  (yyval.str) = mm_strdup("skip locked");
 }
-#line 50753 "preproc.c"
+#line 50746 "preproc.c"
     break;
 
   case 1640: /* opt_nowait_or_skip: %empty  */
-#line 10134 "preproc.y"
+#line 10127 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 50760 "preproc.c"
+#line 50753 "preproc.c"
     break;
 
   case 1641: /* UpdateStmt: opt_with_clause UPDATE relation_expr_opt_alias SET set_clause_list from_clause where_or_current_clause returning_clause  */
-#line 10141 "preproc.y"
+#line 10134 "preproc.y"
  { 
  (yyval.str) = cat_str(8,(yyvsp[-7].str),mm_strdup("update"),(yyvsp[-5].str),mm_strdup("set"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 50768 "preproc.c"
+#line 50761 "preproc.c"
     break;
 
   case 1642: /* set_clause_list: set_clause  */
-#line 10149 "preproc.y"
+#line 10142 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50776 "preproc.c"
+#line 50769 "preproc.c"
     break;
 
   case 1643: /* set_clause_list: set_clause_list ',' set_clause  */
-#line 10153 "preproc.y"
+#line 10146 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 50784 "preproc.c"
+#line 50777 "preproc.c"
     break;
 
   case 1644: /* set_clause: set_target '=' a_expr  */
-#line 10161 "preproc.y"
+#line 10154 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
 }
-#line 50792 "preproc.c"
+#line 50785 "preproc.c"
     break;
 
   case 1645: /* set_clause: '(' set_target_list ')' '=' a_expr  */
-#line 10165 "preproc.y"
+#line 10158 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("("),(yyvsp[-3].str),mm_strdup(") ="),(yyvsp[0].str));
 }
-#line 50800 "preproc.c"
+#line 50793 "preproc.c"
     break;
 
   case 1646: /* set_target: ColId opt_indirection  */
-#line 10173 "preproc.y"
+#line 10166 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 50808 "preproc.c"
+#line 50801 "preproc.c"
     break;
 
   case 1647: /* set_target_list: set_target  */
-#line 10181 "preproc.y"
+#line 10174 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50816 "preproc.c"
+#line 50809 "preproc.c"
     break;
 
   case 1648: /* set_target_list: set_target_list ',' set_target  */
-#line 10185 "preproc.y"
+#line 10178 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 50824 "preproc.c"
+#line 50817 "preproc.c"
     break;
 
   case 1649: /* MergeStmt: opt_with_clause MERGE INTO relation_expr_opt_alias USING table_ref ON a_expr merge_when_list  */
-#line 10193 "preproc.y"
+#line 10186 "preproc.y"
  { 
  (yyval.str) = cat_str(8,(yyvsp[-8].str),mm_strdup("merge into"),(yyvsp[-5].str),mm_strdup("using"),(yyvsp[-3].str),mm_strdup("on"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 50832 "preproc.c"
+#line 50825 "preproc.c"
     break;
 
   case 1650: /* merge_when_list: merge_when_clause  */
-#line 10201 "preproc.y"
+#line 10194 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 50840 "preproc.c"
+#line 50833 "preproc.c"
     break;
 
   case 1651: /* merge_when_list: merge_when_list merge_when_clause  */
-#line 10205 "preproc.y"
+#line 10198 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 50848 "preproc.c"
+#line 50841 "preproc.c"
     break;
 
   case 1652: /* merge_when_clause: WHEN MATCHED opt_merge_when_condition THEN merge_update  */
-#line 10213 "preproc.y"
+#line 10206 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("when matched"),(yyvsp[-2].str),mm_strdup("then"),(yyvsp[0].str));
 }
-#line 50856 "preproc.c"
+#line 50849 "preproc.c"
     break;
 
   case 1653: /* merge_when_clause: WHEN MATCHED opt_merge_when_condition THEN merge_delete  */
-#line 10217 "preproc.y"
+#line 10210 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("when matched"),(yyvsp[-2].str),mm_strdup("then"),(yyvsp[0].str));
 }
-#line 50864 "preproc.c"
+#line 50857 "preproc.c"
     break;
 
   case 1654: /* merge_when_clause: WHEN NOT MATCHED opt_merge_when_condition THEN merge_insert  */
-#line 10221 "preproc.y"
+#line 10214 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("when not matched"),(yyvsp[-2].str),mm_strdup("then"),(yyvsp[0].str));
 }
-#line 50872 "preproc.c"
+#line 50865 "preproc.c"
     break;
 
   case 1655: /* merge_when_clause: WHEN MATCHED opt_merge_when_condition THEN DO NOTHING  */
-#line 10225 "preproc.y"
+#line 10218 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("when matched"),(yyvsp[-3].str),mm_strdup("then do nothing"));
 }
-#line 50880 "preproc.c"
+#line 50873 "preproc.c"
     break;
 
   case 1656: /* merge_when_clause: WHEN NOT MATCHED opt_merge_when_condition THEN DO NOTHING  */
-#line 10229 "preproc.y"
+#line 10222 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("when not matched"),(yyvsp[-3].str),mm_strdup("then do nothing"));
 }
-#line 50888 "preproc.c"
+#line 50881 "preproc.c"
     break;
 
   case 1657: /* opt_merge_when_condition: AND a_expr  */
-#line 10237 "preproc.y"
+#line 10230 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("and"),(yyvsp[0].str));
 }
-#line 50896 "preproc.c"
+#line 50889 "preproc.c"
     break;
 
   case 1658: /* opt_merge_when_condition: %empty  */
-#line 10241 "preproc.y"
+#line 10234 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 50903 "preproc.c"
+#line 50896 "preproc.c"
     break;
 
   case 1659: /* merge_update: UPDATE SET set_clause_list  */
-#line 10248 "preproc.y"
+#line 10241 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("update set"),(yyvsp[0].str));
 }
-#line 50911 "preproc.c"
+#line 50904 "preproc.c"
     break;
 
   case 1660: /* merge_delete: DELETE_P  */
-#line 10256 "preproc.y"
+#line 10249 "preproc.y"
  { 
  (yyval.str) = mm_strdup("delete");
 }
-#line 50919 "preproc.c"
+#line 50912 "preproc.c"
     break;
 
   case 1661: /* merge_insert: INSERT merge_values_clause  */
-#line 10264 "preproc.y"
+#line 10257 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("insert"),(yyvsp[0].str));
 }
-#line 50927 "preproc.c"
+#line 50920 "preproc.c"
     break;
 
   case 1662: /* merge_insert: INSERT OVERRIDING override_kind VALUE_P merge_values_clause  */
-#line 10268 "preproc.y"
+#line 10261 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("insert overriding"),(yyvsp[-2].str),mm_strdup("value"),(yyvsp[0].str));
 }
-#line 50935 "preproc.c"
+#line 50928 "preproc.c"
     break;
 
   case 1663: /* merge_insert: INSERT '(' insert_column_list ')' merge_values_clause  */
-#line 10272 "preproc.y"
+#line 10265 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("insert ("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 50943 "preproc.c"
+#line 50936 "preproc.c"
     break;
 
   case 1664: /* merge_insert: INSERT '(' insert_column_list ')' OVERRIDING override_kind VALUE_P merge_values_clause  */
-#line 10276 "preproc.y"
+#line 10269 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("insert ("),(yyvsp[-5].str),mm_strdup(") overriding"),(yyvsp[-2].str),mm_strdup("value"),(yyvsp[0].str));
 }
-#line 50951 "preproc.c"
+#line 50944 "preproc.c"
     break;
 
   case 1665: /* merge_insert: INSERT DEFAULT VALUES  */
-#line 10280 "preproc.y"
+#line 10273 "preproc.y"
  { 
  (yyval.str) = mm_strdup("insert default values");
 }
-#line 50959 "preproc.c"
+#line 50952 "preproc.c"
     break;
 
   case 1666: /* merge_values_clause: VALUES '(' expr_list ')'  */
-#line 10288 "preproc.y"
+#line 10281 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("values ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 50967 "preproc.c"
+#line 50960 "preproc.c"
     break;
 
   case 1667: /* DeclareCursorStmt: DECLARE cursor_name cursor_options CURSOR opt_hold FOR SelectStmt  */
-#line 10296 "preproc.y"
+#line 10289 "preproc.y"
         {
 		struct cursor *ptr, *this;
 		char *cursor_marker = (yyvsp[-5].str)[0] == ':' ? mm_strdup("$0") : mm_strdup((yyvsp[-5].str));
@@ -51014,19 +51007,19 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
 		(yyval.str) = cat2_str(adjust_outofscope_cursor_vars(this), comment);
 	}
-#line 51018 "preproc.c"
+#line 51011 "preproc.c"
     break;
 
   case 1668: /* cursor_name: name  */
-#line 10347 "preproc.y"
+#line 10340 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51026 "preproc.c"
+#line 51019 "preproc.c"
     break;
 
   case 1669: /* cursor_name: char_civar  */
-#line 10351 "preproc.y"
+#line 10344 "preproc.y"
                 {
 			char *curname = mm_alloc(strlen((yyvsp[0].str)) + 2);
 			sprintf(curname, ":%s", (yyvsp[0].str));
@@ -51034,1801 +51027,1801 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			(yyvsp[0].str) = curname;
 			(yyval.str) = (yyvsp[0].str);
 		}
-#line 51038 "preproc.c"
+#line 51031 "preproc.c"
     break;
 
   case 1670: /* cursor_options: %empty  */
-#line 10363 "preproc.y"
+#line 10356 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 51045 "preproc.c"
+#line 51038 "preproc.c"
     break;
 
   case 1671: /* cursor_options: cursor_options NO SCROLL  */
-#line 10366 "preproc.y"
+#line 10359 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("no scroll"));
 }
-#line 51053 "preproc.c"
+#line 51046 "preproc.c"
     break;
 
   case 1672: /* cursor_options: cursor_options SCROLL  */
-#line 10370 "preproc.y"
+#line 10363 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),mm_strdup("scroll"));
 }
-#line 51061 "preproc.c"
+#line 51054 "preproc.c"
     break;
 
   case 1673: /* cursor_options: cursor_options BINARY  */
-#line 10374 "preproc.y"
+#line 10367 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),mm_strdup("binary"));
 }
-#line 51069 "preproc.c"
+#line 51062 "preproc.c"
     break;
 
   case 1674: /* cursor_options: cursor_options ASENSITIVE  */
-#line 10378 "preproc.y"
+#line 10371 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),mm_strdup("asensitive"));
 }
-#line 51077 "preproc.c"
+#line 51070 "preproc.c"
     break;
 
   case 1675: /* cursor_options: cursor_options INSENSITIVE  */
-#line 10382 "preproc.y"
+#line 10375 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),mm_strdup("insensitive"));
 }
-#line 51085 "preproc.c"
+#line 51078 "preproc.c"
     break;
 
   case 1676: /* opt_hold: %empty  */
-#line 10390 "preproc.y"
+#line 10383 "preproc.y"
         {
 		if (compat == ECPG_COMPAT_INFORMIX_SE && autocommit)
 			(yyval.str) = mm_strdup("with hold");
 		else
 			(yyval.str) = EMPTY;
 	}
-#line 51096 "preproc.c"
+#line 51089 "preproc.c"
     break;
 
   case 1677: /* opt_hold: WITH HOLD  */
-#line 10397 "preproc.y"
+#line 10390 "preproc.y"
  { 
  (yyval.str) = mm_strdup("with hold");
 }
-#line 51104 "preproc.c"
+#line 51097 "preproc.c"
     break;
 
   case 1678: /* opt_hold: WITHOUT HOLD  */
-#line 10401 "preproc.y"
+#line 10394 "preproc.y"
  { 
  (yyval.str) = mm_strdup("without hold");
 }
-#line 51112 "preproc.c"
+#line 51105 "preproc.c"
     break;
 
   case 1679: /* SelectStmt: select_no_parens  */
-#line 10409 "preproc.y"
+#line 10402 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51120 "preproc.c"
+#line 51113 "preproc.c"
     break;
 
   case 1680: /* SelectStmt: select_with_parens  */
-#line 10413 "preproc.y"
+#line 10406 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51128 "preproc.c"
+#line 51121 "preproc.c"
     break;
 
   case 1681: /* select_with_parens: '(' select_no_parens ')'  */
-#line 10421 "preproc.y"
+#line 10414 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 51136 "preproc.c"
+#line 51129 "preproc.c"
     break;
 
   case 1682: /* select_with_parens: '(' select_with_parens ')'  */
-#line 10425 "preproc.y"
+#line 10418 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 51144 "preproc.c"
+#line 51137 "preproc.c"
     break;
 
   case 1683: /* select_no_parens: simple_select  */
-#line 10433 "preproc.y"
+#line 10426 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51152 "preproc.c"
+#line 51145 "preproc.c"
     break;
 
   case 1684: /* select_no_parens: select_clause sort_clause  */
-#line 10437 "preproc.y"
+#line 10430 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 51160 "preproc.c"
+#line 51153 "preproc.c"
     break;
 
   case 1685: /* select_no_parens: select_clause opt_sort_clause for_locking_clause opt_select_limit  */
-#line 10441 "preproc.y"
+#line 10434 "preproc.y"
  { 
  (yyval.str) = cat_str(4,(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 51168 "preproc.c"
+#line 51161 "preproc.c"
     break;
 
   case 1686: /* select_no_parens: select_clause opt_sort_clause select_limit opt_for_locking_clause  */
-#line 10445 "preproc.y"
+#line 10438 "preproc.y"
  { 
  (yyval.str) = cat_str(4,(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 51176 "preproc.c"
+#line 51169 "preproc.c"
     break;
 
   case 1687: /* select_no_parens: with_clause select_clause  */
-#line 10449 "preproc.y"
+#line 10442 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 51184 "preproc.c"
+#line 51177 "preproc.c"
     break;
 
   case 1688: /* select_no_parens: with_clause select_clause sort_clause  */
-#line 10453 "preproc.y"
+#line 10446 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 51192 "preproc.c"
+#line 51185 "preproc.c"
     break;
 
   case 1689: /* select_no_parens: with_clause select_clause opt_sort_clause for_locking_clause opt_select_limit  */
-#line 10457 "preproc.y"
+#line 10450 "preproc.y"
  { 
  (yyval.str) = cat_str(5,(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 51200 "preproc.c"
+#line 51193 "preproc.c"
     break;
 
   case 1690: /* select_no_parens: with_clause select_clause opt_sort_clause select_limit opt_for_locking_clause  */
-#line 10461 "preproc.y"
+#line 10454 "preproc.y"
  { 
  (yyval.str) = cat_str(5,(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 51208 "preproc.c"
+#line 51201 "preproc.c"
     break;
 
   case 1691: /* select_clause: simple_select  */
-#line 10469 "preproc.y"
+#line 10462 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51216 "preproc.c"
+#line 51209 "preproc.c"
     break;
 
   case 1692: /* select_clause: select_with_parens  */
-#line 10473 "preproc.y"
+#line 10466 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51224 "preproc.c"
+#line 51217 "preproc.c"
     break;
 
   case 1693: /* simple_select: SELECT opt_all_clause opt_target_list into_clause from_clause where_clause group_clause having_clause window_clause  */
-#line 10481 "preproc.y"
+#line 10474 "preproc.y"
  { 
  (yyval.str) = cat_str(9,mm_strdup("select"),(yyvsp[-7].str),(yyvsp[-6].str),(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 51232 "preproc.c"
+#line 51225 "preproc.c"
     break;
 
   case 1694: /* simple_select: SELECT distinct_clause target_list into_clause from_clause where_clause group_clause having_clause window_clause  */
-#line 10485 "preproc.y"
+#line 10478 "preproc.y"
  { 
  (yyval.str) = cat_str(9,mm_strdup("select"),(yyvsp[-7].str),(yyvsp[-6].str),(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 51240 "preproc.c"
+#line 51233 "preproc.c"
     break;
 
   case 1695: /* simple_select: values_clause  */
-#line 10489 "preproc.y"
+#line 10482 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51248 "preproc.c"
+#line 51241 "preproc.c"
     break;
 
   case 1696: /* simple_select: TABLE relation_expr  */
-#line 10493 "preproc.y"
+#line 10486 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("table"),(yyvsp[0].str));
 }
-#line 51256 "preproc.c"
+#line 51249 "preproc.c"
     break;
 
   case 1697: /* simple_select: select_clause UNION set_quantifier select_clause  */
-#line 10497 "preproc.y"
+#line 10490 "preproc.y"
  { 
  (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("union"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 51264 "preproc.c"
+#line 51257 "preproc.c"
     break;
 
   case 1698: /* simple_select: select_clause INTERSECT set_quantifier select_clause  */
-#line 10501 "preproc.y"
+#line 10494 "preproc.y"
  { 
  (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("intersect"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 51272 "preproc.c"
+#line 51265 "preproc.c"
     break;
 
   case 1699: /* simple_select: select_clause EXCEPT set_quantifier select_clause  */
-#line 10505 "preproc.y"
+#line 10498 "preproc.y"
  { 
  (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("except"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 51280 "preproc.c"
+#line 51273 "preproc.c"
     break;
 
   case 1700: /* with_clause: WITH cte_list  */
-#line 10513 "preproc.y"
+#line 10506 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("with"),(yyvsp[0].str));
 }
-#line 51288 "preproc.c"
+#line 51281 "preproc.c"
     break;
 
   case 1701: /* with_clause: WITH_LA cte_list  */
-#line 10517 "preproc.y"
+#line 10510 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("with"),(yyvsp[0].str));
 }
-#line 51296 "preproc.c"
+#line 51289 "preproc.c"
     break;
 
   case 1702: /* with_clause: WITH RECURSIVE cte_list  */
-#line 10521 "preproc.y"
+#line 10514 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("with recursive"),(yyvsp[0].str));
 }
-#line 51304 "preproc.c"
+#line 51297 "preproc.c"
     break;
 
   case 1703: /* cte_list: common_table_expr  */
-#line 10529 "preproc.y"
+#line 10522 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51312 "preproc.c"
+#line 51305 "preproc.c"
     break;
 
   case 1704: /* cte_list: cte_list ',' common_table_expr  */
-#line 10533 "preproc.y"
+#line 10526 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 51320 "preproc.c"
+#line 51313 "preproc.c"
     break;
 
   case 1705: /* common_table_expr: name opt_name_list AS opt_materialized '(' PreparableStmt ')' opt_search_clause opt_cycle_clause  */
-#line 10541 "preproc.y"
+#line 10534 "preproc.y"
  { 
  (yyval.str) = cat_str(9,(yyvsp[-8].str),(yyvsp[-7].str),mm_strdup("as"),(yyvsp[-5].str),mm_strdup("("),(yyvsp[-3].str),mm_strdup(")"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 51328 "preproc.c"
+#line 51321 "preproc.c"
     break;
 
   case 1706: /* opt_materialized: MATERIALIZED  */
-#line 10549 "preproc.y"
+#line 10542 "preproc.y"
  { 
  (yyval.str) = mm_strdup("materialized");
 }
-#line 51336 "preproc.c"
+#line 51329 "preproc.c"
     break;
 
   case 1707: /* opt_materialized: NOT MATERIALIZED  */
-#line 10553 "preproc.y"
+#line 10546 "preproc.y"
  { 
  (yyval.str) = mm_strdup("not materialized");
 }
-#line 51344 "preproc.c"
+#line 51337 "preproc.c"
     break;
 
   case 1708: /* opt_materialized: %empty  */
-#line 10557 "preproc.y"
+#line 10550 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 51351 "preproc.c"
+#line 51344 "preproc.c"
     break;
 
   case 1709: /* opt_search_clause: SEARCH DEPTH FIRST_P BY columnList SET ColId  */
-#line 10564 "preproc.y"
+#line 10557 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("search depth first by"),(yyvsp[-2].str),mm_strdup("set"),(yyvsp[0].str));
 }
-#line 51359 "preproc.c"
+#line 51352 "preproc.c"
     break;
 
   case 1710: /* opt_search_clause: SEARCH BREADTH FIRST_P BY columnList SET ColId  */
-#line 10568 "preproc.y"
+#line 10561 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("search breadth first by"),(yyvsp[-2].str),mm_strdup("set"),(yyvsp[0].str));
 }
-#line 51367 "preproc.c"
+#line 51360 "preproc.c"
     break;
 
   case 1711: /* opt_search_clause: %empty  */
-#line 10572 "preproc.y"
+#line 10565 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 51374 "preproc.c"
+#line 51367 "preproc.c"
     break;
 
   case 1712: /* opt_cycle_clause: CYCLE columnList SET ColId TO AexprConst DEFAULT AexprConst USING ColId  */
-#line 10579 "preproc.y"
+#line 10572 "preproc.y"
  { 
  (yyval.str) = cat_str(10,mm_strdup("cycle"),(yyvsp[-8].str),mm_strdup("set"),(yyvsp[-6].str),mm_strdup("to"),(yyvsp[-4].str),mm_strdup("default"),(yyvsp[-2].str),mm_strdup("using"),(yyvsp[0].str));
 }
-#line 51382 "preproc.c"
+#line 51375 "preproc.c"
     break;
 
   case 1713: /* opt_cycle_clause: CYCLE columnList SET ColId USING ColId  */
-#line 10583 "preproc.y"
+#line 10576 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("cycle"),(yyvsp[-4].str),mm_strdup("set"),(yyvsp[-2].str),mm_strdup("using"),(yyvsp[0].str));
 }
-#line 51390 "preproc.c"
+#line 51383 "preproc.c"
     break;
 
   case 1714: /* opt_cycle_clause: %empty  */
-#line 10587 "preproc.y"
+#line 10580 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 51397 "preproc.c"
+#line 51390 "preproc.c"
     break;
 
   case 1715: /* opt_with_clause: with_clause  */
-#line 10594 "preproc.y"
+#line 10587 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51405 "preproc.c"
+#line 51398 "preproc.c"
     break;
 
   case 1716: /* opt_with_clause: %empty  */
-#line 10598 "preproc.y"
+#line 10591 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 51412 "preproc.c"
+#line 51405 "preproc.c"
     break;
 
   case 1717: /* into_clause: INTO OptTempTableName  */
-#line 10605 "preproc.y"
+#line 10598 "preproc.y"
                                         {
 						FoundInto = 1;
 						(yyval.str)= cat2_str(mm_strdup("into"), (yyvsp[0].str));
 					}
-#line 51421 "preproc.c"
+#line 51414 "preproc.c"
     break;
 
   case 1718: /* into_clause: ecpg_into  */
-#line 10609 "preproc.y"
+#line 10602 "preproc.y"
                     { (yyval.str) = EMPTY; }
-#line 51427 "preproc.c"
+#line 51420 "preproc.c"
     break;
 
   case 1719: /* into_clause: %empty  */
-#line 10611 "preproc.y"
+#line 10604 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 51434 "preproc.c"
+#line 51427 "preproc.c"
     break;
 
   case 1720: /* OptTempTableName: TEMPORARY opt_table qualified_name  */
-#line 10618 "preproc.y"
+#line 10611 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("temporary"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 51442 "preproc.c"
+#line 51435 "preproc.c"
     break;
 
   case 1721: /* OptTempTableName: TEMP opt_table qualified_name  */
-#line 10622 "preproc.y"
+#line 10615 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("temp"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 51450 "preproc.c"
+#line 51443 "preproc.c"
     break;
 
   case 1722: /* OptTempTableName: LOCAL TEMPORARY opt_table qualified_name  */
-#line 10626 "preproc.y"
+#line 10619 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("local temporary"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 51458 "preproc.c"
+#line 51451 "preproc.c"
     break;
 
   case 1723: /* OptTempTableName: LOCAL TEMP opt_table qualified_name  */
-#line 10630 "preproc.y"
+#line 10623 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("local temp"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 51466 "preproc.c"
+#line 51459 "preproc.c"
     break;
 
   case 1724: /* OptTempTableName: GLOBAL TEMPORARY opt_table qualified_name  */
-#line 10634 "preproc.y"
+#line 10627 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("global temporary"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 51474 "preproc.c"
+#line 51467 "preproc.c"
     break;
 
   case 1725: /* OptTempTableName: GLOBAL TEMP opt_table qualified_name  */
-#line 10638 "preproc.y"
+#line 10631 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("global temp"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 51482 "preproc.c"
+#line 51475 "preproc.c"
     break;
 
   case 1726: /* OptTempTableName: UNLOGGED opt_table qualified_name  */
-#line 10642 "preproc.y"
+#line 10635 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("unlogged"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 51490 "preproc.c"
+#line 51483 "preproc.c"
     break;
 
   case 1727: /* OptTempTableName: TABLE qualified_name  */
-#line 10646 "preproc.y"
+#line 10639 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("table"),(yyvsp[0].str));
 }
-#line 51498 "preproc.c"
+#line 51491 "preproc.c"
     break;
 
   case 1728: /* OptTempTableName: qualified_name  */
-#line 10650 "preproc.y"
+#line 10643 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51506 "preproc.c"
+#line 51499 "preproc.c"
     break;
 
   case 1729: /* opt_table: TABLE  */
-#line 10658 "preproc.y"
+#line 10651 "preproc.y"
  { 
  (yyval.str) = mm_strdup("table");
 }
-#line 51514 "preproc.c"
+#line 51507 "preproc.c"
     break;
 
   case 1730: /* opt_table: %empty  */
-#line 10662 "preproc.y"
+#line 10655 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 51521 "preproc.c"
+#line 51514 "preproc.c"
     break;
 
   case 1731: /* set_quantifier: ALL  */
-#line 10669 "preproc.y"
+#line 10662 "preproc.y"
  { 
  (yyval.str) = mm_strdup("all");
 }
-#line 51529 "preproc.c"
+#line 51522 "preproc.c"
     break;
 
   case 1732: /* set_quantifier: DISTINCT  */
-#line 10673 "preproc.y"
+#line 10666 "preproc.y"
  { 
  (yyval.str) = mm_strdup("distinct");
 }
-#line 51537 "preproc.c"
+#line 51530 "preproc.c"
     break;
 
   case 1733: /* set_quantifier: %empty  */
-#line 10677 "preproc.y"
+#line 10670 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 51544 "preproc.c"
+#line 51537 "preproc.c"
     break;
 
   case 1734: /* distinct_clause: DISTINCT  */
-#line 10684 "preproc.y"
+#line 10677 "preproc.y"
  { 
  (yyval.str) = mm_strdup("distinct");
 }
-#line 51552 "preproc.c"
+#line 51545 "preproc.c"
     break;
 
   case 1735: /* distinct_clause: DISTINCT ON '(' expr_list ')'  */
-#line 10688 "preproc.y"
+#line 10681 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("distinct on ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 51560 "preproc.c"
+#line 51553 "preproc.c"
     break;
 
   case 1736: /* opt_all_clause: ALL  */
-#line 10696 "preproc.y"
+#line 10689 "preproc.y"
  { 
  (yyval.str) = mm_strdup("all");
 }
-#line 51568 "preproc.c"
+#line 51561 "preproc.c"
     break;
 
   case 1737: /* opt_all_clause: %empty  */
-#line 10700 "preproc.y"
+#line 10693 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 51575 "preproc.c"
+#line 51568 "preproc.c"
     break;
 
   case 1738: /* opt_sort_clause: sort_clause  */
-#line 10707 "preproc.y"
+#line 10700 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51583 "preproc.c"
+#line 51576 "preproc.c"
     break;
 
   case 1739: /* opt_sort_clause: %empty  */
-#line 10711 "preproc.y"
+#line 10704 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 51590 "preproc.c"
+#line 51583 "preproc.c"
     break;
 
   case 1740: /* sort_clause: ORDER BY sortby_list  */
-#line 10718 "preproc.y"
+#line 10711 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("order by"),(yyvsp[0].str));
 }
-#line 51598 "preproc.c"
+#line 51591 "preproc.c"
     break;
 
   case 1741: /* sortby_list: sortby  */
-#line 10726 "preproc.y"
+#line 10719 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51606 "preproc.c"
+#line 51599 "preproc.c"
     break;
 
   case 1742: /* sortby_list: sortby_list ',' sortby  */
-#line 10730 "preproc.y"
+#line 10723 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 51614 "preproc.c"
+#line 51607 "preproc.c"
     break;
 
   case 1743: /* sortby: a_expr USING qual_all_Op opt_nulls_order  */
-#line 10738 "preproc.y"
+#line 10731 "preproc.y"
  { 
  (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("using"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 51622 "preproc.c"
+#line 51615 "preproc.c"
     break;
 
   case 1744: /* sortby: a_expr opt_asc_desc opt_nulls_order  */
-#line 10742 "preproc.y"
+#line 10735 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 51630 "preproc.c"
+#line 51623 "preproc.c"
     break;
 
   case 1745: /* select_limit: limit_clause offset_clause  */
-#line 10750 "preproc.y"
+#line 10743 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 51638 "preproc.c"
+#line 51631 "preproc.c"
     break;
 
   case 1746: /* select_limit: offset_clause limit_clause  */
-#line 10754 "preproc.y"
+#line 10747 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 51646 "preproc.c"
+#line 51639 "preproc.c"
     break;
 
   case 1747: /* select_limit: limit_clause  */
-#line 10758 "preproc.y"
+#line 10751 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51654 "preproc.c"
+#line 51647 "preproc.c"
     break;
 
   case 1748: /* select_limit: offset_clause  */
-#line 10762 "preproc.y"
+#line 10755 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51662 "preproc.c"
+#line 51655 "preproc.c"
     break;
 
   case 1749: /* opt_select_limit: select_limit  */
-#line 10770 "preproc.y"
+#line 10763 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51670 "preproc.c"
+#line 51663 "preproc.c"
     break;
 
   case 1750: /* opt_select_limit: %empty  */
-#line 10774 "preproc.y"
+#line 10767 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 51677 "preproc.c"
+#line 51670 "preproc.c"
     break;
 
   case 1751: /* limit_clause: LIMIT select_limit_value  */
-#line 10781 "preproc.y"
+#line 10774 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("limit"),(yyvsp[0].str));
 }
-#line 51685 "preproc.c"
+#line 51678 "preproc.c"
     break;
 
   case 1752: /* limit_clause: LIMIT select_limit_value ',' select_offset_value  */
-#line 10785 "preproc.y"
+#line 10778 "preproc.y"
         {
 		mmerror(PARSE_ERROR, ET_WARNING, "no longer supported LIMIT #,# syntax passed to server");
 		(yyval.str) = cat_str(4, mm_strdup("limit"), (yyvsp[-2].str), mm_strdup(","), (yyvsp[0].str));
 	}
-#line 51694 "preproc.c"
+#line 51687 "preproc.c"
     break;
 
   case 1753: /* limit_clause: FETCH first_or_next select_fetch_first_value row_or_rows ONLY  */
-#line 10790 "preproc.y"
+#line 10783 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("fetch"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup("only"));
 }
-#line 51702 "preproc.c"
+#line 51695 "preproc.c"
     break;
 
   case 1754: /* limit_clause: FETCH first_or_next select_fetch_first_value row_or_rows WITH TIES  */
-#line 10794 "preproc.y"
+#line 10787 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("fetch"),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("with ties"));
 }
-#line 51710 "preproc.c"
+#line 51703 "preproc.c"
     break;
 
   case 1755: /* limit_clause: FETCH first_or_next row_or_rows ONLY  */
-#line 10798 "preproc.y"
+#line 10791 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("fetch"),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup("only"));
 }
-#line 51718 "preproc.c"
+#line 51711 "preproc.c"
     break;
 
   case 1756: /* limit_clause: FETCH first_or_next row_or_rows WITH TIES  */
-#line 10802 "preproc.y"
+#line 10795 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("fetch"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("with ties"));
 }
-#line 51726 "preproc.c"
+#line 51719 "preproc.c"
     break;
 
   case 1757: /* offset_clause: OFFSET select_offset_value  */
-#line 10810 "preproc.y"
+#line 10803 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("offset"),(yyvsp[0].str));
 }
-#line 51734 "preproc.c"
+#line 51727 "preproc.c"
     break;
 
   case 1758: /* offset_clause: OFFSET select_fetch_first_value row_or_rows  */
-#line 10814 "preproc.y"
+#line 10807 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("offset"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 51742 "preproc.c"
+#line 51735 "preproc.c"
     break;
 
   case 1759: /* select_limit_value: a_expr  */
-#line 10822 "preproc.y"
+#line 10815 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51750 "preproc.c"
+#line 51743 "preproc.c"
     break;
 
   case 1760: /* select_limit_value: ALL  */
-#line 10826 "preproc.y"
+#line 10819 "preproc.y"
  { 
  (yyval.str) = mm_strdup("all");
 }
-#line 51758 "preproc.c"
+#line 51751 "preproc.c"
     break;
 
   case 1761: /* select_offset_value: a_expr  */
-#line 10834 "preproc.y"
+#line 10827 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51766 "preproc.c"
+#line 51759 "preproc.c"
     break;
 
   case 1762: /* select_fetch_first_value: c_expr  */
-#line 10842 "preproc.y"
+#line 10835 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51774 "preproc.c"
+#line 51767 "preproc.c"
     break;
 
   case 1763: /* select_fetch_first_value: '+' I_or_F_const  */
-#line 10846 "preproc.y"
+#line 10839 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("+"),(yyvsp[0].str));
 }
-#line 51782 "preproc.c"
+#line 51775 "preproc.c"
     break;
 
   case 1764: /* select_fetch_first_value: '-' I_or_F_const  */
-#line 10850 "preproc.y"
+#line 10843 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("-"),(yyvsp[0].str));
 }
-#line 51790 "preproc.c"
+#line 51783 "preproc.c"
     break;
 
   case 1765: /* I_or_F_const: Iconst  */
-#line 10858 "preproc.y"
+#line 10851 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51798 "preproc.c"
+#line 51791 "preproc.c"
     break;
 
   case 1766: /* I_or_F_const: ecpg_fconst  */
-#line 10862 "preproc.y"
+#line 10855 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51806 "preproc.c"
+#line 51799 "preproc.c"
     break;
 
   case 1767: /* row_or_rows: ROW  */
-#line 10870 "preproc.y"
+#line 10863 "preproc.y"
  { 
  (yyval.str) = mm_strdup("row");
 }
-#line 51814 "preproc.c"
+#line 51807 "preproc.c"
     break;
 
   case 1768: /* row_or_rows: ROWS  */
-#line 10874 "preproc.y"
+#line 10867 "preproc.y"
  { 
  (yyval.str) = mm_strdup("rows");
 }
-#line 51822 "preproc.c"
+#line 51815 "preproc.c"
     break;
 
   case 1769: /* first_or_next: FIRST_P  */
-#line 10882 "preproc.y"
+#line 10875 "preproc.y"
  { 
  (yyval.str) = mm_strdup("first");
 }
-#line 51830 "preproc.c"
+#line 51823 "preproc.c"
     break;
 
   case 1770: /* first_or_next: NEXT  */
-#line 10886 "preproc.y"
+#line 10879 "preproc.y"
  { 
  (yyval.str) = mm_strdup("next");
 }
-#line 51838 "preproc.c"
+#line 51831 "preproc.c"
     break;
 
   case 1771: /* group_clause: GROUP_P BY set_quantifier group_by_list  */
-#line 10894 "preproc.y"
+#line 10887 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("group by"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 51846 "preproc.c"
+#line 51839 "preproc.c"
     break;
 
   case 1772: /* group_clause: %empty  */
-#line 10898 "preproc.y"
+#line 10891 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 51853 "preproc.c"
+#line 51846 "preproc.c"
     break;
 
   case 1773: /* group_by_list: group_by_item  */
-#line 10905 "preproc.y"
+#line 10898 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51861 "preproc.c"
+#line 51854 "preproc.c"
     break;
 
   case 1774: /* group_by_list: group_by_list ',' group_by_item  */
-#line 10909 "preproc.y"
+#line 10902 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 51869 "preproc.c"
+#line 51862 "preproc.c"
     break;
 
   case 1775: /* group_by_item: a_expr  */
-#line 10917 "preproc.y"
+#line 10910 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51877 "preproc.c"
+#line 51870 "preproc.c"
     break;
 
   case 1776: /* group_by_item: empty_grouping_set  */
-#line 10921 "preproc.y"
+#line 10914 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51885 "preproc.c"
+#line 51878 "preproc.c"
     break;
 
   case 1777: /* group_by_item: cube_clause  */
-#line 10925 "preproc.y"
+#line 10918 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51893 "preproc.c"
+#line 51886 "preproc.c"
     break;
 
   case 1778: /* group_by_item: rollup_clause  */
-#line 10929 "preproc.y"
+#line 10922 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51901 "preproc.c"
+#line 51894 "preproc.c"
     break;
 
   case 1779: /* group_by_item: grouping_sets_clause  */
-#line 10933 "preproc.y"
+#line 10926 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51909 "preproc.c"
+#line 51902 "preproc.c"
     break;
 
   case 1780: /* empty_grouping_set: '(' ')'  */
-#line 10941 "preproc.y"
+#line 10934 "preproc.y"
  { 
  (yyval.str) = mm_strdup("( )");
 }
-#line 51917 "preproc.c"
+#line 51910 "preproc.c"
     break;
 
   case 1781: /* rollup_clause: ROLLUP '(' expr_list ')'  */
-#line 10949 "preproc.y"
+#line 10942 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("rollup ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 51925 "preproc.c"
+#line 51918 "preproc.c"
     break;
 
   case 1782: /* cube_clause: CUBE '(' expr_list ')'  */
-#line 10957 "preproc.y"
+#line 10950 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("cube ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 51933 "preproc.c"
+#line 51926 "preproc.c"
     break;
 
   case 1783: /* grouping_sets_clause: GROUPING SETS '(' group_by_list ')'  */
-#line 10965 "preproc.y"
+#line 10958 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("grouping sets ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 51941 "preproc.c"
+#line 51934 "preproc.c"
     break;
 
   case 1784: /* having_clause: HAVING a_expr  */
-#line 10973 "preproc.y"
+#line 10966 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("having"),(yyvsp[0].str));
 }
-#line 51949 "preproc.c"
+#line 51942 "preproc.c"
     break;
 
   case 1785: /* having_clause: %empty  */
-#line 10977 "preproc.y"
+#line 10970 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 51956 "preproc.c"
+#line 51949 "preproc.c"
     break;
 
   case 1786: /* for_locking_clause: for_locking_items  */
-#line 10984 "preproc.y"
+#line 10977 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51964 "preproc.c"
+#line 51957 "preproc.c"
     break;
 
   case 1787: /* for_locking_clause: FOR READ ONLY  */
-#line 10988 "preproc.y"
+#line 10981 "preproc.y"
  { 
  (yyval.str) = mm_strdup("for read only");
 }
-#line 51972 "preproc.c"
+#line 51965 "preproc.c"
     break;
 
   case 1788: /* opt_for_locking_clause: for_locking_clause  */
-#line 10996 "preproc.y"
+#line 10989 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51980 "preproc.c"
+#line 51973 "preproc.c"
     break;
 
   case 1789: /* opt_for_locking_clause: %empty  */
-#line 11000 "preproc.y"
+#line 10993 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 51987 "preproc.c"
+#line 51980 "preproc.c"
     break;
 
   case 1790: /* for_locking_items: for_locking_item  */
-#line 11007 "preproc.y"
+#line 11000 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 51995 "preproc.c"
+#line 51988 "preproc.c"
     break;
 
   case 1791: /* for_locking_items: for_locking_items for_locking_item  */
-#line 11011 "preproc.y"
+#line 11004 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 52003 "preproc.c"
+#line 51996 "preproc.c"
     break;
 
   case 1792: /* for_locking_item: for_locking_strength locked_rels_list opt_nowait_or_skip  */
-#line 11019 "preproc.y"
+#line 11012 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 52011 "preproc.c"
+#line 52004 "preproc.c"
     break;
 
   case 1793: /* for_locking_strength: FOR UPDATE  */
-#line 11027 "preproc.y"
+#line 11020 "preproc.y"
  { 
  (yyval.str) = mm_strdup("for update");
 }
-#line 52019 "preproc.c"
+#line 52012 "preproc.c"
     break;
 
   case 1794: /* for_locking_strength: FOR NO KEY UPDATE  */
-#line 11031 "preproc.y"
+#line 11024 "preproc.y"
  { 
  (yyval.str) = mm_strdup("for no key update");
 }
-#line 52027 "preproc.c"
+#line 52020 "preproc.c"
     break;
 
   case 1795: /* for_locking_strength: FOR SHARE  */
-#line 11035 "preproc.y"
+#line 11028 "preproc.y"
  { 
  (yyval.str) = mm_strdup("for share");
 }
-#line 52035 "preproc.c"
+#line 52028 "preproc.c"
     break;
 
   case 1796: /* for_locking_strength: FOR KEY SHARE  */
-#line 11039 "preproc.y"
+#line 11032 "preproc.y"
  { 
  (yyval.str) = mm_strdup("for key share");
 }
-#line 52043 "preproc.c"
+#line 52036 "preproc.c"
     break;
 
   case 1797: /* locked_rels_list: OF qualified_name_list  */
-#line 11047 "preproc.y"
+#line 11040 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("of"),(yyvsp[0].str));
 }
-#line 52051 "preproc.c"
+#line 52044 "preproc.c"
     break;
 
   case 1798: /* locked_rels_list: %empty  */
-#line 11051 "preproc.y"
+#line 11044 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 52058 "preproc.c"
+#line 52051 "preproc.c"
     break;
 
   case 1799: /* values_clause: VALUES '(' expr_list ')'  */
-#line 11058 "preproc.y"
+#line 11051 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("values ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 52066 "preproc.c"
+#line 52059 "preproc.c"
     break;
 
   case 1800: /* values_clause: values_clause ',' '(' expr_list ')'  */
-#line 11062 "preproc.y"
+#line 11055 "preproc.y"
  { 
  (yyval.str) = cat_str(4,(yyvsp[-4].str),mm_strdup(", ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 52074 "preproc.c"
+#line 52067 "preproc.c"
     break;
 
   case 1801: /* from_clause: FROM from_list  */
-#line 11070 "preproc.y"
+#line 11063 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("from"),(yyvsp[0].str));
 }
-#line 52082 "preproc.c"
+#line 52075 "preproc.c"
     break;
 
   case 1802: /* from_clause: %empty  */
-#line 11074 "preproc.y"
+#line 11067 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 52089 "preproc.c"
+#line 52082 "preproc.c"
     break;
 
   case 1803: /* from_list: table_ref  */
-#line 11081 "preproc.y"
+#line 11074 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 52097 "preproc.c"
+#line 52090 "preproc.c"
     break;
 
   case 1804: /* from_list: from_list ',' table_ref  */
-#line 11085 "preproc.y"
+#line 11078 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 52105 "preproc.c"
+#line 52098 "preproc.c"
     break;
 
   case 1805: /* table_ref: relation_expr opt_alias_clause  */
-#line 11093 "preproc.y"
+#line 11086 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 52113 "preproc.c"
+#line 52106 "preproc.c"
     break;
 
   case 1806: /* table_ref: relation_expr opt_alias_clause tablesample_clause  */
-#line 11097 "preproc.y"
+#line 11090 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 52121 "preproc.c"
+#line 52114 "preproc.c"
     break;
 
   case 1807: /* table_ref: func_table func_alias_clause  */
-#line 11101 "preproc.y"
+#line 11094 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 52129 "preproc.c"
+#line 52122 "preproc.c"
     break;
 
   case 1808: /* table_ref: LATERAL_P func_table func_alias_clause  */
-#line 11105 "preproc.y"
+#line 11098 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("lateral"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 52137 "preproc.c"
+#line 52130 "preproc.c"
     break;
 
   case 1809: /* table_ref: xmltable opt_alias_clause  */
-#line 11109 "preproc.y"
+#line 11102 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 52145 "preproc.c"
+#line 52138 "preproc.c"
     break;
 
   case 1810: /* table_ref: LATERAL_P xmltable opt_alias_clause  */
-#line 11113 "preproc.y"
+#line 11106 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("lateral"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 52153 "preproc.c"
+#line 52146 "preproc.c"
     break;
 
   case 1811: /* table_ref: select_with_parens opt_alias_clause  */
-#line 11117 "preproc.y"
+#line 11110 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 52161 "preproc.c"
+#line 52154 "preproc.c"
     break;
 
   case 1812: /* table_ref: LATERAL_P select_with_parens opt_alias_clause  */
-#line 11121 "preproc.y"
+#line 11114 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("lateral"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 52169 "preproc.c"
+#line 52162 "preproc.c"
     break;
 
   case 1813: /* table_ref: joined_table  */
-#line 11125 "preproc.y"
+#line 11118 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 52177 "preproc.c"
+#line 52170 "preproc.c"
     break;
 
   case 1814: /* table_ref: '(' joined_table ')' alias_clause  */
-#line 11129 "preproc.y"
+#line 11122 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 52185 "preproc.c"
+#line 52178 "preproc.c"
     break;
 
   case 1815: /* joined_table: '(' joined_table ')'  */
-#line 11137 "preproc.y"
+#line 11130 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 52193 "preproc.c"
+#line 52186 "preproc.c"
     break;
 
   case 1816: /* joined_table: table_ref CROSS JOIN table_ref  */
-#line 11141 "preproc.y"
+#line 11134 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-3].str),mm_strdup("cross join"),(yyvsp[0].str));
 }
-#line 52201 "preproc.c"
+#line 52194 "preproc.c"
     break;
 
   case 1817: /* joined_table: table_ref join_type JOIN table_ref join_qual  */
-#line 11145 "preproc.y"
+#line 11138 "preproc.y"
  { 
  (yyval.str) = cat_str(5,(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("join"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 52209 "preproc.c"
+#line 52202 "preproc.c"
     break;
 
   case 1818: /* joined_table: table_ref JOIN table_ref join_qual  */
-#line 11149 "preproc.y"
+#line 11142 "preproc.y"
  { 
  (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("join"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 52217 "preproc.c"
+#line 52210 "preproc.c"
     break;
 
   case 1819: /* joined_table: table_ref NATURAL join_type JOIN table_ref  */
-#line 11153 "preproc.y"
+#line 11146 "preproc.y"
  { 
  (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("natural"),(yyvsp[-2].str),mm_strdup("join"),(yyvsp[0].str));
 }
-#line 52225 "preproc.c"
+#line 52218 "preproc.c"
     break;
 
   case 1820: /* joined_table: table_ref NATURAL JOIN table_ref  */
-#line 11157 "preproc.y"
+#line 11150 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-3].str),mm_strdup("natural join"),(yyvsp[0].str));
 }
-#line 52233 "preproc.c"
+#line 52226 "preproc.c"
     break;
 
   case 1821: /* alias_clause: AS ColId '(' name_list ')'  */
-#line 11165 "preproc.y"
+#line 11158 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("as"),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 52241 "preproc.c"
+#line 52234 "preproc.c"
     break;
 
   case 1822: /* alias_clause: AS ColId  */
-#line 11169 "preproc.y"
+#line 11162 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("as"),(yyvsp[0].str));
 }
-#line 52249 "preproc.c"
+#line 52242 "preproc.c"
     break;
 
   case 1823: /* alias_clause: ColId '(' name_list ')'  */
-#line 11173 "preproc.y"
+#line 11166 "preproc.y"
  { 
  (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 52257 "preproc.c"
+#line 52250 "preproc.c"
     break;
 
   case 1824: /* alias_clause: ColId  */
-#line 11177 "preproc.y"
+#line 11170 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 52265 "preproc.c"
+#line 52258 "preproc.c"
     break;
 
   case 1825: /* opt_alias_clause: alias_clause  */
-#line 11185 "preproc.y"
+#line 11178 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 52273 "preproc.c"
+#line 52266 "preproc.c"
     break;
 
   case 1826: /* opt_alias_clause: %empty  */
-#line 11189 "preproc.y"
+#line 11182 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 52280 "preproc.c"
+#line 52273 "preproc.c"
     break;
 
   case 1827: /* opt_alias_clause_for_join_using: AS ColId  */
-#line 11196 "preproc.y"
+#line 11189 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("as"),(yyvsp[0].str));
 }
-#line 52288 "preproc.c"
+#line 52281 "preproc.c"
     break;
 
   case 1828: /* opt_alias_clause_for_join_using: %empty  */
-#line 11200 "preproc.y"
+#line 11193 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 52295 "preproc.c"
+#line 52288 "preproc.c"
     break;
 
   case 1829: /* func_alias_clause: alias_clause  */
-#line 11207 "preproc.y"
+#line 11200 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 52303 "preproc.c"
+#line 52296 "preproc.c"
     break;
 
   case 1830: /* func_alias_clause: AS '(' TableFuncElementList ')'  */
-#line 11211 "preproc.y"
+#line 11204 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("as ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 52311 "preproc.c"
+#line 52304 "preproc.c"
     break;
 
   case 1831: /* func_alias_clause: AS ColId '(' TableFuncElementList ')'  */
-#line 11215 "preproc.y"
+#line 11208 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("as"),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 52319 "preproc.c"
+#line 52312 "preproc.c"
     break;
 
   case 1832: /* func_alias_clause: ColId '(' TableFuncElementList ')'  */
-#line 11219 "preproc.y"
+#line 11212 "preproc.y"
  { 
  (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 52327 "preproc.c"
+#line 52320 "preproc.c"
     break;
 
   case 1833: /* func_alias_clause: %empty  */
-#line 11223 "preproc.y"
+#line 11216 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 52334 "preproc.c"
+#line 52327 "preproc.c"
     break;
 
   case 1834: /* join_type: FULL opt_outer  */
-#line 11230 "preproc.y"
+#line 11223 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("full"),(yyvsp[0].str));
 }
-#line 52342 "preproc.c"
+#line 52335 "preproc.c"
     break;
 
   case 1835: /* join_type: LEFT opt_outer  */
-#line 11234 "preproc.y"
+#line 11227 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("left"),(yyvsp[0].str));
 }
-#line 52350 "preproc.c"
+#line 52343 "preproc.c"
     break;
 
   case 1836: /* join_type: RIGHT opt_outer  */
-#line 11238 "preproc.y"
+#line 11231 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("right"),(yyvsp[0].str));
 }
-#line 52358 "preproc.c"
+#line 52351 "preproc.c"
     break;
 
   case 1837: /* join_type: INNER_P  */
-#line 11242 "preproc.y"
+#line 11235 "preproc.y"
  { 
  (yyval.str) = mm_strdup("inner");
 }
-#line 52366 "preproc.c"
+#line 52359 "preproc.c"
     break;
 
   case 1838: /* opt_outer: OUTER_P  */
-#line 11250 "preproc.y"
+#line 11243 "preproc.y"
  { 
  (yyval.str) = mm_strdup("outer");
 }
-#line 52374 "preproc.c"
+#line 52367 "preproc.c"
     break;
 
   case 1839: /* opt_outer: %empty  */
-#line 11254 "preproc.y"
+#line 11247 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 52381 "preproc.c"
+#line 52374 "preproc.c"
     break;
 
   case 1840: /* join_qual: USING '(' name_list ')' opt_alias_clause_for_join_using  */
-#line 11261 "preproc.y"
+#line 11254 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("using ("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 52389 "preproc.c"
+#line 52382 "preproc.c"
     break;
 
   case 1841: /* join_qual: ON a_expr  */
-#line 11265 "preproc.y"
+#line 11258 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("on"),(yyvsp[0].str));
 }
-#line 52397 "preproc.c"
+#line 52390 "preproc.c"
     break;
 
   case 1842: /* relation_expr: qualified_name  */
-#line 11273 "preproc.y"
+#line 11266 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 52405 "preproc.c"
+#line 52398 "preproc.c"
     break;
 
   case 1843: /* relation_expr: extended_relation_expr  */
-#line 11277 "preproc.y"
+#line 11270 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 52413 "preproc.c"
+#line 52406 "preproc.c"
     break;
 
   case 1844: /* extended_relation_expr: qualified_name '*'  */
-#line 11285 "preproc.y"
+#line 11278 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),mm_strdup("*"));
 }
-#line 52421 "preproc.c"
+#line 52414 "preproc.c"
     break;
 
   case 1845: /* extended_relation_expr: ONLY qualified_name  */
-#line 11289 "preproc.y"
+#line 11282 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("only"),(yyvsp[0].str));
 }
-#line 52429 "preproc.c"
+#line 52422 "preproc.c"
     break;
 
   case 1846: /* extended_relation_expr: ONLY '(' qualified_name ')'  */
-#line 11293 "preproc.y"
+#line 11286 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("only ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 52437 "preproc.c"
+#line 52430 "preproc.c"
     break;
 
   case 1847: /* relation_expr_list: relation_expr  */
-#line 11301 "preproc.y"
+#line 11294 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 52445 "preproc.c"
+#line 52438 "preproc.c"
     break;
 
   case 1848: /* relation_expr_list: relation_expr_list ',' relation_expr  */
-#line 11305 "preproc.y"
+#line 11298 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 52453 "preproc.c"
+#line 52446 "preproc.c"
     break;
 
   case 1849: /* relation_expr_opt_alias: relation_expr  */
-#line 11313 "preproc.y"
+#line 11306 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 52461 "preproc.c"
+#line 52454 "preproc.c"
     break;
 
   case 1850: /* relation_expr_opt_alias: relation_expr ColId  */
-#line 11317 "preproc.y"
+#line 11310 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 52469 "preproc.c"
+#line 52462 "preproc.c"
     break;
 
   case 1851: /* relation_expr_opt_alias: relation_expr AS ColId  */
-#line 11321 "preproc.y"
+#line 11314 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("as"),(yyvsp[0].str));
 }
-#line 52477 "preproc.c"
+#line 52470 "preproc.c"
     break;
 
   case 1852: /* tablesample_clause: TABLESAMPLE func_name '(' expr_list ')' opt_repeatable_clause  */
-#line 11329 "preproc.y"
+#line 11322 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("tablesample"),(yyvsp[-4].str),mm_strdup("("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 52485 "preproc.c"
+#line 52478 "preproc.c"
     break;
 
   case 1853: /* opt_repeatable_clause: REPEATABLE '(' a_expr ')'  */
-#line 11337 "preproc.y"
+#line 11330 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("repeatable ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 52493 "preproc.c"
+#line 52486 "preproc.c"
     break;
 
   case 1854: /* opt_repeatable_clause: %empty  */
-#line 11341 "preproc.y"
+#line 11334 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 52500 "preproc.c"
+#line 52493 "preproc.c"
     break;
 
   case 1855: /* func_table: func_expr_windowless opt_ordinality  */
-#line 11348 "preproc.y"
+#line 11341 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 52508 "preproc.c"
+#line 52501 "preproc.c"
     break;
 
   case 1856: /* func_table: ROWS FROM '(' rowsfrom_list ')' opt_ordinality  */
-#line 11352 "preproc.y"
+#line 11345 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("rows from ("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 52516 "preproc.c"
+#line 52509 "preproc.c"
     break;
 
   case 1857: /* rowsfrom_item: func_expr_windowless opt_col_def_list  */
-#line 11360 "preproc.y"
+#line 11353 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 52524 "preproc.c"
+#line 52517 "preproc.c"
     break;
 
   case 1858: /* rowsfrom_list: rowsfrom_item  */
-#line 11368 "preproc.y"
+#line 11361 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 52532 "preproc.c"
+#line 52525 "preproc.c"
     break;
 
   case 1859: /* rowsfrom_list: rowsfrom_list ',' rowsfrom_item  */
-#line 11372 "preproc.y"
+#line 11365 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 52540 "preproc.c"
+#line 52533 "preproc.c"
     break;
 
   case 1860: /* opt_col_def_list: AS '(' TableFuncElementList ')'  */
-#line 11380 "preproc.y"
+#line 11373 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("as ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 52548 "preproc.c"
+#line 52541 "preproc.c"
     break;
 
   case 1861: /* opt_col_def_list: %empty  */
-#line 11384 "preproc.y"
+#line 11377 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 52555 "preproc.c"
+#line 52548 "preproc.c"
     break;
 
   case 1862: /* opt_ordinality: WITH_LA ORDINALITY  */
-#line 11391 "preproc.y"
+#line 11384 "preproc.y"
  { 
  (yyval.str) = mm_strdup("with ordinality");
 }
-#line 52563 "preproc.c"
+#line 52556 "preproc.c"
     break;
 
   case 1863: /* opt_ordinality: %empty  */
-#line 11395 "preproc.y"
+#line 11388 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 52570 "preproc.c"
+#line 52563 "preproc.c"
     break;
 
   case 1864: /* where_clause: WHERE a_expr  */
-#line 11402 "preproc.y"
+#line 11395 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("where"),(yyvsp[0].str));
 }
-#line 52578 "preproc.c"
+#line 52571 "preproc.c"
     break;
 
   case 1865: /* where_clause: %empty  */
-#line 11406 "preproc.y"
+#line 11399 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 52585 "preproc.c"
+#line 52578 "preproc.c"
     break;
 
   case 1866: /* where_or_current_clause: WHERE a_expr  */
-#line 11413 "preproc.y"
+#line 11406 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("where"),(yyvsp[0].str));
 }
-#line 52593 "preproc.c"
+#line 52586 "preproc.c"
     break;
 
   case 1867: /* where_or_current_clause: WHERE CURRENT_P OF cursor_name  */
-#line 11417 "preproc.y"
+#line 11410 "preproc.y"
         {
 		char *cursor_marker = (yyvsp[0].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[0].str);
 		(yyval.str) = cat_str(2,mm_strdup("where current of"), cursor_marker);
 	}
-#line 52602 "preproc.c"
+#line 52595 "preproc.c"
     break;
 
   case 1868: /* where_or_current_clause: %empty  */
-#line 11422 "preproc.y"
+#line 11415 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 52609 "preproc.c"
+#line 52602 "preproc.c"
     break;
 
   case 1869: /* OptTableFuncElementList: TableFuncElementList  */
-#line 11429 "preproc.y"
+#line 11422 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 52617 "preproc.c"
+#line 52610 "preproc.c"
     break;
 
   case 1870: /* OptTableFuncElementList: %empty  */
-#line 11433 "preproc.y"
+#line 11426 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 52624 "preproc.c"
+#line 52617 "preproc.c"
     break;
 
   case 1871: /* TableFuncElementList: TableFuncElement  */
-#line 11440 "preproc.y"
+#line 11433 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 52632 "preproc.c"
+#line 52625 "preproc.c"
     break;
 
   case 1872: /* TableFuncElementList: TableFuncElementList ',' TableFuncElement  */
-#line 11444 "preproc.y"
+#line 11437 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 52640 "preproc.c"
+#line 52633 "preproc.c"
     break;
 
   case 1873: /* TableFuncElement: ColId Typename opt_collate_clause  */
-#line 11452 "preproc.y"
+#line 11445 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 52648 "preproc.c"
+#line 52641 "preproc.c"
     break;
 
   case 1874: /* xmltable: XMLTABLE '(' c_expr xmlexists_argument COLUMNS xmltable_column_list ')'  */
-#line 11460 "preproc.y"
+#line 11453 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("xmltable ("),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("columns"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 52656 "preproc.c"
+#line 52649 "preproc.c"
     break;
 
   case 1875: /* xmltable: XMLTABLE '(' XMLNAMESPACES '(' xml_namespace_list ')' ',' c_expr xmlexists_argument COLUMNS xmltable_column_list ')'  */
-#line 11464 "preproc.y"
+#line 11457 "preproc.y"
  { 
  (yyval.str) = cat_str(8,mm_strdup("xmltable ( xmlnamespaces ("),(yyvsp[-7].str),mm_strdup(") ,"),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("columns"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 52664 "preproc.c"
+#line 52657 "preproc.c"
     break;
 
   case 1876: /* xmltable_column_list: xmltable_column_el  */
-#line 11472 "preproc.y"
+#line 11465 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 52672 "preproc.c"
+#line 52665 "preproc.c"
     break;
 
   case 1877: /* xmltable_column_list: xmltable_column_list ',' xmltable_column_el  */
-#line 11476 "preproc.y"
+#line 11469 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 52680 "preproc.c"
+#line 52673 "preproc.c"
     break;
 
   case 1878: /* xmltable_column_el: ColId Typename  */
-#line 11484 "preproc.y"
+#line 11477 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 52688 "preproc.c"
+#line 52681 "preproc.c"
     break;
 
   case 1879: /* xmltable_column_el: ColId Typename xmltable_column_option_list  */
-#line 11488 "preproc.y"
+#line 11481 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 52696 "preproc.c"
+#line 52689 "preproc.c"
     break;
 
   case 1880: /* xmltable_column_el: ColId FOR ORDINALITY  */
-#line 11492 "preproc.y"
+#line 11485 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("for ordinality"));
 }
-#line 52704 "preproc.c"
+#line 52697 "preproc.c"
     break;
 
   case 1881: /* xmltable_column_option_list: xmltable_column_option_el  */
-#line 11500 "preproc.y"
+#line 11493 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 52712 "preproc.c"
+#line 52705 "preproc.c"
     break;
 
   case 1882: /* xmltable_column_option_list: xmltable_column_option_list xmltable_column_option_el  */
-#line 11504 "preproc.y"
+#line 11497 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 52720 "preproc.c"
+#line 52713 "preproc.c"
     break;
 
   case 1883: /* xmltable_column_option_el: ecpg_ident b_expr  */
-#line 11512 "preproc.y"
+#line 11505 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 52728 "preproc.c"
+#line 52721 "preproc.c"
     break;
 
   case 1884: /* xmltable_column_option_el: DEFAULT b_expr  */
-#line 11516 "preproc.y"
+#line 11509 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("default"),(yyvsp[0].str));
 }
-#line 52736 "preproc.c"
+#line 52729 "preproc.c"
     break;
 
   case 1885: /* xmltable_column_option_el: NOT NULL_P  */
-#line 11520 "preproc.y"
+#line 11513 "preproc.y"
  { 
  (yyval.str) = mm_strdup("not null");
 }
-#line 52744 "preproc.c"
+#line 52737 "preproc.c"
     break;
 
   case 1886: /* xmltable_column_option_el: NULL_P  */
-#line 11524 "preproc.y"
+#line 11517 "preproc.y"
  { 
  (yyval.str) = mm_strdup("null");
 }
-#line 52752 "preproc.c"
+#line 52745 "preproc.c"
     break;
 
   case 1887: /* xml_namespace_list: xml_namespace_el  */
-#line 11532 "preproc.y"
+#line 11525 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 52760 "preproc.c"
+#line 52753 "preproc.c"
     break;
 
   case 1888: /* xml_namespace_list: xml_namespace_list ',' xml_namespace_el  */
-#line 11536 "preproc.y"
+#line 11529 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 52768 "preproc.c"
+#line 52761 "preproc.c"
     break;
 
   case 1889: /* xml_namespace_el: b_expr AS ColLabel  */
-#line 11544 "preproc.y"
+#line 11537 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("as"),(yyvsp[0].str));
 }
-#line 52776 "preproc.c"
+#line 52769 "preproc.c"
     break;
 
   case 1890: /* xml_namespace_el: DEFAULT b_expr  */
-#line 11548 "preproc.y"
+#line 11541 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("default"),(yyvsp[0].str));
 }
-#line 52784 "preproc.c"
+#line 52777 "preproc.c"
     break;
 
   case 1891: /* Typename: SimpleTypename opt_array_bounds  */
-#line 11556 "preproc.y"
+#line 11549 "preproc.y"
         {	(yyval.str) = cat2_str((yyvsp[-1].str), (yyvsp[0].index).str); }
-#line 52790 "preproc.c"
+#line 52783 "preproc.c"
     break;
 
   case 1892: /* Typename: SETOF SimpleTypename opt_array_bounds  */
-#line 11558 "preproc.y"
+#line 11551 "preproc.y"
         {	(yyval.str) = cat_str(3, mm_strdup("setof"), (yyvsp[-1].str), (yyvsp[0].index).str); }
-#line 52796 "preproc.c"
+#line 52789 "preproc.c"
     break;
 
   case 1893: /* Typename: SimpleTypename ARRAY '[' Iconst ']'  */
-#line 11560 "preproc.y"
+#line 11553 "preproc.y"
  { 
  (yyval.str) = cat_str(4,(yyvsp[-4].str),mm_strdup("array ["),(yyvsp[-1].str),mm_strdup("]"));
 }
-#line 52804 "preproc.c"
+#line 52797 "preproc.c"
     break;
 
   case 1894: /* Typename: SETOF SimpleTypename ARRAY '[' Iconst ']'  */
-#line 11564 "preproc.y"
+#line 11557 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("setof"),(yyvsp[-4].str),mm_strdup("array ["),(yyvsp[-1].str),mm_strdup("]"));
 }
-#line 52812 "preproc.c"
+#line 52805 "preproc.c"
     break;
 
   case 1895: /* Typename: SimpleTypename ARRAY  */
-#line 11568 "preproc.y"
+#line 11561 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),mm_strdup("array"));
 }
-#line 52820 "preproc.c"
+#line 52813 "preproc.c"
     break;
 
   case 1896: /* Typename: SETOF SimpleTypename ARRAY  */
-#line 11572 "preproc.y"
+#line 11565 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("setof"),(yyvsp[-1].str),mm_strdup("array"));
 }
-#line 52828 "preproc.c"
+#line 52821 "preproc.c"
     break;
 
   case 1897: /* opt_array_bounds: opt_array_bounds '[' ']'  */
-#line 11580 "preproc.y"
+#line 11573 "preproc.y"
         {
 		(yyval.index).index1 = (yyvsp[-2].index).index1;
 		(yyval.index).index2 = (yyvsp[-2].index).index2;
@@ -52838,11 +52831,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			(yyval.index).index2 = mm_strdup("0");
 		(yyval.index).str = cat_str(2, (yyvsp[-2].index).str, mm_strdup("[]"));
 	}
-#line 52842 "preproc.c"
+#line 52835 "preproc.c"
     break;
 
   case 1898: /* opt_array_bounds: opt_array_bounds '[' Iresult ']'  */
-#line 11590 "preproc.y"
+#line 11583 "preproc.y"
         {
 		(yyval.index).index1 = (yyvsp[-3].index).index1;
 		(yyval.index).index2 = (yyvsp[-3].index).index2;
@@ -52852,10992 +52845,10992 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			(yyval.index).index2 = mm_strdup((yyvsp[-1].str));
 		(yyval.index).str = cat_str(4, (yyvsp[-3].index).str, mm_strdup("["), (yyvsp[-1].str), mm_strdup("]"));
 	}
-#line 52856 "preproc.c"
+#line 52849 "preproc.c"
     break;
 
   case 1899: /* opt_array_bounds: %empty  */
-#line 11600 "preproc.y"
+#line 11593 "preproc.y"
         {
 		(yyval.index).index1 = mm_strdup("-1");
 		(yyval.index).index2 = mm_strdup("-1");
 		(yyval.index).str= EMPTY;
 	}
-#line 52866 "preproc.c"
+#line 52859 "preproc.c"
     break;
 
   case 1900: /* SimpleTypename: GenericType  */
-#line 11610 "preproc.y"
+#line 11603 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 52874 "preproc.c"
+#line 52867 "preproc.c"
     break;
 
   case 1901: /* SimpleTypename: Numeric  */
-#line 11614 "preproc.y"
+#line 11607 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 52882 "preproc.c"
+#line 52875 "preproc.c"
     break;
 
   case 1902: /* SimpleTypename: Bit  */
-#line 11618 "preproc.y"
+#line 11611 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 52890 "preproc.c"
+#line 52883 "preproc.c"
     break;
 
   case 1903: /* SimpleTypename: Character  */
-#line 11622 "preproc.y"
+#line 11615 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 52898 "preproc.c"
+#line 52891 "preproc.c"
     break;
 
   case 1904: /* SimpleTypename: ConstDatetime  */
-#line 11626 "preproc.y"
+#line 11619 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 52906 "preproc.c"
+#line 52899 "preproc.c"
     break;
 
   case 1905: /* SimpleTypename: ConstInterval opt_interval  */
-#line 11630 "preproc.y"
+#line 11623 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 52914 "preproc.c"
+#line 52907 "preproc.c"
     break;
 
   case 1906: /* SimpleTypename: ConstInterval '(' Iconst ')'  */
-#line 11634 "preproc.y"
+#line 11627 "preproc.y"
  { 
  (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 52922 "preproc.c"
+#line 52915 "preproc.c"
     break;
 
   case 1907: /* ConstTypename: Numeric  */
-#line 11642 "preproc.y"
+#line 11635 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 52930 "preproc.c"
+#line 52923 "preproc.c"
     break;
 
   case 1908: /* ConstTypename: ConstBit  */
-#line 11646 "preproc.y"
+#line 11639 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 52938 "preproc.c"
+#line 52931 "preproc.c"
     break;
 
   case 1909: /* ConstTypename: ConstCharacter  */
-#line 11650 "preproc.y"
+#line 11643 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 52946 "preproc.c"
+#line 52939 "preproc.c"
     break;
 
   case 1910: /* ConstTypename: ConstDatetime  */
-#line 11654 "preproc.y"
+#line 11647 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 52954 "preproc.c"
+#line 52947 "preproc.c"
     break;
 
   case 1911: /* GenericType: type_function_name opt_type_modifiers  */
-#line 11662 "preproc.y"
+#line 11655 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 52962 "preproc.c"
+#line 52955 "preproc.c"
     break;
 
   case 1912: /* GenericType: type_function_name attrs opt_type_modifiers  */
-#line 11666 "preproc.y"
+#line 11659 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 52970 "preproc.c"
+#line 52963 "preproc.c"
     break;
 
   case 1913: /* opt_type_modifiers: '(' expr_list ')'  */
-#line 11674 "preproc.y"
+#line 11667 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 52978 "preproc.c"
+#line 52971 "preproc.c"
     break;
 
   case 1914: /* opt_type_modifiers: %empty  */
-#line 11678 "preproc.y"
+#line 11671 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 52985 "preproc.c"
+#line 52978 "preproc.c"
     break;
 
   case 1915: /* Numeric: INT_P  */
-#line 11685 "preproc.y"
+#line 11678 "preproc.y"
  { 
  (yyval.str) = mm_strdup("int");
 }
-#line 52993 "preproc.c"
+#line 52986 "preproc.c"
     break;
 
   case 1916: /* Numeric: INTEGER  */
-#line 11689 "preproc.y"
+#line 11682 "preproc.y"
  { 
  (yyval.str) = mm_strdup("integer");
 }
-#line 53001 "preproc.c"
+#line 52994 "preproc.c"
     break;
 
   case 1917: /* Numeric: SMALLINT  */
-#line 11693 "preproc.y"
+#line 11686 "preproc.y"
  { 
  (yyval.str) = mm_strdup("smallint");
 }
-#line 53009 "preproc.c"
+#line 53002 "preproc.c"
     break;
 
   case 1918: /* Numeric: BIGINT  */
-#line 11697 "preproc.y"
+#line 11690 "preproc.y"
  { 
  (yyval.str) = mm_strdup("bigint");
 }
-#line 53017 "preproc.c"
+#line 53010 "preproc.c"
     break;
 
   case 1919: /* Numeric: REAL  */
-#line 11701 "preproc.y"
+#line 11694 "preproc.y"
  { 
  (yyval.str) = mm_strdup("real");
 }
-#line 53025 "preproc.c"
+#line 53018 "preproc.c"
     break;
 
   case 1920: /* Numeric: FLOAT_P opt_float  */
-#line 11705 "preproc.y"
+#line 11698 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("float"),(yyvsp[0].str));
 }
-#line 53033 "preproc.c"
+#line 53026 "preproc.c"
     break;
 
   case 1921: /* Numeric: DOUBLE_P PRECISION  */
-#line 11709 "preproc.y"
+#line 11702 "preproc.y"
  { 
  (yyval.str) = mm_strdup("double precision");
 }
-#line 53041 "preproc.c"
+#line 53034 "preproc.c"
     break;
 
   case 1922: /* Numeric: DECIMAL_P opt_type_modifiers  */
-#line 11713 "preproc.y"
+#line 11706 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("decimal"),(yyvsp[0].str));
 }
-#line 53049 "preproc.c"
+#line 53042 "preproc.c"
     break;
 
   case 1923: /* Numeric: DEC opt_type_modifiers  */
-#line 11717 "preproc.y"
+#line 11710 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("dec"),(yyvsp[0].str));
 }
-#line 53057 "preproc.c"
+#line 53050 "preproc.c"
     break;
 
   case 1924: /* Numeric: NUMERIC opt_type_modifiers  */
-#line 11721 "preproc.y"
+#line 11714 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("numeric"),(yyvsp[0].str));
 }
-#line 53065 "preproc.c"
+#line 53058 "preproc.c"
     break;
 
   case 1925: /* Numeric: BOOLEAN_P  */
-#line 11725 "preproc.y"
+#line 11718 "preproc.y"
  { 
  (yyval.str) = mm_strdup("boolean");
 }
-#line 53073 "preproc.c"
+#line 53066 "preproc.c"
     break;
 
   case 1926: /* opt_float: '(' Iconst ')'  */
-#line 11733 "preproc.y"
+#line 11726 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 53081 "preproc.c"
+#line 53074 "preproc.c"
     break;
 
   case 1927: /* opt_float: %empty  */
-#line 11737 "preproc.y"
+#line 11730 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 53088 "preproc.c"
+#line 53081 "preproc.c"
     break;
 
   case 1928: /* Bit: BitWithLength  */
-#line 11744 "preproc.y"
+#line 11737 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 53096 "preproc.c"
+#line 53089 "preproc.c"
     break;
 
   case 1929: /* Bit: BitWithoutLength  */
-#line 11748 "preproc.y"
+#line 11741 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 53104 "preproc.c"
+#line 53097 "preproc.c"
     break;
 
   case 1930: /* ConstBit: BitWithLength  */
-#line 11756 "preproc.y"
+#line 11749 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 53112 "preproc.c"
+#line 53105 "preproc.c"
     break;
 
   case 1931: /* ConstBit: BitWithoutLength  */
-#line 11760 "preproc.y"
+#line 11753 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 53120 "preproc.c"
+#line 53113 "preproc.c"
     break;
 
   case 1932: /* BitWithLength: BIT opt_varying '(' expr_list ')'  */
-#line 11768 "preproc.y"
+#line 11761 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("bit"),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 53128 "preproc.c"
+#line 53121 "preproc.c"
     break;
 
   case 1933: /* BitWithoutLength: BIT opt_varying  */
-#line 11776 "preproc.y"
+#line 11769 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("bit"),(yyvsp[0].str));
 }
-#line 53136 "preproc.c"
+#line 53129 "preproc.c"
     break;
 
   case 1934: /* Character: CharacterWithLength  */
-#line 11784 "preproc.y"
+#line 11777 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 53144 "preproc.c"
+#line 53137 "preproc.c"
     break;
 
   case 1935: /* Character: CharacterWithoutLength  */
-#line 11788 "preproc.y"
+#line 11781 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 53152 "preproc.c"
+#line 53145 "preproc.c"
     break;
 
   case 1936: /* ConstCharacter: CharacterWithLength  */
-#line 11796 "preproc.y"
+#line 11789 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 53160 "preproc.c"
+#line 53153 "preproc.c"
     break;
 
   case 1937: /* ConstCharacter: CharacterWithoutLength  */
-#line 11800 "preproc.y"
+#line 11793 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 53168 "preproc.c"
+#line 53161 "preproc.c"
     break;
 
   case 1938: /* CharacterWithLength: character '(' Iconst ')'  */
-#line 11808 "preproc.y"
+#line 11801 "preproc.y"
  { 
  (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 53176 "preproc.c"
+#line 53169 "preproc.c"
     break;
 
   case 1939: /* CharacterWithoutLength: character  */
-#line 11816 "preproc.y"
+#line 11809 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 53184 "preproc.c"
+#line 53177 "preproc.c"
     break;
 
   case 1940: /* character: CHARACTER opt_varying  */
-#line 11824 "preproc.y"
+#line 11817 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("character"),(yyvsp[0].str));
 }
-#line 53192 "preproc.c"
+#line 53185 "preproc.c"
     break;
 
   case 1941: /* character: CHAR_P opt_varying  */
-#line 11828 "preproc.y"
+#line 11821 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("char"),(yyvsp[0].str));
 }
-#line 53200 "preproc.c"
+#line 53193 "preproc.c"
     break;
 
   case 1942: /* character: VARCHAR  */
-#line 11832 "preproc.y"
+#line 11825 "preproc.y"
  { 
  (yyval.str) = mm_strdup("varchar");
 }
-#line 53208 "preproc.c"
+#line 53201 "preproc.c"
     break;
 
   case 1943: /* character: NATIONAL CHARACTER opt_varying  */
-#line 11836 "preproc.y"
+#line 11829 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("national character"),(yyvsp[0].str));
 }
-#line 53216 "preproc.c"
+#line 53209 "preproc.c"
     break;
 
   case 1944: /* character: NATIONAL CHAR_P opt_varying  */
-#line 11840 "preproc.y"
+#line 11833 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("national char"),(yyvsp[0].str));
 }
-#line 53224 "preproc.c"
+#line 53217 "preproc.c"
     break;
 
   case 1945: /* character: NCHAR opt_varying  */
-#line 11844 "preproc.y"
+#line 11837 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("nchar"),(yyvsp[0].str));
 }
-#line 53232 "preproc.c"
+#line 53225 "preproc.c"
     break;
 
   case 1946: /* opt_varying: VARYING  */
-#line 11852 "preproc.y"
+#line 11845 "preproc.y"
  { 
  (yyval.str) = mm_strdup("varying");
 }
-#line 53240 "preproc.c"
+#line 53233 "preproc.c"
     break;
 
   case 1947: /* opt_varying: %empty  */
-#line 11856 "preproc.y"
+#line 11849 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 53247 "preproc.c"
+#line 53240 "preproc.c"
     break;
 
   case 1948: /* ConstDatetime: TIMESTAMP '(' Iconst ')' opt_timezone  */
-#line 11863 "preproc.y"
+#line 11856 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("timestamp ("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 53255 "preproc.c"
+#line 53248 "preproc.c"
     break;
 
   case 1949: /* ConstDatetime: TIMESTAMP opt_timezone  */
-#line 11867 "preproc.y"
+#line 11860 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("timestamp"),(yyvsp[0].str));
 }
-#line 53263 "preproc.c"
+#line 53256 "preproc.c"
     break;
 
   case 1950: /* ConstDatetime: TIME '(' Iconst ')' opt_timezone  */
-#line 11871 "preproc.y"
+#line 11864 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("time ("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 53271 "preproc.c"
+#line 53264 "preproc.c"
     break;
 
   case 1951: /* ConstDatetime: TIME opt_timezone  */
-#line 11875 "preproc.y"
+#line 11868 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("time"),(yyvsp[0].str));
 }
-#line 53279 "preproc.c"
+#line 53272 "preproc.c"
     break;
 
   case 1952: /* ConstInterval: INTERVAL  */
-#line 11883 "preproc.y"
+#line 11876 "preproc.y"
  { 
  (yyval.str) = mm_strdup("interval");
 }
-#line 53287 "preproc.c"
+#line 53280 "preproc.c"
     break;
 
   case 1953: /* opt_timezone: WITH_LA TIME ZONE  */
-#line 11891 "preproc.y"
+#line 11884 "preproc.y"
  { 
  (yyval.str) = mm_strdup("with time zone");
 }
-#line 53295 "preproc.c"
+#line 53288 "preproc.c"
     break;
 
   case 1954: /* opt_timezone: WITHOUT_LA TIME ZONE  */
-#line 11895 "preproc.y"
+#line 11888 "preproc.y"
  { 
  (yyval.str) = mm_strdup("without time zone");
 }
-#line 53303 "preproc.c"
+#line 53296 "preproc.c"
     break;
 
   case 1955: /* opt_timezone: %empty  */
-#line 11899 "preproc.y"
+#line 11892 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 53310 "preproc.c"
+#line 53303 "preproc.c"
     break;
 
   case 1956: /* opt_interval: YEAR_P  */
-#line 11906 "preproc.y"
+#line 11899 "preproc.y"
  { 
  (yyval.str) = mm_strdup("year");
 }
-#line 53318 "preproc.c"
+#line 53311 "preproc.c"
     break;
 
   case 1957: /* opt_interval: MONTH_P  */
-#line 11910 "preproc.y"
+#line 11903 "preproc.y"
  { 
  (yyval.str) = mm_strdup("month");
 }
-#line 53326 "preproc.c"
+#line 53319 "preproc.c"
     break;
 
   case 1958: /* opt_interval: DAY_P  */
-#line 11914 "preproc.y"
+#line 11907 "preproc.y"
  { 
  (yyval.str) = mm_strdup("day");
 }
-#line 53334 "preproc.c"
+#line 53327 "preproc.c"
     break;
 
   case 1959: /* opt_interval: HOUR_P  */
-#line 11918 "preproc.y"
+#line 11911 "preproc.y"
  { 
  (yyval.str) = mm_strdup("hour");
 }
-#line 53342 "preproc.c"
+#line 53335 "preproc.c"
     break;
 
   case 1960: /* opt_interval: MINUTE_P  */
-#line 11922 "preproc.y"
+#line 11915 "preproc.y"
  { 
  (yyval.str) = mm_strdup("minute");
 }
-#line 53350 "preproc.c"
+#line 53343 "preproc.c"
     break;
 
   case 1961: /* opt_interval: interval_second  */
-#line 11926 "preproc.y"
+#line 11919 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 53358 "preproc.c"
+#line 53351 "preproc.c"
     break;
 
   case 1962: /* opt_interval: YEAR_P TO MONTH_P  */
-#line 11930 "preproc.y"
+#line 11923 "preproc.y"
  { 
  (yyval.str) = mm_strdup("year to month");
 }
-#line 53366 "preproc.c"
+#line 53359 "preproc.c"
     break;
 
   case 1963: /* opt_interval: DAY_P TO HOUR_P  */
-#line 11934 "preproc.y"
+#line 11927 "preproc.y"
  { 
  (yyval.str) = mm_strdup("day to hour");
 }
-#line 53374 "preproc.c"
+#line 53367 "preproc.c"
     break;
 
   case 1964: /* opt_interval: DAY_P TO MINUTE_P  */
-#line 11938 "preproc.y"
+#line 11931 "preproc.y"
  { 
  (yyval.str) = mm_strdup("day to minute");
 }
-#line 53382 "preproc.c"
+#line 53375 "preproc.c"
     break;
 
   case 1965: /* opt_interval: DAY_P TO interval_second  */
-#line 11942 "preproc.y"
+#line 11935 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("day to"),(yyvsp[0].str));
 }
-#line 53390 "preproc.c"
+#line 53383 "preproc.c"
     break;
 
   case 1966: /* opt_interval: HOUR_P TO MINUTE_P  */
-#line 11946 "preproc.y"
+#line 11939 "preproc.y"
  { 
  (yyval.str) = mm_strdup("hour to minute");
 }
-#line 53398 "preproc.c"
+#line 53391 "preproc.c"
     break;
 
   case 1967: /* opt_interval: HOUR_P TO interval_second  */
-#line 11950 "preproc.y"
+#line 11943 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("hour to"),(yyvsp[0].str));
 }
-#line 53406 "preproc.c"
+#line 53399 "preproc.c"
     break;
 
   case 1968: /* opt_interval: MINUTE_P TO interval_second  */
-#line 11954 "preproc.y"
+#line 11947 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("minute to"),(yyvsp[0].str));
 }
-#line 53414 "preproc.c"
+#line 53407 "preproc.c"
     break;
 
   case 1969: /* opt_interval: %empty  */
-#line 11958 "preproc.y"
+#line 11951 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 53421 "preproc.c"
+#line 53414 "preproc.c"
     break;
 
   case 1970: /* interval_second: SECOND_P  */
-#line 11965 "preproc.y"
+#line 11958 "preproc.y"
  { 
  (yyval.str) = mm_strdup("second");
 }
-#line 53429 "preproc.c"
+#line 53422 "preproc.c"
     break;
 
   case 1971: /* interval_second: SECOND_P '(' Iconst ')'  */
-#line 11969 "preproc.y"
+#line 11962 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("second ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 53437 "preproc.c"
+#line 53430 "preproc.c"
     break;
 
   case 1972: /* a_expr: c_expr  */
-#line 11977 "preproc.y"
+#line 11970 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 53445 "preproc.c"
+#line 53438 "preproc.c"
     break;
 
   case 1973: /* a_expr: a_expr TYPECAST Typename  */
-#line 11981 "preproc.y"
+#line 11974 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("::"),(yyvsp[0].str));
 }
-#line 53453 "preproc.c"
+#line 53446 "preproc.c"
     break;
 
   case 1974: /* a_expr: a_expr COLLATE any_name  */
-#line 11985 "preproc.y"
+#line 11978 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("collate"),(yyvsp[0].str));
 }
-#line 53461 "preproc.c"
+#line 53454 "preproc.c"
     break;
 
   case 1975: /* a_expr: a_expr AT TIME ZONE a_expr  */
-#line 11989 "preproc.y"
+#line 11982 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-4].str),mm_strdup("at time zone"),(yyvsp[0].str));
 }
-#line 53469 "preproc.c"
+#line 53462 "preproc.c"
     break;
 
   case 1976: /* a_expr: '+' a_expr  */
-#line 11993 "preproc.y"
+#line 11986 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("+"),(yyvsp[0].str));
 }
-#line 53477 "preproc.c"
+#line 53470 "preproc.c"
     break;
 
   case 1977: /* a_expr: '-' a_expr  */
-#line 11997 "preproc.y"
+#line 11990 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("-"),(yyvsp[0].str));
 }
-#line 53485 "preproc.c"
+#line 53478 "preproc.c"
     break;
 
   case 1978: /* a_expr: a_expr '+' a_expr  */
-#line 12001 "preproc.y"
+#line 11994 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("+"),(yyvsp[0].str));
 }
-#line 53493 "preproc.c"
+#line 53486 "preproc.c"
     break;
 
   case 1979: /* a_expr: a_expr '-' a_expr  */
-#line 12005 "preproc.y"
+#line 11998 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("-"),(yyvsp[0].str));
 }
-#line 53501 "preproc.c"
+#line 53494 "preproc.c"
     break;
 
   case 1980: /* a_expr: a_expr '*' a_expr  */
-#line 12009 "preproc.y"
+#line 12002 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("*"),(yyvsp[0].str));
 }
-#line 53509 "preproc.c"
+#line 53502 "preproc.c"
     break;
 
   case 1981: /* a_expr: a_expr '/' a_expr  */
-#line 12013 "preproc.y"
+#line 12006 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("/"),(yyvsp[0].str));
 }
-#line 53517 "preproc.c"
+#line 53510 "preproc.c"
     break;
 
   case 1982: /* a_expr: a_expr '%' a_expr  */
-#line 12017 "preproc.y"
+#line 12010 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("%"),(yyvsp[0].str));
 }
-#line 53525 "preproc.c"
+#line 53518 "preproc.c"
     break;
 
   case 1983: /* a_expr: a_expr '^' a_expr  */
-#line 12021 "preproc.y"
+#line 12014 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("^"),(yyvsp[0].str));
 }
-#line 53533 "preproc.c"
+#line 53526 "preproc.c"
     break;
 
   case 1984: /* a_expr: a_expr '<' a_expr  */
-#line 12025 "preproc.y"
+#line 12018 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("<"),(yyvsp[0].str));
 }
-#line 53541 "preproc.c"
+#line 53534 "preproc.c"
     break;
 
   case 1985: /* a_expr: a_expr '>' a_expr  */
-#line 12029 "preproc.y"
+#line 12022 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(">"),(yyvsp[0].str));
 }
-#line 53549 "preproc.c"
+#line 53542 "preproc.c"
     break;
 
   case 1986: /* a_expr: a_expr '=' a_expr  */
-#line 12033 "preproc.y"
+#line 12026 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
 }
-#line 53557 "preproc.c"
+#line 53550 "preproc.c"
     break;
 
   case 1987: /* a_expr: a_expr LESS_EQUALS a_expr  */
-#line 12037 "preproc.y"
+#line 12030 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("<="),(yyvsp[0].str));
 }
-#line 53565 "preproc.c"
+#line 53558 "preproc.c"
     break;
 
   case 1988: /* a_expr: a_expr GREATER_EQUALS a_expr  */
-#line 12041 "preproc.y"
+#line 12034 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(">="),(yyvsp[0].str));
 }
-#line 53573 "preproc.c"
+#line 53566 "preproc.c"
     break;
 
   case 1989: /* a_expr: a_expr NOT_EQUALS a_expr  */
-#line 12045 "preproc.y"
+#line 12038 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("<>"),(yyvsp[0].str));
 }
-#line 53581 "preproc.c"
+#line 53574 "preproc.c"
     break;
 
   case 1990: /* a_expr: a_expr qual_Op a_expr  */
-#line 12049 "preproc.y"
+#line 12042 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 53589 "preproc.c"
+#line 53582 "preproc.c"
     break;
 
   case 1991: /* a_expr: qual_Op a_expr  */
-#line 12053 "preproc.y"
+#line 12046 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 53597 "preproc.c"
+#line 53590 "preproc.c"
     break;
 
   case 1992: /* a_expr: a_expr AND a_expr  */
-#line 12057 "preproc.y"
+#line 12050 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("and"),(yyvsp[0].str));
 }
-#line 53605 "preproc.c"
+#line 53598 "preproc.c"
     break;
 
   case 1993: /* a_expr: a_expr OR a_expr  */
-#line 12061 "preproc.y"
+#line 12054 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("or"),(yyvsp[0].str));
 }
-#line 53613 "preproc.c"
+#line 53606 "preproc.c"
     break;
 
   case 1994: /* a_expr: NOT a_expr  */
-#line 12065 "preproc.y"
+#line 12058 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("not"),(yyvsp[0].str));
 }
-#line 53621 "preproc.c"
+#line 53614 "preproc.c"
     break;
 
   case 1995: /* a_expr: NOT_LA a_expr  */
-#line 12069 "preproc.y"
+#line 12062 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("not"),(yyvsp[0].str));
 }
-#line 53629 "preproc.c"
+#line 53622 "preproc.c"
     break;
 
   case 1996: /* a_expr: a_expr LIKE a_expr  */
-#line 12073 "preproc.y"
+#line 12066 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("like"),(yyvsp[0].str));
 }
-#line 53637 "preproc.c"
+#line 53630 "preproc.c"
     break;
 
   case 1997: /* a_expr: a_expr LIKE a_expr ESCAPE a_expr  */
-#line 12077 "preproc.y"
+#line 12070 "preproc.y"
  { 
  (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("like"),(yyvsp[-2].str),mm_strdup("escape"),(yyvsp[0].str));
 }
-#line 53645 "preproc.c"
+#line 53638 "preproc.c"
     break;
 
   case 1998: /* a_expr: a_expr NOT_LA LIKE a_expr  */
-#line 12081 "preproc.y"
+#line 12074 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-3].str),mm_strdup("not like"),(yyvsp[0].str));
 }
-#line 53653 "preproc.c"
+#line 53646 "preproc.c"
     break;
 
   case 1999: /* a_expr: a_expr NOT_LA LIKE a_expr ESCAPE a_expr  */
-#line 12085 "preproc.y"
+#line 12078 "preproc.y"
  { 
  (yyval.str) = cat_str(5,(yyvsp[-5].str),mm_strdup("not like"),(yyvsp[-2].str),mm_strdup("escape"),(yyvsp[0].str));
 }
-#line 53661 "preproc.c"
+#line 53654 "preproc.c"
     break;
 
   case 2000: /* a_expr: a_expr ILIKE a_expr  */
-#line 12089 "preproc.y"
+#line 12082 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("ilike"),(yyvsp[0].str));
 }
-#line 53669 "preproc.c"
+#line 53662 "preproc.c"
     break;
 
   case 2001: /* a_expr: a_expr ILIKE a_expr ESCAPE a_expr  */
-#line 12093 "preproc.y"
+#line 12086 "preproc.y"
  { 
  (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("ilike"),(yyvsp[-2].str),mm_strdup("escape"),(yyvsp[0].str));
 }
-#line 53677 "preproc.c"
+#line 53670 "preproc.c"
     break;
 
   case 2002: /* a_expr: a_expr NOT_LA ILIKE a_expr  */
-#line 12097 "preproc.y"
+#line 12090 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-3].str),mm_strdup("not ilike"),(yyvsp[0].str));
 }
-#line 53685 "preproc.c"
+#line 53678 "preproc.c"
     break;
 
   case 2003: /* a_expr: a_expr NOT_LA ILIKE a_expr ESCAPE a_expr  */
-#line 12101 "preproc.y"
+#line 12094 "preproc.y"
  { 
  (yyval.str) = cat_str(5,(yyvsp[-5].str),mm_strdup("not ilike"),(yyvsp[-2].str),mm_strdup("escape"),(yyvsp[0].str));
 }
-#line 53693 "preproc.c"
+#line 53686 "preproc.c"
     break;
 
   case 2004: /* a_expr: a_expr SIMILAR TO a_expr  */
-#line 12105 "preproc.y"
+#line 12098 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-3].str),mm_strdup("similar to"),(yyvsp[0].str));
 }
-#line 53701 "preproc.c"
+#line 53694 "preproc.c"
     break;
 
   case 2005: /* a_expr: a_expr SIMILAR TO a_expr ESCAPE a_expr  */
-#line 12109 "preproc.y"
+#line 12102 "preproc.y"
  { 
  (yyval.str) = cat_str(5,(yyvsp[-5].str),mm_strdup("similar to"),(yyvsp[-2].str),mm_strdup("escape"),(yyvsp[0].str));
 }
-#line 53709 "preproc.c"
+#line 53702 "preproc.c"
     break;
 
   case 2006: /* a_expr: a_expr NOT_LA SIMILAR TO a_expr  */
-#line 12113 "preproc.y"
+#line 12106 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-4].str),mm_strdup("not similar to"),(yyvsp[0].str));
 }
-#line 53717 "preproc.c"
+#line 53710 "preproc.c"
     break;
 
   case 2007: /* a_expr: a_expr NOT_LA SIMILAR TO a_expr ESCAPE a_expr  */
-#line 12117 "preproc.y"
+#line 12110 "preproc.y"
  { 
  (yyval.str) = cat_str(5,(yyvsp[-6].str),mm_strdup("not similar to"),(yyvsp[-2].str),mm_strdup("escape"),(yyvsp[0].str));
 }
-#line 53725 "preproc.c"
+#line 53718 "preproc.c"
     break;
 
   case 2008: /* a_expr: a_expr IS NULL_P  */
-#line 12121 "preproc.y"
+#line 12114 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("is null"));
 }
-#line 53733 "preproc.c"
+#line 53726 "preproc.c"
     break;
 
   case 2009: /* a_expr: a_expr ISNULL  */
-#line 12125 "preproc.y"
+#line 12118 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),mm_strdup("isnull"));
 }
-#line 53741 "preproc.c"
+#line 53734 "preproc.c"
     break;
 
   case 2010: /* a_expr: a_expr IS NOT NULL_P  */
-#line 12129 "preproc.y"
+#line 12122 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-3].str),mm_strdup("is not null"));
 }
-#line 53749 "preproc.c"
+#line 53742 "preproc.c"
     break;
 
   case 2011: /* a_expr: a_expr NOTNULL  */
-#line 12133 "preproc.y"
+#line 12126 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),mm_strdup("notnull"));
 }
-#line 53757 "preproc.c"
+#line 53750 "preproc.c"
     break;
 
   case 2012: /* a_expr: row OVERLAPS row  */
-#line 12137 "preproc.y"
+#line 12130 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("overlaps"),(yyvsp[0].str));
 }
-#line 53765 "preproc.c"
+#line 53758 "preproc.c"
     break;
 
   case 2013: /* a_expr: a_expr IS TRUE_P  */
-#line 12141 "preproc.y"
+#line 12134 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("is true"));
 }
-#line 53773 "preproc.c"
+#line 53766 "preproc.c"
     break;
 
   case 2014: /* a_expr: a_expr IS NOT TRUE_P  */
-#line 12145 "preproc.y"
+#line 12138 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-3].str),mm_strdup("is not true"));
 }
-#line 53781 "preproc.c"
+#line 53774 "preproc.c"
     break;
 
   case 2015: /* a_expr: a_expr IS FALSE_P  */
-#line 12149 "preproc.y"
+#line 12142 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("is false"));
 }
-#line 53789 "preproc.c"
+#line 53782 "preproc.c"
     break;
 
   case 2016: /* a_expr: a_expr IS NOT FALSE_P  */
-#line 12153 "preproc.y"
+#line 12146 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-3].str),mm_strdup("is not false"));
 }
-#line 53797 "preproc.c"
+#line 53790 "preproc.c"
     break;
 
   case 2017: /* a_expr: a_expr IS UNKNOWN  */
-#line 12157 "preproc.y"
+#line 12150 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("is unknown"));
 }
-#line 53805 "preproc.c"
+#line 53798 "preproc.c"
     break;
 
   case 2018: /* a_expr: a_expr IS NOT UNKNOWN  */
-#line 12161 "preproc.y"
+#line 12154 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-3].str),mm_strdup("is not unknown"));
 }
-#line 53813 "preproc.c"
+#line 53806 "preproc.c"
     break;
 
   case 2019: /* a_expr: a_expr IS DISTINCT FROM a_expr  */
-#line 12165 "preproc.y"
+#line 12158 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-4].str),mm_strdup("is distinct from"),(yyvsp[0].str));
 }
-#line 53821 "preproc.c"
+#line 53814 "preproc.c"
     break;
 
   case 2020: /* a_expr: a_expr IS NOT DISTINCT FROM a_expr  */
-#line 12169 "preproc.y"
+#line 12162 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-5].str),mm_strdup("is not distinct from"),(yyvsp[0].str));
 }
-#line 53829 "preproc.c"
+#line 53822 "preproc.c"
     break;
 
   case 2021: /* a_expr: a_expr BETWEEN opt_asymmetric b_expr AND a_expr  */
-#line 12173 "preproc.y"
+#line 12166 "preproc.y"
  { 
  (yyval.str) = cat_str(6,(yyvsp[-5].str),mm_strdup("between"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("and"),(yyvsp[0].str));
 }
-#line 53837 "preproc.c"
+#line 53830 "preproc.c"
     break;
 
   case 2022: /* a_expr: a_expr NOT_LA BETWEEN opt_asymmetric b_expr AND a_expr  */
-#line 12177 "preproc.y"
+#line 12170 "preproc.y"
  { 
  (yyval.str) = cat_str(6,(yyvsp[-6].str),mm_strdup("not between"),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup("and"),(yyvsp[0].str));
 }
-#line 53845 "preproc.c"
+#line 53838 "preproc.c"
     break;
 
   case 2023: /* a_expr: a_expr BETWEEN SYMMETRIC b_expr AND a_expr  */
-#line 12181 "preproc.y"
+#line 12174 "preproc.y"
  { 
  (yyval.str) = cat_str(5,(yyvsp[-5].str),mm_strdup("between symmetric"),(yyvsp[-2].str),mm_strdup("and"),(yyvsp[0].str));
 }
-#line 53853 "preproc.c"
+#line 53846 "preproc.c"
     break;
 
   case 2024: /* a_expr: a_expr NOT_LA BETWEEN SYMMETRIC b_expr AND a_expr  */
-#line 12185 "preproc.y"
+#line 12178 "preproc.y"
  { 
  (yyval.str) = cat_str(5,(yyvsp[-6].str),mm_strdup("not between symmetric"),(yyvsp[-2].str),mm_strdup("and"),(yyvsp[0].str));
 }
-#line 53861 "preproc.c"
+#line 53854 "preproc.c"
     break;
 
   case 2025: /* a_expr: a_expr IN_P in_expr  */
-#line 12189 "preproc.y"
+#line 12182 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("in"),(yyvsp[0].str));
 }
-#line 53869 "preproc.c"
+#line 53862 "preproc.c"
     break;
 
   case 2026: /* a_expr: a_expr NOT_LA IN_P in_expr  */
-#line 12193 "preproc.y"
+#line 12186 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-3].str),mm_strdup("not in"),(yyvsp[0].str));
 }
-#line 53877 "preproc.c"
+#line 53870 "preproc.c"
     break;
 
   case 2027: /* a_expr: a_expr subquery_Op sub_type select_with_parens  */
-#line 12197 "preproc.y"
+#line 12190 "preproc.y"
  { 
  (yyval.str) = cat_str(4,(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 53885 "preproc.c"
+#line 53878 "preproc.c"
     break;
 
   case 2028: /* a_expr: a_expr subquery_Op sub_type '(' a_expr ')'  */
-#line 12201 "preproc.y"
+#line 12194 "preproc.y"
  { 
  (yyval.str) = cat_str(6,(yyvsp[-5].str),(yyvsp[-4].str),(yyvsp[-3].str),mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 53893 "preproc.c"
+#line 53886 "preproc.c"
     break;
 
   case 2029: /* a_expr: UNIQUE opt_unique_null_treatment select_with_parens  */
-#line 12205 "preproc.y"
+#line 12198 "preproc.y"
  { 
 mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
  (yyval.str) = cat_str(3,mm_strdup("unique"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 53902 "preproc.c"
+#line 53895 "preproc.c"
     break;
 
   case 2030: /* a_expr: a_expr IS DOCUMENT_P  */
-#line 12210 "preproc.y"
+#line 12203 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("is document"));
 }
-#line 53910 "preproc.c"
+#line 53903 "preproc.c"
     break;
 
   case 2031: /* a_expr: a_expr IS NOT DOCUMENT_P  */
-#line 12214 "preproc.y"
+#line 12207 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-3].str),mm_strdup("is not document"));
 }
-#line 53918 "preproc.c"
+#line 53911 "preproc.c"
     break;
 
   case 2032: /* a_expr: a_expr IS NORMALIZED  */
-#line 12218 "preproc.y"
+#line 12211 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("is normalized"));
 }
-#line 53926 "preproc.c"
+#line 53919 "preproc.c"
     break;
 
   case 2033: /* a_expr: a_expr IS unicode_normal_form NORMALIZED  */
-#line 12222 "preproc.y"
+#line 12215 "preproc.y"
  { 
  (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("is"),(yyvsp[-1].str),mm_strdup("normalized"));
 }
-#line 53934 "preproc.c"
+#line 53927 "preproc.c"
     break;
 
   case 2034: /* a_expr: a_expr IS NOT NORMALIZED  */
-#line 12226 "preproc.y"
+#line 12219 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-3].str),mm_strdup("is not normalized"));
 }
-#line 53942 "preproc.c"
+#line 53935 "preproc.c"
     break;
 
   case 2035: /* a_expr: a_expr IS NOT unicode_normal_form NORMALIZED  */
-#line 12230 "preproc.y"
+#line 12223 "preproc.y"
  { 
  (yyval.str) = cat_str(4,(yyvsp[-4].str),mm_strdup("is not"),(yyvsp[-1].str),mm_strdup("normalized"));
 }
-#line 53950 "preproc.c"
+#line 53943 "preproc.c"
     break;
 
   case 2036: /* a_expr: a_expr IS json_predicate_type_constraint json_key_uniqueness_constraint_opt  */
-#line 12234 "preproc.y"
+#line 12227 "preproc.y"
  { 
  (yyval.str) = cat_str(4,(yyvsp[-3].str),mm_strdup("is"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 53958 "preproc.c"
+#line 53951 "preproc.c"
     break;
 
   case 2037: /* a_expr: a_expr IS NOT json_predicate_type_constraint json_key_uniqueness_constraint_opt  */
-#line 12238 "preproc.y"
+#line 12231 "preproc.y"
  { 
  (yyval.str) = cat_str(4,(yyvsp[-4].str),mm_strdup("is not"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 53966 "preproc.c"
+#line 53959 "preproc.c"
     break;
 
   case 2038: /* a_expr: DEFAULT  */
-#line 12242 "preproc.y"
+#line 12235 "preproc.y"
  { 
  (yyval.str) = mm_strdup("default");
 }
-#line 53974 "preproc.c"
+#line 53967 "preproc.c"
     break;
 
   case 2039: /* b_expr: c_expr  */
-#line 12250 "preproc.y"
+#line 12243 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 53982 "preproc.c"
+#line 53975 "preproc.c"
     break;
 
   case 2040: /* b_expr: b_expr TYPECAST Typename  */
-#line 12254 "preproc.y"
+#line 12247 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("::"),(yyvsp[0].str));
 }
-#line 53990 "preproc.c"
+#line 53983 "preproc.c"
     break;
 
   case 2041: /* b_expr: '+' b_expr  */
-#line 12258 "preproc.y"
+#line 12251 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("+"),(yyvsp[0].str));
 }
-#line 53998 "preproc.c"
+#line 53991 "preproc.c"
     break;
 
   case 2042: /* b_expr: '-' b_expr  */
-#line 12262 "preproc.y"
+#line 12255 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("-"),(yyvsp[0].str));
 }
-#line 54006 "preproc.c"
+#line 53999 "preproc.c"
     break;
 
   case 2043: /* b_expr: b_expr '+' b_expr  */
-#line 12266 "preproc.y"
+#line 12259 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("+"),(yyvsp[0].str));
 }
-#line 54014 "preproc.c"
+#line 54007 "preproc.c"
     break;
 
   case 2044: /* b_expr: b_expr '-' b_expr  */
-#line 12270 "preproc.y"
+#line 12263 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("-"),(yyvsp[0].str));
 }
-#line 54022 "preproc.c"
+#line 54015 "preproc.c"
     break;
 
   case 2045: /* b_expr: b_expr '*' b_expr  */
-#line 12274 "preproc.y"
+#line 12267 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("*"),(yyvsp[0].str));
 }
-#line 54030 "preproc.c"
+#line 54023 "preproc.c"
     break;
 
   case 2046: /* b_expr: b_expr '/' b_expr  */
-#line 12278 "preproc.y"
+#line 12271 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("/"),(yyvsp[0].str));
 }
-#line 54038 "preproc.c"
+#line 54031 "preproc.c"
     break;
 
   case 2047: /* b_expr: b_expr '%' b_expr  */
-#line 12282 "preproc.y"
+#line 12275 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("%"),(yyvsp[0].str));
 }
-#line 54046 "preproc.c"
+#line 54039 "preproc.c"
     break;
 
   case 2048: /* b_expr: b_expr '^' b_expr  */
-#line 12286 "preproc.y"
+#line 12279 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("^"),(yyvsp[0].str));
 }
-#line 54054 "preproc.c"
+#line 54047 "preproc.c"
     break;
 
   case 2049: /* b_expr: b_expr '<' b_expr  */
-#line 12290 "preproc.y"
+#line 12283 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("<"),(yyvsp[0].str));
 }
-#line 54062 "preproc.c"
+#line 54055 "preproc.c"
     break;
 
   case 2050: /* b_expr: b_expr '>' b_expr  */
-#line 12294 "preproc.y"
+#line 12287 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(">"),(yyvsp[0].str));
 }
-#line 54070 "preproc.c"
+#line 54063 "preproc.c"
     break;
 
   case 2051: /* b_expr: b_expr '=' b_expr  */
-#line 12298 "preproc.y"
+#line 12291 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("="),(yyvsp[0].str));
 }
-#line 54078 "preproc.c"
+#line 54071 "preproc.c"
     break;
 
   case 2052: /* b_expr: b_expr LESS_EQUALS b_expr  */
-#line 12302 "preproc.y"
+#line 12295 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("<="),(yyvsp[0].str));
 }
-#line 54086 "preproc.c"
+#line 54079 "preproc.c"
     break;
 
   case 2053: /* b_expr: b_expr GREATER_EQUALS b_expr  */
-#line 12306 "preproc.y"
+#line 12299 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(">="),(yyvsp[0].str));
 }
-#line 54094 "preproc.c"
+#line 54087 "preproc.c"
     break;
 
   case 2054: /* b_expr: b_expr NOT_EQUALS b_expr  */
-#line 12310 "preproc.y"
+#line 12303 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("<>"),(yyvsp[0].str));
 }
-#line 54102 "preproc.c"
+#line 54095 "preproc.c"
     break;
 
   case 2055: /* b_expr: b_expr qual_Op b_expr  */
-#line 12314 "preproc.y"
+#line 12307 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 54110 "preproc.c"
+#line 54103 "preproc.c"
     break;
 
   case 2056: /* b_expr: qual_Op b_expr  */
-#line 12318 "preproc.y"
+#line 12311 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 54118 "preproc.c"
+#line 54111 "preproc.c"
     break;
 
   case 2057: /* b_expr: b_expr IS DISTINCT FROM b_expr  */
-#line 12322 "preproc.y"
+#line 12315 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-4].str),mm_strdup("is distinct from"),(yyvsp[0].str));
 }
-#line 54126 "preproc.c"
+#line 54119 "preproc.c"
     break;
 
   case 2058: /* b_expr: b_expr IS NOT DISTINCT FROM b_expr  */
-#line 12326 "preproc.y"
+#line 12319 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-5].str),mm_strdup("is not distinct from"),(yyvsp[0].str));
 }
-#line 54134 "preproc.c"
+#line 54127 "preproc.c"
     break;
 
   case 2059: /* b_expr: b_expr IS DOCUMENT_P  */
-#line 12330 "preproc.y"
+#line 12323 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("is document"));
 }
-#line 54142 "preproc.c"
+#line 54135 "preproc.c"
     break;
 
   case 2060: /* b_expr: b_expr IS NOT DOCUMENT_P  */
-#line 12334 "preproc.y"
+#line 12327 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-3].str),mm_strdup("is not document"));
 }
-#line 54150 "preproc.c"
+#line 54143 "preproc.c"
     break;
 
   case 2061: /* c_expr: columnref  */
-#line 12342 "preproc.y"
+#line 12335 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 54158 "preproc.c"
+#line 54151 "preproc.c"
     break;
 
   case 2062: /* c_expr: AexprConst  */
-#line 12346 "preproc.y"
+#line 12339 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 54166 "preproc.c"
+#line 54159 "preproc.c"
     break;
 
   case 2063: /* c_expr: ecpg_param opt_indirection  */
-#line 12350 "preproc.y"
+#line 12343 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 54174 "preproc.c"
+#line 54167 "preproc.c"
     break;
 
   case 2064: /* c_expr: '(' a_expr ')' opt_indirection  */
-#line 12354 "preproc.y"
+#line 12347 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 54182 "preproc.c"
+#line 54175 "preproc.c"
     break;
 
   case 2065: /* c_expr: case_expr  */
-#line 12358 "preproc.y"
+#line 12351 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 54190 "preproc.c"
+#line 54183 "preproc.c"
     break;
 
   case 2066: /* c_expr: func_expr  */
-#line 12362 "preproc.y"
+#line 12355 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 54198 "preproc.c"
+#line 54191 "preproc.c"
     break;
 
   case 2067: /* c_expr: select_with_parens  */
-#line 12366 "preproc.y"
+#line 12359 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 54206 "preproc.c"
+#line 54199 "preproc.c"
     break;
 
   case 2068: /* c_expr: select_with_parens indirection  */
-#line 12370 "preproc.y"
+#line 12363 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 54214 "preproc.c"
+#line 54207 "preproc.c"
     break;
 
   case 2069: /* c_expr: EXISTS select_with_parens  */
-#line 12374 "preproc.y"
+#line 12367 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("exists"),(yyvsp[0].str));
 }
-#line 54222 "preproc.c"
+#line 54215 "preproc.c"
     break;
 
   case 2070: /* c_expr: ARRAY select_with_parens  */
-#line 12378 "preproc.y"
+#line 12371 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("array"),(yyvsp[0].str));
 }
-#line 54230 "preproc.c"
+#line 54223 "preproc.c"
     break;
 
   case 2071: /* c_expr: ARRAY array_expr  */
-#line 12382 "preproc.y"
+#line 12375 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("array"),(yyvsp[0].str));
 }
-#line 54238 "preproc.c"
+#line 54231 "preproc.c"
     break;
 
   case 2072: /* c_expr: explicit_row  */
-#line 12386 "preproc.y"
+#line 12379 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 54246 "preproc.c"
+#line 54239 "preproc.c"
     break;
 
   case 2073: /* c_expr: implicit_row  */
-#line 12390 "preproc.y"
+#line 12383 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 54254 "preproc.c"
+#line 54247 "preproc.c"
     break;
 
   case 2074: /* c_expr: GROUPING '(' expr_list ')'  */
-#line 12394 "preproc.y"
+#line 12387 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("grouping ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54262 "preproc.c"
+#line 54255 "preproc.c"
     break;
 
   case 2075: /* func_application: func_name '(' ')'  */
-#line 12402 "preproc.y"
+#line 12395 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-2].str),mm_strdup("( )"));
 }
-#line 54270 "preproc.c"
+#line 54263 "preproc.c"
     break;
 
   case 2076: /* func_application: func_name '(' func_arg_list opt_sort_clause ')'  */
-#line 12406 "preproc.y"
+#line 12399 "preproc.y"
  { 
  (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("("),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54278 "preproc.c"
+#line 54271 "preproc.c"
     break;
 
   case 2077: /* func_application: func_name '(' VARIADIC func_arg_expr opt_sort_clause ')'  */
-#line 12410 "preproc.y"
+#line 12403 "preproc.y"
  { 
  (yyval.str) = cat_str(5,(yyvsp[-5].str),mm_strdup("( variadic"),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54286 "preproc.c"
+#line 54279 "preproc.c"
     break;
 
   case 2078: /* func_application: func_name '(' func_arg_list ',' VARIADIC func_arg_expr opt_sort_clause ')'  */
-#line 12414 "preproc.y"
+#line 12407 "preproc.y"
  { 
  (yyval.str) = cat_str(7,(yyvsp[-7].str),mm_strdup("("),(yyvsp[-5].str),mm_strdup(", variadic"),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54294 "preproc.c"
+#line 54287 "preproc.c"
     break;
 
   case 2079: /* func_application: func_name '(' ALL func_arg_list opt_sort_clause ')'  */
-#line 12418 "preproc.y"
+#line 12411 "preproc.y"
  { 
  (yyval.str) = cat_str(5,(yyvsp[-5].str),mm_strdup("( all"),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54302 "preproc.c"
+#line 54295 "preproc.c"
     break;
 
   case 2080: /* func_application: func_name '(' DISTINCT func_arg_list opt_sort_clause ')'  */
-#line 12422 "preproc.y"
+#line 12415 "preproc.y"
  { 
  (yyval.str) = cat_str(5,(yyvsp[-5].str),mm_strdup("( distinct"),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54310 "preproc.c"
+#line 54303 "preproc.c"
     break;
 
   case 2081: /* func_application: func_name '(' '*' ')'  */
-#line 12426 "preproc.y"
+#line 12419 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-3].str),mm_strdup("( * )"));
 }
-#line 54318 "preproc.c"
+#line 54311 "preproc.c"
     break;
 
   case 2082: /* func_expr: func_application within_group_clause filter_clause over_clause  */
-#line 12434 "preproc.y"
+#line 12427 "preproc.y"
  { 
  (yyval.str) = cat_str(4,(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 54326 "preproc.c"
+#line 54319 "preproc.c"
     break;
 
   case 2083: /* func_expr: json_aggregate_func filter_clause over_clause  */
-#line 12438 "preproc.y"
+#line 12431 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 54334 "preproc.c"
+#line 54327 "preproc.c"
     break;
 
   case 2084: /* func_expr: func_expr_common_subexpr  */
-#line 12442 "preproc.y"
+#line 12435 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 54342 "preproc.c"
+#line 54335 "preproc.c"
     break;
 
   case 2085: /* func_expr_windowless: func_application  */
-#line 12450 "preproc.y"
+#line 12443 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 54350 "preproc.c"
+#line 54343 "preproc.c"
     break;
 
   case 2086: /* func_expr_windowless: func_expr_common_subexpr  */
-#line 12454 "preproc.y"
+#line 12447 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 54358 "preproc.c"
+#line 54351 "preproc.c"
     break;
 
   case 2087: /* func_expr_windowless: json_aggregate_func  */
-#line 12458 "preproc.y"
+#line 12451 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 54366 "preproc.c"
+#line 54359 "preproc.c"
     break;
 
   case 2088: /* func_expr_common_subexpr: COLLATION FOR '(' a_expr ')'  */
-#line 12466 "preproc.y"
+#line 12459 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("collation for ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54374 "preproc.c"
+#line 54367 "preproc.c"
     break;
 
   case 2089: /* func_expr_common_subexpr: CURRENT_DATE  */
-#line 12470 "preproc.y"
+#line 12463 "preproc.y"
  { 
  (yyval.str) = mm_strdup("current_date");
 }
-#line 54382 "preproc.c"
+#line 54375 "preproc.c"
     break;
 
   case 2090: /* func_expr_common_subexpr: CURRENT_TIME  */
-#line 12474 "preproc.y"
+#line 12467 "preproc.y"
  { 
  (yyval.str) = mm_strdup("current_time");
 }
-#line 54390 "preproc.c"
+#line 54383 "preproc.c"
     break;
 
   case 2091: /* func_expr_common_subexpr: CURRENT_TIME '(' Iconst ')'  */
-#line 12478 "preproc.y"
+#line 12471 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("current_time ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54398 "preproc.c"
+#line 54391 "preproc.c"
     break;
 
   case 2092: /* func_expr_common_subexpr: CURRENT_TIMESTAMP  */
-#line 12482 "preproc.y"
+#line 12475 "preproc.y"
  { 
  (yyval.str) = mm_strdup("current_timestamp");
 }
-#line 54406 "preproc.c"
+#line 54399 "preproc.c"
     break;
 
   case 2093: /* func_expr_common_subexpr: CURRENT_TIMESTAMP '(' Iconst ')'  */
-#line 12486 "preproc.y"
+#line 12479 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("current_timestamp ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54414 "preproc.c"
+#line 54407 "preproc.c"
     break;
 
   case 2094: /* func_expr_common_subexpr: LOCALTIME  */
-#line 12490 "preproc.y"
+#line 12483 "preproc.y"
  { 
  (yyval.str) = mm_strdup("localtime");
 }
-#line 54422 "preproc.c"
+#line 54415 "preproc.c"
     break;
 
   case 2095: /* func_expr_common_subexpr: LOCALTIME '(' Iconst ')'  */
-#line 12494 "preproc.y"
+#line 12487 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("localtime ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54430 "preproc.c"
+#line 54423 "preproc.c"
     break;
 
   case 2096: /* func_expr_common_subexpr: LOCALTIMESTAMP  */
-#line 12498 "preproc.y"
+#line 12491 "preproc.y"
  { 
  (yyval.str) = mm_strdup("localtimestamp");
 }
-#line 54438 "preproc.c"
+#line 54431 "preproc.c"
     break;
 
   case 2097: /* func_expr_common_subexpr: LOCALTIMESTAMP '(' Iconst ')'  */
-#line 12502 "preproc.y"
+#line 12495 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("localtimestamp ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54446 "preproc.c"
+#line 54439 "preproc.c"
     break;
 
   case 2098: /* func_expr_common_subexpr: CURRENT_ROLE  */
-#line 12506 "preproc.y"
+#line 12499 "preproc.y"
  { 
  (yyval.str) = mm_strdup("current_role");
 }
-#line 54454 "preproc.c"
+#line 54447 "preproc.c"
     break;
 
   case 2099: /* func_expr_common_subexpr: CURRENT_USER  */
-#line 12510 "preproc.y"
+#line 12503 "preproc.y"
  { 
  (yyval.str) = mm_strdup("current_user");
 }
-#line 54462 "preproc.c"
+#line 54455 "preproc.c"
     break;
 
   case 2100: /* func_expr_common_subexpr: SESSION_USER  */
-#line 12514 "preproc.y"
+#line 12507 "preproc.y"
  { 
  (yyval.str) = mm_strdup("session_user");
 }
-#line 54470 "preproc.c"
+#line 54463 "preproc.c"
     break;
 
   case 2101: /* func_expr_common_subexpr: SYSTEM_USER  */
-#line 12518 "preproc.y"
+#line 12511 "preproc.y"
  { 
  (yyval.str) = mm_strdup("system_user");
 }
-#line 54478 "preproc.c"
+#line 54471 "preproc.c"
     break;
 
   case 2102: /* func_expr_common_subexpr: USER  */
-#line 12522 "preproc.y"
+#line 12515 "preproc.y"
  { 
  (yyval.str) = mm_strdup("user");
 }
-#line 54486 "preproc.c"
+#line 54479 "preproc.c"
     break;
 
   case 2103: /* func_expr_common_subexpr: CURRENT_CATALOG  */
-#line 12526 "preproc.y"
+#line 12519 "preproc.y"
  { 
  (yyval.str) = mm_strdup("current_catalog");
 }
-#line 54494 "preproc.c"
+#line 54487 "preproc.c"
     break;
 
   case 2104: /* func_expr_common_subexpr: CURRENT_SCHEMA  */
-#line 12530 "preproc.y"
+#line 12523 "preproc.y"
  { 
  (yyval.str) = mm_strdup("current_schema");
 }
-#line 54502 "preproc.c"
+#line 54495 "preproc.c"
     break;
 
   case 2105: /* func_expr_common_subexpr: CAST '(' a_expr AS Typename ')'  */
-#line 12534 "preproc.y"
+#line 12527 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("cast ("),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54510 "preproc.c"
+#line 54503 "preproc.c"
     break;
 
   case 2106: /* func_expr_common_subexpr: EXTRACT '(' extract_list ')'  */
-#line 12538 "preproc.y"
+#line 12531 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("extract ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54518 "preproc.c"
+#line 54511 "preproc.c"
     break;
 
   case 2107: /* func_expr_common_subexpr: NORMALIZE '(' a_expr ')'  */
-#line 12542 "preproc.y"
+#line 12535 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("normalize ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54526 "preproc.c"
+#line 54519 "preproc.c"
     break;
 
   case 2108: /* func_expr_common_subexpr: NORMALIZE '(' a_expr ',' unicode_normal_form ')'  */
-#line 12546 "preproc.y"
+#line 12539 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("normalize ("),(yyvsp[-3].str),mm_strdup(","),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54534 "preproc.c"
+#line 54527 "preproc.c"
     break;
 
   case 2109: /* func_expr_common_subexpr: OVERLAY '(' overlay_list ')'  */
-#line 12550 "preproc.y"
+#line 12543 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("overlay ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54542 "preproc.c"
+#line 54535 "preproc.c"
     break;
 
   case 2110: /* func_expr_common_subexpr: OVERLAY '(' func_arg_list_opt ')'  */
-#line 12554 "preproc.y"
+#line 12547 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("overlay ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54550 "preproc.c"
+#line 54543 "preproc.c"
     break;
 
   case 2111: /* func_expr_common_subexpr: POSITION '(' position_list ')'  */
-#line 12558 "preproc.y"
+#line 12551 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("position ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54558 "preproc.c"
+#line 54551 "preproc.c"
     break;
 
   case 2112: /* func_expr_common_subexpr: SUBSTRING '(' substr_list ')'  */
-#line 12562 "preproc.y"
+#line 12555 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("substring ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54566 "preproc.c"
+#line 54559 "preproc.c"
     break;
 
   case 2113: /* func_expr_common_subexpr: SUBSTRING '(' func_arg_list_opt ')'  */
-#line 12566 "preproc.y"
+#line 12559 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("substring ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54574 "preproc.c"
+#line 54567 "preproc.c"
     break;
 
   case 2114: /* func_expr_common_subexpr: TREAT '(' a_expr AS Typename ')'  */
-#line 12570 "preproc.y"
+#line 12563 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("treat ("),(yyvsp[-3].str),mm_strdup("as"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54582 "preproc.c"
+#line 54575 "preproc.c"
     break;
 
   case 2115: /* func_expr_common_subexpr: TRIM '(' BOTH trim_list ')'  */
-#line 12574 "preproc.y"
+#line 12567 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("trim ( both"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54590 "preproc.c"
+#line 54583 "preproc.c"
     break;
 
   case 2116: /* func_expr_common_subexpr: TRIM '(' LEADING trim_list ')'  */
-#line 12578 "preproc.y"
+#line 12571 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("trim ( leading"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54598 "preproc.c"
+#line 54591 "preproc.c"
     break;
 
   case 2117: /* func_expr_common_subexpr: TRIM '(' TRAILING trim_list ')'  */
-#line 12582 "preproc.y"
+#line 12575 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("trim ( trailing"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54606 "preproc.c"
+#line 54599 "preproc.c"
     break;
 
   case 2118: /* func_expr_common_subexpr: TRIM '(' trim_list ')'  */
-#line 12586 "preproc.y"
+#line 12579 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("trim ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54614 "preproc.c"
+#line 54607 "preproc.c"
     break;
 
   case 2119: /* func_expr_common_subexpr: NULLIF '(' a_expr ',' a_expr ')'  */
-#line 12590 "preproc.y"
+#line 12583 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("nullif ("),(yyvsp[-3].str),mm_strdup(","),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54622 "preproc.c"
+#line 54615 "preproc.c"
     break;
 
   case 2120: /* func_expr_common_subexpr: COALESCE '(' expr_list ')'  */
-#line 12594 "preproc.y"
+#line 12587 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("coalesce ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54630 "preproc.c"
+#line 54623 "preproc.c"
     break;
 
   case 2121: /* func_expr_common_subexpr: GREATEST '(' expr_list ')'  */
-#line 12598 "preproc.y"
+#line 12591 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("greatest ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54638 "preproc.c"
+#line 54631 "preproc.c"
     break;
 
   case 2122: /* func_expr_common_subexpr: LEAST '(' expr_list ')'  */
-#line 12602 "preproc.y"
+#line 12595 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("least ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54646 "preproc.c"
+#line 54639 "preproc.c"
     break;
 
   case 2123: /* func_expr_common_subexpr: XMLCONCAT '(' expr_list ')'  */
-#line 12606 "preproc.y"
+#line 12599 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("xmlconcat ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54654 "preproc.c"
+#line 54647 "preproc.c"
     break;
 
   case 2124: /* func_expr_common_subexpr: XMLELEMENT '(' NAME_P ColLabel ')'  */
-#line 12610 "preproc.y"
+#line 12603 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("xmlelement ( name"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54662 "preproc.c"
+#line 54655 "preproc.c"
     break;
 
   case 2125: /* func_expr_common_subexpr: XMLELEMENT '(' NAME_P ColLabel ',' xml_attributes ')'  */
-#line 12614 "preproc.y"
+#line 12607 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("xmlelement ( name"),(yyvsp[-3].str),mm_strdup(","),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54670 "preproc.c"
+#line 54663 "preproc.c"
     break;
 
   case 2126: /* func_expr_common_subexpr: XMLELEMENT '(' NAME_P ColLabel ',' expr_list ')'  */
-#line 12618 "preproc.y"
+#line 12611 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("xmlelement ( name"),(yyvsp[-3].str),mm_strdup(","),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54678 "preproc.c"
+#line 54671 "preproc.c"
     break;
 
   case 2127: /* func_expr_common_subexpr: XMLELEMENT '(' NAME_P ColLabel ',' xml_attributes ',' expr_list ')'  */
-#line 12622 "preproc.y"
+#line 12615 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("xmlelement ( name"),(yyvsp[-5].str),mm_strdup(","),(yyvsp[-3].str),mm_strdup(","),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54686 "preproc.c"
+#line 54679 "preproc.c"
     break;
 
   case 2128: /* func_expr_common_subexpr: XMLEXISTS '(' c_expr xmlexists_argument ')'  */
-#line 12626 "preproc.y"
+#line 12619 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("xmlexists ("),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54694 "preproc.c"
+#line 54687 "preproc.c"
     break;
 
   case 2129: /* func_expr_common_subexpr: XMLFOREST '(' xml_attribute_list ')'  */
-#line 12630 "preproc.y"
+#line 12623 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("xmlforest ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54702 "preproc.c"
+#line 54695 "preproc.c"
     break;
 
   case 2130: /* func_expr_common_subexpr: XMLPARSE '(' document_or_content a_expr xml_whitespace_option ')'  */
-#line 12634 "preproc.y"
+#line 12627 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("xmlparse ("),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54710 "preproc.c"
+#line 54703 "preproc.c"
     break;
 
   case 2131: /* func_expr_common_subexpr: XMLPI '(' NAME_P ColLabel ')'  */
-#line 12638 "preproc.y"
+#line 12631 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("xmlpi ( name"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54718 "preproc.c"
+#line 54711 "preproc.c"
     break;
 
   case 2132: /* func_expr_common_subexpr: XMLPI '(' NAME_P ColLabel ',' a_expr ')'  */
-#line 12642 "preproc.y"
+#line 12635 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("xmlpi ( name"),(yyvsp[-3].str),mm_strdup(","),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54726 "preproc.c"
+#line 54719 "preproc.c"
     break;
 
   case 2133: /* func_expr_common_subexpr: XMLROOT '(' a_expr ',' xml_root_version opt_xml_root_standalone ')'  */
-#line 12646 "preproc.y"
+#line 12639 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("xmlroot ("),(yyvsp[-4].str),mm_strdup(","),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54734 "preproc.c"
+#line 54727 "preproc.c"
     break;
 
   case 2134: /* func_expr_common_subexpr: XMLSERIALIZE '(' document_or_content a_expr AS SimpleTypename xml_indent_option ')'  */
-#line 12650 "preproc.y"
+#line 12643 "preproc.y"
  { 
  (yyval.str) = cat_str(7,mm_strdup("xmlserialize ("),(yyvsp[-5].str),(yyvsp[-4].str),mm_strdup("as"),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54742 "preproc.c"
+#line 54735 "preproc.c"
     break;
 
   case 2135: /* func_expr_common_subexpr: JSON_OBJECT '(' func_arg_list ')'  */
-#line 12654 "preproc.y"
+#line 12647 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("json_object ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54750 "preproc.c"
+#line 54743 "preproc.c"
     break;
 
   case 2136: /* func_expr_common_subexpr: JSON_OBJECT '(' json_name_and_value_list json_object_constructor_null_clause_opt json_key_uniqueness_constraint_opt json_output_clause_opt ')'  */
-#line 12658 "preproc.y"
+#line 12651 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("json_object ("),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54758 "preproc.c"
+#line 54751 "preproc.c"
     break;
 
   case 2137: /* func_expr_common_subexpr: JSON_OBJECT '(' json_output_clause_opt ')'  */
-#line 12662 "preproc.y"
+#line 12655 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("json_object ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54766 "preproc.c"
+#line 54759 "preproc.c"
     break;
 
   case 2138: /* func_expr_common_subexpr: JSON_ARRAY '(' json_value_expr_list json_array_constructor_null_clause_opt json_output_clause_opt ')'  */
-#line 12666 "preproc.y"
+#line 12659 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("json_array ("),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54774 "preproc.c"
+#line 54767 "preproc.c"
     break;
 
   case 2139: /* func_expr_common_subexpr: JSON_ARRAY '(' select_no_parens json_format_clause_opt json_output_clause_opt ')'  */
-#line 12670 "preproc.y"
+#line 12663 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("json_array ("),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54782 "preproc.c"
+#line 54775 "preproc.c"
     break;
 
   case 2140: /* func_expr_common_subexpr: JSON_ARRAY '(' json_output_clause_opt ')'  */
-#line 12674 "preproc.y"
+#line 12667 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("json_array ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54790 "preproc.c"
+#line 54783 "preproc.c"
     break;
 
   case 2141: /* xml_root_version: VERSION_P a_expr  */
-#line 12682 "preproc.y"
+#line 12675 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("version"),(yyvsp[0].str));
 }
-#line 54798 "preproc.c"
+#line 54791 "preproc.c"
     break;
 
   case 2142: /* xml_root_version: VERSION_P NO VALUE_P  */
-#line 12686 "preproc.y"
+#line 12679 "preproc.y"
  { 
  (yyval.str) = mm_strdup("version no value");
 }
-#line 54806 "preproc.c"
+#line 54799 "preproc.c"
     break;
 
   case 2143: /* opt_xml_root_standalone: ',' STANDALONE_P YES_P  */
-#line 12694 "preproc.y"
+#line 12687 "preproc.y"
  { 
  (yyval.str) = mm_strdup(", standalone yes");
 }
-#line 54814 "preproc.c"
+#line 54807 "preproc.c"
     break;
 
   case 2144: /* opt_xml_root_standalone: ',' STANDALONE_P NO  */
-#line 12698 "preproc.y"
+#line 12691 "preproc.y"
  { 
  (yyval.str) = mm_strdup(", standalone no");
 }
-#line 54822 "preproc.c"
+#line 54815 "preproc.c"
     break;
 
   case 2145: /* opt_xml_root_standalone: ',' STANDALONE_P NO VALUE_P  */
-#line 12702 "preproc.y"
+#line 12695 "preproc.y"
  { 
  (yyval.str) = mm_strdup(", standalone no value");
 }
-#line 54830 "preproc.c"
+#line 54823 "preproc.c"
     break;
 
   case 2146: /* opt_xml_root_standalone: %empty  */
-#line 12706 "preproc.y"
+#line 12699 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 54837 "preproc.c"
+#line 54830 "preproc.c"
     break;
 
   case 2147: /* xml_attributes: XMLATTRIBUTES '(' xml_attribute_list ')'  */
-#line 12713 "preproc.y"
+#line 12706 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("xmlattributes ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54845 "preproc.c"
+#line 54838 "preproc.c"
     break;
 
   case 2148: /* xml_attribute_list: xml_attribute_el  */
-#line 12721 "preproc.y"
+#line 12714 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 54853 "preproc.c"
+#line 54846 "preproc.c"
     break;
 
   case 2149: /* xml_attribute_list: xml_attribute_list ',' xml_attribute_el  */
-#line 12725 "preproc.y"
+#line 12718 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 54861 "preproc.c"
+#line 54854 "preproc.c"
     break;
 
   case 2150: /* xml_attribute_el: a_expr AS ColLabel  */
-#line 12733 "preproc.y"
+#line 12726 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("as"),(yyvsp[0].str));
 }
-#line 54869 "preproc.c"
+#line 54862 "preproc.c"
     break;
 
   case 2151: /* xml_attribute_el: a_expr  */
-#line 12737 "preproc.y"
+#line 12730 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 54877 "preproc.c"
+#line 54870 "preproc.c"
     break;
 
   case 2152: /* document_or_content: DOCUMENT_P  */
-#line 12745 "preproc.y"
+#line 12738 "preproc.y"
  { 
  (yyval.str) = mm_strdup("document");
 }
-#line 54885 "preproc.c"
+#line 54878 "preproc.c"
     break;
 
   case 2153: /* document_or_content: CONTENT_P  */
-#line 12749 "preproc.y"
+#line 12742 "preproc.y"
  { 
  (yyval.str) = mm_strdup("content");
 }
-#line 54893 "preproc.c"
+#line 54886 "preproc.c"
     break;
 
   case 2154: /* xml_indent_option: INDENT  */
-#line 12757 "preproc.y"
+#line 12750 "preproc.y"
  { 
  (yyval.str) = mm_strdup("indent");
 }
-#line 54901 "preproc.c"
+#line 54894 "preproc.c"
     break;
 
   case 2155: /* xml_indent_option: NO INDENT  */
-#line 12761 "preproc.y"
+#line 12754 "preproc.y"
  { 
  (yyval.str) = mm_strdup("no indent");
 }
-#line 54909 "preproc.c"
+#line 54902 "preproc.c"
     break;
 
   case 2156: /* xml_indent_option: %empty  */
-#line 12765 "preproc.y"
+#line 12758 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 54916 "preproc.c"
+#line 54909 "preproc.c"
     break;
 
   case 2157: /* xml_whitespace_option: PRESERVE WHITESPACE_P  */
-#line 12772 "preproc.y"
+#line 12765 "preproc.y"
  { 
  (yyval.str) = mm_strdup("preserve whitespace");
 }
-#line 54924 "preproc.c"
+#line 54917 "preproc.c"
     break;
 
   case 2158: /* xml_whitespace_option: STRIP_P WHITESPACE_P  */
-#line 12776 "preproc.y"
+#line 12769 "preproc.y"
  { 
  (yyval.str) = mm_strdup("strip whitespace");
 }
-#line 54932 "preproc.c"
+#line 54925 "preproc.c"
     break;
 
   case 2159: /* xml_whitespace_option: %empty  */
-#line 12780 "preproc.y"
+#line 12773 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 54939 "preproc.c"
+#line 54932 "preproc.c"
     break;
 
   case 2160: /* xmlexists_argument: PASSING c_expr  */
-#line 12787 "preproc.y"
+#line 12780 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("passing"),(yyvsp[0].str));
 }
-#line 54947 "preproc.c"
+#line 54940 "preproc.c"
     break;
 
   case 2161: /* xmlexists_argument: PASSING c_expr xml_passing_mech  */
-#line 12791 "preproc.y"
+#line 12784 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("passing"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 54955 "preproc.c"
+#line 54948 "preproc.c"
     break;
 
   case 2162: /* xmlexists_argument: PASSING xml_passing_mech c_expr  */
-#line 12795 "preproc.y"
+#line 12788 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("passing"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 54963 "preproc.c"
+#line 54956 "preproc.c"
     break;
 
   case 2163: /* xmlexists_argument: PASSING xml_passing_mech c_expr xml_passing_mech  */
-#line 12799 "preproc.y"
+#line 12792 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("passing"),(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 54971 "preproc.c"
+#line 54964 "preproc.c"
     break;
 
   case 2164: /* xml_passing_mech: BY REF_P  */
-#line 12807 "preproc.y"
+#line 12800 "preproc.y"
  { 
  (yyval.str) = mm_strdup("by ref");
 }
-#line 54979 "preproc.c"
+#line 54972 "preproc.c"
     break;
 
   case 2165: /* xml_passing_mech: BY VALUE_P  */
-#line 12811 "preproc.y"
+#line 12804 "preproc.y"
  { 
  (yyval.str) = mm_strdup("by value");
 }
-#line 54987 "preproc.c"
+#line 54980 "preproc.c"
     break;
 
   case 2166: /* within_group_clause: WITHIN GROUP_P '(' sort_clause ')'  */
-#line 12819 "preproc.y"
+#line 12812 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("within group ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 54995 "preproc.c"
+#line 54988 "preproc.c"
     break;
 
   case 2167: /* within_group_clause: %empty  */
-#line 12823 "preproc.y"
+#line 12816 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 55002 "preproc.c"
+#line 54995 "preproc.c"
     break;
 
   case 2168: /* filter_clause: FILTER '(' WHERE a_expr ')'  */
-#line 12830 "preproc.y"
+#line 12823 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("filter ( where"),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 55010 "preproc.c"
+#line 55003 "preproc.c"
     break;
 
   case 2169: /* filter_clause: %empty  */
-#line 12834 "preproc.y"
+#line 12827 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 55017 "preproc.c"
+#line 55010 "preproc.c"
     break;
 
   case 2170: /* window_clause: WINDOW window_definition_list  */
-#line 12841 "preproc.y"
+#line 12834 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("window"),(yyvsp[0].str));
 }
-#line 55025 "preproc.c"
+#line 55018 "preproc.c"
     break;
 
   case 2171: /* window_clause: %empty  */
-#line 12845 "preproc.y"
+#line 12838 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 55032 "preproc.c"
+#line 55025 "preproc.c"
     break;
 
   case 2172: /* window_definition_list: window_definition  */
-#line 12852 "preproc.y"
+#line 12845 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 55040 "preproc.c"
+#line 55033 "preproc.c"
     break;
 
   case 2173: /* window_definition_list: window_definition_list ',' window_definition  */
-#line 12856 "preproc.y"
+#line 12849 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 55048 "preproc.c"
+#line 55041 "preproc.c"
     break;
 
   case 2174: /* window_definition: ColId AS window_specification  */
-#line 12864 "preproc.y"
+#line 12857 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("as"),(yyvsp[0].str));
 }
-#line 55056 "preproc.c"
+#line 55049 "preproc.c"
     break;
 
   case 2175: /* over_clause: OVER window_specification  */
-#line 12872 "preproc.y"
+#line 12865 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("over"),(yyvsp[0].str));
 }
-#line 55064 "preproc.c"
+#line 55057 "preproc.c"
     break;
 
   case 2176: /* over_clause: OVER ColId  */
-#line 12876 "preproc.y"
+#line 12869 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("over"),(yyvsp[0].str));
 }
-#line 55072 "preproc.c"
+#line 55065 "preproc.c"
     break;
 
   case 2177: /* over_clause: %empty  */
-#line 12880 "preproc.y"
+#line 12873 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 55079 "preproc.c"
+#line 55072 "preproc.c"
     break;
 
   case 2178: /* window_specification: '(' opt_existing_window_name opt_partition_clause opt_sort_clause opt_frame_clause ')'  */
-#line 12887 "preproc.y"
+#line 12880 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("("),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 55087 "preproc.c"
+#line 55080 "preproc.c"
     break;
 
   case 2179: /* opt_existing_window_name: ColId  */
-#line 12895 "preproc.y"
+#line 12888 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 55095 "preproc.c"
+#line 55088 "preproc.c"
     break;
 
   case 2180: /* opt_existing_window_name: %empty  */
-#line 12899 "preproc.y"
+#line 12892 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 55102 "preproc.c"
+#line 55095 "preproc.c"
     break;
 
   case 2181: /* opt_partition_clause: PARTITION BY expr_list  */
-#line 12906 "preproc.y"
+#line 12899 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("partition by"),(yyvsp[0].str));
 }
-#line 55110 "preproc.c"
+#line 55103 "preproc.c"
     break;
 
   case 2182: /* opt_partition_clause: %empty  */
-#line 12910 "preproc.y"
+#line 12903 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 55117 "preproc.c"
+#line 55110 "preproc.c"
     break;
 
   case 2183: /* opt_frame_clause: RANGE frame_extent opt_window_exclusion_clause  */
-#line 12917 "preproc.y"
+#line 12910 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("range"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 55125 "preproc.c"
+#line 55118 "preproc.c"
     break;
 
   case 2184: /* opt_frame_clause: ROWS frame_extent opt_window_exclusion_clause  */
-#line 12921 "preproc.y"
+#line 12914 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("rows"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 55133 "preproc.c"
+#line 55126 "preproc.c"
     break;
 
   case 2185: /* opt_frame_clause: GROUPS frame_extent opt_window_exclusion_clause  */
-#line 12925 "preproc.y"
+#line 12918 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("groups"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 55141 "preproc.c"
+#line 55134 "preproc.c"
     break;
 
   case 2186: /* opt_frame_clause: %empty  */
-#line 12929 "preproc.y"
+#line 12922 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 55148 "preproc.c"
+#line 55141 "preproc.c"
     break;
 
   case 2187: /* frame_extent: frame_bound  */
-#line 12936 "preproc.y"
+#line 12929 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 55156 "preproc.c"
+#line 55149 "preproc.c"
     break;
 
   case 2188: /* frame_extent: BETWEEN frame_bound AND frame_bound  */
-#line 12940 "preproc.y"
+#line 12933 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("between"),(yyvsp[-2].str),mm_strdup("and"),(yyvsp[0].str));
 }
-#line 55164 "preproc.c"
+#line 55157 "preproc.c"
     break;
 
   case 2189: /* frame_bound: UNBOUNDED PRECEDING  */
-#line 12948 "preproc.y"
+#line 12941 "preproc.y"
  { 
  (yyval.str) = mm_strdup("unbounded preceding");
 }
-#line 55172 "preproc.c"
+#line 55165 "preproc.c"
     break;
 
   case 2190: /* frame_bound: UNBOUNDED FOLLOWING  */
-#line 12952 "preproc.y"
+#line 12945 "preproc.y"
  { 
  (yyval.str) = mm_strdup("unbounded following");
 }
-#line 55180 "preproc.c"
+#line 55173 "preproc.c"
     break;
 
   case 2191: /* frame_bound: CURRENT_P ROW  */
-#line 12956 "preproc.y"
+#line 12949 "preproc.y"
  { 
  (yyval.str) = mm_strdup("current row");
 }
-#line 55188 "preproc.c"
+#line 55181 "preproc.c"
     break;
 
   case 2192: /* frame_bound: a_expr PRECEDING  */
-#line 12960 "preproc.y"
+#line 12953 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),mm_strdup("preceding"));
 }
-#line 55196 "preproc.c"
+#line 55189 "preproc.c"
     break;
 
   case 2193: /* frame_bound: a_expr FOLLOWING  */
-#line 12964 "preproc.y"
+#line 12957 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),mm_strdup("following"));
 }
-#line 55204 "preproc.c"
+#line 55197 "preproc.c"
     break;
 
   case 2194: /* opt_window_exclusion_clause: EXCLUDE CURRENT_P ROW  */
-#line 12972 "preproc.y"
+#line 12965 "preproc.y"
  { 
  (yyval.str) = mm_strdup("exclude current row");
 }
-#line 55212 "preproc.c"
+#line 55205 "preproc.c"
     break;
 
   case 2195: /* opt_window_exclusion_clause: EXCLUDE GROUP_P  */
-#line 12976 "preproc.y"
+#line 12969 "preproc.y"
  { 
  (yyval.str) = mm_strdup("exclude group");
 }
-#line 55220 "preproc.c"
+#line 55213 "preproc.c"
     break;
 
   case 2196: /* opt_window_exclusion_clause: EXCLUDE TIES  */
-#line 12980 "preproc.y"
+#line 12973 "preproc.y"
  { 
  (yyval.str) = mm_strdup("exclude ties");
 }
-#line 55228 "preproc.c"
+#line 55221 "preproc.c"
     break;
 
   case 2197: /* opt_window_exclusion_clause: EXCLUDE NO OTHERS  */
-#line 12984 "preproc.y"
+#line 12977 "preproc.y"
  { 
  (yyval.str) = mm_strdup("exclude no others");
 }
-#line 55236 "preproc.c"
+#line 55229 "preproc.c"
     break;
 
   case 2198: /* opt_window_exclusion_clause: %empty  */
-#line 12988 "preproc.y"
+#line 12981 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 55243 "preproc.c"
+#line 55236 "preproc.c"
     break;
 
   case 2199: /* row: ROW '(' expr_list ')'  */
-#line 12995 "preproc.y"
+#line 12988 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("row ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 55251 "preproc.c"
+#line 55244 "preproc.c"
     break;
 
   case 2200: /* row: ROW '(' ')'  */
-#line 12999 "preproc.y"
+#line 12992 "preproc.y"
  { 
  (yyval.str) = mm_strdup("row ( )");
 }
-#line 55259 "preproc.c"
+#line 55252 "preproc.c"
     break;
 
   case 2201: /* row: '(' expr_list ',' a_expr ')'  */
-#line 13003 "preproc.y"
+#line 12996 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("("),(yyvsp[-3].str),mm_strdup(","),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 55267 "preproc.c"
+#line 55260 "preproc.c"
     break;
 
   case 2202: /* explicit_row: ROW '(' expr_list ')'  */
-#line 13011 "preproc.y"
+#line 13004 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("row ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 55275 "preproc.c"
+#line 55268 "preproc.c"
     break;
 
   case 2203: /* explicit_row: ROW '(' ')'  */
-#line 13015 "preproc.y"
+#line 13008 "preproc.y"
  { 
  (yyval.str) = mm_strdup("row ( )");
 }
-#line 55283 "preproc.c"
+#line 55276 "preproc.c"
     break;
 
   case 2204: /* implicit_row: '(' expr_list ',' a_expr ')'  */
-#line 13023 "preproc.y"
+#line 13016 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("("),(yyvsp[-3].str),mm_strdup(","),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 55291 "preproc.c"
+#line 55284 "preproc.c"
     break;
 
   case 2205: /* sub_type: ANY  */
-#line 13031 "preproc.y"
+#line 13024 "preproc.y"
  { 
  (yyval.str) = mm_strdup("any");
 }
-#line 55299 "preproc.c"
+#line 55292 "preproc.c"
     break;
 
   case 2206: /* sub_type: SOME  */
-#line 13035 "preproc.y"
+#line 13028 "preproc.y"
  { 
  (yyval.str) = mm_strdup("some");
 }
-#line 55307 "preproc.c"
+#line 55300 "preproc.c"
     break;
 
   case 2207: /* sub_type: ALL  */
-#line 13039 "preproc.y"
+#line 13032 "preproc.y"
  { 
  (yyval.str) = mm_strdup("all");
 }
-#line 55315 "preproc.c"
+#line 55308 "preproc.c"
     break;
 
   case 2208: /* all_Op: Op  */
-#line 13047 "preproc.y"
+#line 13040 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 55323 "preproc.c"
+#line 55316 "preproc.c"
     break;
 
   case 2209: /* all_Op: MathOp  */
-#line 13051 "preproc.y"
+#line 13044 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 55331 "preproc.c"
+#line 55324 "preproc.c"
     break;
 
   case 2210: /* MathOp: '+'  */
-#line 13059 "preproc.y"
+#line 13052 "preproc.y"
  { 
  (yyval.str) = mm_strdup("+");
 }
-#line 55339 "preproc.c"
+#line 55332 "preproc.c"
     break;
 
   case 2211: /* MathOp: '-'  */
-#line 13063 "preproc.y"
+#line 13056 "preproc.y"
  { 
  (yyval.str) = mm_strdup("-");
 }
-#line 55347 "preproc.c"
+#line 55340 "preproc.c"
     break;
 
   case 2212: /* MathOp: '*'  */
-#line 13067 "preproc.y"
+#line 13060 "preproc.y"
  { 
  (yyval.str) = mm_strdup("*");
 }
-#line 55355 "preproc.c"
+#line 55348 "preproc.c"
     break;
 
   case 2213: /* MathOp: '/'  */
-#line 13071 "preproc.y"
+#line 13064 "preproc.y"
  { 
  (yyval.str) = mm_strdup("/");
 }
-#line 55363 "preproc.c"
+#line 55356 "preproc.c"
     break;
 
   case 2214: /* MathOp: '%'  */
-#line 13075 "preproc.y"
+#line 13068 "preproc.y"
  { 
  (yyval.str) = mm_strdup("%");
 }
-#line 55371 "preproc.c"
+#line 55364 "preproc.c"
     break;
 
   case 2215: /* MathOp: '^'  */
-#line 13079 "preproc.y"
+#line 13072 "preproc.y"
  { 
  (yyval.str) = mm_strdup("^");
 }
-#line 55379 "preproc.c"
+#line 55372 "preproc.c"
     break;
 
   case 2216: /* MathOp: '<'  */
-#line 13083 "preproc.y"
+#line 13076 "preproc.y"
  { 
  (yyval.str) = mm_strdup("<");
 }
-#line 55387 "preproc.c"
+#line 55380 "preproc.c"
     break;
 
   case 2217: /* MathOp: '>'  */
-#line 13087 "preproc.y"
+#line 13080 "preproc.y"
  { 
  (yyval.str) = mm_strdup(">");
 }
-#line 55395 "preproc.c"
+#line 55388 "preproc.c"
     break;
 
   case 2218: /* MathOp: '='  */
-#line 13091 "preproc.y"
+#line 13084 "preproc.y"
  { 
  (yyval.str) = mm_strdup("=");
 }
-#line 55403 "preproc.c"
+#line 55396 "preproc.c"
     break;
 
   case 2219: /* MathOp: LESS_EQUALS  */
-#line 13095 "preproc.y"
+#line 13088 "preproc.y"
  { 
  (yyval.str) = mm_strdup("<=");
 }
-#line 55411 "preproc.c"
+#line 55404 "preproc.c"
     break;
 
   case 2220: /* MathOp: GREATER_EQUALS  */
-#line 13099 "preproc.y"
+#line 13092 "preproc.y"
  { 
  (yyval.str) = mm_strdup(">=");
 }
-#line 55419 "preproc.c"
+#line 55412 "preproc.c"
     break;
 
   case 2221: /* MathOp: NOT_EQUALS  */
-#line 13103 "preproc.y"
+#line 13096 "preproc.y"
  { 
  (yyval.str) = mm_strdup("<>");
 }
-#line 55427 "preproc.c"
+#line 55420 "preproc.c"
     break;
 
   case 2222: /* qual_Op: Op  */
-#line 13111 "preproc.y"
+#line 13104 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 55435 "preproc.c"
+#line 55428 "preproc.c"
     break;
 
   case 2223: /* qual_Op: OPERATOR '(' any_operator ')'  */
-#line 13115 "preproc.y"
+#line 13108 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("operator ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 55443 "preproc.c"
+#line 55436 "preproc.c"
     break;
 
   case 2224: /* qual_all_Op: all_Op  */
-#line 13123 "preproc.y"
+#line 13116 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 55451 "preproc.c"
+#line 55444 "preproc.c"
     break;
 
   case 2225: /* qual_all_Op: OPERATOR '(' any_operator ')'  */
-#line 13127 "preproc.y"
+#line 13120 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("operator ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 55459 "preproc.c"
+#line 55452 "preproc.c"
     break;
 
   case 2226: /* subquery_Op: all_Op  */
-#line 13135 "preproc.y"
+#line 13128 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 55467 "preproc.c"
+#line 55460 "preproc.c"
     break;
 
   case 2227: /* subquery_Op: OPERATOR '(' any_operator ')'  */
-#line 13139 "preproc.y"
+#line 13132 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("operator ("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 55475 "preproc.c"
+#line 55468 "preproc.c"
     break;
 
   case 2228: /* subquery_Op: LIKE  */
-#line 13143 "preproc.y"
+#line 13136 "preproc.y"
  { 
  (yyval.str) = mm_strdup("like");
 }
-#line 55483 "preproc.c"
+#line 55476 "preproc.c"
     break;
 
   case 2229: /* subquery_Op: NOT_LA LIKE  */
-#line 13147 "preproc.y"
+#line 13140 "preproc.y"
  { 
  (yyval.str) = mm_strdup("not like");
 }
-#line 55491 "preproc.c"
+#line 55484 "preproc.c"
     break;
 
   case 2230: /* subquery_Op: ILIKE  */
-#line 13151 "preproc.y"
+#line 13144 "preproc.y"
  { 
  (yyval.str) = mm_strdup("ilike");
 }
-#line 55499 "preproc.c"
+#line 55492 "preproc.c"
     break;
 
   case 2231: /* subquery_Op: NOT_LA ILIKE  */
-#line 13155 "preproc.y"
+#line 13148 "preproc.y"
  { 
  (yyval.str) = mm_strdup("not ilike");
 }
-#line 55507 "preproc.c"
+#line 55500 "preproc.c"
     break;
 
   case 2232: /* expr_list: a_expr  */
-#line 13163 "preproc.y"
+#line 13156 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 55515 "preproc.c"
+#line 55508 "preproc.c"
     break;
 
   case 2233: /* expr_list: expr_list ',' a_expr  */
-#line 13167 "preproc.y"
+#line 13160 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 55523 "preproc.c"
+#line 55516 "preproc.c"
     break;
 
   case 2234: /* func_arg_list: func_arg_expr  */
-#line 13175 "preproc.y"
+#line 13168 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 55531 "preproc.c"
+#line 55524 "preproc.c"
     break;
 
   case 2235: /* func_arg_list: func_arg_list ',' func_arg_expr  */
-#line 13179 "preproc.y"
+#line 13172 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 55539 "preproc.c"
+#line 55532 "preproc.c"
     break;
 
   case 2236: /* func_arg_expr: a_expr  */
-#line 13187 "preproc.y"
+#line 13180 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 55547 "preproc.c"
+#line 55540 "preproc.c"
     break;
 
   case 2237: /* func_arg_expr: param_name COLON_EQUALS a_expr  */
-#line 13191 "preproc.y"
+#line 13184 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(":="),(yyvsp[0].str));
 }
-#line 55555 "preproc.c"
+#line 55548 "preproc.c"
     break;
 
   case 2238: /* func_arg_expr: param_name EQUALS_GREATER a_expr  */
-#line 13195 "preproc.y"
+#line 13188 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("=>"),(yyvsp[0].str));
 }
-#line 55563 "preproc.c"
+#line 55556 "preproc.c"
     break;
 
   case 2239: /* func_arg_list_opt: func_arg_list  */
-#line 13203 "preproc.y"
+#line 13196 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 55571 "preproc.c"
+#line 55564 "preproc.c"
     break;
 
   case 2240: /* func_arg_list_opt: %empty  */
-#line 13207 "preproc.y"
+#line 13200 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 55578 "preproc.c"
+#line 55571 "preproc.c"
     break;
 
   case 2241: /* type_list: Typename  */
-#line 13214 "preproc.y"
+#line 13207 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 55586 "preproc.c"
+#line 55579 "preproc.c"
     break;
 
   case 2242: /* type_list: type_list ',' Typename  */
-#line 13218 "preproc.y"
+#line 13211 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 55594 "preproc.c"
+#line 55587 "preproc.c"
     break;
 
   case 2243: /* array_expr: '[' expr_list ']'  */
-#line 13226 "preproc.y"
+#line 13219 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("["),(yyvsp[-1].str),mm_strdup("]"));
 }
-#line 55602 "preproc.c"
+#line 55595 "preproc.c"
     break;
 
   case 2244: /* array_expr: '[' array_expr_list ']'  */
-#line 13230 "preproc.y"
+#line 13223 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("["),(yyvsp[-1].str),mm_strdup("]"));
 }
-#line 55610 "preproc.c"
+#line 55603 "preproc.c"
     break;
 
   case 2245: /* array_expr: '[' ']'  */
-#line 13234 "preproc.y"
+#line 13227 "preproc.y"
  { 
  (yyval.str) = mm_strdup("[ ]");
 }
-#line 55618 "preproc.c"
+#line 55611 "preproc.c"
     break;
 
   case 2246: /* array_expr_list: array_expr  */
-#line 13242 "preproc.y"
+#line 13235 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 55626 "preproc.c"
+#line 55619 "preproc.c"
     break;
 
   case 2247: /* array_expr_list: array_expr_list ',' array_expr  */
-#line 13246 "preproc.y"
+#line 13239 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 55634 "preproc.c"
+#line 55627 "preproc.c"
     break;
 
   case 2248: /* extract_list: extract_arg FROM a_expr  */
-#line 13254 "preproc.y"
+#line 13247 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("from"),(yyvsp[0].str));
 }
-#line 55642 "preproc.c"
+#line 55635 "preproc.c"
     break;
 
   case 2249: /* extract_arg: ecpg_ident  */
-#line 13262 "preproc.y"
+#line 13255 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 55650 "preproc.c"
+#line 55643 "preproc.c"
     break;
 
   case 2250: /* extract_arg: YEAR_P  */
-#line 13266 "preproc.y"
+#line 13259 "preproc.y"
  { 
  (yyval.str) = mm_strdup("year");
 }
-#line 55658 "preproc.c"
+#line 55651 "preproc.c"
     break;
 
   case 2251: /* extract_arg: MONTH_P  */
-#line 13270 "preproc.y"
+#line 13263 "preproc.y"
  { 
  (yyval.str) = mm_strdup("month");
 }
-#line 55666 "preproc.c"
+#line 55659 "preproc.c"
     break;
 
   case 2252: /* extract_arg: DAY_P  */
-#line 13274 "preproc.y"
+#line 13267 "preproc.y"
  { 
  (yyval.str) = mm_strdup("day");
 }
-#line 55674 "preproc.c"
+#line 55667 "preproc.c"
     break;
 
   case 2253: /* extract_arg: HOUR_P  */
-#line 13278 "preproc.y"
+#line 13271 "preproc.y"
  { 
  (yyval.str) = mm_strdup("hour");
 }
-#line 55682 "preproc.c"
+#line 55675 "preproc.c"
     break;
 
   case 2254: /* extract_arg: MINUTE_P  */
-#line 13282 "preproc.y"
+#line 13275 "preproc.y"
  { 
  (yyval.str) = mm_strdup("minute");
 }
-#line 55690 "preproc.c"
+#line 55683 "preproc.c"
     break;
 
   case 2255: /* extract_arg: SECOND_P  */
-#line 13286 "preproc.y"
+#line 13279 "preproc.y"
  { 
  (yyval.str) = mm_strdup("second");
 }
-#line 55698 "preproc.c"
+#line 55691 "preproc.c"
     break;
 
   case 2256: /* extract_arg: ecpg_sconst  */
-#line 13290 "preproc.y"
+#line 13283 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 55706 "preproc.c"
+#line 55699 "preproc.c"
     break;
 
   case 2257: /* unicode_normal_form: NFC  */
-#line 13298 "preproc.y"
+#line 13291 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nfc");
 }
-#line 55714 "preproc.c"
+#line 55707 "preproc.c"
     break;
 
   case 2258: /* unicode_normal_form: NFD  */
-#line 13302 "preproc.y"
+#line 13295 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nfd");
 }
-#line 55722 "preproc.c"
+#line 55715 "preproc.c"
     break;
 
   case 2259: /* unicode_normal_form: NFKC  */
-#line 13306 "preproc.y"
+#line 13299 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nfkc");
 }
-#line 55730 "preproc.c"
+#line 55723 "preproc.c"
     break;
 
   case 2260: /* unicode_normal_form: NFKD  */
-#line 13310 "preproc.y"
+#line 13303 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nfkd");
 }
-#line 55738 "preproc.c"
+#line 55731 "preproc.c"
     break;
 
   case 2261: /* overlay_list: a_expr PLACING a_expr FROM a_expr FOR a_expr  */
-#line 13318 "preproc.y"
+#line 13311 "preproc.y"
  { 
  (yyval.str) = cat_str(7,(yyvsp[-6].str),mm_strdup("placing"),(yyvsp[-4].str),mm_strdup("from"),(yyvsp[-2].str),mm_strdup("for"),(yyvsp[0].str));
 }
-#line 55746 "preproc.c"
+#line 55739 "preproc.c"
     break;
 
   case 2262: /* overlay_list: a_expr PLACING a_expr FROM a_expr  */
-#line 13322 "preproc.y"
+#line 13315 "preproc.y"
  { 
  (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("placing"),(yyvsp[-2].str),mm_strdup("from"),(yyvsp[0].str));
 }
-#line 55754 "preproc.c"
+#line 55747 "preproc.c"
     break;
 
   case 2263: /* position_list: b_expr IN_P b_expr  */
-#line 13330 "preproc.y"
+#line 13323 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("in"),(yyvsp[0].str));
 }
-#line 55762 "preproc.c"
+#line 55755 "preproc.c"
     break;
 
   case 2264: /* substr_list: a_expr FROM a_expr FOR a_expr  */
-#line 13338 "preproc.y"
+#line 13331 "preproc.y"
  { 
  (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("from"),(yyvsp[-2].str),mm_strdup("for"),(yyvsp[0].str));
 }
-#line 55770 "preproc.c"
+#line 55763 "preproc.c"
     break;
 
   case 2265: /* substr_list: a_expr FOR a_expr FROM a_expr  */
-#line 13342 "preproc.y"
+#line 13335 "preproc.y"
  { 
  (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("for"),(yyvsp[-2].str),mm_strdup("from"),(yyvsp[0].str));
 }
-#line 55778 "preproc.c"
+#line 55771 "preproc.c"
     break;
 
   case 2266: /* substr_list: a_expr FROM a_expr  */
-#line 13346 "preproc.y"
+#line 13339 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("from"),(yyvsp[0].str));
 }
-#line 55786 "preproc.c"
+#line 55779 "preproc.c"
     break;
 
   case 2267: /* substr_list: a_expr FOR a_expr  */
-#line 13350 "preproc.y"
+#line 13343 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("for"),(yyvsp[0].str));
 }
-#line 55794 "preproc.c"
+#line 55787 "preproc.c"
     break;
 
   case 2268: /* substr_list: a_expr SIMILAR a_expr ESCAPE a_expr  */
-#line 13354 "preproc.y"
+#line 13347 "preproc.y"
  { 
  (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("similar"),(yyvsp[-2].str),mm_strdup("escape"),(yyvsp[0].str));
 }
-#line 55802 "preproc.c"
+#line 55795 "preproc.c"
     break;
 
   case 2269: /* trim_list: a_expr FROM expr_list  */
-#line 13362 "preproc.y"
+#line 13355 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("from"),(yyvsp[0].str));
 }
-#line 55810 "preproc.c"
+#line 55803 "preproc.c"
     break;
 
   case 2270: /* trim_list: FROM expr_list  */
-#line 13366 "preproc.y"
+#line 13359 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("from"),(yyvsp[0].str));
 }
-#line 55818 "preproc.c"
+#line 55811 "preproc.c"
     break;
 
   case 2271: /* trim_list: expr_list  */
-#line 13370 "preproc.y"
+#line 13363 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 55826 "preproc.c"
+#line 55819 "preproc.c"
     break;
 
   case 2272: /* in_expr: select_with_parens  */
-#line 13378 "preproc.y"
+#line 13371 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 55834 "preproc.c"
+#line 55827 "preproc.c"
     break;
 
   case 2273: /* in_expr: '(' expr_list ')'  */
-#line 13382 "preproc.y"
+#line 13375 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 55842 "preproc.c"
+#line 55835 "preproc.c"
     break;
 
   case 2274: /* case_expr: CASE case_arg when_clause_list case_default END_P  */
-#line 13390 "preproc.y"
+#line 13383 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("case"),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup("end"));
 }
-#line 55850 "preproc.c"
+#line 55843 "preproc.c"
     break;
 
   case 2275: /* when_clause_list: when_clause  */
-#line 13398 "preproc.y"
+#line 13391 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 55858 "preproc.c"
+#line 55851 "preproc.c"
     break;
 
   case 2276: /* when_clause_list: when_clause_list when_clause  */
-#line 13402 "preproc.y"
+#line 13395 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 55866 "preproc.c"
+#line 55859 "preproc.c"
     break;
 
   case 2277: /* when_clause: WHEN a_expr THEN a_expr  */
-#line 13410 "preproc.y"
+#line 13403 "preproc.y"
  { 
  (yyval.str) = cat_str(4,mm_strdup("when"),(yyvsp[-2].str),mm_strdup("then"),(yyvsp[0].str));
 }
-#line 55874 "preproc.c"
+#line 55867 "preproc.c"
     break;
 
   case 2278: /* case_default: ELSE a_expr  */
-#line 13418 "preproc.y"
+#line 13411 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("else"),(yyvsp[0].str));
 }
-#line 55882 "preproc.c"
+#line 55875 "preproc.c"
     break;
 
   case 2279: /* case_default: %empty  */
-#line 13422 "preproc.y"
+#line 13415 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 55889 "preproc.c"
+#line 55882 "preproc.c"
     break;
 
   case 2280: /* case_arg: a_expr  */
-#line 13429 "preproc.y"
+#line 13422 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 55897 "preproc.c"
+#line 55890 "preproc.c"
     break;
 
   case 2281: /* case_arg: %empty  */
-#line 13433 "preproc.y"
+#line 13426 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 55904 "preproc.c"
+#line 55897 "preproc.c"
     break;
 
   case 2282: /* columnref: ColId  */
-#line 13440 "preproc.y"
+#line 13433 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 55912 "preproc.c"
+#line 55905 "preproc.c"
     break;
 
   case 2283: /* columnref: ColId indirection  */
-#line 13444 "preproc.y"
+#line 13437 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 55920 "preproc.c"
+#line 55913 "preproc.c"
     break;
 
   case 2284: /* indirection_el: '.' attr_name  */
-#line 13452 "preproc.y"
+#line 13445 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("."),(yyvsp[0].str));
 }
-#line 55928 "preproc.c"
+#line 55921 "preproc.c"
     break;
 
   case 2285: /* indirection_el: '.' '*'  */
-#line 13456 "preproc.y"
+#line 13449 "preproc.y"
  { 
  (yyval.str) = mm_strdup(". *");
 }
-#line 55936 "preproc.c"
+#line 55929 "preproc.c"
     break;
 
   case 2286: /* indirection_el: '[' a_expr ']'  */
-#line 13460 "preproc.y"
+#line 13453 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("["),(yyvsp[-1].str),mm_strdup("]"));
 }
-#line 55944 "preproc.c"
+#line 55937 "preproc.c"
     break;
 
   case 2287: /* indirection_el: '[' opt_slice_bound ':' opt_slice_bound ']'  */
-#line 13464 "preproc.y"
+#line 13457 "preproc.y"
  { 
  (yyval.str) = cat_str(5,mm_strdup("["),(yyvsp[-3].str),mm_strdup(":"),(yyvsp[-1].str),mm_strdup("]"));
 }
-#line 55952 "preproc.c"
+#line 55945 "preproc.c"
     break;
 
   case 2288: /* opt_slice_bound: a_expr  */
-#line 13472 "preproc.y"
+#line 13465 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 55960 "preproc.c"
+#line 55953 "preproc.c"
     break;
 
   case 2289: /* opt_slice_bound: %empty  */
-#line 13476 "preproc.y"
+#line 13469 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 55967 "preproc.c"
+#line 55960 "preproc.c"
     break;
 
   case 2290: /* indirection: indirection_el  */
-#line 13483 "preproc.y"
+#line 13476 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 55975 "preproc.c"
+#line 55968 "preproc.c"
     break;
 
   case 2291: /* indirection: indirection indirection_el  */
-#line 13487 "preproc.y"
+#line 13480 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 55983 "preproc.c"
+#line 55976 "preproc.c"
     break;
 
   case 2292: /* opt_indirection: %empty  */
-#line 13495 "preproc.y"
+#line 13488 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 55990 "preproc.c"
+#line 55983 "preproc.c"
     break;
 
   case 2293: /* opt_indirection: opt_indirection indirection_el  */
-#line 13498 "preproc.y"
+#line 13491 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 55998 "preproc.c"
+#line 55991 "preproc.c"
     break;
 
   case 2294: /* opt_asymmetric: ASYMMETRIC  */
-#line 13506 "preproc.y"
+#line 13499 "preproc.y"
  { 
  (yyval.str) = mm_strdup("asymmetric");
 }
-#line 56006 "preproc.c"
+#line 55999 "preproc.c"
     break;
 
   case 2295: /* opt_asymmetric: %empty  */
-#line 13510 "preproc.y"
+#line 13503 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 56013 "preproc.c"
+#line 56006 "preproc.c"
     break;
 
   case 2296: /* json_value_expr: a_expr json_format_clause_opt  */
-#line 13517 "preproc.y"
+#line 13510 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 56021 "preproc.c"
+#line 56014 "preproc.c"
     break;
 
   case 2297: /* json_format_clause_opt: FORMAT_LA JSON json_encoding_clause_opt  */
-#line 13525 "preproc.y"
+#line 13518 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("format json"),(yyvsp[0].str));
 }
-#line 56029 "preproc.c"
+#line 56022 "preproc.c"
     break;
 
   case 2298: /* json_format_clause_opt: %empty  */
-#line 13529 "preproc.y"
+#line 13522 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 56036 "preproc.c"
+#line 56029 "preproc.c"
     break;
 
   case 2299: /* json_encoding_clause_opt: ENCODING name  */
-#line 13536 "preproc.y"
+#line 13529 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("encoding"),(yyvsp[0].str));
 }
-#line 56044 "preproc.c"
+#line 56037 "preproc.c"
     break;
 
   case 2300: /* json_encoding_clause_opt: %empty  */
-#line 13540 "preproc.y"
+#line 13533 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 56051 "preproc.c"
+#line 56044 "preproc.c"
     break;
 
   case 2301: /* json_output_clause_opt: RETURNING Typename json_format_clause_opt  */
-#line 13547 "preproc.y"
+#line 13540 "preproc.y"
  { 
  (yyval.str) = cat_str(3,mm_strdup("returning"),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 56059 "preproc.c"
+#line 56052 "preproc.c"
     break;
 
   case 2302: /* json_output_clause_opt: %empty  */
-#line 13551 "preproc.y"
+#line 13544 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 56066 "preproc.c"
+#line 56059 "preproc.c"
     break;
 
   case 2303: /* json_predicate_type_constraint: JSON  */
-#line 13558 "preproc.y"
+#line 13551 "preproc.y"
  { 
  (yyval.str) = mm_strdup("json");
 }
-#line 56074 "preproc.c"
+#line 56067 "preproc.c"
     break;
 
   case 2304: /* json_predicate_type_constraint: JSON VALUE_P  */
-#line 13562 "preproc.y"
+#line 13555 "preproc.y"
  { 
  (yyval.str) = mm_strdup("json value");
 }
-#line 56082 "preproc.c"
+#line 56075 "preproc.c"
     break;
 
   case 2305: /* json_predicate_type_constraint: JSON ARRAY  */
-#line 13566 "preproc.y"
+#line 13559 "preproc.y"
  { 
  (yyval.str) = mm_strdup("json array");
 }
-#line 56090 "preproc.c"
+#line 56083 "preproc.c"
     break;
 
   case 2306: /* json_predicate_type_constraint: JSON OBJECT_P  */
-#line 13570 "preproc.y"
+#line 13563 "preproc.y"
  { 
  (yyval.str) = mm_strdup("json object");
 }
-#line 56098 "preproc.c"
+#line 56091 "preproc.c"
     break;
 
   case 2307: /* json_predicate_type_constraint: JSON SCALAR  */
-#line 13574 "preproc.y"
+#line 13567 "preproc.y"
  { 
  (yyval.str) = mm_strdup("json scalar");
 }
-#line 56106 "preproc.c"
+#line 56099 "preproc.c"
     break;
 
   case 2308: /* json_key_uniqueness_constraint_opt: WITH UNIQUE KEYS  */
-#line 13582 "preproc.y"
+#line 13575 "preproc.y"
  { 
  (yyval.str) = mm_strdup("with unique keys");
 }
-#line 56114 "preproc.c"
+#line 56107 "preproc.c"
     break;
 
   case 2309: /* json_key_uniqueness_constraint_opt: WITH UNIQUE  */
-#line 13586 "preproc.y"
+#line 13579 "preproc.y"
  { 
  (yyval.str) = mm_strdup("with unique");
 }
-#line 56122 "preproc.c"
+#line 56115 "preproc.c"
     break;
 
   case 2310: /* json_key_uniqueness_constraint_opt: WITHOUT UNIQUE KEYS  */
-#line 13590 "preproc.y"
+#line 13583 "preproc.y"
  { 
  (yyval.str) = mm_strdup("without unique keys");
 }
-#line 56130 "preproc.c"
+#line 56123 "preproc.c"
     break;
 
   case 2311: /* json_key_uniqueness_constraint_opt: WITHOUT UNIQUE  */
-#line 13594 "preproc.y"
+#line 13587 "preproc.y"
  { 
  (yyval.str) = mm_strdup("without unique");
 }
-#line 56138 "preproc.c"
+#line 56131 "preproc.c"
     break;
 
   case 2312: /* json_key_uniqueness_constraint_opt: %empty  */
-#line 13598 "preproc.y"
+#line 13591 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 56145 "preproc.c"
+#line 56138 "preproc.c"
     break;
 
   case 2313: /* json_name_and_value_list: json_name_and_value  */
-#line 13605 "preproc.y"
+#line 13598 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56153 "preproc.c"
+#line 56146 "preproc.c"
     break;
 
   case 2314: /* json_name_and_value_list: json_name_and_value_list ',' json_name_and_value  */
-#line 13609 "preproc.y"
+#line 13602 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 56161 "preproc.c"
+#line 56154 "preproc.c"
     break;
 
   case 2315: /* json_name_and_value: c_expr VALUE_P json_value_expr  */
-#line 13617 "preproc.y"
+#line 13610 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("value"),(yyvsp[0].str));
 }
-#line 56169 "preproc.c"
+#line 56162 "preproc.c"
     break;
 
   case 2316: /* json_name_and_value: a_expr ':' json_value_expr  */
-#line 13621 "preproc.y"
+#line 13614 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(":"),(yyvsp[0].str));
 }
-#line 56177 "preproc.c"
+#line 56170 "preproc.c"
     break;
 
   case 2317: /* json_object_constructor_null_clause_opt: NULL_P ON NULL_P  */
-#line 13629 "preproc.y"
+#line 13622 "preproc.y"
  { 
  (yyval.str) = mm_strdup("null on null");
 }
-#line 56185 "preproc.c"
+#line 56178 "preproc.c"
     break;
 
   case 2318: /* json_object_constructor_null_clause_opt: ABSENT ON NULL_P  */
-#line 13633 "preproc.y"
+#line 13626 "preproc.y"
  { 
  (yyval.str) = mm_strdup("absent on null");
 }
-#line 56193 "preproc.c"
+#line 56186 "preproc.c"
     break;
 
   case 2319: /* json_object_constructor_null_clause_opt: %empty  */
-#line 13637 "preproc.y"
+#line 13630 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 56200 "preproc.c"
+#line 56193 "preproc.c"
     break;
 
   case 2320: /* json_array_constructor_null_clause_opt: NULL_P ON NULL_P  */
-#line 13644 "preproc.y"
+#line 13637 "preproc.y"
  { 
  (yyval.str) = mm_strdup("null on null");
 }
-#line 56208 "preproc.c"
+#line 56201 "preproc.c"
     break;
 
   case 2321: /* json_array_constructor_null_clause_opt: ABSENT ON NULL_P  */
-#line 13648 "preproc.y"
+#line 13641 "preproc.y"
  { 
  (yyval.str) = mm_strdup("absent on null");
 }
-#line 56216 "preproc.c"
+#line 56209 "preproc.c"
     break;
 
   case 2322: /* json_array_constructor_null_clause_opt: %empty  */
-#line 13652 "preproc.y"
+#line 13645 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 56223 "preproc.c"
+#line 56216 "preproc.c"
     break;
 
   case 2323: /* json_value_expr_list: json_value_expr  */
-#line 13659 "preproc.y"
+#line 13652 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56231 "preproc.c"
+#line 56224 "preproc.c"
     break;
 
   case 2324: /* json_value_expr_list: json_value_expr_list ',' json_value_expr  */
-#line 13663 "preproc.y"
+#line 13656 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 56239 "preproc.c"
+#line 56232 "preproc.c"
     break;
 
   case 2325: /* json_aggregate_func: JSON_OBJECTAGG '(' json_name_and_value json_object_constructor_null_clause_opt json_key_uniqueness_constraint_opt json_output_clause_opt ')'  */
-#line 13671 "preproc.y"
+#line 13664 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("json_objectagg ("),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 56247 "preproc.c"
+#line 56240 "preproc.c"
     break;
 
   case 2326: /* json_aggregate_func: JSON_ARRAYAGG '(' json_value_expr json_array_aggregate_order_by_clause_opt json_array_constructor_null_clause_opt json_output_clause_opt ')'  */
-#line 13675 "preproc.y"
+#line 13668 "preproc.y"
  { 
  (yyval.str) = cat_str(6,mm_strdup("json_arrayagg ("),(yyvsp[-4].str),(yyvsp[-3].str),(yyvsp[-2].str),(yyvsp[-1].str),mm_strdup(")"));
 }
-#line 56255 "preproc.c"
+#line 56248 "preproc.c"
     break;
 
   case 2327: /* json_array_aggregate_order_by_clause_opt: ORDER BY sortby_list  */
-#line 13683 "preproc.y"
+#line 13676 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("order by"),(yyvsp[0].str));
 }
-#line 56263 "preproc.c"
+#line 56256 "preproc.c"
     break;
 
   case 2328: /* json_array_aggregate_order_by_clause_opt: %empty  */
-#line 13687 "preproc.y"
+#line 13680 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 56270 "preproc.c"
+#line 56263 "preproc.c"
     break;
 
   case 2329: /* opt_target_list: target_list  */
-#line 13694 "preproc.y"
+#line 13687 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56278 "preproc.c"
+#line 56271 "preproc.c"
     break;
 
   case 2330: /* opt_target_list: %empty  */
-#line 13698 "preproc.y"
+#line 13691 "preproc.y"
  { 
  (yyval.str)=EMPTY; }
-#line 56285 "preproc.c"
+#line 56278 "preproc.c"
     break;
 
   case 2331: /* target_list: target_el  */
-#line 13705 "preproc.y"
+#line 13698 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56293 "preproc.c"
+#line 56286 "preproc.c"
     break;
 
   case 2332: /* target_list: target_list ',' target_el  */
-#line 13709 "preproc.y"
+#line 13702 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 56301 "preproc.c"
+#line 56294 "preproc.c"
     break;
 
   case 2333: /* target_el: a_expr AS ColLabel  */
-#line 13717 "preproc.y"
+#line 13710 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup("as"),(yyvsp[0].str));
 }
-#line 56309 "preproc.c"
+#line 56302 "preproc.c"
     break;
 
   case 2334: /* target_el: a_expr BareColLabel  */
-#line 13721 "preproc.y"
+#line 13714 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 56317 "preproc.c"
+#line 56310 "preproc.c"
     break;
 
   case 2335: /* target_el: a_expr  */
-#line 13725 "preproc.y"
+#line 13718 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56325 "preproc.c"
+#line 56318 "preproc.c"
     break;
 
   case 2336: /* target_el: '*'  */
-#line 13729 "preproc.y"
+#line 13722 "preproc.y"
  { 
  (yyval.str) = mm_strdup("*");
 }
-#line 56333 "preproc.c"
+#line 56326 "preproc.c"
     break;
 
   case 2337: /* qualified_name_list: qualified_name  */
-#line 13737 "preproc.y"
+#line 13730 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56341 "preproc.c"
+#line 56334 "preproc.c"
     break;
 
   case 2338: /* qualified_name_list: qualified_name_list ',' qualified_name  */
-#line 13741 "preproc.y"
+#line 13734 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 56349 "preproc.c"
+#line 56342 "preproc.c"
     break;
 
   case 2339: /* qualified_name: ColId  */
-#line 13749 "preproc.y"
+#line 13742 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56357 "preproc.c"
+#line 56350 "preproc.c"
     break;
 
   case 2340: /* qualified_name: ColId indirection  */
-#line 13753 "preproc.y"
+#line 13746 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 56365 "preproc.c"
+#line 56358 "preproc.c"
     break;
 
   case 2341: /* name_list: name  */
-#line 13761 "preproc.y"
+#line 13754 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56373 "preproc.c"
+#line 56366 "preproc.c"
     break;
 
   case 2342: /* name_list: name_list ',' name  */
-#line 13765 "preproc.y"
+#line 13758 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 56381 "preproc.c"
+#line 56374 "preproc.c"
     break;
 
   case 2343: /* name: ColId  */
-#line 13773 "preproc.y"
+#line 13766 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56389 "preproc.c"
+#line 56382 "preproc.c"
     break;
 
   case 2344: /* attr_name: ColLabel  */
-#line 13781 "preproc.y"
+#line 13774 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56397 "preproc.c"
+#line 56390 "preproc.c"
     break;
 
   case 2345: /* file_name: ecpg_sconst  */
-#line 13789 "preproc.y"
+#line 13782 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56405 "preproc.c"
+#line 56398 "preproc.c"
     break;
 
   case 2346: /* func_name: type_function_name  */
-#line 13797 "preproc.y"
+#line 13790 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56413 "preproc.c"
+#line 56406 "preproc.c"
     break;
 
   case 2347: /* func_name: ColId indirection  */
-#line 13801 "preproc.y"
+#line 13794 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 56421 "preproc.c"
+#line 56414 "preproc.c"
     break;
 
   case 2348: /* AexprConst: Iconst  */
-#line 13809 "preproc.y"
+#line 13802 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56429 "preproc.c"
+#line 56422 "preproc.c"
     break;
 
   case 2349: /* AexprConst: ecpg_fconst  */
-#line 13813 "preproc.y"
+#line 13806 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56437 "preproc.c"
+#line 56430 "preproc.c"
     break;
 
   case 2350: /* AexprConst: ecpg_sconst  */
-#line 13817 "preproc.y"
+#line 13810 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56445 "preproc.c"
+#line 56438 "preproc.c"
     break;
 
   case 2351: /* AexprConst: ecpg_bconst  */
-#line 13821 "preproc.y"
+#line 13814 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56453 "preproc.c"
+#line 56446 "preproc.c"
     break;
 
   case 2352: /* AexprConst: ecpg_xconst  */
-#line 13825 "preproc.y"
+#line 13818 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56461 "preproc.c"
+#line 56454 "preproc.c"
     break;
 
   case 2353: /* AexprConst: func_name ecpg_sconst  */
-#line 13829 "preproc.y"
+#line 13822 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 56469 "preproc.c"
+#line 56462 "preproc.c"
     break;
 
   case 2354: /* AexprConst: func_name '(' func_arg_list opt_sort_clause ')' ecpg_sconst  */
-#line 13833 "preproc.y"
+#line 13826 "preproc.y"
  { 
  (yyval.str) = cat_str(6,(yyvsp[-5].str),mm_strdup("("),(yyvsp[-3].str),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 56477 "preproc.c"
+#line 56470 "preproc.c"
     break;
 
   case 2355: /* AexprConst: ConstTypename ecpg_sconst  */
-#line 13837 "preproc.y"
+#line 13830 "preproc.y"
  { 
  (yyval.str) = cat_str(2,(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 56485 "preproc.c"
+#line 56478 "preproc.c"
     break;
 
   case 2356: /* AexprConst: ConstInterval ecpg_sconst opt_interval  */
-#line 13841 "preproc.y"
+#line 13834 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),(yyvsp[-1].str),(yyvsp[0].str));
 }
-#line 56493 "preproc.c"
+#line 56486 "preproc.c"
     break;
 
   case 2357: /* AexprConst: ConstInterval '(' Iconst ')' ecpg_sconst  */
-#line 13845 "preproc.y"
+#line 13838 "preproc.y"
  { 
  (yyval.str) = cat_str(5,(yyvsp[-4].str),mm_strdup("("),(yyvsp[-2].str),mm_strdup(")"),(yyvsp[0].str));
 }
-#line 56501 "preproc.c"
+#line 56494 "preproc.c"
     break;
 
   case 2358: /* AexprConst: TRUE_P  */
-#line 13849 "preproc.y"
+#line 13842 "preproc.y"
  { 
  (yyval.str) = mm_strdup("true");
 }
-#line 56509 "preproc.c"
+#line 56502 "preproc.c"
     break;
 
   case 2359: /* AexprConst: FALSE_P  */
-#line 13853 "preproc.y"
+#line 13846 "preproc.y"
  { 
  (yyval.str) = mm_strdup("false");
 }
-#line 56517 "preproc.c"
+#line 56510 "preproc.c"
     break;
 
   case 2360: /* AexprConst: NULL_P  */
-#line 13857 "preproc.y"
+#line 13850 "preproc.y"
  { 
  (yyval.str) = mm_strdup("null");
 }
-#line 56525 "preproc.c"
+#line 56518 "preproc.c"
     break;
 
   case 2361: /* AexprConst: civar  */
-#line 13860 "preproc.y"
+#line 13853 "preproc.y"
                                 { (yyval.str) = (yyvsp[0].str); }
-#line 56531 "preproc.c"
+#line 56524 "preproc.c"
     break;
 
   case 2362: /* AexprConst: civarind  */
-#line 13861 "preproc.y"
+#line 13854 "preproc.y"
                                 { (yyval.str) = (yyvsp[0].str); }
-#line 56537 "preproc.c"
+#line 56530 "preproc.c"
     break;
 
   case 2363: /* Iconst: ICONST  */
-#line 13867 "preproc.y"
+#line 13860 "preproc.y"
         { (yyval.str) = make_name(); }
-#line 56543 "preproc.c"
+#line 56536 "preproc.c"
     break;
 
   case 2364: /* SignedIconst: Iconst  */
-#line 13873 "preproc.y"
+#line 13866 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56551 "preproc.c"
+#line 56544 "preproc.c"
     break;
 
   case 2365: /* SignedIconst: civar  */
-#line 13876 "preproc.y"
+#line 13869 "preproc.y"
                 { (yyval.str) = (yyvsp[0].str); }
-#line 56557 "preproc.c"
+#line 56550 "preproc.c"
     break;
 
   case 2366: /* SignedIconst: '+' Iconst  */
-#line 13878 "preproc.y"
+#line 13871 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("+"),(yyvsp[0].str));
 }
-#line 56565 "preproc.c"
+#line 56558 "preproc.c"
     break;
 
   case 2367: /* SignedIconst: '-' Iconst  */
-#line 13882 "preproc.y"
+#line 13875 "preproc.y"
  { 
  (yyval.str) = cat_str(2,mm_strdup("-"),(yyvsp[0].str));
 }
-#line 56573 "preproc.c"
+#line 56566 "preproc.c"
     break;
 
   case 2368: /* RoleId: RoleSpec  */
-#line 13890 "preproc.y"
+#line 13883 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56581 "preproc.c"
+#line 56574 "preproc.c"
     break;
 
   case 2369: /* RoleSpec: NonReservedWord  */
-#line 13898 "preproc.y"
+#line 13891 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56589 "preproc.c"
+#line 56582 "preproc.c"
     break;
 
   case 2370: /* RoleSpec: CURRENT_ROLE  */
-#line 13902 "preproc.y"
+#line 13895 "preproc.y"
  { 
  (yyval.str) = mm_strdup("current_role");
 }
-#line 56597 "preproc.c"
+#line 56590 "preproc.c"
     break;
 
   case 2371: /* RoleSpec: CURRENT_USER  */
-#line 13906 "preproc.y"
+#line 13899 "preproc.y"
  { 
  (yyval.str) = mm_strdup("current_user");
 }
-#line 56605 "preproc.c"
+#line 56598 "preproc.c"
     break;
 
   case 2372: /* RoleSpec: SESSION_USER  */
-#line 13910 "preproc.y"
+#line 13903 "preproc.y"
  { 
  (yyval.str) = mm_strdup("session_user");
 }
-#line 56613 "preproc.c"
+#line 56606 "preproc.c"
     break;
 
   case 2373: /* role_list: RoleSpec  */
-#line 13918 "preproc.y"
+#line 13911 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56621 "preproc.c"
+#line 56614 "preproc.c"
     break;
 
   case 2374: /* role_list: role_list ',' RoleSpec  */
-#line 13922 "preproc.y"
+#line 13915 "preproc.y"
  { 
  (yyval.str) = cat_str(3,(yyvsp[-2].str),mm_strdup(","),(yyvsp[0].str));
 }
-#line 56629 "preproc.c"
+#line 56622 "preproc.c"
     break;
 
   case 2375: /* NonReservedWord: ecpg_ident  */
-#line 13930 "preproc.y"
+#line 13923 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56637 "preproc.c"
+#line 56630 "preproc.c"
     break;
 
   case 2376: /* NonReservedWord: unreserved_keyword  */
-#line 13934 "preproc.y"
+#line 13927 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56645 "preproc.c"
+#line 56638 "preproc.c"
     break;
 
   case 2377: /* NonReservedWord: col_name_keyword  */
-#line 13938 "preproc.y"
+#line 13931 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56653 "preproc.c"
+#line 56646 "preproc.c"
     break;
 
   case 2378: /* NonReservedWord: type_func_name_keyword  */
-#line 13942 "preproc.y"
+#line 13935 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56661 "preproc.c"
+#line 56654 "preproc.c"
     break;
 
   case 2379: /* BareColLabel: ecpg_ident  */
-#line 13950 "preproc.y"
+#line 13943 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56669 "preproc.c"
+#line 56662 "preproc.c"
     break;
 
   case 2380: /* BareColLabel: bare_label_keyword  */
-#line 13954 "preproc.y"
+#line 13947 "preproc.y"
  { 
  (yyval.str) = (yyvsp[0].str);
 }
-#line 56677 "preproc.c"
+#line 56670 "preproc.c"
     break;
 
   case 2381: /* unreserved_keyword: ABORT_P  */
-#line 13962 "preproc.y"
+#line 13955 "preproc.y"
  { 
  (yyval.str) = mm_strdup("abort");
 }
-#line 56685 "preproc.c"
+#line 56678 "preproc.c"
     break;
 
   case 2382: /* unreserved_keyword: ABSENT  */
-#line 13966 "preproc.y"
+#line 13959 "preproc.y"
  { 
  (yyval.str) = mm_strdup("absent");
 }
-#line 56693 "preproc.c"
+#line 56686 "preproc.c"
     break;
 
   case 2383: /* unreserved_keyword: ABSOLUTE_P  */
-#line 13970 "preproc.y"
+#line 13963 "preproc.y"
  { 
  (yyval.str) = mm_strdup("absolute");
 }
-#line 56701 "preproc.c"
+#line 56694 "preproc.c"
     break;
 
   case 2384: /* unreserved_keyword: ACCESS  */
-#line 13974 "preproc.y"
+#line 13967 "preproc.y"
  { 
  (yyval.str) = mm_strdup("access");
 }
-#line 56709 "preproc.c"
+#line 56702 "preproc.c"
     break;
 
   case 2385: /* unreserved_keyword: ACTION  */
-#line 13978 "preproc.y"
+#line 13971 "preproc.y"
  { 
  (yyval.str) = mm_strdup("action");
 }
-#line 56717 "preproc.c"
+#line 56710 "preproc.c"
     break;
 
   case 2386: /* unreserved_keyword: ADD_P  */
-#line 13982 "preproc.y"
+#line 13975 "preproc.y"
  { 
  (yyval.str) = mm_strdup("add");
 }
-#line 56725 "preproc.c"
+#line 56718 "preproc.c"
     break;
 
   case 2387: /* unreserved_keyword: ADMIN  */
-#line 13986 "preproc.y"
+#line 13979 "preproc.y"
  { 
  (yyval.str) = mm_strdup("admin");
 }
-#line 56733 "preproc.c"
+#line 56726 "preproc.c"
     break;
 
   case 2388: /* unreserved_keyword: AFTER  */
-#line 13990 "preproc.y"
+#line 13983 "preproc.y"
  { 
  (yyval.str) = mm_strdup("after");
 }
-#line 56741 "preproc.c"
+#line 56734 "preproc.c"
     break;
 
   case 2389: /* unreserved_keyword: AGGREGATE  */
-#line 13994 "preproc.y"
+#line 13987 "preproc.y"
  { 
  (yyval.str) = mm_strdup("aggregate");
 }
-#line 56749 "preproc.c"
+#line 56742 "preproc.c"
     break;
 
   case 2390: /* unreserved_keyword: ALSO  */
-#line 13998 "preproc.y"
+#line 13991 "preproc.y"
  { 
  (yyval.str) = mm_strdup("also");
 }
-#line 56757 "preproc.c"
+#line 56750 "preproc.c"
     break;
 
   case 2391: /* unreserved_keyword: ALTER  */
-#line 14002 "preproc.y"
+#line 13995 "preproc.y"
  { 
  (yyval.str) = mm_strdup("alter");
 }
-#line 56765 "preproc.c"
+#line 56758 "preproc.c"
     break;
 
   case 2392: /* unreserved_keyword: ALWAYS  */
-#line 14006 "preproc.y"
+#line 13999 "preproc.y"
  { 
  (yyval.str) = mm_strdup("always");
 }
-#line 56773 "preproc.c"
+#line 56766 "preproc.c"
     break;
 
   case 2393: /* unreserved_keyword: ASENSITIVE  */
-#line 14010 "preproc.y"
+#line 14003 "preproc.y"
  { 
  (yyval.str) = mm_strdup("asensitive");
 }
-#line 56781 "preproc.c"
+#line 56774 "preproc.c"
     break;
 
   case 2394: /* unreserved_keyword: ASSERTION  */
-#line 14014 "preproc.y"
+#line 14007 "preproc.y"
  { 
  (yyval.str) = mm_strdup("assertion");
 }
-#line 56789 "preproc.c"
+#line 56782 "preproc.c"
     break;
 
   case 2395: /* unreserved_keyword: ASSIGNMENT  */
-#line 14018 "preproc.y"
+#line 14011 "preproc.y"
  { 
  (yyval.str) = mm_strdup("assignment");
 }
-#line 56797 "preproc.c"
+#line 56790 "preproc.c"
     break;
 
   case 2396: /* unreserved_keyword: AT  */
-#line 14022 "preproc.y"
+#line 14015 "preproc.y"
  { 
  (yyval.str) = mm_strdup("at");
 }
-#line 56805 "preproc.c"
+#line 56798 "preproc.c"
     break;
 
   case 2397: /* unreserved_keyword: ATOMIC  */
-#line 14026 "preproc.y"
+#line 14019 "preproc.y"
  { 
  (yyval.str) = mm_strdup("atomic");
 }
-#line 56813 "preproc.c"
+#line 56806 "preproc.c"
     break;
 
   case 2398: /* unreserved_keyword: ATTACH  */
-#line 14030 "preproc.y"
+#line 14023 "preproc.y"
  { 
  (yyval.str) = mm_strdup("attach");
 }
-#line 56821 "preproc.c"
+#line 56814 "preproc.c"
     break;
 
   case 2399: /* unreserved_keyword: ATTRIBUTE  */
-#line 14034 "preproc.y"
+#line 14027 "preproc.y"
  { 
  (yyval.str) = mm_strdup("attribute");
 }
-#line 56829 "preproc.c"
+#line 56822 "preproc.c"
     break;
 
   case 2400: /* unreserved_keyword: BACKWARD  */
-#line 14038 "preproc.y"
+#line 14031 "preproc.y"
  { 
  (yyval.str) = mm_strdup("backward");
 }
-#line 56837 "preproc.c"
+#line 56830 "preproc.c"
     break;
 
   case 2401: /* unreserved_keyword: BEFORE  */
-#line 14042 "preproc.y"
+#line 14035 "preproc.y"
  { 
  (yyval.str) = mm_strdup("before");
 }
-#line 56845 "preproc.c"
+#line 56838 "preproc.c"
     break;
 
   case 2402: /* unreserved_keyword: BEGIN_P  */
-#line 14046 "preproc.y"
+#line 14039 "preproc.y"
  { 
  (yyval.str) = mm_strdup("begin");
 }
-#line 56853 "preproc.c"
+#line 56846 "preproc.c"
     break;
 
   case 2403: /* unreserved_keyword: BREADTH  */
-#line 14050 "preproc.y"
+#line 14043 "preproc.y"
  { 
  (yyval.str) = mm_strdup("breadth");
 }
-#line 56861 "preproc.c"
+#line 56854 "preproc.c"
     break;
 
   case 2404: /* unreserved_keyword: BY  */
-#line 14054 "preproc.y"
+#line 14047 "preproc.y"
  { 
  (yyval.str) = mm_strdup("by");
 }
-#line 56869 "preproc.c"
+#line 56862 "preproc.c"
     break;
 
   case 2405: /* unreserved_keyword: CACHE  */
-#line 14058 "preproc.y"
+#line 14051 "preproc.y"
  { 
  (yyval.str) = mm_strdup("cache");
 }
-#line 56877 "preproc.c"
+#line 56870 "preproc.c"
     break;
 
   case 2406: /* unreserved_keyword: CALL  */
-#line 14062 "preproc.y"
+#line 14055 "preproc.y"
  { 
  (yyval.str) = mm_strdup("call");
 }
-#line 56885 "preproc.c"
+#line 56878 "preproc.c"
     break;
 
   case 2407: /* unreserved_keyword: CALLED  */
-#line 14066 "preproc.y"
+#line 14059 "preproc.y"
  { 
  (yyval.str) = mm_strdup("called");
 }
-#line 56893 "preproc.c"
+#line 56886 "preproc.c"
     break;
 
   case 2408: /* unreserved_keyword: CASCADE  */
-#line 14070 "preproc.y"
+#line 14063 "preproc.y"
  { 
  (yyval.str) = mm_strdup("cascade");
 }
-#line 56901 "preproc.c"
+#line 56894 "preproc.c"
     break;
 
   case 2409: /* unreserved_keyword: CASCADED  */
-#line 14074 "preproc.y"
+#line 14067 "preproc.y"
  { 
  (yyval.str) = mm_strdup("cascaded");
 }
-#line 56909 "preproc.c"
+#line 56902 "preproc.c"
     break;
 
   case 2410: /* unreserved_keyword: CATALOG_P  */
-#line 14078 "preproc.y"
+#line 14071 "preproc.y"
  { 
  (yyval.str) = mm_strdup("catalog");
 }
-#line 56917 "preproc.c"
+#line 56910 "preproc.c"
     break;
 
   case 2411: /* unreserved_keyword: CHAIN  */
-#line 14082 "preproc.y"
+#line 14075 "preproc.y"
  { 
  (yyval.str) = mm_strdup("chain");
 }
-#line 56925 "preproc.c"
+#line 56918 "preproc.c"
     break;
 
   case 2412: /* unreserved_keyword: CHARACTERISTICS  */
-#line 14086 "preproc.y"
+#line 14079 "preproc.y"
  { 
  (yyval.str) = mm_strdup("characteristics");
 }
-#line 56933 "preproc.c"
+#line 56926 "preproc.c"
     break;
 
   case 2413: /* unreserved_keyword: CHECKPOINT  */
-#line 14090 "preproc.y"
+#line 14083 "preproc.y"
  { 
  (yyval.str) = mm_strdup("checkpoint");
 }
-#line 56941 "preproc.c"
+#line 56934 "preproc.c"
     break;
 
   case 2414: /* unreserved_keyword: CLASS  */
-#line 14094 "preproc.y"
+#line 14087 "preproc.y"
  { 
  (yyval.str) = mm_strdup("class");
 }
-#line 56949 "preproc.c"
+#line 56942 "preproc.c"
     break;
 
   case 2415: /* unreserved_keyword: CLOSE  */
-#line 14098 "preproc.y"
+#line 14091 "preproc.y"
  { 
  (yyval.str) = mm_strdup("close");
 }
-#line 56957 "preproc.c"
+#line 56950 "preproc.c"
     break;
 
   case 2416: /* unreserved_keyword: CLUSTER  */
-#line 14102 "preproc.y"
+#line 14095 "preproc.y"
  { 
  (yyval.str) = mm_strdup("cluster");
 }
-#line 56965 "preproc.c"
+#line 56958 "preproc.c"
     break;
 
   case 2417: /* unreserved_keyword: COLUMNS  */
-#line 14106 "preproc.y"
+#line 14099 "preproc.y"
  { 
  (yyval.str) = mm_strdup("columns");
 }
-#line 56973 "preproc.c"
+#line 56966 "preproc.c"
     break;
 
   case 2418: /* unreserved_keyword: COMMENT  */
-#line 14110 "preproc.y"
+#line 14103 "preproc.y"
  { 
  (yyval.str) = mm_strdup("comment");
 }
-#line 56981 "preproc.c"
+#line 56974 "preproc.c"
     break;
 
   case 2419: /* unreserved_keyword: COMMENTS  */
-#line 14114 "preproc.y"
+#line 14107 "preproc.y"
  { 
  (yyval.str) = mm_strdup("comments");
 }
-#line 56989 "preproc.c"
+#line 56982 "preproc.c"
     break;
 
   case 2420: /* unreserved_keyword: COMMIT  */
-#line 14118 "preproc.y"
+#line 14111 "preproc.y"
  { 
  (yyval.str) = mm_strdup("commit");
 }
-#line 56997 "preproc.c"
+#line 56990 "preproc.c"
     break;
 
   case 2421: /* unreserved_keyword: COMMITTED  */
-#line 14122 "preproc.y"
+#line 14115 "preproc.y"
  { 
  (yyval.str) = mm_strdup("committed");
 }
-#line 57005 "preproc.c"
+#line 56998 "preproc.c"
     break;
 
   case 2422: /* unreserved_keyword: COMPRESSION  */
-#line 14126 "preproc.y"
+#line 14119 "preproc.y"
  { 
  (yyval.str) = mm_strdup("compression");
 }
-#line 57013 "preproc.c"
+#line 57006 "preproc.c"
     break;
 
   case 2423: /* unreserved_keyword: CONFIGURATION  */
-#line 14130 "preproc.y"
+#line 14123 "preproc.y"
  { 
  (yyval.str) = mm_strdup("configuration");
 }
-#line 57021 "preproc.c"
+#line 57014 "preproc.c"
     break;
 
   case 2424: /* unreserved_keyword: CONFLICT  */
-#line 14134 "preproc.y"
+#line 14127 "preproc.y"
  { 
  (yyval.str) = mm_strdup("conflict");
 }
-#line 57029 "preproc.c"
+#line 57022 "preproc.c"
     break;
 
   case 2425: /* unreserved_keyword: CONSTRAINTS  */
-#line 14138 "preproc.y"
+#line 14131 "preproc.y"
  { 
  (yyval.str) = mm_strdup("constraints");
 }
-#line 57037 "preproc.c"
+#line 57030 "preproc.c"
     break;
 
   case 2426: /* unreserved_keyword: CONTENT_P  */
-#line 14142 "preproc.y"
+#line 14135 "preproc.y"
  { 
  (yyval.str) = mm_strdup("content");
 }
-#line 57045 "preproc.c"
+#line 57038 "preproc.c"
     break;
 
   case 2427: /* unreserved_keyword: CONTINUE_P  */
-#line 14146 "preproc.y"
+#line 14139 "preproc.y"
  { 
  (yyval.str) = mm_strdup("continue");
 }
-#line 57053 "preproc.c"
+#line 57046 "preproc.c"
     break;
 
   case 2428: /* unreserved_keyword: CONVERSION_P  */
-#line 14150 "preproc.y"
+#line 14143 "preproc.y"
  { 
  (yyval.str) = mm_strdup("conversion");
 }
-#line 57061 "preproc.c"
+#line 57054 "preproc.c"
     break;
 
   case 2429: /* unreserved_keyword: COPY  */
-#line 14154 "preproc.y"
+#line 14147 "preproc.y"
  { 
  (yyval.str) = mm_strdup("copy");
 }
-#line 57069 "preproc.c"
+#line 57062 "preproc.c"
     break;
 
   case 2430: /* unreserved_keyword: COST  */
-#line 14158 "preproc.y"
+#line 14151 "preproc.y"
  { 
  (yyval.str) = mm_strdup("cost");
 }
-#line 57077 "preproc.c"
+#line 57070 "preproc.c"
     break;
 
   case 2431: /* unreserved_keyword: CSV  */
-#line 14162 "preproc.y"
+#line 14155 "preproc.y"
  { 
  (yyval.str) = mm_strdup("csv");
 }
-#line 57085 "preproc.c"
+#line 57078 "preproc.c"
     break;
 
   case 2432: /* unreserved_keyword: CUBE  */
-#line 14166 "preproc.y"
+#line 14159 "preproc.y"
  { 
  (yyval.str) = mm_strdup("cube");
 }
-#line 57093 "preproc.c"
+#line 57086 "preproc.c"
     break;
 
   case 2433: /* unreserved_keyword: CURSOR  */
-#line 14170 "preproc.y"
+#line 14163 "preproc.y"
  { 
  (yyval.str) = mm_strdup("cursor");
 }
-#line 57101 "preproc.c"
+#line 57094 "preproc.c"
     break;
 
   case 2434: /* unreserved_keyword: CYCLE  */
-#line 14174 "preproc.y"
+#line 14167 "preproc.y"
  { 
  (yyval.str) = mm_strdup("cycle");
 }
-#line 57109 "preproc.c"
+#line 57102 "preproc.c"
     break;
 
   case 2435: /* unreserved_keyword: DATA_P  */
-#line 14178 "preproc.y"
+#line 14171 "preproc.y"
  { 
  (yyval.str) = mm_strdup("data");
 }
-#line 57117 "preproc.c"
+#line 57110 "preproc.c"
     break;
 
   case 2436: /* unreserved_keyword: DATABASE  */
-#line 14182 "preproc.y"
+#line 14175 "preproc.y"
  { 
  (yyval.str) = mm_strdup("database");
 }
-#line 57125 "preproc.c"
+#line 57118 "preproc.c"
     break;
 
   case 2437: /* unreserved_keyword: DEALLOCATE  */
-#line 14186 "preproc.y"
+#line 14179 "preproc.y"
  { 
  (yyval.str) = mm_strdup("deallocate");
 }
-#line 57133 "preproc.c"
+#line 57126 "preproc.c"
     break;
 
   case 2438: /* unreserved_keyword: DECLARE  */
-#line 14190 "preproc.y"
+#line 14183 "preproc.y"
  { 
  (yyval.str) = mm_strdup("declare");
 }
-#line 57141 "preproc.c"
+#line 57134 "preproc.c"
     break;
 
   case 2439: /* unreserved_keyword: DEFAULTS  */
-#line 14194 "preproc.y"
+#line 14187 "preproc.y"
  { 
  (yyval.str) = mm_strdup("defaults");
 }
-#line 57149 "preproc.c"
+#line 57142 "preproc.c"
     break;
 
   case 2440: /* unreserved_keyword: DEFERRED  */
-#line 14198 "preproc.y"
+#line 14191 "preproc.y"
  { 
  (yyval.str) = mm_strdup("deferred");
 }
-#line 57157 "preproc.c"
+#line 57150 "preproc.c"
     break;
 
   case 2441: /* unreserved_keyword: DEFINER  */
-#line 14202 "preproc.y"
+#line 14195 "preproc.y"
  { 
  (yyval.str) = mm_strdup("definer");
 }
-#line 57165 "preproc.c"
+#line 57158 "preproc.c"
     break;
 
   case 2442: /* unreserved_keyword: DELETE_P  */
-#line 14206 "preproc.y"
+#line 14199 "preproc.y"
  { 
  (yyval.str) = mm_strdup("delete");
 }
-#line 57173 "preproc.c"
+#line 57166 "preproc.c"
     break;
 
   case 2443: /* unreserved_keyword: DELIMITER  */
-#line 14210 "preproc.y"
+#line 14203 "preproc.y"
  { 
  (yyval.str) = mm_strdup("delimiter");
 }
-#line 57181 "preproc.c"
+#line 57174 "preproc.c"
     break;
 
   case 2444: /* unreserved_keyword: DELIMITERS  */
-#line 14214 "preproc.y"
+#line 14207 "preproc.y"
  { 
  (yyval.str) = mm_strdup("delimiters");
 }
-#line 57189 "preproc.c"
+#line 57182 "preproc.c"
     break;
 
   case 2445: /* unreserved_keyword: DEPENDS  */
-#line 14218 "preproc.y"
+#line 14211 "preproc.y"
  { 
  (yyval.str) = mm_strdup("depends");
 }
-#line 57197 "preproc.c"
+#line 57190 "preproc.c"
     break;
 
   case 2446: /* unreserved_keyword: DEPTH  */
-#line 14222 "preproc.y"
+#line 14215 "preproc.y"
  { 
  (yyval.str) = mm_strdup("depth");
 }
-#line 57205 "preproc.c"
+#line 57198 "preproc.c"
     break;
 
   case 2447: /* unreserved_keyword: DETACH  */
-#line 14226 "preproc.y"
+#line 14219 "preproc.y"
  { 
  (yyval.str) = mm_strdup("detach");
 }
-#line 57213 "preproc.c"
+#line 57206 "preproc.c"
     break;
 
   case 2448: /* unreserved_keyword: DICTIONARY  */
-#line 14230 "preproc.y"
+#line 14223 "preproc.y"
  { 
  (yyval.str) = mm_strdup("dictionary");
 }
-#line 57221 "preproc.c"
+#line 57214 "preproc.c"
     break;
 
   case 2449: /* unreserved_keyword: DISABLE_P  */
-#line 14234 "preproc.y"
+#line 14227 "preproc.y"
  { 
  (yyval.str) = mm_strdup("disable");
 }
-#line 57229 "preproc.c"
+#line 57222 "preproc.c"
     break;
 
   case 2450: /* unreserved_keyword: DISCARD  */
-#line 14238 "preproc.y"
+#line 14231 "preproc.y"
  { 
  (yyval.str) = mm_strdup("discard");
 }
-#line 57237 "preproc.c"
+#line 57230 "preproc.c"
     break;
 
   case 2451: /* unreserved_keyword: DOCUMENT_P  */
-#line 14242 "preproc.y"
+#line 14235 "preproc.y"
  { 
  (yyval.str) = mm_strdup("document");
 }
-#line 57245 "preproc.c"
+#line 57238 "preproc.c"
     break;
 
   case 2452: /* unreserved_keyword: DOMAIN_P  */
-#line 14246 "preproc.y"
+#line 14239 "preproc.y"
  { 
  (yyval.str) = mm_strdup("domain");
 }
-#line 57253 "preproc.c"
+#line 57246 "preproc.c"
     break;
 
   case 2453: /* unreserved_keyword: DOUBLE_P  */
-#line 14250 "preproc.y"
+#line 14243 "preproc.y"
  { 
  (yyval.str) = mm_strdup("double");
 }
-#line 57261 "preproc.c"
+#line 57254 "preproc.c"
     break;
 
   case 2454: /* unreserved_keyword: DROP  */
-#line 14254 "preproc.y"
+#line 14247 "preproc.y"
  { 
  (yyval.str) = mm_strdup("drop");
 }
-#line 57269 "preproc.c"
+#line 57262 "preproc.c"
     break;
 
   case 2455: /* unreserved_keyword: EACH  */
-#line 14258 "preproc.y"
+#line 14251 "preproc.y"
  { 
  (yyval.str) = mm_strdup("each");
 }
-#line 57277 "preproc.c"
+#line 57270 "preproc.c"
     break;
 
   case 2456: /* unreserved_keyword: ENABLE_P  */
-#line 14262 "preproc.y"
+#line 14255 "preproc.y"
  { 
  (yyval.str) = mm_strdup("enable");
 }
-#line 57285 "preproc.c"
+#line 57278 "preproc.c"
     break;
 
   case 2457: /* unreserved_keyword: ENCODING  */
-#line 14266 "preproc.y"
+#line 14259 "preproc.y"
  { 
  (yyval.str) = mm_strdup("encoding");
 }
-#line 57293 "preproc.c"
+#line 57286 "preproc.c"
     break;
 
   case 2458: /* unreserved_keyword: ENCRYPTED  */
-#line 14270 "preproc.y"
+#line 14263 "preproc.y"
  { 
  (yyval.str) = mm_strdup("encrypted");
 }
-#line 57301 "preproc.c"
+#line 57294 "preproc.c"
     break;
 
   case 2459: /* unreserved_keyword: ENUM_P  */
-#line 14274 "preproc.y"
+#line 14267 "preproc.y"
  { 
  (yyval.str) = mm_strdup("enum");
 }
-#line 57309 "preproc.c"
+#line 57302 "preproc.c"
     break;
 
   case 2460: /* unreserved_keyword: ESCAPE  */
-#line 14278 "preproc.y"
+#line 14271 "preproc.y"
  { 
  (yyval.str) = mm_strdup("escape");
 }
-#line 57317 "preproc.c"
+#line 57310 "preproc.c"
     break;
 
   case 2461: /* unreserved_keyword: EVENT  */
-#line 14282 "preproc.y"
+#line 14275 "preproc.y"
  { 
  (yyval.str) = mm_strdup("event");
 }
-#line 57325 "preproc.c"
+#line 57318 "preproc.c"
     break;
 
   case 2462: /* unreserved_keyword: EXCLUDE  */
-#line 14286 "preproc.y"
+#line 14279 "preproc.y"
  { 
  (yyval.str) = mm_strdup("exclude");
 }
-#line 57333 "preproc.c"
+#line 57326 "preproc.c"
     break;
 
   case 2463: /* unreserved_keyword: EXCLUDING  */
-#line 14290 "preproc.y"
+#line 14283 "preproc.y"
  { 
  (yyval.str) = mm_strdup("excluding");
 }
-#line 57341 "preproc.c"
+#line 57334 "preproc.c"
     break;
 
   case 2464: /* unreserved_keyword: EXCLUSIVE  */
-#line 14294 "preproc.y"
+#line 14287 "preproc.y"
  { 
  (yyval.str) = mm_strdup("exclusive");
 }
-#line 57349 "preproc.c"
+#line 57342 "preproc.c"
     break;
 
   case 2465: /* unreserved_keyword: EXECUTE  */
-#line 14298 "preproc.y"
+#line 14291 "preproc.y"
  { 
  (yyval.str) = mm_strdup("execute");
 }
-#line 57357 "preproc.c"
+#line 57350 "preproc.c"
     break;
 
   case 2466: /* unreserved_keyword: EXPLAIN  */
-#line 14302 "preproc.y"
+#line 14295 "preproc.y"
  { 
  (yyval.str) = mm_strdup("explain");
 }
-#line 57365 "preproc.c"
+#line 57358 "preproc.c"
     break;
 
   case 2467: /* unreserved_keyword: EXPRESSION  */
-#line 14306 "preproc.y"
+#line 14299 "preproc.y"
  { 
  (yyval.str) = mm_strdup("expression");
 }
-#line 57373 "preproc.c"
+#line 57366 "preproc.c"
     break;
 
   case 2468: /* unreserved_keyword: EXTENSION  */
-#line 14310 "preproc.y"
+#line 14303 "preproc.y"
  { 
  (yyval.str) = mm_strdup("extension");
 }
-#line 57381 "preproc.c"
+#line 57374 "preproc.c"
     break;
 
   case 2469: /* unreserved_keyword: EXTERNAL  */
-#line 14314 "preproc.y"
+#line 14307 "preproc.y"
  { 
  (yyval.str) = mm_strdup("external");
 }
-#line 57389 "preproc.c"
+#line 57382 "preproc.c"
     break;
 
   case 2470: /* unreserved_keyword: FAMILY  */
-#line 14318 "preproc.y"
+#line 14311 "preproc.y"
  { 
  (yyval.str) = mm_strdup("family");
 }
-#line 57397 "preproc.c"
+#line 57390 "preproc.c"
     break;
 
   case 2471: /* unreserved_keyword: FILTER  */
-#line 14322 "preproc.y"
+#line 14315 "preproc.y"
  { 
  (yyval.str) = mm_strdup("filter");
 }
-#line 57405 "preproc.c"
+#line 57398 "preproc.c"
     break;
 
   case 2472: /* unreserved_keyword: FINALIZE  */
-#line 14326 "preproc.y"
+#line 14319 "preproc.y"
  { 
  (yyval.str) = mm_strdup("finalize");
 }
-#line 57413 "preproc.c"
+#line 57406 "preproc.c"
     break;
 
   case 2473: /* unreserved_keyword: FIRST_P  */
-#line 14330 "preproc.y"
+#line 14323 "preproc.y"
  { 
  (yyval.str) = mm_strdup("first");
 }
-#line 57421 "preproc.c"
+#line 57414 "preproc.c"
     break;
 
   case 2474: /* unreserved_keyword: FOLLOWING  */
-#line 14334 "preproc.y"
+#line 14327 "preproc.y"
  { 
  (yyval.str) = mm_strdup("following");
 }
-#line 57429 "preproc.c"
+#line 57422 "preproc.c"
     break;
 
   case 2475: /* unreserved_keyword: FORCE  */
-#line 14338 "preproc.y"
+#line 14331 "preproc.y"
  { 
  (yyval.str) = mm_strdup("force");
 }
-#line 57437 "preproc.c"
+#line 57430 "preproc.c"
     break;
 
   case 2476: /* unreserved_keyword: FORMAT  */
-#line 14342 "preproc.y"
+#line 14335 "preproc.y"
  { 
  (yyval.str) = mm_strdup("format");
 }
-#line 57445 "preproc.c"
+#line 57438 "preproc.c"
     break;
 
   case 2477: /* unreserved_keyword: FORWARD  */
-#line 14346 "preproc.y"
+#line 14339 "preproc.y"
  { 
  (yyval.str) = mm_strdup("forward");
 }
-#line 57453 "preproc.c"
+#line 57446 "preproc.c"
     break;
 
   case 2478: /* unreserved_keyword: FUNCTION  */
-#line 14350 "preproc.y"
+#line 14343 "preproc.y"
  { 
  (yyval.str) = mm_strdup("function");
 }
-#line 57461 "preproc.c"
+#line 57454 "preproc.c"
     break;
 
   case 2479: /* unreserved_keyword: FUNCTIONS  */
-#line 14354 "preproc.y"
+#line 14347 "preproc.y"
  { 
  (yyval.str) = mm_strdup("functions");
 }
-#line 57469 "preproc.c"
+#line 57462 "preproc.c"
     break;
 
   case 2480: /* unreserved_keyword: GENERATED  */
-#line 14358 "preproc.y"
+#line 14351 "preproc.y"
  { 
  (yyval.str) = mm_strdup("generated");
 }
-#line 57477 "preproc.c"
+#line 57470 "preproc.c"
     break;
 
   case 2481: /* unreserved_keyword: GLOBAL  */
-#line 14362 "preproc.y"
+#line 14355 "preproc.y"
  { 
  (yyval.str) = mm_strdup("global");
 }
-#line 57485 "preproc.c"
+#line 57478 "preproc.c"
     break;
 
   case 2482: /* unreserved_keyword: GRANTED  */
-#line 14366 "preproc.y"
+#line 14359 "preproc.y"
  { 
  (yyval.str) = mm_strdup("granted");
 }
-#line 57493 "preproc.c"
+#line 57486 "preproc.c"
     break;
 
   case 2483: /* unreserved_keyword: GROUPS  */
-#line 14370 "preproc.y"
+#line 14363 "preproc.y"
  { 
  (yyval.str) = mm_strdup("groups");
 }
-#line 57501 "preproc.c"
+#line 57494 "preproc.c"
     break;
 
   case 2484: /* unreserved_keyword: HANDLER  */
-#line 14374 "preproc.y"
+#line 14367 "preproc.y"
  { 
  (yyval.str) = mm_strdup("handler");
 }
-#line 57509 "preproc.c"
+#line 57502 "preproc.c"
     break;
 
   case 2485: /* unreserved_keyword: HEADER_P  */
-#line 14378 "preproc.y"
+#line 14371 "preproc.y"
  { 
  (yyval.str) = mm_strdup("header");
 }
-#line 57517 "preproc.c"
+#line 57510 "preproc.c"
     break;
 
   case 2486: /* unreserved_keyword: HOLD  */
-#line 14382 "preproc.y"
+#line 14375 "preproc.y"
  { 
  (yyval.str) = mm_strdup("hold");
 }
-#line 57525 "preproc.c"
+#line 57518 "preproc.c"
     break;
 
   case 2487: /* unreserved_keyword: IDENTITY_P  */
-#line 14386 "preproc.y"
+#line 14379 "preproc.y"
  { 
  (yyval.str) = mm_strdup("identity");
 }
-#line 57533 "preproc.c"
+#line 57526 "preproc.c"
     break;
 
   case 2488: /* unreserved_keyword: IF_P  */
-#line 14390 "preproc.y"
+#line 14383 "preproc.y"
  { 
  (yyval.str) = mm_strdup("if");
 }
-#line 57541 "preproc.c"
+#line 57534 "preproc.c"
     break;
 
   case 2489: /* unreserved_keyword: IMMEDIATE  */
-#line 14394 "preproc.y"
+#line 14387 "preproc.y"
  { 
  (yyval.str) = mm_strdup("immediate");
 }
-#line 57549 "preproc.c"
+#line 57542 "preproc.c"
     break;
 
   case 2490: /* unreserved_keyword: IMMUTABLE  */
-#line 14398 "preproc.y"
+#line 14391 "preproc.y"
  { 
  (yyval.str) = mm_strdup("immutable");
 }
-#line 57557 "preproc.c"
+#line 57550 "preproc.c"
     break;
 
   case 2491: /* unreserved_keyword: IMPLICIT_P  */
-#line 14402 "preproc.y"
+#line 14395 "preproc.y"
  { 
  (yyval.str) = mm_strdup("implicit");
 }
-#line 57565 "preproc.c"
+#line 57558 "preproc.c"
     break;
 
   case 2492: /* unreserved_keyword: IMPORT_P  */
-#line 14406 "preproc.y"
+#line 14399 "preproc.y"
  { 
  (yyval.str) = mm_strdup("import");
 }
-#line 57573 "preproc.c"
+#line 57566 "preproc.c"
     break;
 
   case 2493: /* unreserved_keyword: INCLUDE  */
-#line 14410 "preproc.y"
+#line 14403 "preproc.y"
  { 
  (yyval.str) = mm_strdup("include");
 }
-#line 57581 "preproc.c"
+#line 57574 "preproc.c"
     break;
 
   case 2494: /* unreserved_keyword: INCLUDING  */
-#line 14414 "preproc.y"
+#line 14407 "preproc.y"
  { 
  (yyval.str) = mm_strdup("including");
 }
-#line 57589 "preproc.c"
+#line 57582 "preproc.c"
     break;
 
   case 2495: /* unreserved_keyword: INCREMENT  */
-#line 14418 "preproc.y"
+#line 14411 "preproc.y"
  { 
  (yyval.str) = mm_strdup("increment");
 }
-#line 57597 "preproc.c"
+#line 57590 "preproc.c"
     break;
 
   case 2496: /* unreserved_keyword: INDENT  */
-#line 14422 "preproc.y"
+#line 14415 "preproc.y"
  { 
  (yyval.str) = mm_strdup("indent");
 }
-#line 57605 "preproc.c"
+#line 57598 "preproc.c"
     break;
 
   case 2497: /* unreserved_keyword: INDEX  */
-#line 14426 "preproc.y"
+#line 14419 "preproc.y"
  { 
  (yyval.str) = mm_strdup("index");
 }
-#line 57613 "preproc.c"
+#line 57606 "preproc.c"
     break;
 
   case 2498: /* unreserved_keyword: INDEXES  */
-#line 14430 "preproc.y"
+#line 14423 "preproc.y"
  { 
  (yyval.str) = mm_strdup("indexes");
 }
-#line 57621 "preproc.c"
+#line 57614 "preproc.c"
     break;
 
   case 2499: /* unreserved_keyword: INHERIT  */
-#line 14434 "preproc.y"
+#line 14427 "preproc.y"
  { 
  (yyval.str) = mm_strdup("inherit");
 }
-#line 57629 "preproc.c"
+#line 57622 "preproc.c"
     break;
 
   case 2500: /* unreserved_keyword: INHERITS  */
-#line 14438 "preproc.y"
+#line 14431 "preproc.y"
  { 
  (yyval.str) = mm_strdup("inherits");
 }
-#line 57637 "preproc.c"
+#line 57630 "preproc.c"
     break;
 
   case 2501: /* unreserved_keyword: INLINE_P  */
-#line 14442 "preproc.y"
+#line 14435 "preproc.y"
  { 
  (yyval.str) = mm_strdup("inline");
 }
-#line 57645 "preproc.c"
+#line 57638 "preproc.c"
     break;
 
   case 2502: /* unreserved_keyword: INSENSITIVE  */
-#line 14446 "preproc.y"
+#line 14439 "preproc.y"
  { 
  (yyval.str) = mm_strdup("insensitive");
 }
-#line 57653 "preproc.c"
+#line 57646 "preproc.c"
     break;
 
   case 2503: /* unreserved_keyword: INSERT  */
-#line 14450 "preproc.y"
+#line 14443 "preproc.y"
  { 
  (yyval.str) = mm_strdup("insert");
 }
-#line 57661 "preproc.c"
+#line 57654 "preproc.c"
     break;
 
   case 2504: /* unreserved_keyword: INSTEAD  */
-#line 14454 "preproc.y"
+#line 14447 "preproc.y"
  { 
  (yyval.str) = mm_strdup("instead");
 }
-#line 57669 "preproc.c"
+#line 57662 "preproc.c"
     break;
 
   case 2505: /* unreserved_keyword: INVOKER  */
-#line 14458 "preproc.y"
+#line 14451 "preproc.y"
  { 
  (yyval.str) = mm_strdup("invoker");
 }
-#line 57677 "preproc.c"
+#line 57670 "preproc.c"
     break;
 
   case 2506: /* unreserved_keyword: ISOLATION  */
-#line 14462 "preproc.y"
+#line 14455 "preproc.y"
  { 
  (yyval.str) = mm_strdup("isolation");
 }
-#line 57685 "preproc.c"
+#line 57678 "preproc.c"
     break;
 
   case 2507: /* unreserved_keyword: JSON  */
-#line 14466 "preproc.y"
+#line 14459 "preproc.y"
  { 
  (yyval.str) = mm_strdup("json");
 }
-#line 57693 "preproc.c"
+#line 57686 "preproc.c"
     break;
 
   case 2508: /* unreserved_keyword: KEY  */
-#line 14470 "preproc.y"
+#line 14463 "preproc.y"
  { 
  (yyval.str) = mm_strdup("key");
 }
-#line 57701 "preproc.c"
+#line 57694 "preproc.c"
     break;
 
   case 2509: /* unreserved_keyword: KEYS  */
-#line 14474 "preproc.y"
+#line 14467 "preproc.y"
  { 
  (yyval.str) = mm_strdup("keys");
 }
-#line 57709 "preproc.c"
+#line 57702 "preproc.c"
     break;
 
   case 2510: /* unreserved_keyword: LABEL  */
-#line 14478 "preproc.y"
+#line 14471 "preproc.y"
  { 
  (yyval.str) = mm_strdup("label");
 }
-#line 57717 "preproc.c"
+#line 57710 "preproc.c"
     break;
 
   case 2511: /* unreserved_keyword: LANGUAGE  */
-#line 14482 "preproc.y"
+#line 14475 "preproc.y"
  { 
  (yyval.str) = mm_strdup("language");
 }
-#line 57725 "preproc.c"
+#line 57718 "preproc.c"
     break;
 
   case 2512: /* unreserved_keyword: LARGE_P  */
-#line 14486 "preproc.y"
+#line 14479 "preproc.y"
  { 
  (yyval.str) = mm_strdup("large");
 }
-#line 57733 "preproc.c"
+#line 57726 "preproc.c"
     break;
 
   case 2513: /* unreserved_keyword: LAST_P  */
-#line 14490 "preproc.y"
+#line 14483 "preproc.y"
  { 
  (yyval.str) = mm_strdup("last");
 }
-#line 57741 "preproc.c"
+#line 57734 "preproc.c"
     break;
 
   case 2514: /* unreserved_keyword: LEAKPROOF  */
-#line 14494 "preproc.y"
+#line 14487 "preproc.y"
  { 
  (yyval.str) = mm_strdup("leakproof");
 }
-#line 57749 "preproc.c"
+#line 57742 "preproc.c"
     break;
 
   case 2515: /* unreserved_keyword: LEVEL  */
-#line 14498 "preproc.y"
+#line 14491 "preproc.y"
  { 
  (yyval.str) = mm_strdup("level");
 }
-#line 57757 "preproc.c"
+#line 57750 "preproc.c"
     break;
 
   case 2516: /* unreserved_keyword: LISTEN  */
-#line 14502 "preproc.y"
+#line 14495 "preproc.y"
  { 
  (yyval.str) = mm_strdup("listen");
 }
-#line 57765 "preproc.c"
+#line 57758 "preproc.c"
     break;
 
   case 2517: /* unreserved_keyword: LOAD  */
-#line 14506 "preproc.y"
+#line 14499 "preproc.y"
  { 
  (yyval.str) = mm_strdup("load");
 }
-#line 57773 "preproc.c"
+#line 57766 "preproc.c"
     break;
 
   case 2518: /* unreserved_keyword: LOCAL  */
-#line 14510 "preproc.y"
+#line 14503 "preproc.y"
  { 
  (yyval.str) = mm_strdup("local");
 }
-#line 57781 "preproc.c"
+#line 57774 "preproc.c"
     break;
 
   case 2519: /* unreserved_keyword: LOCATION  */
-#line 14514 "preproc.y"
+#line 14507 "preproc.y"
  { 
  (yyval.str) = mm_strdup("location");
 }
-#line 57789 "preproc.c"
+#line 57782 "preproc.c"
     break;
 
   case 2520: /* unreserved_keyword: LOCK_P  */
-#line 14518 "preproc.y"
+#line 14511 "preproc.y"
  { 
  (yyval.str) = mm_strdup("lock");
 }
-#line 57797 "preproc.c"
+#line 57790 "preproc.c"
     break;
 
   case 2521: /* unreserved_keyword: LOCKED  */
-#line 14522 "preproc.y"
+#line 14515 "preproc.y"
  { 
  (yyval.str) = mm_strdup("locked");
 }
-#line 57805 "preproc.c"
+#line 57798 "preproc.c"
     break;
 
   case 2522: /* unreserved_keyword: LOGGED  */
-#line 14526 "preproc.y"
+#line 14519 "preproc.y"
  { 
  (yyval.str) = mm_strdup("logged");
 }
-#line 57813 "preproc.c"
+#line 57806 "preproc.c"
     break;
 
   case 2523: /* unreserved_keyword: MAPPING  */
-#line 14530 "preproc.y"
+#line 14523 "preproc.y"
  { 
  (yyval.str) = mm_strdup("mapping");
 }
-#line 57821 "preproc.c"
+#line 57814 "preproc.c"
     break;
 
   case 2524: /* unreserved_keyword: MATCH  */
-#line 14534 "preproc.y"
+#line 14527 "preproc.y"
  { 
  (yyval.str) = mm_strdup("match");
 }
-#line 57829 "preproc.c"
+#line 57822 "preproc.c"
     break;
 
   case 2525: /* unreserved_keyword: MATCHED  */
-#line 14538 "preproc.y"
+#line 14531 "preproc.y"
  { 
  (yyval.str) = mm_strdup("matched");
 }
-#line 57837 "preproc.c"
+#line 57830 "preproc.c"
     break;
 
   case 2526: /* unreserved_keyword: MATERIALIZED  */
-#line 14542 "preproc.y"
+#line 14535 "preproc.y"
  { 
  (yyval.str) = mm_strdup("materialized");
 }
-#line 57845 "preproc.c"
+#line 57838 "preproc.c"
     break;
 
   case 2527: /* unreserved_keyword: MAXVALUE  */
-#line 14546 "preproc.y"
+#line 14539 "preproc.y"
  { 
  (yyval.str) = mm_strdup("maxvalue");
 }
-#line 57853 "preproc.c"
+#line 57846 "preproc.c"
     break;
 
   case 2528: /* unreserved_keyword: MERGE  */
-#line 14550 "preproc.y"
+#line 14543 "preproc.y"
  { 
  (yyval.str) = mm_strdup("merge");
 }
-#line 57861 "preproc.c"
+#line 57854 "preproc.c"
     break;
 
   case 2529: /* unreserved_keyword: METHOD  */
-#line 14554 "preproc.y"
+#line 14547 "preproc.y"
  { 
  (yyval.str) = mm_strdup("method");
 }
-#line 57869 "preproc.c"
+#line 57862 "preproc.c"
     break;
 
   case 2530: /* unreserved_keyword: MINVALUE  */
-#line 14558 "preproc.y"
+#line 14551 "preproc.y"
  { 
  (yyval.str) = mm_strdup("minvalue");
 }
-#line 57877 "preproc.c"
+#line 57870 "preproc.c"
     break;
 
   case 2531: /* unreserved_keyword: MODE  */
-#line 14562 "preproc.y"
+#line 14555 "preproc.y"
  { 
  (yyval.str) = mm_strdup("mode");
 }
-#line 57885 "preproc.c"
+#line 57878 "preproc.c"
     break;
 
   case 2532: /* unreserved_keyword: MOVE  */
-#line 14566 "preproc.y"
+#line 14559 "preproc.y"
  { 
  (yyval.str) = mm_strdup("move");
 }
-#line 57893 "preproc.c"
+#line 57886 "preproc.c"
     break;
 
   case 2533: /* unreserved_keyword: NAME_P  */
-#line 14570 "preproc.y"
+#line 14563 "preproc.y"
  { 
  (yyval.str) = mm_strdup("name");
 }
-#line 57901 "preproc.c"
+#line 57894 "preproc.c"
     break;
 
   case 2534: /* unreserved_keyword: NAMES  */
-#line 14574 "preproc.y"
+#line 14567 "preproc.y"
  { 
  (yyval.str) = mm_strdup("names");
 }
-#line 57909 "preproc.c"
+#line 57902 "preproc.c"
     break;
 
   case 2535: /* unreserved_keyword: NEW  */
-#line 14578 "preproc.y"
+#line 14571 "preproc.y"
  { 
  (yyval.str) = mm_strdup("new");
 }
-#line 57917 "preproc.c"
+#line 57910 "preproc.c"
     break;
 
   case 2536: /* unreserved_keyword: NEXT  */
-#line 14582 "preproc.y"
+#line 14575 "preproc.y"
  { 
  (yyval.str) = mm_strdup("next");
 }
-#line 57925 "preproc.c"
+#line 57918 "preproc.c"
     break;
 
   case 2537: /* unreserved_keyword: NFC  */
-#line 14586 "preproc.y"
+#line 14579 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nfc");
 }
-#line 57933 "preproc.c"
+#line 57926 "preproc.c"
     break;
 
   case 2538: /* unreserved_keyword: NFD  */
-#line 14590 "preproc.y"
+#line 14583 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nfd");
 }
-#line 57941 "preproc.c"
+#line 57934 "preproc.c"
     break;
 
   case 2539: /* unreserved_keyword: NFKC  */
-#line 14594 "preproc.y"
+#line 14587 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nfkc");
 }
-#line 57949 "preproc.c"
+#line 57942 "preproc.c"
     break;
 
   case 2540: /* unreserved_keyword: NFKD  */
-#line 14598 "preproc.y"
+#line 14591 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nfkd");
 }
-#line 57957 "preproc.c"
+#line 57950 "preproc.c"
     break;
 
   case 2541: /* unreserved_keyword: NO  */
-#line 14602 "preproc.y"
+#line 14595 "preproc.y"
  { 
  (yyval.str) = mm_strdup("no");
 }
-#line 57965 "preproc.c"
+#line 57958 "preproc.c"
     break;
 
   case 2542: /* unreserved_keyword: NORMALIZED  */
-#line 14606 "preproc.y"
+#line 14599 "preproc.y"
  { 
  (yyval.str) = mm_strdup("normalized");
 }
-#line 57973 "preproc.c"
+#line 57966 "preproc.c"
     break;
 
   case 2543: /* unreserved_keyword: NOTHING  */
-#line 14610 "preproc.y"
+#line 14603 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nothing");
 }
-#line 57981 "preproc.c"
+#line 57974 "preproc.c"
     break;
 
   case 2544: /* unreserved_keyword: NOTIFY  */
-#line 14614 "preproc.y"
+#line 14607 "preproc.y"
  { 
  (yyval.str) = mm_strdup("notify");
 }
-#line 57989 "preproc.c"
+#line 57982 "preproc.c"
     break;
 
   case 2545: /* unreserved_keyword: NOWAIT  */
-#line 14618 "preproc.y"
+#line 14611 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nowait");
 }
-#line 57997 "preproc.c"
+#line 57990 "preproc.c"
     break;
 
   case 2546: /* unreserved_keyword: NULLS_P  */
-#line 14622 "preproc.y"
+#line 14615 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nulls");
 }
-#line 58005 "preproc.c"
+#line 57998 "preproc.c"
     break;
 
   case 2547: /* unreserved_keyword: OBJECT_P  */
-#line 14626 "preproc.y"
+#line 14619 "preproc.y"
  { 
  (yyval.str) = mm_strdup("object");
 }
-#line 58013 "preproc.c"
+#line 58006 "preproc.c"
     break;
 
   case 2548: /* unreserved_keyword: OF  */
-#line 14630 "preproc.y"
+#line 14623 "preproc.y"
  { 
  (yyval.str) = mm_strdup("of");
 }
-#line 58021 "preproc.c"
+#line 58014 "preproc.c"
     break;
 
   case 2549: /* unreserved_keyword: OFF  */
-#line 14634 "preproc.y"
+#line 14627 "preproc.y"
  { 
  (yyval.str) = mm_strdup("off");
 }
-#line 58029 "preproc.c"
+#line 58022 "preproc.c"
     break;
 
   case 2550: /* unreserved_keyword: OIDS  */
-#line 14638 "preproc.y"
+#line 14631 "preproc.y"
  { 
  (yyval.str) = mm_strdup("oids");
 }
-#line 58037 "preproc.c"
+#line 58030 "preproc.c"
     break;
 
   case 2551: /* unreserved_keyword: OLD  */
-#line 14642 "preproc.y"
+#line 14635 "preproc.y"
  { 
  (yyval.str) = mm_strdup("old");
 }
-#line 58045 "preproc.c"
+#line 58038 "preproc.c"
     break;
 
   case 2552: /* unreserved_keyword: OPERATOR  */
-#line 14646 "preproc.y"
+#line 14639 "preproc.y"
  { 
  (yyval.str) = mm_strdup("operator");
 }
-#line 58053 "preproc.c"
+#line 58046 "preproc.c"
     break;
 
   case 2553: /* unreserved_keyword: OPTION  */
-#line 14650 "preproc.y"
+#line 14643 "preproc.y"
  { 
  (yyval.str) = mm_strdup("option");
 }
-#line 58061 "preproc.c"
+#line 58054 "preproc.c"
     break;
 
   case 2554: /* unreserved_keyword: OPTIONS  */
-#line 14654 "preproc.y"
+#line 14647 "preproc.y"
  { 
  (yyval.str) = mm_strdup("options");
 }
-#line 58069 "preproc.c"
+#line 58062 "preproc.c"
     break;
 
   case 2555: /* unreserved_keyword: ORDINALITY  */
-#line 14658 "preproc.y"
+#line 14651 "preproc.y"
  { 
  (yyval.str) = mm_strdup("ordinality");
 }
-#line 58077 "preproc.c"
+#line 58070 "preproc.c"
     break;
 
   case 2556: /* unreserved_keyword: OTHERS  */
-#line 14662 "preproc.y"
+#line 14655 "preproc.y"
  { 
  (yyval.str) = mm_strdup("others");
 }
-#line 58085 "preproc.c"
+#line 58078 "preproc.c"
     break;
 
   case 2557: /* unreserved_keyword: OVER  */
-#line 14666 "preproc.y"
+#line 14659 "preproc.y"
  { 
  (yyval.str) = mm_strdup("over");
 }
-#line 58093 "preproc.c"
+#line 58086 "preproc.c"
     break;
 
   case 2558: /* unreserved_keyword: OVERRIDING  */
-#line 14670 "preproc.y"
+#line 14663 "preproc.y"
  { 
  (yyval.str) = mm_strdup("overriding");
 }
-#line 58101 "preproc.c"
+#line 58094 "preproc.c"
     break;
 
   case 2559: /* unreserved_keyword: OWNED  */
-#line 14674 "preproc.y"
+#line 14667 "preproc.y"
  { 
  (yyval.str) = mm_strdup("owned");
 }
-#line 58109 "preproc.c"
+#line 58102 "preproc.c"
     break;
 
   case 2560: /* unreserved_keyword: OWNER  */
-#line 14678 "preproc.y"
+#line 14671 "preproc.y"
  { 
  (yyval.str) = mm_strdup("owner");
 }
-#line 58117 "preproc.c"
+#line 58110 "preproc.c"
     break;
 
   case 2561: /* unreserved_keyword: PARALLEL  */
-#line 14682 "preproc.y"
+#line 14675 "preproc.y"
  { 
  (yyval.str) = mm_strdup("parallel");
 }
-#line 58125 "preproc.c"
+#line 58118 "preproc.c"
     break;
 
   case 2562: /* unreserved_keyword: PARAMETER  */
-#line 14686 "preproc.y"
+#line 14679 "preproc.y"
  { 
  (yyval.str) = mm_strdup("parameter");
 }
-#line 58133 "preproc.c"
+#line 58126 "preproc.c"
     break;
 
   case 2563: /* unreserved_keyword: PARSER  */
-#line 14690 "preproc.y"
+#line 14683 "preproc.y"
  { 
  (yyval.str) = mm_strdup("parser");
 }
-#line 58141 "preproc.c"
+#line 58134 "preproc.c"
     break;
 
   case 2564: /* unreserved_keyword: PARTIAL  */
-#line 14694 "preproc.y"
+#line 14687 "preproc.y"
  { 
  (yyval.str) = mm_strdup("partial");
 }
-#line 58149 "preproc.c"
+#line 58142 "preproc.c"
     break;
 
   case 2565: /* unreserved_keyword: PARTITION  */
-#line 14698 "preproc.y"
+#line 14691 "preproc.y"
  { 
  (yyval.str) = mm_strdup("partition");
 }
-#line 58157 "preproc.c"
+#line 58150 "preproc.c"
     break;
 
   case 2566: /* unreserved_keyword: PASSING  */
-#line 14702 "preproc.y"
+#line 14695 "preproc.y"
  { 
  (yyval.str) = mm_strdup("passing");
 }
-#line 58165 "preproc.c"
+#line 58158 "preproc.c"
     break;
 
   case 2567: /* unreserved_keyword: PASSWORD  */
-#line 14706 "preproc.y"
+#line 14699 "preproc.y"
  { 
  (yyval.str) = mm_strdup("password");
 }
-#line 58173 "preproc.c"
+#line 58166 "preproc.c"
     break;
 
   case 2568: /* unreserved_keyword: PLANS  */
-#line 14710 "preproc.y"
+#line 14703 "preproc.y"
  { 
  (yyval.str) = mm_strdup("plans");
 }
-#line 58181 "preproc.c"
+#line 58174 "preproc.c"
     break;
 
   case 2569: /* unreserved_keyword: POLICY  */
-#line 14714 "preproc.y"
+#line 14707 "preproc.y"
  { 
  (yyval.str) = mm_strdup("policy");
 }
-#line 58189 "preproc.c"
+#line 58182 "preproc.c"
     break;
 
   case 2570: /* unreserved_keyword: PRECEDING  */
-#line 14718 "preproc.y"
+#line 14711 "preproc.y"
  { 
  (yyval.str) = mm_strdup("preceding");
 }
-#line 58197 "preproc.c"
+#line 58190 "preproc.c"
     break;
 
   case 2571: /* unreserved_keyword: PREPARE  */
-#line 14722 "preproc.y"
+#line 14715 "preproc.y"
  { 
  (yyval.str) = mm_strdup("prepare");
 }
-#line 58205 "preproc.c"
+#line 58198 "preproc.c"
     break;
 
   case 2572: /* unreserved_keyword: PREPARED  */
-#line 14726 "preproc.y"
+#line 14719 "preproc.y"
  { 
  (yyval.str) = mm_strdup("prepared");
 }
-#line 58213 "preproc.c"
+#line 58206 "preproc.c"
     break;
 
   case 2573: /* unreserved_keyword: PRESERVE  */
-#line 14730 "preproc.y"
+#line 14723 "preproc.y"
  { 
  (yyval.str) = mm_strdup("preserve");
 }
-#line 58221 "preproc.c"
+#line 58214 "preproc.c"
     break;
 
   case 2574: /* unreserved_keyword: PRIOR  */
-#line 14734 "preproc.y"
+#line 14727 "preproc.y"
  { 
  (yyval.str) = mm_strdup("prior");
 }
-#line 58229 "preproc.c"
+#line 58222 "preproc.c"
     break;
 
   case 2575: /* unreserved_keyword: PRIVILEGES  */
-#line 14738 "preproc.y"
+#line 14731 "preproc.y"
  { 
  (yyval.str) = mm_strdup("privileges");
 }
-#line 58237 "preproc.c"
+#line 58230 "preproc.c"
     break;
 
   case 2576: /* unreserved_keyword: PROCEDURAL  */
-#line 14742 "preproc.y"
+#line 14735 "preproc.y"
  { 
  (yyval.str) = mm_strdup("procedural");
 }
-#line 58245 "preproc.c"
+#line 58238 "preproc.c"
     break;
 
   case 2577: /* unreserved_keyword: PROCEDURE  */
-#line 14746 "preproc.y"
+#line 14739 "preproc.y"
  { 
  (yyval.str) = mm_strdup("procedure");
 }
-#line 58253 "preproc.c"
+#line 58246 "preproc.c"
     break;
 
   case 2578: /* unreserved_keyword: PROCEDURES  */
-#line 14750 "preproc.y"
+#line 14743 "preproc.y"
  { 
  (yyval.str) = mm_strdup("procedures");
 }
-#line 58261 "preproc.c"
+#line 58254 "preproc.c"
     break;
 
   case 2579: /* unreserved_keyword: PROGRAM  */
-#line 14754 "preproc.y"
+#line 14747 "preproc.y"
  { 
  (yyval.str) = mm_strdup("program");
 }
-#line 58269 "preproc.c"
+#line 58262 "preproc.c"
     break;
 
   case 2580: /* unreserved_keyword: PUBLICATION  */
-#line 14758 "preproc.y"
+#line 14751 "preproc.y"
  { 
  (yyval.str) = mm_strdup("publication");
 }
-#line 58277 "preproc.c"
+#line 58270 "preproc.c"
     break;
 
   case 2581: /* unreserved_keyword: QUOTE  */
-#line 14762 "preproc.y"
+#line 14755 "preproc.y"
  { 
  (yyval.str) = mm_strdup("quote");
 }
-#line 58285 "preproc.c"
+#line 58278 "preproc.c"
     break;
 
   case 2582: /* unreserved_keyword: RANGE  */
-#line 14766 "preproc.y"
+#line 14759 "preproc.y"
  { 
  (yyval.str) = mm_strdup("range");
 }
-#line 58293 "preproc.c"
+#line 58286 "preproc.c"
     break;
 
   case 2583: /* unreserved_keyword: READ  */
-#line 14770 "preproc.y"
+#line 14763 "preproc.y"
  { 
  (yyval.str) = mm_strdup("read");
 }
-#line 58301 "preproc.c"
+#line 58294 "preproc.c"
     break;
 
   case 2584: /* unreserved_keyword: REASSIGN  */
-#line 14774 "preproc.y"
+#line 14767 "preproc.y"
  { 
  (yyval.str) = mm_strdup("reassign");
 }
-#line 58309 "preproc.c"
+#line 58302 "preproc.c"
     break;
 
   case 2585: /* unreserved_keyword: RECHECK  */
-#line 14778 "preproc.y"
+#line 14771 "preproc.y"
  { 
  (yyval.str) = mm_strdup("recheck");
 }
-#line 58317 "preproc.c"
+#line 58310 "preproc.c"
     break;
 
   case 2586: /* unreserved_keyword: RECURSIVE  */
-#line 14782 "preproc.y"
+#line 14775 "preproc.y"
  { 
  (yyval.str) = mm_strdup("recursive");
 }
-#line 58325 "preproc.c"
+#line 58318 "preproc.c"
     break;
 
   case 2587: /* unreserved_keyword: REF_P  */
-#line 14786 "preproc.y"
+#line 14779 "preproc.y"
  { 
  (yyval.str) = mm_strdup("ref");
 }
-#line 58333 "preproc.c"
+#line 58326 "preproc.c"
     break;
 
   case 2588: /* unreserved_keyword: REFERENCING  */
-#line 14790 "preproc.y"
+#line 14783 "preproc.y"
  { 
  (yyval.str) = mm_strdup("referencing");
 }
-#line 58341 "preproc.c"
+#line 58334 "preproc.c"
     break;
 
   case 2589: /* unreserved_keyword: REFRESH  */
-#line 14794 "preproc.y"
+#line 14787 "preproc.y"
  { 
  (yyval.str) = mm_strdup("refresh");
 }
-#line 58349 "preproc.c"
+#line 58342 "preproc.c"
     break;
 
   case 2590: /* unreserved_keyword: REINDEX  */
-#line 14798 "preproc.y"
+#line 14791 "preproc.y"
  { 
  (yyval.str) = mm_strdup("reindex");
 }
-#line 58357 "preproc.c"
+#line 58350 "preproc.c"
     break;
 
   case 2591: /* unreserved_keyword: RELATIVE_P  */
-#line 14802 "preproc.y"
+#line 14795 "preproc.y"
  { 
  (yyval.str) = mm_strdup("relative");
 }
-#line 58365 "preproc.c"
+#line 58358 "preproc.c"
     break;
 
   case 2592: /* unreserved_keyword: RELEASE  */
-#line 14806 "preproc.y"
+#line 14799 "preproc.y"
  { 
  (yyval.str) = mm_strdup("release");
 }
-#line 58373 "preproc.c"
+#line 58366 "preproc.c"
     break;
 
   case 2593: /* unreserved_keyword: RENAME  */
-#line 14810 "preproc.y"
+#line 14803 "preproc.y"
  { 
  (yyval.str) = mm_strdup("rename");
 }
-#line 58381 "preproc.c"
+#line 58374 "preproc.c"
     break;
 
   case 2594: /* unreserved_keyword: REPEATABLE  */
-#line 14814 "preproc.y"
+#line 14807 "preproc.y"
  { 
  (yyval.str) = mm_strdup("repeatable");
 }
-#line 58389 "preproc.c"
+#line 58382 "preproc.c"
     break;
 
   case 2595: /* unreserved_keyword: REPLACE  */
-#line 14818 "preproc.y"
+#line 14811 "preproc.y"
  { 
  (yyval.str) = mm_strdup("replace");
 }
-#line 58397 "preproc.c"
+#line 58390 "preproc.c"
     break;
 
   case 2596: /* unreserved_keyword: REPLICA  */
-#line 14822 "preproc.y"
+#line 14815 "preproc.y"
  { 
  (yyval.str) = mm_strdup("replica");
 }
-#line 58405 "preproc.c"
+#line 58398 "preproc.c"
     break;
 
   case 2597: /* unreserved_keyword: RESET  */
-#line 14826 "preproc.y"
+#line 14819 "preproc.y"
  { 
  (yyval.str) = mm_strdup("reset");
 }
-#line 58413 "preproc.c"
+#line 58406 "preproc.c"
     break;
 
   case 2598: /* unreserved_keyword: RESTART  */
-#line 14830 "preproc.y"
+#line 14823 "preproc.y"
  { 
  (yyval.str) = mm_strdup("restart");
 }
-#line 58421 "preproc.c"
+#line 58414 "preproc.c"
     break;
 
   case 2599: /* unreserved_keyword: RESTRICT  */
-#line 14834 "preproc.y"
+#line 14827 "preproc.y"
  { 
  (yyval.str) = mm_strdup("restrict");
 }
-#line 58429 "preproc.c"
+#line 58422 "preproc.c"
     break;
 
   case 2600: /* unreserved_keyword: RETURN  */
-#line 14838 "preproc.y"
+#line 14831 "preproc.y"
  { 
  (yyval.str) = mm_strdup("return");
 }
-#line 58437 "preproc.c"
+#line 58430 "preproc.c"
     break;
 
   case 2601: /* unreserved_keyword: RETURNS  */
-#line 14842 "preproc.y"
+#line 14835 "preproc.y"
  { 
  (yyval.str) = mm_strdup("returns");
 }
-#line 58445 "preproc.c"
+#line 58438 "preproc.c"
     break;
 
   case 2602: /* unreserved_keyword: REVOKE  */
-#line 14846 "preproc.y"
+#line 14839 "preproc.y"
  { 
  (yyval.str) = mm_strdup("revoke");
 }
-#line 58453 "preproc.c"
+#line 58446 "preproc.c"
     break;
 
   case 2603: /* unreserved_keyword: ROLE  */
-#line 14850 "preproc.y"
+#line 14843 "preproc.y"
  { 
  (yyval.str) = mm_strdup("role");
 }
-#line 58461 "preproc.c"
+#line 58454 "preproc.c"
     break;
 
   case 2604: /* unreserved_keyword: ROLLBACK  */
-#line 14854 "preproc.y"
+#line 14847 "preproc.y"
  { 
  (yyval.str) = mm_strdup("rollback");
 }
-#line 58469 "preproc.c"
+#line 58462 "preproc.c"
     break;
 
   case 2605: /* unreserved_keyword: ROLLUP  */
-#line 14858 "preproc.y"
+#line 14851 "preproc.y"
  { 
  (yyval.str) = mm_strdup("rollup");
 }
-#line 58477 "preproc.c"
+#line 58470 "preproc.c"
     break;
 
   case 2606: /* unreserved_keyword: ROUTINE  */
-#line 14862 "preproc.y"
+#line 14855 "preproc.y"
  { 
  (yyval.str) = mm_strdup("routine");
 }
-#line 58485 "preproc.c"
+#line 58478 "preproc.c"
     break;
 
   case 2607: /* unreserved_keyword: ROUTINES  */
-#line 14866 "preproc.y"
+#line 14859 "preproc.y"
  { 
  (yyval.str) = mm_strdup("routines");
 }
-#line 58493 "preproc.c"
+#line 58486 "preproc.c"
     break;
 
   case 2608: /* unreserved_keyword: ROWS  */
-#line 14870 "preproc.y"
+#line 14863 "preproc.y"
  { 
  (yyval.str) = mm_strdup("rows");
 }
-#line 58501 "preproc.c"
+#line 58494 "preproc.c"
     break;
 
   case 2609: /* unreserved_keyword: RULE  */
-#line 14874 "preproc.y"
+#line 14867 "preproc.y"
  { 
  (yyval.str) = mm_strdup("rule");
 }
-#line 58509 "preproc.c"
+#line 58502 "preproc.c"
     break;
 
   case 2610: /* unreserved_keyword: SAVEPOINT  */
-#line 14878 "preproc.y"
+#line 14871 "preproc.y"
  { 
  (yyval.str) = mm_strdup("savepoint");
 }
-#line 58517 "preproc.c"
+#line 58510 "preproc.c"
     break;
 
   case 2611: /* unreserved_keyword: SCALAR  */
-#line 14882 "preproc.y"
+#line 14875 "preproc.y"
  { 
  (yyval.str) = mm_strdup("scalar");
 }
-#line 58525 "preproc.c"
+#line 58518 "preproc.c"
     break;
 
   case 2612: /* unreserved_keyword: SCHEMA  */
-#line 14886 "preproc.y"
+#line 14879 "preproc.y"
  { 
  (yyval.str) = mm_strdup("schema");
 }
-#line 58533 "preproc.c"
+#line 58526 "preproc.c"
     break;
 
   case 2613: /* unreserved_keyword: SCHEMAS  */
-#line 14890 "preproc.y"
+#line 14883 "preproc.y"
  { 
  (yyval.str) = mm_strdup("schemas");
 }
-#line 58541 "preproc.c"
+#line 58534 "preproc.c"
     break;
 
   case 2614: /* unreserved_keyword: SCROLL  */
-#line 14894 "preproc.y"
+#line 14887 "preproc.y"
  { 
  (yyval.str) = mm_strdup("scroll");
 }
-#line 58549 "preproc.c"
+#line 58542 "preproc.c"
     break;
 
   case 2615: /* unreserved_keyword: SEARCH  */
-#line 14898 "preproc.y"
+#line 14891 "preproc.y"
  { 
  (yyval.str) = mm_strdup("search");
 }
-#line 58557 "preproc.c"
+#line 58550 "preproc.c"
     break;
 
   case 2616: /* unreserved_keyword: SECURITY  */
-#line 14902 "preproc.y"
+#line 14895 "preproc.y"
  { 
  (yyval.str) = mm_strdup("security");
 }
-#line 58565 "preproc.c"
+#line 58558 "preproc.c"
     break;
 
   case 2617: /* unreserved_keyword: SEQUENCE  */
-#line 14906 "preproc.y"
+#line 14899 "preproc.y"
  { 
  (yyval.str) = mm_strdup("sequence");
 }
-#line 58573 "preproc.c"
+#line 58566 "preproc.c"
     break;
 
   case 2618: /* unreserved_keyword: SEQUENCES  */
-#line 14910 "preproc.y"
+#line 14903 "preproc.y"
  { 
  (yyval.str) = mm_strdup("sequences");
 }
-#line 58581 "preproc.c"
+#line 58574 "preproc.c"
     break;
 
   case 2619: /* unreserved_keyword: SERIALIZABLE  */
-#line 14914 "preproc.y"
+#line 14907 "preproc.y"
  { 
  (yyval.str) = mm_strdup("serializable");
 }
-#line 58589 "preproc.c"
+#line 58582 "preproc.c"
     break;
 
   case 2620: /* unreserved_keyword: SERVER  */
-#line 14918 "preproc.y"
+#line 14911 "preproc.y"
  { 
  (yyval.str) = mm_strdup("server");
 }
-#line 58597 "preproc.c"
+#line 58590 "preproc.c"
     break;
 
   case 2621: /* unreserved_keyword: SESSION  */
-#line 14922 "preproc.y"
+#line 14915 "preproc.y"
  { 
  (yyval.str) = mm_strdup("session");
 }
-#line 58605 "preproc.c"
+#line 58598 "preproc.c"
     break;
 
   case 2622: /* unreserved_keyword: SET  */
-#line 14926 "preproc.y"
+#line 14919 "preproc.y"
  { 
  (yyval.str) = mm_strdup("set");
 }
-#line 58613 "preproc.c"
+#line 58606 "preproc.c"
     break;
 
   case 2623: /* unreserved_keyword: SETS  */
-#line 14930 "preproc.y"
+#line 14923 "preproc.y"
  { 
  (yyval.str) = mm_strdup("sets");
 }
-#line 58621 "preproc.c"
+#line 58614 "preproc.c"
     break;
 
   case 2624: /* unreserved_keyword: SHARE  */
-#line 14934 "preproc.y"
+#line 14927 "preproc.y"
  { 
  (yyval.str) = mm_strdup("share");
 }
-#line 58629 "preproc.c"
+#line 58622 "preproc.c"
     break;
 
   case 2625: /* unreserved_keyword: SHOW  */
-#line 14938 "preproc.y"
+#line 14931 "preproc.y"
  { 
  (yyval.str) = mm_strdup("show");
 }
-#line 58637 "preproc.c"
+#line 58630 "preproc.c"
     break;
 
   case 2626: /* unreserved_keyword: SIMPLE  */
-#line 14942 "preproc.y"
+#line 14935 "preproc.y"
  { 
  (yyval.str) = mm_strdup("simple");
 }
-#line 58645 "preproc.c"
+#line 58638 "preproc.c"
     break;
 
   case 2627: /* unreserved_keyword: SKIP  */
-#line 14946 "preproc.y"
+#line 14939 "preproc.y"
  { 
  (yyval.str) = mm_strdup("skip");
 }
-#line 58653 "preproc.c"
+#line 58646 "preproc.c"
     break;
 
   case 2628: /* unreserved_keyword: SNAPSHOT  */
-#line 14950 "preproc.y"
+#line 14943 "preproc.y"
  { 
  (yyval.str) = mm_strdup("snapshot");
 }
-#line 58661 "preproc.c"
+#line 58654 "preproc.c"
     break;
 
   case 2629: /* unreserved_keyword: SQL_P  */
-#line 14954 "preproc.y"
+#line 14947 "preproc.y"
  { 
  (yyval.str) = mm_strdup("sql");
 }
-#line 58669 "preproc.c"
+#line 58662 "preproc.c"
     break;
 
   case 2630: /* unreserved_keyword: STABLE  */
-#line 14958 "preproc.y"
+#line 14951 "preproc.y"
  { 
  (yyval.str) = mm_strdup("stable");
 }
-#line 58677 "preproc.c"
+#line 58670 "preproc.c"
     break;
 
   case 2631: /* unreserved_keyword: STANDALONE_P  */
-#line 14962 "preproc.y"
+#line 14955 "preproc.y"
  { 
  (yyval.str) = mm_strdup("standalone");
 }
-#line 58685 "preproc.c"
+#line 58678 "preproc.c"
     break;
 
   case 2632: /* unreserved_keyword: START  */
-#line 14966 "preproc.y"
+#line 14959 "preproc.y"
  { 
  (yyval.str) = mm_strdup("start");
 }
-#line 58693 "preproc.c"
+#line 58686 "preproc.c"
     break;
 
   case 2633: /* unreserved_keyword: STATEMENT  */
-#line 14970 "preproc.y"
+#line 14963 "preproc.y"
  { 
  (yyval.str) = mm_strdup("statement");
 }
-#line 58701 "preproc.c"
+#line 58694 "preproc.c"
     break;
 
   case 2634: /* unreserved_keyword: STATISTICS  */
-#line 14974 "preproc.y"
+#line 14967 "preproc.y"
  { 
  (yyval.str) = mm_strdup("statistics");
 }
-#line 58709 "preproc.c"
+#line 58702 "preproc.c"
     break;
 
   case 2635: /* unreserved_keyword: STDIN  */
-#line 14978 "preproc.y"
+#line 14971 "preproc.y"
  { 
  (yyval.str) = mm_strdup("stdin");
 }
-#line 58717 "preproc.c"
+#line 58710 "preproc.c"
     break;
 
   case 2636: /* unreserved_keyword: STDOUT  */
-#line 14982 "preproc.y"
+#line 14975 "preproc.y"
  { 
  (yyval.str) = mm_strdup("stdout");
 }
-#line 58725 "preproc.c"
+#line 58718 "preproc.c"
     break;
 
   case 2637: /* unreserved_keyword: STORAGE  */
-#line 14986 "preproc.y"
+#line 14979 "preproc.y"
  { 
  (yyval.str) = mm_strdup("storage");
 }
-#line 58733 "preproc.c"
+#line 58726 "preproc.c"
     break;
 
   case 2638: /* unreserved_keyword: STORED  */
-#line 14990 "preproc.y"
+#line 14983 "preproc.y"
  { 
  (yyval.str) = mm_strdup("stored");
 }
-#line 58741 "preproc.c"
+#line 58734 "preproc.c"
     break;
 
   case 2639: /* unreserved_keyword: STRICT_P  */
-#line 14994 "preproc.y"
+#line 14987 "preproc.y"
  { 
  (yyval.str) = mm_strdup("strict");
 }
-#line 58749 "preproc.c"
+#line 58742 "preproc.c"
     break;
 
   case 2640: /* unreserved_keyword: STRIP_P  */
-#line 14998 "preproc.y"
+#line 14991 "preproc.y"
  { 
  (yyval.str) = mm_strdup("strip");
 }
-#line 58757 "preproc.c"
+#line 58750 "preproc.c"
     break;
 
   case 2641: /* unreserved_keyword: SUBSCRIPTION  */
-#line 15002 "preproc.y"
+#line 14995 "preproc.y"
  { 
  (yyval.str) = mm_strdup("subscription");
 }
-#line 58765 "preproc.c"
+#line 58758 "preproc.c"
     break;
 
   case 2642: /* unreserved_keyword: SUPPORT  */
-#line 15006 "preproc.y"
+#line 14999 "preproc.y"
  { 
  (yyval.str) = mm_strdup("support");
 }
-#line 58773 "preproc.c"
+#line 58766 "preproc.c"
     break;
 
   case 2643: /* unreserved_keyword: SYSID  */
-#line 15010 "preproc.y"
+#line 15003 "preproc.y"
  { 
  (yyval.str) = mm_strdup("sysid");
 }
-#line 58781 "preproc.c"
+#line 58774 "preproc.c"
     break;
 
   case 2644: /* unreserved_keyword: SYSTEM_P  */
-#line 15014 "preproc.y"
+#line 15007 "preproc.y"
  { 
  (yyval.str) = mm_strdup("system");
 }
-#line 58789 "preproc.c"
+#line 58782 "preproc.c"
     break;
 
   case 2645: /* unreserved_keyword: TABLES  */
-#line 15018 "preproc.y"
+#line 15011 "preproc.y"
  { 
  (yyval.str) = mm_strdup("tables");
 }
-#line 58797 "preproc.c"
+#line 58790 "preproc.c"
     break;
 
   case 2646: /* unreserved_keyword: TABLESPACE  */
-#line 15022 "preproc.y"
+#line 15015 "preproc.y"
  { 
  (yyval.str) = mm_strdup("tablespace");
 }
-#line 58805 "preproc.c"
+#line 58798 "preproc.c"
     break;
 
   case 2647: /* unreserved_keyword: TEMP  */
-#line 15026 "preproc.y"
+#line 15019 "preproc.y"
  { 
  (yyval.str) = mm_strdup("temp");
 }
-#line 58813 "preproc.c"
+#line 58806 "preproc.c"
     break;
 
   case 2648: /* unreserved_keyword: TEMPLATE  */
-#line 15030 "preproc.y"
+#line 15023 "preproc.y"
  { 
  (yyval.str) = mm_strdup("template");
 }
-#line 58821 "preproc.c"
+#line 58814 "preproc.c"
     break;
 
   case 2649: /* unreserved_keyword: TEMPORARY  */
-#line 15034 "preproc.y"
+#line 15027 "preproc.y"
  { 
  (yyval.str) = mm_strdup("temporary");
 }
-#line 58829 "preproc.c"
+#line 58822 "preproc.c"
     break;
 
   case 2650: /* unreserved_keyword: TEXT_P  */
-#line 15038 "preproc.y"
+#line 15031 "preproc.y"
  { 
  (yyval.str) = mm_strdup("text");
 }
-#line 58837 "preproc.c"
+#line 58830 "preproc.c"
     break;
 
   case 2651: /* unreserved_keyword: TIES  */
-#line 15042 "preproc.y"
+#line 15035 "preproc.y"
  { 
  (yyval.str) = mm_strdup("ties");
 }
-#line 58845 "preproc.c"
+#line 58838 "preproc.c"
     break;
 
   case 2652: /* unreserved_keyword: TRANSACTION  */
-#line 15046 "preproc.y"
+#line 15039 "preproc.y"
  { 
  (yyval.str) = mm_strdup("transaction");
 }
-#line 58853 "preproc.c"
+#line 58846 "preproc.c"
     break;
 
   case 2653: /* unreserved_keyword: TRANSFORM  */
-#line 15050 "preproc.y"
+#line 15043 "preproc.y"
  { 
  (yyval.str) = mm_strdup("transform");
 }
-#line 58861 "preproc.c"
+#line 58854 "preproc.c"
     break;
 
   case 2654: /* unreserved_keyword: TRIGGER  */
-#line 15054 "preproc.y"
+#line 15047 "preproc.y"
  { 
  (yyval.str) = mm_strdup("trigger");
 }
-#line 58869 "preproc.c"
+#line 58862 "preproc.c"
     break;
 
   case 2655: /* unreserved_keyword: TRUNCATE  */
-#line 15058 "preproc.y"
+#line 15051 "preproc.y"
  { 
  (yyval.str) = mm_strdup("truncate");
 }
-#line 58877 "preproc.c"
+#line 58870 "preproc.c"
     break;
 
   case 2656: /* unreserved_keyword: TRUSTED  */
-#line 15062 "preproc.y"
+#line 15055 "preproc.y"
  { 
  (yyval.str) = mm_strdup("trusted");
 }
-#line 58885 "preproc.c"
+#line 58878 "preproc.c"
     break;
 
   case 2657: /* unreserved_keyword: TYPE_P  */
-#line 15066 "preproc.y"
+#line 15059 "preproc.y"
  { 
  (yyval.str) = mm_strdup("type");
 }
-#line 58893 "preproc.c"
+#line 58886 "preproc.c"
     break;
 
   case 2658: /* unreserved_keyword: TYPES_P  */
-#line 15070 "preproc.y"
+#line 15063 "preproc.y"
  { 
  (yyval.str) = mm_strdup("types");
 }
-#line 58901 "preproc.c"
+#line 58894 "preproc.c"
     break;
 
   case 2659: /* unreserved_keyword: UESCAPE  */
-#line 15074 "preproc.y"
+#line 15067 "preproc.y"
  { 
  (yyval.str) = mm_strdup("uescape");
 }
-#line 58909 "preproc.c"
+#line 58902 "preproc.c"
     break;
 
   case 2660: /* unreserved_keyword: UNBOUNDED  */
-#line 15078 "preproc.y"
+#line 15071 "preproc.y"
  { 
  (yyval.str) = mm_strdup("unbounded");
 }
-#line 58917 "preproc.c"
+#line 58910 "preproc.c"
     break;
 
   case 2661: /* unreserved_keyword: UNCOMMITTED  */
-#line 15082 "preproc.y"
+#line 15075 "preproc.y"
  { 
  (yyval.str) = mm_strdup("uncommitted");
 }
-#line 58925 "preproc.c"
+#line 58918 "preproc.c"
     break;
 
   case 2662: /* unreserved_keyword: UNENCRYPTED  */
-#line 15086 "preproc.y"
+#line 15079 "preproc.y"
  { 
  (yyval.str) = mm_strdup("unencrypted");
 }
-#line 58933 "preproc.c"
+#line 58926 "preproc.c"
     break;
 
   case 2663: /* unreserved_keyword: UNKNOWN  */
-#line 15090 "preproc.y"
+#line 15083 "preproc.y"
  { 
  (yyval.str) = mm_strdup("unknown");
 }
-#line 58941 "preproc.c"
+#line 58934 "preproc.c"
     break;
 
   case 2664: /* unreserved_keyword: UNLISTEN  */
-#line 15094 "preproc.y"
+#line 15087 "preproc.y"
  { 
  (yyval.str) = mm_strdup("unlisten");
 }
-#line 58949 "preproc.c"
+#line 58942 "preproc.c"
     break;
 
   case 2665: /* unreserved_keyword: UNLOGGED  */
-#line 15098 "preproc.y"
+#line 15091 "preproc.y"
  { 
  (yyval.str) = mm_strdup("unlogged");
 }
-#line 58957 "preproc.c"
+#line 58950 "preproc.c"
     break;
 
   case 2666: /* unreserved_keyword: UNTIL  */
-#line 15102 "preproc.y"
+#line 15095 "preproc.y"
  { 
  (yyval.str) = mm_strdup("until");
 }
-#line 58965 "preproc.c"
+#line 58958 "preproc.c"
     break;
 
   case 2667: /* unreserved_keyword: UPDATE  */
-#line 15106 "preproc.y"
+#line 15099 "preproc.y"
  { 
  (yyval.str) = mm_strdup("update");
 }
-#line 58973 "preproc.c"
+#line 58966 "preproc.c"
     break;
 
   case 2668: /* unreserved_keyword: VACUUM  */
-#line 15110 "preproc.y"
+#line 15103 "preproc.y"
  { 
  (yyval.str) = mm_strdup("vacuum");
 }
-#line 58981 "preproc.c"
+#line 58974 "preproc.c"
     break;
 
   case 2669: /* unreserved_keyword: VALID  */
-#line 15114 "preproc.y"
+#line 15107 "preproc.y"
  { 
  (yyval.str) = mm_strdup("valid");
 }
-#line 58989 "preproc.c"
+#line 58982 "preproc.c"
     break;
 
   case 2670: /* unreserved_keyword: VALIDATE  */
-#line 15118 "preproc.y"
+#line 15111 "preproc.y"
  { 
  (yyval.str) = mm_strdup("validate");
 }
-#line 58997 "preproc.c"
+#line 58990 "preproc.c"
     break;
 
   case 2671: /* unreserved_keyword: VALIDATOR  */
-#line 15122 "preproc.y"
+#line 15115 "preproc.y"
  { 
  (yyval.str) = mm_strdup("validator");
 }
-#line 59005 "preproc.c"
+#line 58998 "preproc.c"
     break;
 
   case 2672: /* unreserved_keyword: VALUE_P  */
-#line 15126 "preproc.y"
+#line 15119 "preproc.y"
  { 
  (yyval.str) = mm_strdup("value");
 }
-#line 59013 "preproc.c"
+#line 59006 "preproc.c"
     break;
 
   case 2673: /* unreserved_keyword: VARYING  */
-#line 15130 "preproc.y"
+#line 15123 "preproc.y"
  { 
  (yyval.str) = mm_strdup("varying");
 }
-#line 59021 "preproc.c"
+#line 59014 "preproc.c"
     break;
 
   case 2674: /* unreserved_keyword: VERSION_P  */
-#line 15134 "preproc.y"
+#line 15127 "preproc.y"
  { 
  (yyval.str) = mm_strdup("version");
 }
-#line 59029 "preproc.c"
+#line 59022 "preproc.c"
     break;
 
   case 2675: /* unreserved_keyword: VIEW  */
-#line 15138 "preproc.y"
+#line 15131 "preproc.y"
  { 
  (yyval.str) = mm_strdup("view");
 }
-#line 59037 "preproc.c"
+#line 59030 "preproc.c"
     break;
 
   case 2676: /* unreserved_keyword: VIEWS  */
-#line 15142 "preproc.y"
+#line 15135 "preproc.y"
  { 
  (yyval.str) = mm_strdup("views");
 }
-#line 59045 "preproc.c"
+#line 59038 "preproc.c"
     break;
 
   case 2677: /* unreserved_keyword: VOLATILE  */
-#line 15146 "preproc.y"
+#line 15139 "preproc.y"
  { 
  (yyval.str) = mm_strdup("volatile");
 }
-#line 59053 "preproc.c"
+#line 59046 "preproc.c"
     break;
 
   case 2678: /* unreserved_keyword: WHITESPACE_P  */
-#line 15150 "preproc.y"
+#line 15143 "preproc.y"
  { 
  (yyval.str) = mm_strdup("whitespace");
 }
-#line 59061 "preproc.c"
+#line 59054 "preproc.c"
     break;
 
   case 2679: /* unreserved_keyword: WITHIN  */
-#line 15154 "preproc.y"
+#line 15147 "preproc.y"
  { 
  (yyval.str) = mm_strdup("within");
 }
-#line 59069 "preproc.c"
+#line 59062 "preproc.c"
     break;
 
   case 2680: /* unreserved_keyword: WITHOUT  */
-#line 15158 "preproc.y"
+#line 15151 "preproc.y"
  { 
  (yyval.str) = mm_strdup("without");
 }
-#line 59077 "preproc.c"
+#line 59070 "preproc.c"
     break;
 
   case 2681: /* unreserved_keyword: WORK  */
-#line 15162 "preproc.y"
+#line 15155 "preproc.y"
  { 
  (yyval.str) = mm_strdup("work");
 }
-#line 59085 "preproc.c"
+#line 59078 "preproc.c"
     break;
 
   case 2682: /* unreserved_keyword: WRAPPER  */
-#line 15166 "preproc.y"
+#line 15159 "preproc.y"
  { 
  (yyval.str) = mm_strdup("wrapper");
 }
-#line 59093 "preproc.c"
+#line 59086 "preproc.c"
     break;
 
   case 2683: /* unreserved_keyword: WRITE  */
-#line 15170 "preproc.y"
+#line 15163 "preproc.y"
  { 
  (yyval.str) = mm_strdup("write");
 }
-#line 59101 "preproc.c"
+#line 59094 "preproc.c"
     break;
 
   case 2684: /* unreserved_keyword: XML_P  */
-#line 15174 "preproc.y"
+#line 15167 "preproc.y"
  { 
  (yyval.str) = mm_strdup("xml");
 }
-#line 59109 "preproc.c"
+#line 59102 "preproc.c"
     break;
 
   case 2685: /* unreserved_keyword: YES_P  */
-#line 15178 "preproc.y"
+#line 15171 "preproc.y"
  { 
  (yyval.str) = mm_strdup("yes");
 }
-#line 59117 "preproc.c"
+#line 59110 "preproc.c"
     break;
 
   case 2686: /* unreserved_keyword: ZONE  */
-#line 15182 "preproc.y"
+#line 15175 "preproc.y"
  { 
  (yyval.str) = mm_strdup("zone");
 }
-#line 59125 "preproc.c"
+#line 59118 "preproc.c"
     break;
 
   case 2687: /* col_name_keyword: BETWEEN  */
-#line 15190 "preproc.y"
+#line 15183 "preproc.y"
  { 
  (yyval.str) = mm_strdup("between");
 }
-#line 59133 "preproc.c"
+#line 59126 "preproc.c"
     break;
 
   case 2688: /* col_name_keyword: BIGINT  */
-#line 15194 "preproc.y"
+#line 15187 "preproc.y"
  { 
  (yyval.str) = mm_strdup("bigint");
 }
-#line 59141 "preproc.c"
+#line 59134 "preproc.c"
     break;
 
   case 2689: /* col_name_keyword: BIT  */
-#line 15198 "preproc.y"
+#line 15191 "preproc.y"
  { 
  (yyval.str) = mm_strdup("bit");
 }
-#line 59149 "preproc.c"
+#line 59142 "preproc.c"
     break;
 
   case 2690: /* col_name_keyword: BOOLEAN_P  */
-#line 15202 "preproc.y"
+#line 15195 "preproc.y"
  { 
  (yyval.str) = mm_strdup("boolean");
 }
-#line 59157 "preproc.c"
+#line 59150 "preproc.c"
     break;
 
   case 2691: /* col_name_keyword: CHARACTER  */
-#line 15206 "preproc.y"
+#line 15199 "preproc.y"
  { 
  (yyval.str) = mm_strdup("character");
 }
-#line 59165 "preproc.c"
+#line 59158 "preproc.c"
     break;
 
   case 2692: /* col_name_keyword: COALESCE  */
-#line 15210 "preproc.y"
+#line 15203 "preproc.y"
  { 
  (yyval.str) = mm_strdup("coalesce");
 }
-#line 59173 "preproc.c"
+#line 59166 "preproc.c"
     break;
 
   case 2693: /* col_name_keyword: DEC  */
-#line 15214 "preproc.y"
+#line 15207 "preproc.y"
  { 
  (yyval.str) = mm_strdup("dec");
 }
-#line 59181 "preproc.c"
+#line 59174 "preproc.c"
     break;
 
   case 2694: /* col_name_keyword: DECIMAL_P  */
-#line 15218 "preproc.y"
+#line 15211 "preproc.y"
  { 
  (yyval.str) = mm_strdup("decimal");
 }
-#line 59189 "preproc.c"
+#line 59182 "preproc.c"
     break;
 
   case 2695: /* col_name_keyword: EXISTS  */
-#line 15222 "preproc.y"
+#line 15215 "preproc.y"
  { 
  (yyval.str) = mm_strdup("exists");
 }
-#line 59197 "preproc.c"
+#line 59190 "preproc.c"
     break;
 
   case 2696: /* col_name_keyword: EXTRACT  */
-#line 15226 "preproc.y"
+#line 15219 "preproc.y"
  { 
  (yyval.str) = mm_strdup("extract");
 }
-#line 59205 "preproc.c"
+#line 59198 "preproc.c"
     break;
 
   case 2697: /* col_name_keyword: FLOAT_P  */
-#line 15230 "preproc.y"
+#line 15223 "preproc.y"
  { 
  (yyval.str) = mm_strdup("float");
 }
-#line 59213 "preproc.c"
+#line 59206 "preproc.c"
     break;
 
   case 2698: /* col_name_keyword: GREATEST  */
-#line 15234 "preproc.y"
+#line 15227 "preproc.y"
  { 
  (yyval.str) = mm_strdup("greatest");
 }
-#line 59221 "preproc.c"
+#line 59214 "preproc.c"
     break;
 
   case 2699: /* col_name_keyword: GROUPING  */
-#line 15238 "preproc.y"
+#line 15231 "preproc.y"
  { 
  (yyval.str) = mm_strdup("grouping");
 }
-#line 59229 "preproc.c"
+#line 59222 "preproc.c"
     break;
 
   case 2700: /* col_name_keyword: INOUT  */
-#line 15242 "preproc.y"
+#line 15235 "preproc.y"
  { 
  (yyval.str) = mm_strdup("inout");
 }
-#line 59237 "preproc.c"
+#line 59230 "preproc.c"
     break;
 
   case 2701: /* col_name_keyword: INTEGER  */
-#line 15246 "preproc.y"
+#line 15239 "preproc.y"
  { 
  (yyval.str) = mm_strdup("integer");
 }
-#line 59245 "preproc.c"
+#line 59238 "preproc.c"
     break;
 
   case 2702: /* col_name_keyword: INTERVAL  */
-#line 15250 "preproc.y"
+#line 15243 "preproc.y"
  { 
  (yyval.str) = mm_strdup("interval");
 }
-#line 59253 "preproc.c"
+#line 59246 "preproc.c"
     break;
 
   case 2703: /* col_name_keyword: JSON_ARRAY  */
-#line 15254 "preproc.y"
+#line 15247 "preproc.y"
  { 
  (yyval.str) = mm_strdup("json_array");
 }
-#line 59261 "preproc.c"
+#line 59254 "preproc.c"
     break;
 
   case 2704: /* col_name_keyword: JSON_ARRAYAGG  */
-#line 15258 "preproc.y"
+#line 15251 "preproc.y"
  { 
  (yyval.str) = mm_strdup("json_arrayagg");
 }
-#line 59269 "preproc.c"
+#line 59262 "preproc.c"
     break;
 
   case 2705: /* col_name_keyword: JSON_OBJECT  */
-#line 15262 "preproc.y"
+#line 15255 "preproc.y"
  { 
  (yyval.str) = mm_strdup("json_object");
 }
-#line 59277 "preproc.c"
+#line 59270 "preproc.c"
     break;
 
   case 2706: /* col_name_keyword: JSON_OBJECTAGG  */
-#line 15266 "preproc.y"
+#line 15259 "preproc.y"
  { 
  (yyval.str) = mm_strdup("json_objectagg");
 }
-#line 59285 "preproc.c"
+#line 59278 "preproc.c"
     break;
 
   case 2707: /* col_name_keyword: LEAST  */
-#line 15270 "preproc.y"
+#line 15263 "preproc.y"
  { 
  (yyval.str) = mm_strdup("least");
 }
-#line 59293 "preproc.c"
+#line 59286 "preproc.c"
     break;
 
   case 2708: /* col_name_keyword: NATIONAL  */
-#line 15274 "preproc.y"
+#line 15267 "preproc.y"
  { 
  (yyval.str) = mm_strdup("national");
 }
-#line 59301 "preproc.c"
+#line 59294 "preproc.c"
     break;
 
   case 2709: /* col_name_keyword: NCHAR  */
-#line 15278 "preproc.y"
+#line 15271 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nchar");
 }
-#line 59309 "preproc.c"
+#line 59302 "preproc.c"
     break;
 
   case 2710: /* col_name_keyword: NONE  */
-#line 15282 "preproc.y"
+#line 15275 "preproc.y"
  { 
  (yyval.str) = mm_strdup("none");
 }
-#line 59317 "preproc.c"
+#line 59310 "preproc.c"
     break;
 
   case 2711: /* col_name_keyword: NORMALIZE  */
-#line 15286 "preproc.y"
+#line 15279 "preproc.y"
  { 
  (yyval.str) = mm_strdup("normalize");
 }
-#line 59325 "preproc.c"
+#line 59318 "preproc.c"
     break;
 
   case 2712: /* col_name_keyword: NULLIF  */
-#line 15290 "preproc.y"
+#line 15283 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nullif");
 }
-#line 59333 "preproc.c"
+#line 59326 "preproc.c"
     break;
 
   case 2713: /* col_name_keyword: NUMERIC  */
-#line 15294 "preproc.y"
+#line 15287 "preproc.y"
  { 
  (yyval.str) = mm_strdup("numeric");
 }
-#line 59341 "preproc.c"
+#line 59334 "preproc.c"
     break;
 
   case 2714: /* col_name_keyword: OUT_P  */
-#line 15298 "preproc.y"
+#line 15291 "preproc.y"
  { 
  (yyval.str) = mm_strdup("out");
 }
-#line 59349 "preproc.c"
+#line 59342 "preproc.c"
     break;
 
   case 2715: /* col_name_keyword: OVERLAY  */
-#line 15302 "preproc.y"
+#line 15295 "preproc.y"
  { 
  (yyval.str) = mm_strdup("overlay");
 }
-#line 59357 "preproc.c"
+#line 59350 "preproc.c"
     break;
 
   case 2716: /* col_name_keyword: POSITION  */
-#line 15306 "preproc.y"
+#line 15299 "preproc.y"
  { 
  (yyval.str) = mm_strdup("position");
 }
-#line 59365 "preproc.c"
+#line 59358 "preproc.c"
     break;
 
   case 2717: /* col_name_keyword: PRECISION  */
-#line 15310 "preproc.y"
+#line 15303 "preproc.y"
  { 
  (yyval.str) = mm_strdup("precision");
 }
-#line 59373 "preproc.c"
+#line 59366 "preproc.c"
     break;
 
   case 2718: /* col_name_keyword: REAL  */
-#line 15314 "preproc.y"
+#line 15307 "preproc.y"
  { 
  (yyval.str) = mm_strdup("real");
 }
-#line 59381 "preproc.c"
+#line 59374 "preproc.c"
     break;
 
   case 2719: /* col_name_keyword: ROW  */
-#line 15318 "preproc.y"
+#line 15311 "preproc.y"
  { 
  (yyval.str) = mm_strdup("row");
 }
-#line 59389 "preproc.c"
+#line 59382 "preproc.c"
     break;
 
   case 2720: /* col_name_keyword: SETOF  */
-#line 15322 "preproc.y"
+#line 15315 "preproc.y"
  { 
  (yyval.str) = mm_strdup("setof");
 }
-#line 59397 "preproc.c"
+#line 59390 "preproc.c"
     break;
 
   case 2721: /* col_name_keyword: SMALLINT  */
-#line 15326 "preproc.y"
+#line 15319 "preproc.y"
  { 
  (yyval.str) = mm_strdup("smallint");
 }
-#line 59405 "preproc.c"
+#line 59398 "preproc.c"
     break;
 
   case 2722: /* col_name_keyword: SUBSTRING  */
-#line 15330 "preproc.y"
+#line 15323 "preproc.y"
  { 
  (yyval.str) = mm_strdup("substring");
 }
-#line 59413 "preproc.c"
+#line 59406 "preproc.c"
     break;
 
   case 2723: /* col_name_keyword: TIME  */
-#line 15334 "preproc.y"
+#line 15327 "preproc.y"
  { 
  (yyval.str) = mm_strdup("time");
 }
-#line 59421 "preproc.c"
+#line 59414 "preproc.c"
     break;
 
   case 2724: /* col_name_keyword: TIMESTAMP  */
-#line 15338 "preproc.y"
+#line 15331 "preproc.y"
  { 
  (yyval.str) = mm_strdup("timestamp");
 }
-#line 59429 "preproc.c"
+#line 59422 "preproc.c"
     break;
 
   case 2725: /* col_name_keyword: TREAT  */
-#line 15342 "preproc.y"
+#line 15335 "preproc.y"
  { 
  (yyval.str) = mm_strdup("treat");
 }
-#line 59437 "preproc.c"
+#line 59430 "preproc.c"
     break;
 
   case 2726: /* col_name_keyword: TRIM  */
-#line 15346 "preproc.y"
+#line 15339 "preproc.y"
  { 
  (yyval.str) = mm_strdup("trim");
 }
-#line 59445 "preproc.c"
+#line 59438 "preproc.c"
     break;
 
   case 2727: /* col_name_keyword: VARCHAR  */
-#line 15350 "preproc.y"
+#line 15343 "preproc.y"
  { 
  (yyval.str) = mm_strdup("varchar");
 }
-#line 59453 "preproc.c"
+#line 59446 "preproc.c"
     break;
 
   case 2728: /* col_name_keyword: XMLATTRIBUTES  */
-#line 15354 "preproc.y"
+#line 15347 "preproc.y"
  { 
  (yyval.str) = mm_strdup("xmlattributes");
 }
-#line 59461 "preproc.c"
+#line 59454 "preproc.c"
     break;
 
   case 2729: /* col_name_keyword: XMLCONCAT  */
-#line 15358 "preproc.y"
+#line 15351 "preproc.y"
  { 
  (yyval.str) = mm_strdup("xmlconcat");
 }
-#line 59469 "preproc.c"
+#line 59462 "preproc.c"
     break;
 
   case 2730: /* col_name_keyword: XMLELEMENT  */
-#line 15362 "preproc.y"
+#line 15355 "preproc.y"
  { 
  (yyval.str) = mm_strdup("xmlelement");
 }
-#line 59477 "preproc.c"
+#line 59470 "preproc.c"
     break;
 
   case 2731: /* col_name_keyword: XMLEXISTS  */
-#line 15366 "preproc.y"
+#line 15359 "preproc.y"
  { 
  (yyval.str) = mm_strdup("xmlexists");
 }
-#line 59485 "preproc.c"
+#line 59478 "preproc.c"
     break;
 
   case 2732: /* col_name_keyword: XMLFOREST  */
-#line 15370 "preproc.y"
+#line 15363 "preproc.y"
  { 
  (yyval.str) = mm_strdup("xmlforest");
 }
-#line 59493 "preproc.c"
+#line 59486 "preproc.c"
     break;
 
   case 2733: /* col_name_keyword: XMLNAMESPACES  */
-#line 15374 "preproc.y"
+#line 15367 "preproc.y"
  { 
  (yyval.str) = mm_strdup("xmlnamespaces");
 }
-#line 59501 "preproc.c"
+#line 59494 "preproc.c"
     break;
 
   case 2734: /* col_name_keyword: XMLPARSE  */
-#line 15378 "preproc.y"
+#line 15371 "preproc.y"
  { 
  (yyval.str) = mm_strdup("xmlparse");
 }
-#line 59509 "preproc.c"
+#line 59502 "preproc.c"
     break;
 
   case 2735: /* col_name_keyword: XMLPI  */
-#line 15382 "preproc.y"
+#line 15375 "preproc.y"
  { 
  (yyval.str) = mm_strdup("xmlpi");
 }
-#line 59517 "preproc.c"
+#line 59510 "preproc.c"
     break;
 
   case 2736: /* col_name_keyword: XMLROOT  */
-#line 15386 "preproc.y"
+#line 15379 "preproc.y"
  { 
  (yyval.str) = mm_strdup("xmlroot");
 }
-#line 59525 "preproc.c"
+#line 59518 "preproc.c"
     break;
 
   case 2737: /* col_name_keyword: XMLSERIALIZE  */
-#line 15390 "preproc.y"
+#line 15383 "preproc.y"
  { 
  (yyval.str) = mm_strdup("xmlserialize");
 }
-#line 59533 "preproc.c"
+#line 59526 "preproc.c"
     break;
 
   case 2738: /* col_name_keyword: XMLTABLE  */
-#line 15394 "preproc.y"
+#line 15387 "preproc.y"
  { 
  (yyval.str) = mm_strdup("xmltable");
 }
-#line 59541 "preproc.c"
+#line 59534 "preproc.c"
     break;
 
   case 2739: /* type_func_name_keyword: AUTHORIZATION  */
-#line 15402 "preproc.y"
+#line 15395 "preproc.y"
  { 
  (yyval.str) = mm_strdup("authorization");
 }
-#line 59549 "preproc.c"
+#line 59542 "preproc.c"
     break;
 
   case 2740: /* type_func_name_keyword: BINARY  */
-#line 15406 "preproc.y"
+#line 15399 "preproc.y"
  { 
  (yyval.str) = mm_strdup("binary");
 }
-#line 59557 "preproc.c"
+#line 59550 "preproc.c"
     break;
 
   case 2741: /* type_func_name_keyword: COLLATION  */
-#line 15410 "preproc.y"
+#line 15403 "preproc.y"
  { 
  (yyval.str) = mm_strdup("collation");
 }
-#line 59565 "preproc.c"
+#line 59558 "preproc.c"
     break;
 
   case 2742: /* type_func_name_keyword: CONCURRENTLY  */
-#line 15414 "preproc.y"
+#line 15407 "preproc.y"
  { 
  (yyval.str) = mm_strdup("concurrently");
 }
-#line 59573 "preproc.c"
+#line 59566 "preproc.c"
     break;
 
   case 2743: /* type_func_name_keyword: CROSS  */
-#line 15418 "preproc.y"
+#line 15411 "preproc.y"
  { 
  (yyval.str) = mm_strdup("cross");
 }
-#line 59581 "preproc.c"
+#line 59574 "preproc.c"
     break;
 
   case 2744: /* type_func_name_keyword: CURRENT_SCHEMA  */
-#line 15422 "preproc.y"
+#line 15415 "preproc.y"
  { 
  (yyval.str) = mm_strdup("current_schema");
 }
-#line 59589 "preproc.c"
+#line 59582 "preproc.c"
     break;
 
   case 2745: /* type_func_name_keyword: FREEZE  */
-#line 15426 "preproc.y"
+#line 15419 "preproc.y"
  { 
  (yyval.str) = mm_strdup("freeze");
 }
-#line 59597 "preproc.c"
+#line 59590 "preproc.c"
     break;
 
   case 2746: /* type_func_name_keyword: FULL  */
-#line 15430 "preproc.y"
+#line 15423 "preproc.y"
  { 
  (yyval.str) = mm_strdup("full");
 }
-#line 59605 "preproc.c"
+#line 59598 "preproc.c"
     break;
 
   case 2747: /* type_func_name_keyword: ILIKE  */
-#line 15434 "preproc.y"
+#line 15427 "preproc.y"
  { 
  (yyval.str) = mm_strdup("ilike");
 }
-#line 59613 "preproc.c"
+#line 59606 "preproc.c"
     break;
 
   case 2748: /* type_func_name_keyword: INNER_P  */
-#line 15438 "preproc.y"
+#line 15431 "preproc.y"
  { 
  (yyval.str) = mm_strdup("inner");
 }
-#line 59621 "preproc.c"
+#line 59614 "preproc.c"
     break;
 
   case 2749: /* type_func_name_keyword: IS  */
-#line 15442 "preproc.y"
+#line 15435 "preproc.y"
  { 
  (yyval.str) = mm_strdup("is");
 }
-#line 59629 "preproc.c"
+#line 59622 "preproc.c"
     break;
 
   case 2750: /* type_func_name_keyword: ISNULL  */
-#line 15446 "preproc.y"
+#line 15439 "preproc.y"
  { 
  (yyval.str) = mm_strdup("isnull");
 }
-#line 59637 "preproc.c"
+#line 59630 "preproc.c"
     break;
 
   case 2751: /* type_func_name_keyword: JOIN  */
-#line 15450 "preproc.y"
+#line 15443 "preproc.y"
  { 
  (yyval.str) = mm_strdup("join");
 }
-#line 59645 "preproc.c"
+#line 59638 "preproc.c"
     break;
 
   case 2752: /* type_func_name_keyword: LEFT  */
-#line 15454 "preproc.y"
+#line 15447 "preproc.y"
  { 
  (yyval.str) = mm_strdup("left");
 }
-#line 59653 "preproc.c"
+#line 59646 "preproc.c"
     break;
 
   case 2753: /* type_func_name_keyword: LIKE  */
-#line 15458 "preproc.y"
+#line 15451 "preproc.y"
  { 
  (yyval.str) = mm_strdup("like");
 }
-#line 59661 "preproc.c"
+#line 59654 "preproc.c"
     break;
 
   case 2754: /* type_func_name_keyword: NATURAL  */
-#line 15462 "preproc.y"
+#line 15455 "preproc.y"
  { 
  (yyval.str) = mm_strdup("natural");
 }
-#line 59669 "preproc.c"
+#line 59662 "preproc.c"
     break;
 
   case 2755: /* type_func_name_keyword: NOTNULL  */
-#line 15466 "preproc.y"
+#line 15459 "preproc.y"
  { 
  (yyval.str) = mm_strdup("notnull");
 }
-#line 59677 "preproc.c"
+#line 59670 "preproc.c"
     break;
 
   case 2756: /* type_func_name_keyword: OUTER_P  */
-#line 15470 "preproc.y"
+#line 15463 "preproc.y"
  { 
  (yyval.str) = mm_strdup("outer");
 }
-#line 59685 "preproc.c"
+#line 59678 "preproc.c"
     break;
 
   case 2757: /* type_func_name_keyword: OVERLAPS  */
-#line 15474 "preproc.y"
+#line 15467 "preproc.y"
  { 
  (yyval.str) = mm_strdup("overlaps");
 }
-#line 59693 "preproc.c"
+#line 59686 "preproc.c"
     break;
 
   case 2758: /* type_func_name_keyword: RIGHT  */
-#line 15478 "preproc.y"
+#line 15471 "preproc.y"
  { 
  (yyval.str) = mm_strdup("right");
 }
-#line 59701 "preproc.c"
+#line 59694 "preproc.c"
     break;
 
   case 2759: /* type_func_name_keyword: SIMILAR  */
-#line 15482 "preproc.y"
+#line 15475 "preproc.y"
  { 
  (yyval.str) = mm_strdup("similar");
 }
-#line 59709 "preproc.c"
+#line 59702 "preproc.c"
     break;
 
   case 2760: /* type_func_name_keyword: TABLESAMPLE  */
-#line 15486 "preproc.y"
+#line 15479 "preproc.y"
  { 
  (yyval.str) = mm_strdup("tablesample");
 }
-#line 59717 "preproc.c"
+#line 59710 "preproc.c"
     break;
 
   case 2761: /* type_func_name_keyword: VERBOSE  */
-#line 15490 "preproc.y"
+#line 15483 "preproc.y"
  { 
  (yyval.str) = mm_strdup("verbose");
 }
-#line 59725 "preproc.c"
+#line 59718 "preproc.c"
     break;
 
   case 2762: /* reserved_keyword: ALL  */
-#line 15498 "preproc.y"
+#line 15491 "preproc.y"
  { 
  (yyval.str) = mm_strdup("all");
 }
-#line 59733 "preproc.c"
+#line 59726 "preproc.c"
     break;
 
   case 2763: /* reserved_keyword: ANALYSE  */
-#line 15502 "preproc.y"
+#line 15495 "preproc.y"
  { 
  (yyval.str) = mm_strdup("analyse");
 }
-#line 59741 "preproc.c"
+#line 59734 "preproc.c"
     break;
 
   case 2764: /* reserved_keyword: ANALYZE  */
-#line 15506 "preproc.y"
+#line 15499 "preproc.y"
  { 
  (yyval.str) = mm_strdup("analyze");
 }
-#line 59749 "preproc.c"
+#line 59742 "preproc.c"
     break;
 
   case 2765: /* reserved_keyword: AND  */
-#line 15510 "preproc.y"
+#line 15503 "preproc.y"
  { 
  (yyval.str) = mm_strdup("and");
 }
-#line 59757 "preproc.c"
+#line 59750 "preproc.c"
     break;
 
   case 2766: /* reserved_keyword: ANY  */
-#line 15514 "preproc.y"
+#line 15507 "preproc.y"
  { 
  (yyval.str) = mm_strdup("any");
 }
-#line 59765 "preproc.c"
+#line 59758 "preproc.c"
     break;
 
   case 2767: /* reserved_keyword: ARRAY  */
-#line 15518 "preproc.y"
+#line 15511 "preproc.y"
  { 
  (yyval.str) = mm_strdup("array");
 }
-#line 59773 "preproc.c"
+#line 59766 "preproc.c"
     break;
 
   case 2768: /* reserved_keyword: AS  */
-#line 15522 "preproc.y"
+#line 15515 "preproc.y"
  { 
  (yyval.str) = mm_strdup("as");
 }
-#line 59781 "preproc.c"
+#line 59774 "preproc.c"
     break;
 
   case 2769: /* reserved_keyword: ASC  */
-#line 15526 "preproc.y"
+#line 15519 "preproc.y"
  { 
  (yyval.str) = mm_strdup("asc");
 }
-#line 59789 "preproc.c"
+#line 59782 "preproc.c"
     break;
 
   case 2770: /* reserved_keyword: ASYMMETRIC  */
-#line 15530 "preproc.y"
+#line 15523 "preproc.y"
  { 
  (yyval.str) = mm_strdup("asymmetric");
 }
-#line 59797 "preproc.c"
+#line 59790 "preproc.c"
     break;
 
   case 2771: /* reserved_keyword: BOTH  */
-#line 15534 "preproc.y"
+#line 15527 "preproc.y"
  { 
  (yyval.str) = mm_strdup("both");
 }
-#line 59805 "preproc.c"
+#line 59798 "preproc.c"
     break;
 
   case 2772: /* reserved_keyword: CASE  */
-#line 15538 "preproc.y"
+#line 15531 "preproc.y"
  { 
  (yyval.str) = mm_strdup("case");
 }
-#line 59813 "preproc.c"
+#line 59806 "preproc.c"
     break;
 
   case 2773: /* reserved_keyword: CAST  */
-#line 15542 "preproc.y"
+#line 15535 "preproc.y"
  { 
  (yyval.str) = mm_strdup("cast");
 }
-#line 59821 "preproc.c"
+#line 59814 "preproc.c"
     break;
 
   case 2774: /* reserved_keyword: CHECK  */
-#line 15546 "preproc.y"
+#line 15539 "preproc.y"
  { 
  (yyval.str) = mm_strdup("check");
 }
-#line 59829 "preproc.c"
+#line 59822 "preproc.c"
     break;
 
   case 2775: /* reserved_keyword: COLLATE  */
-#line 15550 "preproc.y"
+#line 15543 "preproc.y"
  { 
  (yyval.str) = mm_strdup("collate");
 }
-#line 59837 "preproc.c"
+#line 59830 "preproc.c"
     break;
 
   case 2776: /* reserved_keyword: COLUMN  */
-#line 15554 "preproc.y"
+#line 15547 "preproc.y"
  { 
  (yyval.str) = mm_strdup("column");
 }
-#line 59845 "preproc.c"
+#line 59838 "preproc.c"
     break;
 
   case 2777: /* reserved_keyword: CONSTRAINT  */
-#line 15558 "preproc.y"
+#line 15551 "preproc.y"
  { 
  (yyval.str) = mm_strdup("constraint");
 }
-#line 59853 "preproc.c"
+#line 59846 "preproc.c"
     break;
 
   case 2778: /* reserved_keyword: CREATE  */
-#line 15562 "preproc.y"
+#line 15555 "preproc.y"
  { 
  (yyval.str) = mm_strdup("create");
 }
-#line 59861 "preproc.c"
+#line 59854 "preproc.c"
     break;
 
   case 2779: /* reserved_keyword: CURRENT_CATALOG  */
-#line 15566 "preproc.y"
+#line 15559 "preproc.y"
  { 
  (yyval.str) = mm_strdup("current_catalog");
 }
-#line 59869 "preproc.c"
+#line 59862 "preproc.c"
     break;
 
   case 2780: /* reserved_keyword: CURRENT_DATE  */
-#line 15570 "preproc.y"
+#line 15563 "preproc.y"
  { 
  (yyval.str) = mm_strdup("current_date");
 }
-#line 59877 "preproc.c"
+#line 59870 "preproc.c"
     break;
 
   case 2781: /* reserved_keyword: CURRENT_ROLE  */
-#line 15574 "preproc.y"
+#line 15567 "preproc.y"
  { 
  (yyval.str) = mm_strdup("current_role");
 }
-#line 59885 "preproc.c"
+#line 59878 "preproc.c"
     break;
 
   case 2782: /* reserved_keyword: CURRENT_TIME  */
-#line 15578 "preproc.y"
+#line 15571 "preproc.y"
  { 
  (yyval.str) = mm_strdup("current_time");
 }
-#line 59893 "preproc.c"
+#line 59886 "preproc.c"
     break;
 
   case 2783: /* reserved_keyword: CURRENT_TIMESTAMP  */
-#line 15582 "preproc.y"
+#line 15575 "preproc.y"
  { 
  (yyval.str) = mm_strdup("current_timestamp");
 }
-#line 59901 "preproc.c"
+#line 59894 "preproc.c"
     break;
 
   case 2784: /* reserved_keyword: CURRENT_USER  */
-#line 15586 "preproc.y"
+#line 15579 "preproc.y"
  { 
  (yyval.str) = mm_strdup("current_user");
 }
-#line 59909 "preproc.c"
+#line 59902 "preproc.c"
     break;
 
   case 2785: /* reserved_keyword: DEFAULT  */
-#line 15590 "preproc.y"
+#line 15583 "preproc.y"
  { 
  (yyval.str) = mm_strdup("default");
 }
-#line 59917 "preproc.c"
+#line 59910 "preproc.c"
     break;
 
   case 2786: /* reserved_keyword: DEFERRABLE  */
-#line 15594 "preproc.y"
+#line 15587 "preproc.y"
  { 
  (yyval.str) = mm_strdup("deferrable");
 }
-#line 59925 "preproc.c"
+#line 59918 "preproc.c"
     break;
 
   case 2787: /* reserved_keyword: DESC  */
-#line 15598 "preproc.y"
+#line 15591 "preproc.y"
  { 
  (yyval.str) = mm_strdup("desc");
 }
-#line 59933 "preproc.c"
+#line 59926 "preproc.c"
     break;
 
   case 2788: /* reserved_keyword: DISTINCT  */
-#line 15602 "preproc.y"
+#line 15595 "preproc.y"
  { 
  (yyval.str) = mm_strdup("distinct");
 }
-#line 59941 "preproc.c"
+#line 59934 "preproc.c"
     break;
 
   case 2789: /* reserved_keyword: DO  */
-#line 15606 "preproc.y"
+#line 15599 "preproc.y"
  { 
  (yyval.str) = mm_strdup("do");
 }
-#line 59949 "preproc.c"
+#line 59942 "preproc.c"
     break;
 
   case 2790: /* reserved_keyword: ELSE  */
-#line 15610 "preproc.y"
+#line 15603 "preproc.y"
  { 
  (yyval.str) = mm_strdup("else");
 }
-#line 59957 "preproc.c"
+#line 59950 "preproc.c"
     break;
 
   case 2791: /* reserved_keyword: END_P  */
-#line 15614 "preproc.y"
+#line 15607 "preproc.y"
  { 
  (yyval.str) = mm_strdup("end");
 }
-#line 59965 "preproc.c"
+#line 59958 "preproc.c"
     break;
 
   case 2792: /* reserved_keyword: EXCEPT  */
-#line 15618 "preproc.y"
+#line 15611 "preproc.y"
  { 
  (yyval.str) = mm_strdup("except");
 }
-#line 59973 "preproc.c"
+#line 59966 "preproc.c"
     break;
 
   case 2793: /* reserved_keyword: FALSE_P  */
-#line 15622 "preproc.y"
+#line 15615 "preproc.y"
  { 
  (yyval.str) = mm_strdup("false");
 }
-#line 59981 "preproc.c"
+#line 59974 "preproc.c"
     break;
 
   case 2794: /* reserved_keyword: FETCH  */
-#line 15626 "preproc.y"
+#line 15619 "preproc.y"
  { 
  (yyval.str) = mm_strdup("fetch");
 }
-#line 59989 "preproc.c"
+#line 59982 "preproc.c"
     break;
 
   case 2795: /* reserved_keyword: FOR  */
-#line 15630 "preproc.y"
+#line 15623 "preproc.y"
  { 
  (yyval.str) = mm_strdup("for");
 }
-#line 59997 "preproc.c"
+#line 59990 "preproc.c"
     break;
 
   case 2796: /* reserved_keyword: FOREIGN  */
-#line 15634 "preproc.y"
+#line 15627 "preproc.y"
  { 
  (yyval.str) = mm_strdup("foreign");
 }
-#line 60005 "preproc.c"
+#line 59998 "preproc.c"
     break;
 
   case 2797: /* reserved_keyword: FROM  */
-#line 15638 "preproc.y"
+#line 15631 "preproc.y"
  { 
  (yyval.str) = mm_strdup("from");
 }
-#line 60013 "preproc.c"
+#line 60006 "preproc.c"
     break;
 
   case 2798: /* reserved_keyword: GRANT  */
-#line 15642 "preproc.y"
+#line 15635 "preproc.y"
  { 
  (yyval.str) = mm_strdup("grant");
 }
-#line 60021 "preproc.c"
+#line 60014 "preproc.c"
     break;
 
   case 2799: /* reserved_keyword: GROUP_P  */
-#line 15646 "preproc.y"
+#line 15639 "preproc.y"
  { 
  (yyval.str) = mm_strdup("group");
 }
-#line 60029 "preproc.c"
+#line 60022 "preproc.c"
     break;
 
   case 2800: /* reserved_keyword: HAVING  */
-#line 15650 "preproc.y"
+#line 15643 "preproc.y"
  { 
  (yyval.str) = mm_strdup("having");
 }
-#line 60037 "preproc.c"
+#line 60030 "preproc.c"
     break;
 
   case 2801: /* reserved_keyword: IN_P  */
-#line 15654 "preproc.y"
+#line 15647 "preproc.y"
  { 
  (yyval.str) = mm_strdup("in");
 }
-#line 60045 "preproc.c"
+#line 60038 "preproc.c"
     break;
 
   case 2802: /* reserved_keyword: INITIALLY  */
-#line 15658 "preproc.y"
+#line 15651 "preproc.y"
  { 
  (yyval.str) = mm_strdup("initially");
 }
-#line 60053 "preproc.c"
+#line 60046 "preproc.c"
     break;
 
   case 2803: /* reserved_keyword: INTERSECT  */
-#line 15662 "preproc.y"
+#line 15655 "preproc.y"
  { 
  (yyval.str) = mm_strdup("intersect");
 }
-#line 60061 "preproc.c"
+#line 60054 "preproc.c"
     break;
 
   case 2804: /* reserved_keyword: INTO  */
-#line 15666 "preproc.y"
+#line 15659 "preproc.y"
  { 
  (yyval.str) = mm_strdup("into");
 }
-#line 60069 "preproc.c"
+#line 60062 "preproc.c"
     break;
 
   case 2805: /* reserved_keyword: LATERAL_P  */
-#line 15670 "preproc.y"
+#line 15663 "preproc.y"
  { 
  (yyval.str) = mm_strdup("lateral");
 }
-#line 60077 "preproc.c"
+#line 60070 "preproc.c"
     break;
 
   case 2806: /* reserved_keyword: LEADING  */
-#line 15674 "preproc.y"
+#line 15667 "preproc.y"
  { 
  (yyval.str) = mm_strdup("leading");
 }
-#line 60085 "preproc.c"
+#line 60078 "preproc.c"
     break;
 
   case 2807: /* reserved_keyword: LIMIT  */
-#line 15678 "preproc.y"
+#line 15671 "preproc.y"
  { 
  (yyval.str) = mm_strdup("limit");
 }
-#line 60093 "preproc.c"
+#line 60086 "preproc.c"
     break;
 
   case 2808: /* reserved_keyword: LOCALTIME  */
-#line 15682 "preproc.y"
+#line 15675 "preproc.y"
  { 
  (yyval.str) = mm_strdup("localtime");
 }
-#line 60101 "preproc.c"
+#line 60094 "preproc.c"
     break;
 
   case 2809: /* reserved_keyword: LOCALTIMESTAMP  */
-#line 15686 "preproc.y"
+#line 15679 "preproc.y"
  { 
  (yyval.str) = mm_strdup("localtimestamp");
 }
-#line 60109 "preproc.c"
+#line 60102 "preproc.c"
     break;
 
   case 2810: /* reserved_keyword: NOT  */
-#line 15690 "preproc.y"
+#line 15683 "preproc.y"
  { 
  (yyval.str) = mm_strdup("not");
 }
-#line 60117 "preproc.c"
+#line 60110 "preproc.c"
     break;
 
   case 2811: /* reserved_keyword: NULL_P  */
-#line 15694 "preproc.y"
+#line 15687 "preproc.y"
  { 
  (yyval.str) = mm_strdup("null");
 }
-#line 60125 "preproc.c"
+#line 60118 "preproc.c"
     break;
 
   case 2812: /* reserved_keyword: OFFSET  */
-#line 15698 "preproc.y"
+#line 15691 "preproc.y"
  { 
  (yyval.str) = mm_strdup("offset");
 }
-#line 60133 "preproc.c"
+#line 60126 "preproc.c"
     break;
 
   case 2813: /* reserved_keyword: ON  */
-#line 15702 "preproc.y"
+#line 15695 "preproc.y"
  { 
  (yyval.str) = mm_strdup("on");
 }
-#line 60141 "preproc.c"
+#line 60134 "preproc.c"
     break;
 
   case 2814: /* reserved_keyword: ONLY  */
-#line 15706 "preproc.y"
+#line 15699 "preproc.y"
  { 
  (yyval.str) = mm_strdup("only");
 }
-#line 60149 "preproc.c"
+#line 60142 "preproc.c"
     break;
 
   case 2815: /* reserved_keyword: OR  */
-#line 15710 "preproc.y"
+#line 15703 "preproc.y"
  { 
  (yyval.str) = mm_strdup("or");
 }
-#line 60157 "preproc.c"
+#line 60150 "preproc.c"
     break;
 
   case 2816: /* reserved_keyword: ORDER  */
-#line 15714 "preproc.y"
+#line 15707 "preproc.y"
  { 
  (yyval.str) = mm_strdup("order");
 }
-#line 60165 "preproc.c"
+#line 60158 "preproc.c"
     break;
 
   case 2817: /* reserved_keyword: PLACING  */
-#line 15718 "preproc.y"
+#line 15711 "preproc.y"
  { 
  (yyval.str) = mm_strdup("placing");
 }
-#line 60173 "preproc.c"
+#line 60166 "preproc.c"
     break;
 
   case 2818: /* reserved_keyword: PRIMARY  */
-#line 15722 "preproc.y"
+#line 15715 "preproc.y"
  { 
  (yyval.str) = mm_strdup("primary");
 }
-#line 60181 "preproc.c"
+#line 60174 "preproc.c"
     break;
 
   case 2819: /* reserved_keyword: REFERENCES  */
-#line 15726 "preproc.y"
+#line 15719 "preproc.y"
  { 
  (yyval.str) = mm_strdup("references");
 }
-#line 60189 "preproc.c"
+#line 60182 "preproc.c"
     break;
 
   case 2820: /* reserved_keyword: RETURNING  */
-#line 15730 "preproc.y"
+#line 15723 "preproc.y"
  { 
  (yyval.str) = mm_strdup("returning");
 }
-#line 60197 "preproc.c"
+#line 60190 "preproc.c"
     break;
 
   case 2821: /* reserved_keyword: SELECT  */
-#line 15734 "preproc.y"
+#line 15727 "preproc.y"
  { 
  (yyval.str) = mm_strdup("select");
 }
-#line 60205 "preproc.c"
+#line 60198 "preproc.c"
     break;
 
   case 2822: /* reserved_keyword: SESSION_USER  */
-#line 15738 "preproc.y"
+#line 15731 "preproc.y"
  { 
  (yyval.str) = mm_strdup("session_user");
 }
-#line 60213 "preproc.c"
+#line 60206 "preproc.c"
     break;
 
   case 2823: /* reserved_keyword: SOME  */
-#line 15742 "preproc.y"
+#line 15735 "preproc.y"
  { 
  (yyval.str) = mm_strdup("some");
 }
-#line 60221 "preproc.c"
+#line 60214 "preproc.c"
     break;
 
   case 2824: /* reserved_keyword: SYMMETRIC  */
-#line 15746 "preproc.y"
+#line 15739 "preproc.y"
  { 
  (yyval.str) = mm_strdup("symmetric");
 }
-#line 60229 "preproc.c"
+#line 60222 "preproc.c"
     break;
 
   case 2825: /* reserved_keyword: SYSTEM_USER  */
-#line 15750 "preproc.y"
+#line 15743 "preproc.y"
  { 
  (yyval.str) = mm_strdup("system_user");
 }
-#line 60237 "preproc.c"
+#line 60230 "preproc.c"
     break;
 
   case 2826: /* reserved_keyword: TABLE  */
-#line 15754 "preproc.y"
+#line 15747 "preproc.y"
  { 
  (yyval.str) = mm_strdup("table");
 }
-#line 60245 "preproc.c"
+#line 60238 "preproc.c"
     break;
 
   case 2827: /* reserved_keyword: THEN  */
-#line 15758 "preproc.y"
+#line 15751 "preproc.y"
  { 
  (yyval.str) = mm_strdup("then");
 }
-#line 60253 "preproc.c"
+#line 60246 "preproc.c"
     break;
 
   case 2828: /* reserved_keyword: TRAILING  */
-#line 15762 "preproc.y"
+#line 15755 "preproc.y"
  { 
  (yyval.str) = mm_strdup("trailing");
 }
-#line 60261 "preproc.c"
+#line 60254 "preproc.c"
     break;
 
   case 2829: /* reserved_keyword: TRUE_P  */
-#line 15766 "preproc.y"
+#line 15759 "preproc.y"
  { 
  (yyval.str) = mm_strdup("true");
 }
-#line 60269 "preproc.c"
+#line 60262 "preproc.c"
     break;
 
   case 2830: /* reserved_keyword: UNIQUE  */
-#line 15770 "preproc.y"
+#line 15763 "preproc.y"
  { 
  (yyval.str) = mm_strdup("unique");
 }
-#line 60277 "preproc.c"
+#line 60270 "preproc.c"
     break;
 
   case 2831: /* reserved_keyword: USER  */
-#line 15774 "preproc.y"
+#line 15767 "preproc.y"
  { 
  (yyval.str) = mm_strdup("user");
 }
-#line 60285 "preproc.c"
+#line 60278 "preproc.c"
     break;
 
   case 2832: /* reserved_keyword: USING  */
-#line 15778 "preproc.y"
+#line 15771 "preproc.y"
  { 
  (yyval.str) = mm_strdup("using");
 }
-#line 60293 "preproc.c"
+#line 60286 "preproc.c"
     break;
 
   case 2833: /* reserved_keyword: VARIADIC  */
-#line 15782 "preproc.y"
+#line 15775 "preproc.y"
  { 
  (yyval.str) = mm_strdup("variadic");
 }
-#line 60301 "preproc.c"
+#line 60294 "preproc.c"
     break;
 
   case 2834: /* reserved_keyword: WHEN  */
-#line 15786 "preproc.y"
+#line 15779 "preproc.y"
  { 
  (yyval.str) = mm_strdup("when");
 }
-#line 60309 "preproc.c"
+#line 60302 "preproc.c"
     break;
 
   case 2835: /* reserved_keyword: WHERE  */
-#line 15790 "preproc.y"
+#line 15783 "preproc.y"
  { 
  (yyval.str) = mm_strdup("where");
 }
-#line 60317 "preproc.c"
+#line 60310 "preproc.c"
     break;
 
   case 2836: /* reserved_keyword: WINDOW  */
-#line 15794 "preproc.y"
+#line 15787 "preproc.y"
  { 
  (yyval.str) = mm_strdup("window");
 }
-#line 60325 "preproc.c"
+#line 60318 "preproc.c"
     break;
 
   case 2837: /* reserved_keyword: WITH  */
-#line 15798 "preproc.y"
+#line 15791 "preproc.y"
  { 
  (yyval.str) = mm_strdup("with");
 }
-#line 60333 "preproc.c"
+#line 60326 "preproc.c"
     break;
 
   case 2838: /* bare_label_keyword: ABORT_P  */
-#line 15806 "preproc.y"
+#line 15799 "preproc.y"
  { 
  (yyval.str) = mm_strdup("abort");
 }
-#line 60341 "preproc.c"
+#line 60334 "preproc.c"
     break;
 
   case 2839: /* bare_label_keyword: ABSENT  */
-#line 15810 "preproc.y"
+#line 15803 "preproc.y"
  { 
  (yyval.str) = mm_strdup("absent");
 }
-#line 60349 "preproc.c"
+#line 60342 "preproc.c"
     break;
 
   case 2840: /* bare_label_keyword: ABSOLUTE_P  */
-#line 15814 "preproc.y"
+#line 15807 "preproc.y"
  { 
  (yyval.str) = mm_strdup("absolute");
 }
-#line 60357 "preproc.c"
+#line 60350 "preproc.c"
     break;
 
   case 2841: /* bare_label_keyword: ACCESS  */
-#line 15818 "preproc.y"
+#line 15811 "preproc.y"
  { 
  (yyval.str) = mm_strdup("access");
 }
-#line 60365 "preproc.c"
+#line 60358 "preproc.c"
     break;
 
   case 2842: /* bare_label_keyword: ACTION  */
-#line 15822 "preproc.y"
+#line 15815 "preproc.y"
  { 
  (yyval.str) = mm_strdup("action");
 }
-#line 60373 "preproc.c"
+#line 60366 "preproc.c"
     break;
 
   case 2843: /* bare_label_keyword: ADD_P  */
-#line 15826 "preproc.y"
+#line 15819 "preproc.y"
  { 
  (yyval.str) = mm_strdup("add");
 }
-#line 60381 "preproc.c"
+#line 60374 "preproc.c"
     break;
 
   case 2844: /* bare_label_keyword: ADMIN  */
-#line 15830 "preproc.y"
+#line 15823 "preproc.y"
  { 
  (yyval.str) = mm_strdup("admin");
 }
-#line 60389 "preproc.c"
+#line 60382 "preproc.c"
     break;
 
   case 2845: /* bare_label_keyword: AFTER  */
-#line 15834 "preproc.y"
+#line 15827 "preproc.y"
  { 
  (yyval.str) = mm_strdup("after");
 }
-#line 60397 "preproc.c"
+#line 60390 "preproc.c"
     break;
 
   case 2846: /* bare_label_keyword: AGGREGATE  */
-#line 15838 "preproc.y"
+#line 15831 "preproc.y"
  { 
  (yyval.str) = mm_strdup("aggregate");
 }
-#line 60405 "preproc.c"
+#line 60398 "preproc.c"
     break;
 
   case 2847: /* bare_label_keyword: ALL  */
-#line 15842 "preproc.y"
+#line 15835 "preproc.y"
  { 
  (yyval.str) = mm_strdup("all");
 }
-#line 60413 "preproc.c"
+#line 60406 "preproc.c"
     break;
 
   case 2848: /* bare_label_keyword: ALSO  */
-#line 15846 "preproc.y"
+#line 15839 "preproc.y"
  { 
  (yyval.str) = mm_strdup("also");
 }
-#line 60421 "preproc.c"
+#line 60414 "preproc.c"
     break;
 
   case 2849: /* bare_label_keyword: ALTER  */
-#line 15850 "preproc.y"
+#line 15843 "preproc.y"
  { 
  (yyval.str) = mm_strdup("alter");
 }
-#line 60429 "preproc.c"
+#line 60422 "preproc.c"
     break;
 
   case 2850: /* bare_label_keyword: ALWAYS  */
-#line 15854 "preproc.y"
+#line 15847 "preproc.y"
  { 
  (yyval.str) = mm_strdup("always");
 }
-#line 60437 "preproc.c"
+#line 60430 "preproc.c"
     break;
 
   case 2851: /* bare_label_keyword: ANALYSE  */
-#line 15858 "preproc.y"
+#line 15851 "preproc.y"
  { 
  (yyval.str) = mm_strdup("analyse");
 }
-#line 60445 "preproc.c"
+#line 60438 "preproc.c"
     break;
 
   case 2852: /* bare_label_keyword: ANALYZE  */
-#line 15862 "preproc.y"
+#line 15855 "preproc.y"
  { 
  (yyval.str) = mm_strdup("analyze");
 }
-#line 60453 "preproc.c"
+#line 60446 "preproc.c"
     break;
 
   case 2853: /* bare_label_keyword: AND  */
-#line 15866 "preproc.y"
+#line 15859 "preproc.y"
  { 
  (yyval.str) = mm_strdup("and");
 }
-#line 60461 "preproc.c"
+#line 60454 "preproc.c"
     break;
 
   case 2854: /* bare_label_keyword: ANY  */
-#line 15870 "preproc.y"
+#line 15863 "preproc.y"
  { 
  (yyval.str) = mm_strdup("any");
 }
-#line 60469 "preproc.c"
+#line 60462 "preproc.c"
     break;
 
   case 2855: /* bare_label_keyword: ASC  */
-#line 15874 "preproc.y"
+#line 15867 "preproc.y"
  { 
  (yyval.str) = mm_strdup("asc");
 }
-#line 60477 "preproc.c"
+#line 60470 "preproc.c"
     break;
 
   case 2856: /* bare_label_keyword: ASENSITIVE  */
-#line 15878 "preproc.y"
+#line 15871 "preproc.y"
  { 
  (yyval.str) = mm_strdup("asensitive");
 }
-#line 60485 "preproc.c"
+#line 60478 "preproc.c"
     break;
 
   case 2857: /* bare_label_keyword: ASSERTION  */
-#line 15882 "preproc.y"
+#line 15875 "preproc.y"
  { 
  (yyval.str) = mm_strdup("assertion");
 }
-#line 60493 "preproc.c"
+#line 60486 "preproc.c"
     break;
 
   case 2858: /* bare_label_keyword: ASSIGNMENT  */
-#line 15886 "preproc.y"
+#line 15879 "preproc.y"
  { 
  (yyval.str) = mm_strdup("assignment");
 }
-#line 60501 "preproc.c"
+#line 60494 "preproc.c"
     break;
 
   case 2859: /* bare_label_keyword: ASYMMETRIC  */
-#line 15890 "preproc.y"
+#line 15883 "preproc.y"
  { 
  (yyval.str) = mm_strdup("asymmetric");
 }
-#line 60509 "preproc.c"
+#line 60502 "preproc.c"
     break;
 
   case 2860: /* bare_label_keyword: AT  */
-#line 15894 "preproc.y"
+#line 15887 "preproc.y"
  { 
  (yyval.str) = mm_strdup("at");
 }
-#line 60517 "preproc.c"
+#line 60510 "preproc.c"
     break;
 
   case 2861: /* bare_label_keyword: ATOMIC  */
-#line 15898 "preproc.y"
+#line 15891 "preproc.y"
  { 
  (yyval.str) = mm_strdup("atomic");
 }
-#line 60525 "preproc.c"
+#line 60518 "preproc.c"
     break;
 
   case 2862: /* bare_label_keyword: ATTACH  */
-#line 15902 "preproc.y"
+#line 15895 "preproc.y"
  { 
  (yyval.str) = mm_strdup("attach");
 }
-#line 60533 "preproc.c"
+#line 60526 "preproc.c"
     break;
 
   case 2863: /* bare_label_keyword: ATTRIBUTE  */
-#line 15906 "preproc.y"
+#line 15899 "preproc.y"
  { 
  (yyval.str) = mm_strdup("attribute");
 }
-#line 60541 "preproc.c"
+#line 60534 "preproc.c"
     break;
 
   case 2864: /* bare_label_keyword: AUTHORIZATION  */
-#line 15910 "preproc.y"
+#line 15903 "preproc.y"
  { 
  (yyval.str) = mm_strdup("authorization");
 }
-#line 60549 "preproc.c"
+#line 60542 "preproc.c"
     break;
 
   case 2865: /* bare_label_keyword: BACKWARD  */
-#line 15914 "preproc.y"
+#line 15907 "preproc.y"
  { 
  (yyval.str) = mm_strdup("backward");
 }
-#line 60557 "preproc.c"
+#line 60550 "preproc.c"
     break;
 
   case 2866: /* bare_label_keyword: BEFORE  */
-#line 15918 "preproc.y"
+#line 15911 "preproc.y"
  { 
  (yyval.str) = mm_strdup("before");
 }
-#line 60565 "preproc.c"
+#line 60558 "preproc.c"
     break;
 
   case 2867: /* bare_label_keyword: BEGIN_P  */
-#line 15922 "preproc.y"
+#line 15915 "preproc.y"
  { 
  (yyval.str) = mm_strdup("begin");
 }
-#line 60573 "preproc.c"
+#line 60566 "preproc.c"
     break;
 
   case 2868: /* bare_label_keyword: BETWEEN  */
-#line 15926 "preproc.y"
+#line 15919 "preproc.y"
  { 
  (yyval.str) = mm_strdup("between");
 }
-#line 60581 "preproc.c"
+#line 60574 "preproc.c"
     break;
 
   case 2869: /* bare_label_keyword: BIGINT  */
-#line 15930 "preproc.y"
+#line 15923 "preproc.y"
  { 
  (yyval.str) = mm_strdup("bigint");
 }
-#line 60589 "preproc.c"
+#line 60582 "preproc.c"
     break;
 
   case 2870: /* bare_label_keyword: BINARY  */
-#line 15934 "preproc.y"
+#line 15927 "preproc.y"
  { 
  (yyval.str) = mm_strdup("binary");
 }
-#line 60597 "preproc.c"
+#line 60590 "preproc.c"
     break;
 
   case 2871: /* bare_label_keyword: BIT  */
-#line 15938 "preproc.y"
+#line 15931 "preproc.y"
  { 
  (yyval.str) = mm_strdup("bit");
 }
-#line 60605 "preproc.c"
+#line 60598 "preproc.c"
     break;
 
   case 2872: /* bare_label_keyword: BOOLEAN_P  */
-#line 15942 "preproc.y"
+#line 15935 "preproc.y"
  { 
  (yyval.str) = mm_strdup("boolean");
 }
-#line 60613 "preproc.c"
+#line 60606 "preproc.c"
     break;
 
   case 2873: /* bare_label_keyword: BOTH  */
-#line 15946 "preproc.y"
+#line 15939 "preproc.y"
  { 
  (yyval.str) = mm_strdup("both");
 }
-#line 60621 "preproc.c"
+#line 60614 "preproc.c"
     break;
 
   case 2874: /* bare_label_keyword: BREADTH  */
-#line 15950 "preproc.y"
+#line 15943 "preproc.y"
  { 
  (yyval.str) = mm_strdup("breadth");
 }
-#line 60629 "preproc.c"
+#line 60622 "preproc.c"
     break;
 
   case 2875: /* bare_label_keyword: BY  */
-#line 15954 "preproc.y"
+#line 15947 "preproc.y"
  { 
  (yyval.str) = mm_strdup("by");
 }
-#line 60637 "preproc.c"
+#line 60630 "preproc.c"
     break;
 
   case 2876: /* bare_label_keyword: CACHE  */
-#line 15958 "preproc.y"
+#line 15951 "preproc.y"
  { 
  (yyval.str) = mm_strdup("cache");
 }
-#line 60645 "preproc.c"
+#line 60638 "preproc.c"
     break;
 
   case 2877: /* bare_label_keyword: CALL  */
-#line 15962 "preproc.y"
+#line 15955 "preproc.y"
  { 
  (yyval.str) = mm_strdup("call");
 }
-#line 60653 "preproc.c"
+#line 60646 "preproc.c"
     break;
 
   case 2878: /* bare_label_keyword: CALLED  */
-#line 15966 "preproc.y"
+#line 15959 "preproc.y"
  { 
  (yyval.str) = mm_strdup("called");
 }
-#line 60661 "preproc.c"
+#line 60654 "preproc.c"
     break;
 
   case 2879: /* bare_label_keyword: CASCADE  */
-#line 15970 "preproc.y"
+#line 15963 "preproc.y"
  { 
  (yyval.str) = mm_strdup("cascade");
 }
-#line 60669 "preproc.c"
+#line 60662 "preproc.c"
     break;
 
   case 2880: /* bare_label_keyword: CASCADED  */
-#line 15974 "preproc.y"
+#line 15967 "preproc.y"
  { 
  (yyval.str) = mm_strdup("cascaded");
 }
-#line 60677 "preproc.c"
+#line 60670 "preproc.c"
     break;
 
   case 2881: /* bare_label_keyword: CASE  */
-#line 15978 "preproc.y"
+#line 15971 "preproc.y"
  { 
  (yyval.str) = mm_strdup("case");
 }
-#line 60685 "preproc.c"
+#line 60678 "preproc.c"
     break;
 
   case 2882: /* bare_label_keyword: CAST  */
-#line 15982 "preproc.y"
+#line 15975 "preproc.y"
  { 
  (yyval.str) = mm_strdup("cast");
 }
-#line 60693 "preproc.c"
+#line 60686 "preproc.c"
     break;
 
   case 2883: /* bare_label_keyword: CATALOG_P  */
-#line 15986 "preproc.y"
+#line 15979 "preproc.y"
  { 
  (yyval.str) = mm_strdup("catalog");
 }
-#line 60701 "preproc.c"
+#line 60694 "preproc.c"
     break;
 
   case 2884: /* bare_label_keyword: CHAIN  */
-#line 15990 "preproc.y"
+#line 15983 "preproc.y"
  { 
  (yyval.str) = mm_strdup("chain");
 }
-#line 60709 "preproc.c"
+#line 60702 "preproc.c"
     break;
 
   case 2885: /* bare_label_keyword: CHARACTERISTICS  */
-#line 15994 "preproc.y"
+#line 15987 "preproc.y"
  { 
  (yyval.str) = mm_strdup("characteristics");
 }
-#line 60717 "preproc.c"
+#line 60710 "preproc.c"
     break;
 
   case 2886: /* bare_label_keyword: CHECK  */
-#line 15998 "preproc.y"
+#line 15991 "preproc.y"
  { 
  (yyval.str) = mm_strdup("check");
 }
-#line 60725 "preproc.c"
+#line 60718 "preproc.c"
     break;
 
   case 2887: /* bare_label_keyword: CHECKPOINT  */
-#line 16002 "preproc.y"
+#line 15995 "preproc.y"
  { 
  (yyval.str) = mm_strdup("checkpoint");
 }
-#line 60733 "preproc.c"
+#line 60726 "preproc.c"
     break;
 
   case 2888: /* bare_label_keyword: CLASS  */
-#line 16006 "preproc.y"
+#line 15999 "preproc.y"
  { 
  (yyval.str) = mm_strdup("class");
 }
-#line 60741 "preproc.c"
+#line 60734 "preproc.c"
     break;
 
   case 2889: /* bare_label_keyword: CLOSE  */
-#line 16010 "preproc.y"
+#line 16003 "preproc.y"
  { 
  (yyval.str) = mm_strdup("close");
 }
-#line 60749 "preproc.c"
+#line 60742 "preproc.c"
     break;
 
   case 2890: /* bare_label_keyword: CLUSTER  */
-#line 16014 "preproc.y"
+#line 16007 "preproc.y"
  { 
  (yyval.str) = mm_strdup("cluster");
 }
-#line 60757 "preproc.c"
+#line 60750 "preproc.c"
     break;
 
   case 2891: /* bare_label_keyword: COALESCE  */
-#line 16018 "preproc.y"
+#line 16011 "preproc.y"
  { 
  (yyval.str) = mm_strdup("coalesce");
 }
-#line 60765 "preproc.c"
+#line 60758 "preproc.c"
     break;
 
   case 2892: /* bare_label_keyword: COLLATE  */
-#line 16022 "preproc.y"
+#line 16015 "preproc.y"
  { 
  (yyval.str) = mm_strdup("collate");
 }
-#line 60773 "preproc.c"
+#line 60766 "preproc.c"
     break;
 
   case 2893: /* bare_label_keyword: COLLATION  */
-#line 16026 "preproc.y"
+#line 16019 "preproc.y"
  { 
  (yyval.str) = mm_strdup("collation");
 }
-#line 60781 "preproc.c"
+#line 60774 "preproc.c"
     break;
 
   case 2894: /* bare_label_keyword: COLUMN  */
-#line 16030 "preproc.y"
+#line 16023 "preproc.y"
  { 
  (yyval.str) = mm_strdup("column");
 }
-#line 60789 "preproc.c"
+#line 60782 "preproc.c"
     break;
 
   case 2895: /* bare_label_keyword: COLUMNS  */
-#line 16034 "preproc.y"
+#line 16027 "preproc.y"
  { 
  (yyval.str) = mm_strdup("columns");
 }
-#line 60797 "preproc.c"
+#line 60790 "preproc.c"
     break;
 
   case 2896: /* bare_label_keyword: COMMENT  */
-#line 16038 "preproc.y"
+#line 16031 "preproc.y"
  { 
  (yyval.str) = mm_strdup("comment");
 }
-#line 60805 "preproc.c"
+#line 60798 "preproc.c"
     break;
 
   case 2897: /* bare_label_keyword: COMMENTS  */
-#line 16042 "preproc.y"
+#line 16035 "preproc.y"
  { 
  (yyval.str) = mm_strdup("comments");
 }
-#line 60813 "preproc.c"
+#line 60806 "preproc.c"
     break;
 
   case 2898: /* bare_label_keyword: COMMIT  */
-#line 16046 "preproc.y"
+#line 16039 "preproc.y"
  { 
  (yyval.str) = mm_strdup("commit");
 }
-#line 60821 "preproc.c"
+#line 60814 "preproc.c"
     break;
 
   case 2899: /* bare_label_keyword: COMMITTED  */
-#line 16050 "preproc.y"
+#line 16043 "preproc.y"
  { 
  (yyval.str) = mm_strdup("committed");
 }
-#line 60829 "preproc.c"
+#line 60822 "preproc.c"
     break;
 
   case 2900: /* bare_label_keyword: COMPRESSION  */
-#line 16054 "preproc.y"
+#line 16047 "preproc.y"
  { 
  (yyval.str) = mm_strdup("compression");
 }
-#line 60837 "preproc.c"
+#line 60830 "preproc.c"
     break;
 
   case 2901: /* bare_label_keyword: CONCURRENTLY  */
-#line 16058 "preproc.y"
+#line 16051 "preproc.y"
  { 
  (yyval.str) = mm_strdup("concurrently");
 }
-#line 60845 "preproc.c"
+#line 60838 "preproc.c"
     break;
 
   case 2902: /* bare_label_keyword: CONFIGURATION  */
-#line 16062 "preproc.y"
+#line 16055 "preproc.y"
  { 
  (yyval.str) = mm_strdup("configuration");
 }
-#line 60853 "preproc.c"
+#line 60846 "preproc.c"
     break;
 
   case 2903: /* bare_label_keyword: CONFLICT  */
-#line 16066 "preproc.y"
+#line 16059 "preproc.y"
  { 
  (yyval.str) = mm_strdup("conflict");
 }
-#line 60861 "preproc.c"
+#line 60854 "preproc.c"
     break;
 
   case 2904: /* bare_label_keyword: CONNECTION  */
-#line 16070 "preproc.y"
+#line 16063 "preproc.y"
  { 
  (yyval.str) = mm_strdup("connection");
 }
-#line 60869 "preproc.c"
+#line 60862 "preproc.c"
     break;
 
   case 2905: /* bare_label_keyword: CONSTRAINT  */
-#line 16074 "preproc.y"
+#line 16067 "preproc.y"
  { 
  (yyval.str) = mm_strdup("constraint");
 }
-#line 60877 "preproc.c"
+#line 60870 "preproc.c"
     break;
 
   case 2906: /* bare_label_keyword: CONSTRAINTS  */
-#line 16078 "preproc.y"
+#line 16071 "preproc.y"
  { 
  (yyval.str) = mm_strdup("constraints");
 }
-#line 60885 "preproc.c"
+#line 60878 "preproc.c"
     break;
 
   case 2907: /* bare_label_keyword: CONTENT_P  */
-#line 16082 "preproc.y"
+#line 16075 "preproc.y"
  { 
  (yyval.str) = mm_strdup("content");
 }
-#line 60893 "preproc.c"
+#line 60886 "preproc.c"
     break;
 
   case 2908: /* bare_label_keyword: CONTINUE_P  */
-#line 16086 "preproc.y"
+#line 16079 "preproc.y"
  { 
  (yyval.str) = mm_strdup("continue");
 }
-#line 60901 "preproc.c"
+#line 60894 "preproc.c"
     break;
 
   case 2909: /* bare_label_keyword: CONVERSION_P  */
-#line 16090 "preproc.y"
+#line 16083 "preproc.y"
  { 
  (yyval.str) = mm_strdup("conversion");
 }
-#line 60909 "preproc.c"
+#line 60902 "preproc.c"
     break;
 
   case 2910: /* bare_label_keyword: COPY  */
-#line 16094 "preproc.y"
+#line 16087 "preproc.y"
  { 
  (yyval.str) = mm_strdup("copy");
 }
-#line 60917 "preproc.c"
+#line 60910 "preproc.c"
     break;
 
   case 2911: /* bare_label_keyword: COST  */
-#line 16098 "preproc.y"
+#line 16091 "preproc.y"
  { 
  (yyval.str) = mm_strdup("cost");
 }
-#line 60925 "preproc.c"
+#line 60918 "preproc.c"
     break;
 
   case 2912: /* bare_label_keyword: CROSS  */
-#line 16102 "preproc.y"
+#line 16095 "preproc.y"
  { 
  (yyval.str) = mm_strdup("cross");
 }
-#line 60933 "preproc.c"
+#line 60926 "preproc.c"
     break;
 
   case 2913: /* bare_label_keyword: CSV  */
-#line 16106 "preproc.y"
+#line 16099 "preproc.y"
  { 
  (yyval.str) = mm_strdup("csv");
 }
-#line 60941 "preproc.c"
+#line 60934 "preproc.c"
     break;
 
   case 2914: /* bare_label_keyword: CUBE  */
-#line 16110 "preproc.y"
+#line 16103 "preproc.y"
  { 
  (yyval.str) = mm_strdup("cube");
 }
-#line 60949 "preproc.c"
+#line 60942 "preproc.c"
     break;
 
   case 2915: /* bare_label_keyword: CURRENT_P  */
-#line 16114 "preproc.y"
+#line 16107 "preproc.y"
  { 
  (yyval.str) = mm_strdup("current");
 }
-#line 60957 "preproc.c"
+#line 60950 "preproc.c"
     break;
 
   case 2916: /* bare_label_keyword: CURRENT_CATALOG  */
-#line 16118 "preproc.y"
+#line 16111 "preproc.y"
  { 
  (yyval.str) = mm_strdup("current_catalog");
 }
-#line 60965 "preproc.c"
+#line 60958 "preproc.c"
     break;
 
   case 2917: /* bare_label_keyword: CURRENT_DATE  */
-#line 16122 "preproc.y"
+#line 16115 "preproc.y"
  { 
  (yyval.str) = mm_strdup("current_date");
 }
-#line 60973 "preproc.c"
+#line 60966 "preproc.c"
     break;
 
   case 2918: /* bare_label_keyword: CURRENT_ROLE  */
-#line 16126 "preproc.y"
+#line 16119 "preproc.y"
  { 
  (yyval.str) = mm_strdup("current_role");
 }
-#line 60981 "preproc.c"
+#line 60974 "preproc.c"
     break;
 
   case 2919: /* bare_label_keyword: CURRENT_SCHEMA  */
-#line 16130 "preproc.y"
+#line 16123 "preproc.y"
  { 
  (yyval.str) = mm_strdup("current_schema");
 }
-#line 60989 "preproc.c"
+#line 60982 "preproc.c"
     break;
 
   case 2920: /* bare_label_keyword: CURRENT_TIME  */
-#line 16134 "preproc.y"
+#line 16127 "preproc.y"
  { 
  (yyval.str) = mm_strdup("current_time");
 }
-#line 60997 "preproc.c"
+#line 60990 "preproc.c"
     break;
 
   case 2921: /* bare_label_keyword: CURRENT_TIMESTAMP  */
-#line 16138 "preproc.y"
+#line 16131 "preproc.y"
  { 
  (yyval.str) = mm_strdup("current_timestamp");
 }
-#line 61005 "preproc.c"
+#line 60998 "preproc.c"
     break;
 
   case 2922: /* bare_label_keyword: CURRENT_USER  */
-#line 16142 "preproc.y"
+#line 16135 "preproc.y"
  { 
  (yyval.str) = mm_strdup("current_user");
 }
-#line 61013 "preproc.c"
+#line 61006 "preproc.c"
     break;
 
   case 2923: /* bare_label_keyword: CURSOR  */
-#line 16146 "preproc.y"
+#line 16139 "preproc.y"
  { 
  (yyval.str) = mm_strdup("cursor");
 }
-#line 61021 "preproc.c"
+#line 61014 "preproc.c"
     break;
 
   case 2924: /* bare_label_keyword: CYCLE  */
-#line 16150 "preproc.y"
+#line 16143 "preproc.y"
  { 
  (yyval.str) = mm_strdup("cycle");
 }
-#line 61029 "preproc.c"
+#line 61022 "preproc.c"
     break;
 
   case 2925: /* bare_label_keyword: DATA_P  */
-#line 16154 "preproc.y"
+#line 16147 "preproc.y"
  { 
  (yyval.str) = mm_strdup("data");
 }
-#line 61037 "preproc.c"
+#line 61030 "preproc.c"
     break;
 
   case 2926: /* bare_label_keyword: DATABASE  */
-#line 16158 "preproc.y"
+#line 16151 "preproc.y"
  { 
  (yyval.str) = mm_strdup("database");
 }
-#line 61045 "preproc.c"
+#line 61038 "preproc.c"
     break;
 
   case 2927: /* bare_label_keyword: DEALLOCATE  */
-#line 16162 "preproc.y"
+#line 16155 "preproc.y"
  { 
  (yyval.str) = mm_strdup("deallocate");
 }
-#line 61053 "preproc.c"
+#line 61046 "preproc.c"
     break;
 
   case 2928: /* bare_label_keyword: DEC  */
-#line 16166 "preproc.y"
+#line 16159 "preproc.y"
  { 
  (yyval.str) = mm_strdup("dec");
 }
-#line 61061 "preproc.c"
+#line 61054 "preproc.c"
     break;
 
   case 2929: /* bare_label_keyword: DECIMAL_P  */
-#line 16170 "preproc.y"
+#line 16163 "preproc.y"
  { 
  (yyval.str) = mm_strdup("decimal");
 }
-#line 61069 "preproc.c"
+#line 61062 "preproc.c"
     break;
 
   case 2930: /* bare_label_keyword: DECLARE  */
-#line 16174 "preproc.y"
+#line 16167 "preproc.y"
  { 
  (yyval.str) = mm_strdup("declare");
 }
-#line 61077 "preproc.c"
+#line 61070 "preproc.c"
     break;
 
   case 2931: /* bare_label_keyword: DEFAULT  */
-#line 16178 "preproc.y"
+#line 16171 "preproc.y"
  { 
  (yyval.str) = mm_strdup("default");
 }
-#line 61085 "preproc.c"
+#line 61078 "preproc.c"
     break;
 
   case 2932: /* bare_label_keyword: DEFAULTS  */
-#line 16182 "preproc.y"
+#line 16175 "preproc.y"
  { 
  (yyval.str) = mm_strdup("defaults");
 }
-#line 61093 "preproc.c"
+#line 61086 "preproc.c"
     break;
 
   case 2933: /* bare_label_keyword: DEFERRABLE  */
-#line 16186 "preproc.y"
+#line 16179 "preproc.y"
  { 
  (yyval.str) = mm_strdup("deferrable");
 }
-#line 61101 "preproc.c"
+#line 61094 "preproc.c"
     break;
 
   case 2934: /* bare_label_keyword: DEFERRED  */
-#line 16190 "preproc.y"
+#line 16183 "preproc.y"
  { 
  (yyval.str) = mm_strdup("deferred");
 }
-#line 61109 "preproc.c"
+#line 61102 "preproc.c"
     break;
 
   case 2935: /* bare_label_keyword: DEFINER  */
-#line 16194 "preproc.y"
+#line 16187 "preproc.y"
  { 
  (yyval.str) = mm_strdup("definer");
 }
-#line 61117 "preproc.c"
+#line 61110 "preproc.c"
     break;
 
   case 2936: /* bare_label_keyword: DELETE_P  */
-#line 16198 "preproc.y"
+#line 16191 "preproc.y"
  { 
  (yyval.str) = mm_strdup("delete");
 }
-#line 61125 "preproc.c"
+#line 61118 "preproc.c"
     break;
 
   case 2937: /* bare_label_keyword: DELIMITER  */
-#line 16202 "preproc.y"
+#line 16195 "preproc.y"
  { 
  (yyval.str) = mm_strdup("delimiter");
 }
-#line 61133 "preproc.c"
+#line 61126 "preproc.c"
     break;
 
   case 2938: /* bare_label_keyword: DELIMITERS  */
-#line 16206 "preproc.y"
+#line 16199 "preproc.y"
  { 
  (yyval.str) = mm_strdup("delimiters");
 }
-#line 61141 "preproc.c"
+#line 61134 "preproc.c"
     break;
 
   case 2939: /* bare_label_keyword: DEPENDS  */
-#line 16210 "preproc.y"
+#line 16203 "preproc.y"
  { 
  (yyval.str) = mm_strdup("depends");
 }
-#line 61149 "preproc.c"
+#line 61142 "preproc.c"
     break;
 
   case 2940: /* bare_label_keyword: DEPTH  */
-#line 16214 "preproc.y"
+#line 16207 "preproc.y"
  { 
  (yyval.str) = mm_strdup("depth");
 }
-#line 61157 "preproc.c"
+#line 61150 "preproc.c"
     break;
 
   case 2941: /* bare_label_keyword: DESC  */
-#line 16218 "preproc.y"
+#line 16211 "preproc.y"
  { 
  (yyval.str) = mm_strdup("desc");
 }
-#line 61165 "preproc.c"
+#line 61158 "preproc.c"
     break;
 
   case 2942: /* bare_label_keyword: DETACH  */
-#line 16222 "preproc.y"
+#line 16215 "preproc.y"
  { 
  (yyval.str) = mm_strdup("detach");
 }
-#line 61173 "preproc.c"
+#line 61166 "preproc.c"
     break;
 
   case 2943: /* bare_label_keyword: DICTIONARY  */
-#line 16226 "preproc.y"
+#line 16219 "preproc.y"
  { 
  (yyval.str) = mm_strdup("dictionary");
 }
-#line 61181 "preproc.c"
+#line 61174 "preproc.c"
     break;
 
   case 2944: /* bare_label_keyword: DISABLE_P  */
-#line 16230 "preproc.y"
+#line 16223 "preproc.y"
  { 
  (yyval.str) = mm_strdup("disable");
 }
-#line 61189 "preproc.c"
+#line 61182 "preproc.c"
     break;
 
   case 2945: /* bare_label_keyword: DISCARD  */
-#line 16234 "preproc.y"
+#line 16227 "preproc.y"
  { 
  (yyval.str) = mm_strdup("discard");
 }
-#line 61197 "preproc.c"
+#line 61190 "preproc.c"
     break;
 
   case 2946: /* bare_label_keyword: DISTINCT  */
-#line 16238 "preproc.y"
+#line 16231 "preproc.y"
  { 
  (yyval.str) = mm_strdup("distinct");
 }
-#line 61205 "preproc.c"
+#line 61198 "preproc.c"
     break;
 
   case 2947: /* bare_label_keyword: DO  */
-#line 16242 "preproc.y"
+#line 16235 "preproc.y"
  { 
  (yyval.str) = mm_strdup("do");
 }
-#line 61213 "preproc.c"
+#line 61206 "preproc.c"
     break;
 
   case 2948: /* bare_label_keyword: DOCUMENT_P  */
-#line 16246 "preproc.y"
+#line 16239 "preproc.y"
  { 
  (yyval.str) = mm_strdup("document");
 }
-#line 61221 "preproc.c"
+#line 61214 "preproc.c"
     break;
 
   case 2949: /* bare_label_keyword: DOMAIN_P  */
-#line 16250 "preproc.y"
+#line 16243 "preproc.y"
  { 
  (yyval.str) = mm_strdup("domain");
 }
-#line 61229 "preproc.c"
+#line 61222 "preproc.c"
     break;
 
   case 2950: /* bare_label_keyword: DOUBLE_P  */
-#line 16254 "preproc.y"
+#line 16247 "preproc.y"
  { 
  (yyval.str) = mm_strdup("double");
 }
-#line 61237 "preproc.c"
+#line 61230 "preproc.c"
     break;
 
   case 2951: /* bare_label_keyword: DROP  */
-#line 16258 "preproc.y"
+#line 16251 "preproc.y"
  { 
  (yyval.str) = mm_strdup("drop");
 }
-#line 61245 "preproc.c"
+#line 61238 "preproc.c"
     break;
 
   case 2952: /* bare_label_keyword: EACH  */
-#line 16262 "preproc.y"
+#line 16255 "preproc.y"
  { 
  (yyval.str) = mm_strdup("each");
 }
-#line 61253 "preproc.c"
+#line 61246 "preproc.c"
     break;
 
   case 2953: /* bare_label_keyword: ELSE  */
-#line 16266 "preproc.y"
+#line 16259 "preproc.y"
  { 
  (yyval.str) = mm_strdup("else");
 }
-#line 61261 "preproc.c"
+#line 61254 "preproc.c"
     break;
 
   case 2954: /* bare_label_keyword: ENABLE_P  */
-#line 16270 "preproc.y"
+#line 16263 "preproc.y"
  { 
  (yyval.str) = mm_strdup("enable");
 }
-#line 61269 "preproc.c"
+#line 61262 "preproc.c"
     break;
 
   case 2955: /* bare_label_keyword: ENCODING  */
-#line 16274 "preproc.y"
+#line 16267 "preproc.y"
  { 
  (yyval.str) = mm_strdup("encoding");
 }
-#line 61277 "preproc.c"
+#line 61270 "preproc.c"
     break;
 
   case 2956: /* bare_label_keyword: ENCRYPTED  */
-#line 16278 "preproc.y"
+#line 16271 "preproc.y"
  { 
  (yyval.str) = mm_strdup("encrypted");
 }
-#line 61285 "preproc.c"
+#line 61278 "preproc.c"
     break;
 
   case 2957: /* bare_label_keyword: END_P  */
-#line 16282 "preproc.y"
+#line 16275 "preproc.y"
  { 
  (yyval.str) = mm_strdup("end");
 }
-#line 61293 "preproc.c"
+#line 61286 "preproc.c"
     break;
 
   case 2958: /* bare_label_keyword: ENUM_P  */
-#line 16286 "preproc.y"
+#line 16279 "preproc.y"
  { 
  (yyval.str) = mm_strdup("enum");
 }
-#line 61301 "preproc.c"
+#line 61294 "preproc.c"
     break;
 
   case 2959: /* bare_label_keyword: ESCAPE  */
-#line 16290 "preproc.y"
+#line 16283 "preproc.y"
  { 
  (yyval.str) = mm_strdup("escape");
 }
-#line 61309 "preproc.c"
+#line 61302 "preproc.c"
     break;
 
   case 2960: /* bare_label_keyword: EVENT  */
-#line 16294 "preproc.y"
+#line 16287 "preproc.y"
  { 
  (yyval.str) = mm_strdup("event");
 }
-#line 61317 "preproc.c"
+#line 61310 "preproc.c"
     break;
 
   case 2961: /* bare_label_keyword: EXCLUDE  */
-#line 16298 "preproc.y"
+#line 16291 "preproc.y"
  { 
  (yyval.str) = mm_strdup("exclude");
 }
-#line 61325 "preproc.c"
+#line 61318 "preproc.c"
     break;
 
   case 2962: /* bare_label_keyword: EXCLUDING  */
-#line 16302 "preproc.y"
+#line 16295 "preproc.y"
  { 
  (yyval.str) = mm_strdup("excluding");
 }
-#line 61333 "preproc.c"
+#line 61326 "preproc.c"
     break;
 
   case 2963: /* bare_label_keyword: EXCLUSIVE  */
-#line 16306 "preproc.y"
+#line 16299 "preproc.y"
  { 
  (yyval.str) = mm_strdup("exclusive");
 }
-#line 61341 "preproc.c"
+#line 61334 "preproc.c"
     break;
 
   case 2964: /* bare_label_keyword: EXECUTE  */
-#line 16310 "preproc.y"
+#line 16303 "preproc.y"
  { 
  (yyval.str) = mm_strdup("execute");
 }
-#line 61349 "preproc.c"
+#line 61342 "preproc.c"
     break;
 
   case 2965: /* bare_label_keyword: EXISTS  */
-#line 16314 "preproc.y"
+#line 16307 "preproc.y"
  { 
  (yyval.str) = mm_strdup("exists");
 }
-#line 61357 "preproc.c"
+#line 61350 "preproc.c"
     break;
 
   case 2966: /* bare_label_keyword: EXPLAIN  */
-#line 16318 "preproc.y"
+#line 16311 "preproc.y"
  { 
  (yyval.str) = mm_strdup("explain");
 }
-#line 61365 "preproc.c"
+#line 61358 "preproc.c"
     break;
 
   case 2967: /* bare_label_keyword: EXPRESSION  */
-#line 16322 "preproc.y"
+#line 16315 "preproc.y"
  { 
  (yyval.str) = mm_strdup("expression");
 }
-#line 61373 "preproc.c"
+#line 61366 "preproc.c"
     break;
 
   case 2968: /* bare_label_keyword: EXTENSION  */
-#line 16326 "preproc.y"
+#line 16319 "preproc.y"
  { 
  (yyval.str) = mm_strdup("extension");
 }
-#line 61381 "preproc.c"
+#line 61374 "preproc.c"
     break;
 
   case 2969: /* bare_label_keyword: EXTERNAL  */
-#line 16330 "preproc.y"
+#line 16323 "preproc.y"
  { 
  (yyval.str) = mm_strdup("external");
 }
-#line 61389 "preproc.c"
+#line 61382 "preproc.c"
     break;
 
   case 2970: /* bare_label_keyword: EXTRACT  */
-#line 16334 "preproc.y"
+#line 16327 "preproc.y"
  { 
  (yyval.str) = mm_strdup("extract");
 }
-#line 61397 "preproc.c"
+#line 61390 "preproc.c"
     break;
 
   case 2971: /* bare_label_keyword: FALSE_P  */
-#line 16338 "preproc.y"
+#line 16331 "preproc.y"
  { 
  (yyval.str) = mm_strdup("false");
 }
-#line 61405 "preproc.c"
+#line 61398 "preproc.c"
     break;
 
   case 2972: /* bare_label_keyword: FAMILY  */
-#line 16342 "preproc.y"
+#line 16335 "preproc.y"
  { 
  (yyval.str) = mm_strdup("family");
 }
-#line 61413 "preproc.c"
+#line 61406 "preproc.c"
     break;
 
   case 2973: /* bare_label_keyword: FINALIZE  */
-#line 16346 "preproc.y"
+#line 16339 "preproc.y"
  { 
  (yyval.str) = mm_strdup("finalize");
 }
-#line 61421 "preproc.c"
+#line 61414 "preproc.c"
     break;
 
   case 2974: /* bare_label_keyword: FIRST_P  */
-#line 16350 "preproc.y"
+#line 16343 "preproc.y"
  { 
  (yyval.str) = mm_strdup("first");
 }
-#line 61429 "preproc.c"
+#line 61422 "preproc.c"
     break;
 
   case 2975: /* bare_label_keyword: FLOAT_P  */
-#line 16354 "preproc.y"
+#line 16347 "preproc.y"
  { 
  (yyval.str) = mm_strdup("float");
 }
-#line 61437 "preproc.c"
+#line 61430 "preproc.c"
     break;
 
   case 2976: /* bare_label_keyword: FOLLOWING  */
-#line 16358 "preproc.y"
+#line 16351 "preproc.y"
  { 
  (yyval.str) = mm_strdup("following");
 }
-#line 61445 "preproc.c"
+#line 61438 "preproc.c"
     break;
 
   case 2977: /* bare_label_keyword: FORCE  */
-#line 16362 "preproc.y"
+#line 16355 "preproc.y"
  { 
  (yyval.str) = mm_strdup("force");
 }
-#line 61453 "preproc.c"
+#line 61446 "preproc.c"
     break;
 
   case 2978: /* bare_label_keyword: FOREIGN  */
-#line 16366 "preproc.y"
+#line 16359 "preproc.y"
  { 
  (yyval.str) = mm_strdup("foreign");
 }
-#line 61461 "preproc.c"
+#line 61454 "preproc.c"
     break;
 
   case 2979: /* bare_label_keyword: FORMAT  */
-#line 16370 "preproc.y"
+#line 16363 "preproc.y"
  { 
  (yyval.str) = mm_strdup("format");
 }
-#line 61469 "preproc.c"
+#line 61462 "preproc.c"
     break;
 
   case 2980: /* bare_label_keyword: FORWARD  */
-#line 16374 "preproc.y"
+#line 16367 "preproc.y"
  { 
  (yyval.str) = mm_strdup("forward");
 }
-#line 61477 "preproc.c"
+#line 61470 "preproc.c"
     break;
 
   case 2981: /* bare_label_keyword: FREEZE  */
-#line 16378 "preproc.y"
+#line 16371 "preproc.y"
  { 
  (yyval.str) = mm_strdup("freeze");
 }
-#line 61485 "preproc.c"
+#line 61478 "preproc.c"
     break;
 
   case 2982: /* bare_label_keyword: FULL  */
-#line 16382 "preproc.y"
+#line 16375 "preproc.y"
  { 
  (yyval.str) = mm_strdup("full");
 }
-#line 61493 "preproc.c"
+#line 61486 "preproc.c"
     break;
 
   case 2983: /* bare_label_keyword: FUNCTION  */
-#line 16386 "preproc.y"
+#line 16379 "preproc.y"
  { 
  (yyval.str) = mm_strdup("function");
 }
-#line 61501 "preproc.c"
+#line 61494 "preproc.c"
     break;
 
   case 2984: /* bare_label_keyword: FUNCTIONS  */
-#line 16390 "preproc.y"
+#line 16383 "preproc.y"
  { 
  (yyval.str) = mm_strdup("functions");
 }
-#line 61509 "preproc.c"
+#line 61502 "preproc.c"
     break;
 
   case 2985: /* bare_label_keyword: GENERATED  */
-#line 16394 "preproc.y"
+#line 16387 "preproc.y"
  { 
  (yyval.str) = mm_strdup("generated");
 }
-#line 61517 "preproc.c"
+#line 61510 "preproc.c"
     break;
 
   case 2986: /* bare_label_keyword: GLOBAL  */
-#line 16398 "preproc.y"
+#line 16391 "preproc.y"
  { 
  (yyval.str) = mm_strdup("global");
 }
-#line 61525 "preproc.c"
+#line 61518 "preproc.c"
     break;
 
   case 2987: /* bare_label_keyword: GRANTED  */
-#line 16402 "preproc.y"
+#line 16395 "preproc.y"
  { 
  (yyval.str) = mm_strdup("granted");
 }
-#line 61533 "preproc.c"
+#line 61526 "preproc.c"
     break;
 
   case 2988: /* bare_label_keyword: GREATEST  */
-#line 16406 "preproc.y"
+#line 16399 "preproc.y"
  { 
  (yyval.str) = mm_strdup("greatest");
 }
-#line 61541 "preproc.c"
+#line 61534 "preproc.c"
     break;
 
   case 2989: /* bare_label_keyword: GROUPING  */
-#line 16410 "preproc.y"
+#line 16403 "preproc.y"
  { 
  (yyval.str) = mm_strdup("grouping");
 }
-#line 61549 "preproc.c"
+#line 61542 "preproc.c"
     break;
 
   case 2990: /* bare_label_keyword: GROUPS  */
-#line 16414 "preproc.y"
+#line 16407 "preproc.y"
  { 
  (yyval.str) = mm_strdup("groups");
 }
-#line 61557 "preproc.c"
+#line 61550 "preproc.c"
     break;
 
   case 2991: /* bare_label_keyword: HANDLER  */
-#line 16418 "preproc.y"
+#line 16411 "preproc.y"
  { 
  (yyval.str) = mm_strdup("handler");
 }
-#line 61565 "preproc.c"
+#line 61558 "preproc.c"
     break;
 
   case 2992: /* bare_label_keyword: HEADER_P  */
-#line 16422 "preproc.y"
+#line 16415 "preproc.y"
  { 
  (yyval.str) = mm_strdup("header");
 }
-#line 61573 "preproc.c"
+#line 61566 "preproc.c"
     break;
 
   case 2993: /* bare_label_keyword: HOLD  */
-#line 16426 "preproc.y"
+#line 16419 "preproc.y"
  { 
  (yyval.str) = mm_strdup("hold");
 }
-#line 61581 "preproc.c"
+#line 61574 "preproc.c"
     break;
 
   case 2994: /* bare_label_keyword: IDENTITY_P  */
-#line 16430 "preproc.y"
+#line 16423 "preproc.y"
  { 
  (yyval.str) = mm_strdup("identity");
 }
-#line 61589 "preproc.c"
+#line 61582 "preproc.c"
     break;
 
   case 2995: /* bare_label_keyword: IF_P  */
-#line 16434 "preproc.y"
+#line 16427 "preproc.y"
  { 
  (yyval.str) = mm_strdup("if");
 }
-#line 61597 "preproc.c"
+#line 61590 "preproc.c"
     break;
 
   case 2996: /* bare_label_keyword: ILIKE  */
-#line 16438 "preproc.y"
+#line 16431 "preproc.y"
  { 
  (yyval.str) = mm_strdup("ilike");
 }
-#line 61605 "preproc.c"
+#line 61598 "preproc.c"
     break;
 
   case 2997: /* bare_label_keyword: IMMEDIATE  */
-#line 16442 "preproc.y"
+#line 16435 "preproc.y"
  { 
  (yyval.str) = mm_strdup("immediate");
 }
-#line 61613 "preproc.c"
+#line 61606 "preproc.c"
     break;
 
   case 2998: /* bare_label_keyword: IMMUTABLE  */
-#line 16446 "preproc.y"
+#line 16439 "preproc.y"
  { 
  (yyval.str) = mm_strdup("immutable");
 }
-#line 61621 "preproc.c"
+#line 61614 "preproc.c"
     break;
 
   case 2999: /* bare_label_keyword: IMPLICIT_P  */
-#line 16450 "preproc.y"
+#line 16443 "preproc.y"
  { 
  (yyval.str) = mm_strdup("implicit");
 }
-#line 61629 "preproc.c"
+#line 61622 "preproc.c"
     break;
 
   case 3000: /* bare_label_keyword: IMPORT_P  */
-#line 16454 "preproc.y"
+#line 16447 "preproc.y"
  { 
  (yyval.str) = mm_strdup("import");
 }
-#line 61637 "preproc.c"
+#line 61630 "preproc.c"
     break;
 
   case 3001: /* bare_label_keyword: IN_P  */
-#line 16458 "preproc.y"
+#line 16451 "preproc.y"
  { 
  (yyval.str) = mm_strdup("in");
 }
-#line 61645 "preproc.c"
+#line 61638 "preproc.c"
     break;
 
   case 3002: /* bare_label_keyword: INCLUDE  */
-#line 16462 "preproc.y"
+#line 16455 "preproc.y"
  { 
  (yyval.str) = mm_strdup("include");
 }
-#line 61653 "preproc.c"
+#line 61646 "preproc.c"
     break;
 
   case 3003: /* bare_label_keyword: INCLUDING  */
-#line 16466 "preproc.y"
+#line 16459 "preproc.y"
  { 
  (yyval.str) = mm_strdup("including");
 }
-#line 61661 "preproc.c"
+#line 61654 "preproc.c"
     break;
 
   case 3004: /* bare_label_keyword: INCREMENT  */
-#line 16470 "preproc.y"
+#line 16463 "preproc.y"
  { 
  (yyval.str) = mm_strdup("increment");
 }
-#line 61669 "preproc.c"
+#line 61662 "preproc.c"
     break;
 
   case 3005: /* bare_label_keyword: INDENT  */
-#line 16474 "preproc.y"
+#line 16467 "preproc.y"
  { 
  (yyval.str) = mm_strdup("indent");
 }
-#line 61677 "preproc.c"
+#line 61670 "preproc.c"
     break;
 
   case 3006: /* bare_label_keyword: INDEX  */
-#line 16478 "preproc.y"
+#line 16471 "preproc.y"
  { 
  (yyval.str) = mm_strdup("index");
 }
-#line 61685 "preproc.c"
+#line 61678 "preproc.c"
     break;
 
   case 3007: /* bare_label_keyword: INDEXES  */
-#line 16482 "preproc.y"
+#line 16475 "preproc.y"
  { 
  (yyval.str) = mm_strdup("indexes");
 }
-#line 61693 "preproc.c"
+#line 61686 "preproc.c"
     break;
 
   case 3008: /* bare_label_keyword: INHERIT  */
-#line 16486 "preproc.y"
+#line 16479 "preproc.y"
  { 
  (yyval.str) = mm_strdup("inherit");
 }
-#line 61701 "preproc.c"
+#line 61694 "preproc.c"
     break;
 
   case 3009: /* bare_label_keyword: INHERITS  */
-#line 16490 "preproc.y"
+#line 16483 "preproc.y"
  { 
  (yyval.str) = mm_strdup("inherits");
 }
-#line 61709 "preproc.c"
+#line 61702 "preproc.c"
     break;
 
   case 3010: /* bare_label_keyword: INITIALLY  */
-#line 16494 "preproc.y"
+#line 16487 "preproc.y"
  { 
  (yyval.str) = mm_strdup("initially");
 }
-#line 61717 "preproc.c"
+#line 61710 "preproc.c"
     break;
 
   case 3011: /* bare_label_keyword: INLINE_P  */
-#line 16498 "preproc.y"
+#line 16491 "preproc.y"
  { 
  (yyval.str) = mm_strdup("inline");
 }
-#line 61725 "preproc.c"
+#line 61718 "preproc.c"
     break;
 
   case 3012: /* bare_label_keyword: INNER_P  */
-#line 16502 "preproc.y"
+#line 16495 "preproc.y"
  { 
  (yyval.str) = mm_strdup("inner");
 }
-#line 61733 "preproc.c"
+#line 61726 "preproc.c"
     break;
 
   case 3013: /* bare_label_keyword: INOUT  */
-#line 16506 "preproc.y"
+#line 16499 "preproc.y"
  { 
  (yyval.str) = mm_strdup("inout");
 }
-#line 61741 "preproc.c"
+#line 61734 "preproc.c"
     break;
 
   case 3014: /* bare_label_keyword: INPUT_P  */
-#line 16510 "preproc.y"
+#line 16503 "preproc.y"
  { 
  (yyval.str) = mm_strdup("input");
 }
-#line 61749 "preproc.c"
+#line 61742 "preproc.c"
     break;
 
   case 3015: /* bare_label_keyword: INSENSITIVE  */
-#line 16514 "preproc.y"
+#line 16507 "preproc.y"
  { 
  (yyval.str) = mm_strdup("insensitive");
 }
-#line 61757 "preproc.c"
+#line 61750 "preproc.c"
     break;
 
   case 3016: /* bare_label_keyword: INSERT  */
-#line 16518 "preproc.y"
+#line 16511 "preproc.y"
  { 
  (yyval.str) = mm_strdup("insert");
 }
-#line 61765 "preproc.c"
+#line 61758 "preproc.c"
     break;
 
   case 3017: /* bare_label_keyword: INSTEAD  */
-#line 16522 "preproc.y"
+#line 16515 "preproc.y"
  { 
  (yyval.str) = mm_strdup("instead");
 }
-#line 61773 "preproc.c"
+#line 61766 "preproc.c"
     break;
 
   case 3018: /* bare_label_keyword: INT_P  */
-#line 16526 "preproc.y"
+#line 16519 "preproc.y"
  { 
  (yyval.str) = mm_strdup("int");
 }
-#line 61781 "preproc.c"
+#line 61774 "preproc.c"
     break;
 
   case 3019: /* bare_label_keyword: INTEGER  */
-#line 16530 "preproc.y"
+#line 16523 "preproc.y"
  { 
  (yyval.str) = mm_strdup("integer");
 }
-#line 61789 "preproc.c"
+#line 61782 "preproc.c"
     break;
 
   case 3020: /* bare_label_keyword: INTERVAL  */
-#line 16534 "preproc.y"
+#line 16527 "preproc.y"
  { 
  (yyval.str) = mm_strdup("interval");
 }
-#line 61797 "preproc.c"
+#line 61790 "preproc.c"
     break;
 
   case 3021: /* bare_label_keyword: INVOKER  */
-#line 16538 "preproc.y"
+#line 16531 "preproc.y"
  { 
  (yyval.str) = mm_strdup("invoker");
 }
-#line 61805 "preproc.c"
+#line 61798 "preproc.c"
     break;
 
   case 3022: /* bare_label_keyword: IS  */
-#line 16542 "preproc.y"
+#line 16535 "preproc.y"
  { 
  (yyval.str) = mm_strdup("is");
 }
-#line 61813 "preproc.c"
+#line 61806 "preproc.c"
     break;
 
   case 3023: /* bare_label_keyword: ISOLATION  */
-#line 16546 "preproc.y"
+#line 16539 "preproc.y"
  { 
  (yyval.str) = mm_strdup("isolation");
 }
-#line 61821 "preproc.c"
+#line 61814 "preproc.c"
     break;
 
   case 3024: /* bare_label_keyword: JOIN  */
-#line 16550 "preproc.y"
+#line 16543 "preproc.y"
  { 
  (yyval.str) = mm_strdup("join");
 }
-#line 61829 "preproc.c"
+#line 61822 "preproc.c"
     break;
 
   case 3025: /* bare_label_keyword: JSON  */
-#line 16554 "preproc.y"
+#line 16547 "preproc.y"
  { 
  (yyval.str) = mm_strdup("json");
 }
-#line 61837 "preproc.c"
+#line 61830 "preproc.c"
     break;
 
   case 3026: /* bare_label_keyword: JSON_ARRAY  */
-#line 16558 "preproc.y"
+#line 16551 "preproc.y"
  { 
  (yyval.str) = mm_strdup("json_array");
 }
-#line 61845 "preproc.c"
+#line 61838 "preproc.c"
     break;
 
   case 3027: /* bare_label_keyword: JSON_ARRAYAGG  */
-#line 16562 "preproc.y"
+#line 16555 "preproc.y"
  { 
  (yyval.str) = mm_strdup("json_arrayagg");
 }
-#line 61853 "preproc.c"
+#line 61846 "preproc.c"
     break;
 
   case 3028: /* bare_label_keyword: JSON_OBJECT  */
-#line 16566 "preproc.y"
+#line 16559 "preproc.y"
  { 
  (yyval.str) = mm_strdup("json_object");
 }
-#line 61861 "preproc.c"
+#line 61854 "preproc.c"
     break;
 
   case 3029: /* bare_label_keyword: JSON_OBJECTAGG  */
-#line 16570 "preproc.y"
+#line 16563 "preproc.y"
  { 
  (yyval.str) = mm_strdup("json_objectagg");
 }
-#line 61869 "preproc.c"
+#line 61862 "preproc.c"
     break;
 
   case 3030: /* bare_label_keyword: KEY  */
-#line 16574 "preproc.y"
+#line 16567 "preproc.y"
  { 
  (yyval.str) = mm_strdup("key");
 }
-#line 61877 "preproc.c"
+#line 61870 "preproc.c"
     break;
 
   case 3031: /* bare_label_keyword: KEYS  */
-#line 16578 "preproc.y"
+#line 16571 "preproc.y"
  { 
  (yyval.str) = mm_strdup("keys");
 }
-#line 61885 "preproc.c"
+#line 61878 "preproc.c"
     break;
 
   case 3032: /* bare_label_keyword: LABEL  */
-#line 16582 "preproc.y"
+#line 16575 "preproc.y"
  { 
  (yyval.str) = mm_strdup("label");
 }
-#line 61893 "preproc.c"
+#line 61886 "preproc.c"
     break;
 
   case 3033: /* bare_label_keyword: LANGUAGE  */
-#line 16586 "preproc.y"
+#line 16579 "preproc.y"
  { 
  (yyval.str) = mm_strdup("language");
 }
-#line 61901 "preproc.c"
+#line 61894 "preproc.c"
     break;
 
   case 3034: /* bare_label_keyword: LARGE_P  */
-#line 16590 "preproc.y"
+#line 16583 "preproc.y"
  { 
  (yyval.str) = mm_strdup("large");
 }
-#line 61909 "preproc.c"
+#line 61902 "preproc.c"
     break;
 
   case 3035: /* bare_label_keyword: LAST_P  */
-#line 16594 "preproc.y"
+#line 16587 "preproc.y"
  { 
  (yyval.str) = mm_strdup("last");
 }
-#line 61917 "preproc.c"
+#line 61910 "preproc.c"
     break;
 
   case 3036: /* bare_label_keyword: LATERAL_P  */
-#line 16598 "preproc.y"
+#line 16591 "preproc.y"
  { 
  (yyval.str) = mm_strdup("lateral");
 }
-#line 61925 "preproc.c"
+#line 61918 "preproc.c"
     break;
 
   case 3037: /* bare_label_keyword: LEADING  */
-#line 16602 "preproc.y"
+#line 16595 "preproc.y"
  { 
  (yyval.str) = mm_strdup("leading");
 }
-#line 61933 "preproc.c"
+#line 61926 "preproc.c"
     break;
 
   case 3038: /* bare_label_keyword: LEAKPROOF  */
-#line 16606 "preproc.y"
+#line 16599 "preproc.y"
  { 
  (yyval.str) = mm_strdup("leakproof");
 }
-#line 61941 "preproc.c"
+#line 61934 "preproc.c"
     break;
 
   case 3039: /* bare_label_keyword: LEAST  */
-#line 16610 "preproc.y"
+#line 16603 "preproc.y"
  { 
  (yyval.str) = mm_strdup("least");
 }
-#line 61949 "preproc.c"
+#line 61942 "preproc.c"
     break;
 
   case 3040: /* bare_label_keyword: LEFT  */
-#line 16614 "preproc.y"
+#line 16607 "preproc.y"
  { 
  (yyval.str) = mm_strdup("left");
 }
-#line 61957 "preproc.c"
+#line 61950 "preproc.c"
     break;
 
   case 3041: /* bare_label_keyword: LEVEL  */
-#line 16618 "preproc.y"
+#line 16611 "preproc.y"
  { 
  (yyval.str) = mm_strdup("level");
 }
-#line 61965 "preproc.c"
+#line 61958 "preproc.c"
     break;
 
   case 3042: /* bare_label_keyword: LIKE  */
-#line 16622 "preproc.y"
+#line 16615 "preproc.y"
  { 
  (yyval.str) = mm_strdup("like");
 }
-#line 61973 "preproc.c"
+#line 61966 "preproc.c"
     break;
 
   case 3043: /* bare_label_keyword: LISTEN  */
-#line 16626 "preproc.y"
+#line 16619 "preproc.y"
  { 
  (yyval.str) = mm_strdup("listen");
 }
-#line 61981 "preproc.c"
+#line 61974 "preproc.c"
     break;
 
   case 3044: /* bare_label_keyword: LOAD  */
-#line 16630 "preproc.y"
+#line 16623 "preproc.y"
  { 
  (yyval.str) = mm_strdup("load");
 }
-#line 61989 "preproc.c"
+#line 61982 "preproc.c"
     break;
 
   case 3045: /* bare_label_keyword: LOCAL  */
-#line 16634 "preproc.y"
+#line 16627 "preproc.y"
  { 
  (yyval.str) = mm_strdup("local");
 }
-#line 61997 "preproc.c"
+#line 61990 "preproc.c"
     break;
 
   case 3046: /* bare_label_keyword: LOCALTIME  */
-#line 16638 "preproc.y"
+#line 16631 "preproc.y"
  { 
  (yyval.str) = mm_strdup("localtime");
 }
-#line 62005 "preproc.c"
+#line 61998 "preproc.c"
     break;
 
   case 3047: /* bare_label_keyword: LOCALTIMESTAMP  */
-#line 16642 "preproc.y"
+#line 16635 "preproc.y"
  { 
  (yyval.str) = mm_strdup("localtimestamp");
 }
-#line 62013 "preproc.c"
+#line 62006 "preproc.c"
     break;
 
   case 3048: /* bare_label_keyword: LOCATION  */
-#line 16646 "preproc.y"
+#line 16639 "preproc.y"
  { 
  (yyval.str) = mm_strdup("location");
 }
-#line 62021 "preproc.c"
+#line 62014 "preproc.c"
     break;
 
   case 3049: /* bare_label_keyword: LOCK_P  */
-#line 16650 "preproc.y"
+#line 16643 "preproc.y"
  { 
  (yyval.str) = mm_strdup("lock");
 }
-#line 62029 "preproc.c"
+#line 62022 "preproc.c"
     break;
 
   case 3050: /* bare_label_keyword: LOCKED  */
-#line 16654 "preproc.y"
+#line 16647 "preproc.y"
  { 
  (yyval.str) = mm_strdup("locked");
 }
-#line 62037 "preproc.c"
+#line 62030 "preproc.c"
     break;
 
   case 3051: /* bare_label_keyword: LOGGED  */
-#line 16658 "preproc.y"
+#line 16651 "preproc.y"
  { 
  (yyval.str) = mm_strdup("logged");
 }
-#line 62045 "preproc.c"
+#line 62038 "preproc.c"
     break;
 
   case 3052: /* bare_label_keyword: MAPPING  */
-#line 16662 "preproc.y"
+#line 16655 "preproc.y"
  { 
  (yyval.str) = mm_strdup("mapping");
 }
-#line 62053 "preproc.c"
+#line 62046 "preproc.c"
     break;
 
   case 3053: /* bare_label_keyword: MATCH  */
-#line 16666 "preproc.y"
+#line 16659 "preproc.y"
  { 
  (yyval.str) = mm_strdup("match");
 }
-#line 62061 "preproc.c"
+#line 62054 "preproc.c"
     break;
 
   case 3054: /* bare_label_keyword: MATCHED  */
-#line 16670 "preproc.y"
+#line 16663 "preproc.y"
  { 
  (yyval.str) = mm_strdup("matched");
 }
-#line 62069 "preproc.c"
+#line 62062 "preproc.c"
     break;
 
   case 3055: /* bare_label_keyword: MATERIALIZED  */
-#line 16674 "preproc.y"
+#line 16667 "preproc.y"
  { 
  (yyval.str) = mm_strdup("materialized");
 }
-#line 62077 "preproc.c"
+#line 62070 "preproc.c"
     break;
 
   case 3056: /* bare_label_keyword: MAXVALUE  */
-#line 16678 "preproc.y"
+#line 16671 "preproc.y"
  { 
  (yyval.str) = mm_strdup("maxvalue");
 }
-#line 62085 "preproc.c"
+#line 62078 "preproc.c"
     break;
 
   case 3057: /* bare_label_keyword: MERGE  */
-#line 16682 "preproc.y"
+#line 16675 "preproc.y"
  { 
  (yyval.str) = mm_strdup("merge");
 }
-#line 62093 "preproc.c"
+#line 62086 "preproc.c"
     break;
 
   case 3058: /* bare_label_keyword: METHOD  */
-#line 16686 "preproc.y"
+#line 16679 "preproc.y"
  { 
  (yyval.str) = mm_strdup("method");
 }
-#line 62101 "preproc.c"
+#line 62094 "preproc.c"
     break;
 
   case 3059: /* bare_label_keyword: MINVALUE  */
-#line 16690 "preproc.y"
+#line 16683 "preproc.y"
  { 
  (yyval.str) = mm_strdup("minvalue");
 }
-#line 62109 "preproc.c"
+#line 62102 "preproc.c"
     break;
 
   case 3060: /* bare_label_keyword: MODE  */
-#line 16694 "preproc.y"
+#line 16687 "preproc.y"
  { 
  (yyval.str) = mm_strdup("mode");
 }
-#line 62117 "preproc.c"
+#line 62110 "preproc.c"
     break;
 
   case 3061: /* bare_label_keyword: MOVE  */
-#line 16698 "preproc.y"
+#line 16691 "preproc.y"
  { 
  (yyval.str) = mm_strdup("move");
 }
-#line 62125 "preproc.c"
+#line 62118 "preproc.c"
     break;
 
   case 3062: /* bare_label_keyword: NAME_P  */
-#line 16702 "preproc.y"
+#line 16695 "preproc.y"
  { 
  (yyval.str) = mm_strdup("name");
 }
-#line 62133 "preproc.c"
+#line 62126 "preproc.c"
     break;
 
   case 3063: /* bare_label_keyword: NAMES  */
-#line 16706 "preproc.y"
+#line 16699 "preproc.y"
  { 
  (yyval.str) = mm_strdup("names");
 }
-#line 62141 "preproc.c"
+#line 62134 "preproc.c"
     break;
 
   case 3064: /* bare_label_keyword: NATIONAL  */
-#line 16710 "preproc.y"
+#line 16703 "preproc.y"
  { 
  (yyval.str) = mm_strdup("national");
 }
-#line 62149 "preproc.c"
+#line 62142 "preproc.c"
     break;
 
   case 3065: /* bare_label_keyword: NATURAL  */
-#line 16714 "preproc.y"
+#line 16707 "preproc.y"
  { 
  (yyval.str) = mm_strdup("natural");
 }
-#line 62157 "preproc.c"
+#line 62150 "preproc.c"
     break;
 
   case 3066: /* bare_label_keyword: NCHAR  */
-#line 16718 "preproc.y"
+#line 16711 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nchar");
 }
-#line 62165 "preproc.c"
+#line 62158 "preproc.c"
     break;
 
   case 3067: /* bare_label_keyword: NEW  */
-#line 16722 "preproc.y"
+#line 16715 "preproc.y"
  { 
  (yyval.str) = mm_strdup("new");
 }
-#line 62173 "preproc.c"
+#line 62166 "preproc.c"
     break;
 
   case 3068: /* bare_label_keyword: NEXT  */
-#line 16726 "preproc.y"
+#line 16719 "preproc.y"
  { 
  (yyval.str) = mm_strdup("next");
 }
-#line 62181 "preproc.c"
+#line 62174 "preproc.c"
     break;
 
   case 3069: /* bare_label_keyword: NFC  */
-#line 16730 "preproc.y"
+#line 16723 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nfc");
 }
-#line 62189 "preproc.c"
+#line 62182 "preproc.c"
     break;
 
   case 3070: /* bare_label_keyword: NFD  */
-#line 16734 "preproc.y"
+#line 16727 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nfd");
 }
-#line 62197 "preproc.c"
+#line 62190 "preproc.c"
     break;
 
   case 3071: /* bare_label_keyword: NFKC  */
-#line 16738 "preproc.y"
+#line 16731 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nfkc");
 }
-#line 62205 "preproc.c"
+#line 62198 "preproc.c"
     break;
 
   case 3072: /* bare_label_keyword: NFKD  */
-#line 16742 "preproc.y"
+#line 16735 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nfkd");
 }
-#line 62213 "preproc.c"
+#line 62206 "preproc.c"
     break;
 
   case 3073: /* bare_label_keyword: NO  */
-#line 16746 "preproc.y"
+#line 16739 "preproc.y"
  { 
  (yyval.str) = mm_strdup("no");
 }
-#line 62221 "preproc.c"
+#line 62214 "preproc.c"
     break;
 
   case 3074: /* bare_label_keyword: NONE  */
-#line 16750 "preproc.y"
+#line 16743 "preproc.y"
  { 
  (yyval.str) = mm_strdup("none");
 }
-#line 62229 "preproc.c"
+#line 62222 "preproc.c"
     break;
 
   case 3075: /* bare_label_keyword: NORMALIZE  */
-#line 16754 "preproc.y"
+#line 16747 "preproc.y"
  { 
  (yyval.str) = mm_strdup("normalize");
 }
-#line 62237 "preproc.c"
+#line 62230 "preproc.c"
     break;
 
   case 3076: /* bare_label_keyword: NORMALIZED  */
-#line 16758 "preproc.y"
+#line 16751 "preproc.y"
  { 
  (yyval.str) = mm_strdup("normalized");
 }
-#line 62245 "preproc.c"
+#line 62238 "preproc.c"
     break;
 
   case 3077: /* bare_label_keyword: NOT  */
-#line 16762 "preproc.y"
+#line 16755 "preproc.y"
  { 
  (yyval.str) = mm_strdup("not");
 }
-#line 62253 "preproc.c"
+#line 62246 "preproc.c"
     break;
 
   case 3078: /* bare_label_keyword: NOTHING  */
-#line 16766 "preproc.y"
+#line 16759 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nothing");
 }
-#line 62261 "preproc.c"
+#line 62254 "preproc.c"
     break;
 
   case 3079: /* bare_label_keyword: NOTIFY  */
-#line 16770 "preproc.y"
+#line 16763 "preproc.y"
  { 
  (yyval.str) = mm_strdup("notify");
 }
-#line 62269 "preproc.c"
+#line 62262 "preproc.c"
     break;
 
   case 3080: /* bare_label_keyword: NOWAIT  */
-#line 16774 "preproc.y"
+#line 16767 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nowait");
 }
-#line 62277 "preproc.c"
+#line 62270 "preproc.c"
     break;
 
   case 3081: /* bare_label_keyword: NULL_P  */
-#line 16778 "preproc.y"
+#line 16771 "preproc.y"
  { 
  (yyval.str) = mm_strdup("null");
 }
-#line 62285 "preproc.c"
+#line 62278 "preproc.c"
     break;
 
   case 3082: /* bare_label_keyword: NULLIF  */
-#line 16782 "preproc.y"
+#line 16775 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nullif");
 }
-#line 62293 "preproc.c"
+#line 62286 "preproc.c"
     break;
 
   case 3083: /* bare_label_keyword: NULLS_P  */
-#line 16786 "preproc.y"
+#line 16779 "preproc.y"
  { 
  (yyval.str) = mm_strdup("nulls");
 }
-#line 62301 "preproc.c"
+#line 62294 "preproc.c"
     break;
 
   case 3084: /* bare_label_keyword: NUMERIC  */
-#line 16790 "preproc.y"
+#line 16783 "preproc.y"
  { 
  (yyval.str) = mm_strdup("numeric");
 }
-#line 62309 "preproc.c"
+#line 62302 "preproc.c"
     break;
 
   case 3085: /* bare_label_keyword: OBJECT_P  */
-#line 16794 "preproc.y"
+#line 16787 "preproc.y"
  { 
  (yyval.str) = mm_strdup("object");
 }
-#line 62317 "preproc.c"
+#line 62310 "preproc.c"
     break;
 
   case 3086: /* bare_label_keyword: OF  */
-#line 16798 "preproc.y"
+#line 16791 "preproc.y"
  { 
  (yyval.str) = mm_strdup("of");
 }
-#line 62325 "preproc.c"
+#line 62318 "preproc.c"
     break;
 
   case 3087: /* bare_label_keyword: OFF  */
-#line 16802 "preproc.y"
+#line 16795 "preproc.y"
  { 
  (yyval.str) = mm_strdup("off");
 }
-#line 62333 "preproc.c"
+#line 62326 "preproc.c"
     break;
 
   case 3088: /* bare_label_keyword: OIDS  */
-#line 16806 "preproc.y"
+#line 16799 "preproc.y"
  { 
  (yyval.str) = mm_strdup("oids");
 }
-#line 62341 "preproc.c"
+#line 62334 "preproc.c"
     break;
 
   case 3089: /* bare_label_keyword: OLD  */
-#line 16810 "preproc.y"
+#line 16803 "preproc.y"
  { 
  (yyval.str) = mm_strdup("old");
 }
-#line 62349 "preproc.c"
+#line 62342 "preproc.c"
     break;
 
   case 3090: /* bare_label_keyword: ONLY  */
-#line 16814 "preproc.y"
+#line 16807 "preproc.y"
  { 
  (yyval.str) = mm_strdup("only");
 }
-#line 62357 "preproc.c"
+#line 62350 "preproc.c"
     break;
 
   case 3091: /* bare_label_keyword: OPERATOR  */
-#line 16818 "preproc.y"
+#line 16811 "preproc.y"
  { 
  (yyval.str) = mm_strdup("operator");
 }
-#line 62365 "preproc.c"
+#line 62358 "preproc.c"
     break;
 
   case 3092: /* bare_label_keyword: OPTION  */
-#line 16822 "preproc.y"
+#line 16815 "preproc.y"
  { 
  (yyval.str) = mm_strdup("option");
 }
-#line 62373 "preproc.c"
+#line 62366 "preproc.c"
     break;
 
   case 3093: /* bare_label_keyword: OPTIONS  */
-#line 16826 "preproc.y"
+#line 16819 "preproc.y"
  { 
  (yyval.str) = mm_strdup("options");
 }
-#line 62381 "preproc.c"
+#line 62374 "preproc.c"
     break;
 
   case 3094: /* bare_label_keyword: OR  */
-#line 16830 "preproc.y"
+#line 16823 "preproc.y"
  { 
  (yyval.str) = mm_strdup("or");
 }
-#line 62389 "preproc.c"
+#line 62382 "preproc.c"
     break;
 
   case 3095: /* bare_label_keyword: ORDINALITY  */
-#line 16834 "preproc.y"
+#line 16827 "preproc.y"
  { 
  (yyval.str) = mm_strdup("ordinality");
 }
-#line 62397 "preproc.c"
+#line 62390 "preproc.c"
     break;
 
   case 3096: /* bare_label_keyword: OTHERS  */
-#line 16838 "preproc.y"
+#line 16831 "preproc.y"
  { 
  (yyval.str) = mm_strdup("others");
 }
-#line 62405 "preproc.c"
+#line 62398 "preproc.c"
     break;
 
   case 3097: /* bare_label_keyword: OUT_P  */
-#line 16842 "preproc.y"
+#line 16835 "preproc.y"
  { 
  (yyval.str) = mm_strdup("out");
 }
-#line 62413 "preproc.c"
+#line 62406 "preproc.c"
     break;
 
   case 3098: /* bare_label_keyword: OUTER_P  */
-#line 16846 "preproc.y"
+#line 16839 "preproc.y"
  { 
  (yyval.str) = mm_strdup("outer");
 }
-#line 62421 "preproc.c"
+#line 62414 "preproc.c"
     break;
 
   case 3099: /* bare_label_keyword: OVERLAY  */
-#line 16850 "preproc.y"
+#line 16843 "preproc.y"
  { 
  (yyval.str) = mm_strdup("overlay");
 }
-#line 62429 "preproc.c"
+#line 62422 "preproc.c"
     break;
 
   case 3100: /* bare_label_keyword: OVERRIDING  */
-#line 16854 "preproc.y"
+#line 16847 "preproc.y"
  { 
  (yyval.str) = mm_strdup("overriding");
 }
-#line 62437 "preproc.c"
+#line 62430 "preproc.c"
     break;
 
   case 3101: /* bare_label_keyword: OWNED  */
-#line 16858 "preproc.y"
+#line 16851 "preproc.y"
  { 
  (yyval.str) = mm_strdup("owned");
 }
-#line 62445 "preproc.c"
+#line 62438 "preproc.c"
     break;
 
   case 3102: /* bare_label_keyword: OWNER  */
-#line 16862 "preproc.y"
+#line 16855 "preproc.y"
  { 
  (yyval.str) = mm_strdup("owner");
 }
-#line 62453 "preproc.c"
+#line 62446 "preproc.c"
     break;
 
   case 3103: /* bare_label_keyword: PARALLEL  */
-#line 16866 "preproc.y"
+#line 16859 "preproc.y"
  { 
  (yyval.str) = mm_strdup("parallel");
 }
-#line 62461 "preproc.c"
+#line 62454 "preproc.c"
     break;
 
   case 3104: /* bare_label_keyword: PARAMETER  */
-#line 16870 "preproc.y"
+#line 16863 "preproc.y"
  { 
  (yyval.str) = mm_strdup("parameter");
 }
-#line 62469 "preproc.c"
+#line 62462 "preproc.c"
     break;
 
   case 3105: /* bare_label_keyword: PARSER  */
-#line 16874 "preproc.y"
+#line 16867 "preproc.y"
  { 
  (yyval.str) = mm_strdup("parser");
 }
-#line 62477 "preproc.c"
+#line 62470 "preproc.c"
     break;
 
   case 3106: /* bare_label_keyword: PARTIAL  */
-#line 16878 "preproc.y"
+#line 16871 "preproc.y"
  { 
  (yyval.str) = mm_strdup("partial");
 }
-#line 62485 "preproc.c"
+#line 62478 "preproc.c"
     break;
 
   case 3107: /* bare_label_keyword: PARTITION  */
-#line 16882 "preproc.y"
+#line 16875 "preproc.y"
  { 
  (yyval.str) = mm_strdup("partition");
 }
-#line 62493 "preproc.c"
+#line 62486 "preproc.c"
     break;
 
   case 3108: /* bare_label_keyword: PASSING  */
-#line 16886 "preproc.y"
+#line 16879 "preproc.y"
  { 
  (yyval.str) = mm_strdup("passing");
 }
-#line 62501 "preproc.c"
+#line 62494 "preproc.c"
     break;
 
   case 3109: /* bare_label_keyword: PASSWORD  */
-#line 16890 "preproc.y"
+#line 16883 "preproc.y"
  { 
  (yyval.str) = mm_strdup("password");
 }
-#line 62509 "preproc.c"
+#line 62502 "preproc.c"
     break;
 
   case 3110: /* bare_label_keyword: PLACING  */
-#line 16894 "preproc.y"
+#line 16887 "preproc.y"
  { 
  (yyval.str) = mm_strdup("placing");
 }
-#line 62517 "preproc.c"
+#line 62510 "preproc.c"
     break;
 
   case 3111: /* bare_label_keyword: PLANS  */
-#line 16898 "preproc.y"
+#line 16891 "preproc.y"
  { 
  (yyval.str) = mm_strdup("plans");
 }
-#line 62525 "preproc.c"
+#line 62518 "preproc.c"
     break;
 
   case 3112: /* bare_label_keyword: POLICY  */
-#line 16902 "preproc.y"
+#line 16895 "preproc.y"
  { 
  (yyval.str) = mm_strdup("policy");
 }
-#line 62533 "preproc.c"
+#line 62526 "preproc.c"
     break;
 
   case 3113: /* bare_label_keyword: POSITION  */
-#line 16906 "preproc.y"
+#line 16899 "preproc.y"
  { 
  (yyval.str) = mm_strdup("position");
 }
-#line 62541 "preproc.c"
+#line 62534 "preproc.c"
     break;
 
   case 3114: /* bare_label_keyword: PRECEDING  */
-#line 16910 "preproc.y"
+#line 16903 "preproc.y"
  { 
  (yyval.str) = mm_strdup("preceding");
 }
-#line 62549 "preproc.c"
+#line 62542 "preproc.c"
     break;
 
   case 3115: /* bare_label_keyword: PREPARE  */
-#line 16914 "preproc.y"
+#line 16907 "preproc.y"
  { 
  (yyval.str) = mm_strdup("prepare");
 }
-#line 62557 "preproc.c"
+#line 62550 "preproc.c"
     break;
 
   case 3116: /* bare_label_keyword: PREPARED  */
-#line 16918 "preproc.y"
+#line 16911 "preproc.y"
  { 
  (yyval.str) = mm_strdup("prepared");
 }
-#line 62565 "preproc.c"
+#line 62558 "preproc.c"
     break;
 
   case 3117: /* bare_label_keyword: PRESERVE  */
-#line 16922 "preproc.y"
+#line 16915 "preproc.y"
  { 
  (yyval.str) = mm_strdup("preserve");
 }
-#line 62573 "preproc.c"
+#line 62566 "preproc.c"
     break;
 
   case 3118: /* bare_label_keyword: PRIMARY  */
-#line 16926 "preproc.y"
+#line 16919 "preproc.y"
  { 
  (yyval.str) = mm_strdup("primary");
 }
-#line 62581 "preproc.c"
+#line 62574 "preproc.c"
     break;
 
   case 3119: /* bare_label_keyword: PRIOR  */
-#line 16930 "preproc.y"
+#line 16923 "preproc.y"
  { 
  (yyval.str) = mm_strdup("prior");
 }
-#line 62589 "preproc.c"
+#line 62582 "preproc.c"
     break;
 
   case 3120: /* bare_label_keyword: PRIVILEGES  */
-#line 16934 "preproc.y"
+#line 16927 "preproc.y"
  { 
  (yyval.str) = mm_strdup("privileges");
 }
-#line 62597 "preproc.c"
+#line 62590 "preproc.c"
     break;
 
   case 3121: /* bare_label_keyword: PROCEDURAL  */
-#line 16938 "preproc.y"
+#line 16931 "preproc.y"
  { 
  (yyval.str) = mm_strdup("procedural");
 }
-#line 62605 "preproc.c"
+#line 62598 "preproc.c"
     break;
 
   case 3122: /* bare_label_keyword: PROCEDURE  */
-#line 16942 "preproc.y"
+#line 16935 "preproc.y"
  { 
  (yyval.str) = mm_strdup("procedure");
 }
-#line 62613 "preproc.c"
+#line 62606 "preproc.c"
     break;
 
   case 3123: /* bare_label_keyword: PROCEDURES  */
-#line 16946 "preproc.y"
+#line 16939 "preproc.y"
  { 
  (yyval.str) = mm_strdup("procedures");
 }
-#line 62621 "preproc.c"
+#line 62614 "preproc.c"
     break;
 
   case 3124: /* bare_label_keyword: PROGRAM  */
-#line 16950 "preproc.y"
+#line 16943 "preproc.y"
  { 
  (yyval.str) = mm_strdup("program");
 }
-#line 62629 "preproc.c"
+#line 62622 "preproc.c"
     break;
 
   case 3125: /* bare_label_keyword: PUBLICATION  */
-#line 16954 "preproc.y"
+#line 16947 "preproc.y"
  { 
  (yyval.str) = mm_strdup("publication");
 }
-#line 62637 "preproc.c"
+#line 62630 "preproc.c"
     break;
 
   case 3126: /* bare_label_keyword: QUOTE  */
-#line 16958 "preproc.y"
+#line 16951 "preproc.y"
  { 
  (yyval.str) = mm_strdup("quote");
 }
-#line 62645 "preproc.c"
+#line 62638 "preproc.c"
     break;
 
   case 3127: /* bare_label_keyword: RANGE  */
-#line 16962 "preproc.y"
+#line 16955 "preproc.y"
  { 
  (yyval.str) = mm_strdup("range");
 }
-#line 62653 "preproc.c"
+#line 62646 "preproc.c"
     break;
 
   case 3128: /* bare_label_keyword: READ  */
-#line 16966 "preproc.y"
+#line 16959 "preproc.y"
  { 
  (yyval.str) = mm_strdup("read");
 }
-#line 62661 "preproc.c"
+#line 62654 "preproc.c"
     break;
 
   case 3129: /* bare_label_keyword: REAL  */
-#line 16970 "preproc.y"
+#line 16963 "preproc.y"
  { 
  (yyval.str) = mm_strdup("real");
 }
-#line 62669 "preproc.c"
+#line 62662 "preproc.c"
     break;
 
   case 3130: /* bare_label_keyword: REASSIGN  */
-#line 16974 "preproc.y"
+#line 16967 "preproc.y"
  { 
  (yyval.str) = mm_strdup("reassign");
 }
-#line 62677 "preproc.c"
+#line 62670 "preproc.c"
     break;
 
   case 3131: /* bare_label_keyword: RECHECK  */
-#line 16978 "preproc.y"
+#line 16971 "preproc.y"
  { 
  (yyval.str) = mm_strdup("recheck");
 }
-#line 62685 "preproc.c"
+#line 62678 "preproc.c"
     break;
 
   case 3132: /* bare_label_keyword: RECURSIVE  */
-#line 16982 "preproc.y"
+#line 16975 "preproc.y"
  { 
  (yyval.str) = mm_strdup("recursive");
 }
-#line 62693 "preproc.c"
+#line 62686 "preproc.c"
     break;
 
   case 3133: /* bare_label_keyword: REF_P  */
-#line 16986 "preproc.y"
+#line 16979 "preproc.y"
  { 
  (yyval.str) = mm_strdup("ref");
 }
-#line 62701 "preproc.c"
+#line 62694 "preproc.c"
     break;
 
   case 3134: /* bare_label_keyword: REFERENCES  */
-#line 16990 "preproc.y"
+#line 16983 "preproc.y"
  { 
  (yyval.str) = mm_strdup("references");
 }
-#line 62709 "preproc.c"
+#line 62702 "preproc.c"
     break;
 
   case 3135: /* bare_label_keyword: REFERENCING  */
-#line 16994 "preproc.y"
+#line 16987 "preproc.y"
  { 
  (yyval.str) = mm_strdup("referencing");
 }
-#line 62717 "preproc.c"
+#line 62710 "preproc.c"
     break;
 
   case 3136: /* bare_label_keyword: REFRESH  */
-#line 16998 "preproc.y"
+#line 16991 "preproc.y"
  { 
  (yyval.str) = mm_strdup("refresh");
 }
-#line 62725 "preproc.c"
+#line 62718 "preproc.c"
     break;
 
   case 3137: /* bare_label_keyword: REINDEX  */
-#line 17002 "preproc.y"
+#line 16995 "preproc.y"
  { 
  (yyval.str) = mm_strdup("reindex");
 }
-#line 62733 "preproc.c"
+#line 62726 "preproc.c"
     break;
 
   case 3138: /* bare_label_keyword: RELATIVE_P  */
-#line 17006 "preproc.y"
+#line 16999 "preproc.y"
  { 
  (yyval.str) = mm_strdup("relative");
 }
-#line 62741 "preproc.c"
+#line 62734 "preproc.c"
     break;
 
   case 3139: /* bare_label_keyword: RELEASE  */
-#line 17010 "preproc.y"
+#line 17003 "preproc.y"
  { 
  (yyval.str) = mm_strdup("release");
 }
-#line 62749 "preproc.c"
+#line 62742 "preproc.c"
     break;
 
   case 3140: /* bare_label_keyword: RENAME  */
-#line 17014 "preproc.y"
+#line 17007 "preproc.y"
  { 
  (yyval.str) = mm_strdup("rename");
 }
-#line 62757 "preproc.c"
+#line 62750 "preproc.c"
     break;
 
   case 3141: /* bare_label_keyword: REPEATABLE  */
-#line 17018 "preproc.y"
+#line 17011 "preproc.y"
  { 
  (yyval.str) = mm_strdup("repeatable");
 }
-#line 62765 "preproc.c"
+#line 62758 "preproc.c"
     break;
 
   case 3142: /* bare_label_keyword: REPLACE  */
-#line 17022 "preproc.y"
+#line 17015 "preproc.y"
  { 
  (yyval.str) = mm_strdup("replace");
 }
-#line 62773 "preproc.c"
+#line 62766 "preproc.c"
     break;
 
   case 3143: /* bare_label_keyword: REPLICA  */
-#line 17026 "preproc.y"
+#line 17019 "preproc.y"
  { 
  (yyval.str) = mm_strdup("replica");
 }
-#line 62781 "preproc.c"
+#line 62774 "preproc.c"
     break;
 
   case 3144: /* bare_label_keyword: RESET  */
-#line 17030 "preproc.y"
+#line 17023 "preproc.y"
  { 
  (yyval.str) = mm_strdup("reset");
 }
-#line 62789 "preproc.c"
+#line 62782 "preproc.c"
     break;
 
   case 3145: /* bare_label_keyword: RESTART  */
-#line 17034 "preproc.y"
+#line 17027 "preproc.y"
  { 
  (yyval.str) = mm_strdup("restart");
 }
-#line 62797 "preproc.c"
+#line 62790 "preproc.c"
     break;
 
   case 3146: /* bare_label_keyword: RESTRICT  */
-#line 17038 "preproc.y"
+#line 17031 "preproc.y"
  { 
  (yyval.str) = mm_strdup("restrict");
 }
-#line 62805 "preproc.c"
+#line 62798 "preproc.c"
     break;
 
   case 3147: /* bare_label_keyword: RETURN  */
-#line 17042 "preproc.y"
+#line 17035 "preproc.y"
  { 
  (yyval.str) = mm_strdup("return");
 }
-#line 62813 "preproc.c"
+#line 62806 "preproc.c"
     break;
 
   case 3148: /* bare_label_keyword: RETURNS  */
-#line 17046 "preproc.y"
+#line 17039 "preproc.y"
  { 
  (yyval.str) = mm_strdup("returns");
 }
-#line 62821 "preproc.c"
+#line 62814 "preproc.c"
     break;
 
   case 3149: /* bare_label_keyword: REVOKE  */
-#line 17050 "preproc.y"
+#line 17043 "preproc.y"
  { 
  (yyval.str) = mm_strdup("revoke");
 }
-#line 62829 "preproc.c"
+#line 62822 "preproc.c"
     break;
 
   case 3150: /* bare_label_keyword: RIGHT  */
-#line 17054 "preproc.y"
+#line 17047 "preproc.y"
  { 
  (yyval.str) = mm_strdup("right");
 }
-#line 62837 "preproc.c"
+#line 62830 "preproc.c"
     break;
 
   case 3151: /* bare_label_keyword: ROLE  */
-#line 17058 "preproc.y"
+#line 17051 "preproc.y"
  { 
  (yyval.str) = mm_strdup("role");
 }
-#line 62845 "preproc.c"
+#line 62838 "preproc.c"
     break;
 
   case 3152: /* bare_label_keyword: ROLLBACK  */
-#line 17062 "preproc.y"
+#line 17055 "preproc.y"
  { 
  (yyval.str) = mm_strdup("rollback");
 }
-#line 62853 "preproc.c"
+#line 62846 "preproc.c"
     break;
 
   case 3153: /* bare_label_keyword: ROLLUP  */
-#line 17066 "preproc.y"
+#line 17059 "preproc.y"
  { 
  (yyval.str) = mm_strdup("rollup");
 }
-#line 62861 "preproc.c"
+#line 62854 "preproc.c"
     break;
 
   case 3154: /* bare_label_keyword: ROUTINE  */
-#line 17070 "preproc.y"
+#line 17063 "preproc.y"
  { 
  (yyval.str) = mm_strdup("routine");
 }
-#line 62869 "preproc.c"
+#line 62862 "preproc.c"
     break;
 
   case 3155: /* bare_label_keyword: ROUTINES  */
-#line 17074 "preproc.y"
+#line 17067 "preproc.y"
  { 
  (yyval.str) = mm_strdup("routines");
 }
-#line 62877 "preproc.c"
+#line 62870 "preproc.c"
     break;
 
   case 3156: /* bare_label_keyword: ROW  */
-#line 17078 "preproc.y"
+#line 17071 "preproc.y"
  { 
  (yyval.str) = mm_strdup("row");
 }
-#line 62885 "preproc.c"
+#line 62878 "preproc.c"
     break;
 
   case 3157: /* bare_label_keyword: ROWS  */
-#line 17082 "preproc.y"
+#line 17075 "preproc.y"
  { 
  (yyval.str) = mm_strdup("rows");
 }
-#line 62893 "preproc.c"
+#line 62886 "preproc.c"
     break;
 
   case 3158: /* bare_label_keyword: RULE  */
-#line 17086 "preproc.y"
+#line 17079 "preproc.y"
  { 
  (yyval.str) = mm_strdup("rule");
 }
-#line 62901 "preproc.c"
+#line 62894 "preproc.c"
     break;
 
   case 3159: /* bare_label_keyword: SAVEPOINT  */
-#line 17090 "preproc.y"
+#line 17083 "preproc.y"
  { 
  (yyval.str) = mm_strdup("savepoint");
 }
-#line 62909 "preproc.c"
+#line 62902 "preproc.c"
     break;
 
   case 3160: /* bare_label_keyword: SCALAR  */
-#line 17094 "preproc.y"
+#line 17087 "preproc.y"
  { 
  (yyval.str) = mm_strdup("scalar");
 }
-#line 62917 "preproc.c"
+#line 62910 "preproc.c"
     break;
 
   case 3161: /* bare_label_keyword: SCHEMA  */
-#line 17098 "preproc.y"
+#line 17091 "preproc.y"
  { 
  (yyval.str) = mm_strdup("schema");
 }
-#line 62925 "preproc.c"
+#line 62918 "preproc.c"
     break;
 
   case 3162: /* bare_label_keyword: SCHEMAS  */
-#line 17102 "preproc.y"
+#line 17095 "preproc.y"
  { 
  (yyval.str) = mm_strdup("schemas");
 }
-#line 62933 "preproc.c"
+#line 62926 "preproc.c"
     break;
 
   case 3163: /* bare_label_keyword: SCROLL  */
-#line 17106 "preproc.y"
+#line 17099 "preproc.y"
  { 
  (yyval.str) = mm_strdup("scroll");
 }
-#line 62941 "preproc.c"
+#line 62934 "preproc.c"
     break;
 
   case 3164: /* bare_label_keyword: SEARCH  */
-#line 17110 "preproc.y"
+#line 17103 "preproc.y"
  { 
  (yyval.str) = mm_strdup("search");
 }
-#line 62949 "preproc.c"
+#line 62942 "preproc.c"
     break;
 
   case 3165: /* bare_label_keyword: SECURITY  */
-#line 17114 "preproc.y"
+#line 17107 "preproc.y"
  { 
  (yyval.str) = mm_strdup("security");
 }
-#line 62957 "preproc.c"
+#line 62950 "preproc.c"
     break;
 
   case 3166: /* bare_label_keyword: SELECT  */
-#line 17118 "preproc.y"
+#line 17111 "preproc.y"
  { 
  (yyval.str) = mm_strdup("select");
 }
-#line 62965 "preproc.c"
+#line 62958 "preproc.c"
     break;
 
   case 3167: /* bare_label_keyword: SEQUENCE  */
-#line 17122 "preproc.y"
+#line 17115 "preproc.y"
  { 
  (yyval.str) = mm_strdup("sequence");
 }
-#line 62973 "preproc.c"
+#line 62966 "preproc.c"
     break;
 
   case 3168: /* bare_label_keyword: SEQUENCES  */
-#line 17126 "preproc.y"
+#line 17119 "preproc.y"
  { 
  (yyval.str) = mm_strdup("sequences");
 }
-#line 62981 "preproc.c"
+#line 62974 "preproc.c"
     break;
 
   case 3169: /* bare_label_keyword: SERIALIZABLE  */
-#line 17130 "preproc.y"
+#line 17123 "preproc.y"
  { 
  (yyval.str) = mm_strdup("serializable");
 }
-#line 62989 "preproc.c"
+#line 62982 "preproc.c"
     break;
 
   case 3170: /* bare_label_keyword: SERVER  */
-#line 17134 "preproc.y"
+#line 17127 "preproc.y"
  { 
  (yyval.str) = mm_strdup("server");
 }
-#line 62997 "preproc.c"
+#line 62990 "preproc.c"
     break;
 
   case 3171: /* bare_label_keyword: SESSION  */
-#line 17138 "preproc.y"
+#line 17131 "preproc.y"
  { 
  (yyval.str) = mm_strdup("session");
 }
-#line 63005 "preproc.c"
+#line 62998 "preproc.c"
     break;
 
   case 3172: /* bare_label_keyword: SESSION_USER  */
-#line 17142 "preproc.y"
+#line 17135 "preproc.y"
  { 
  (yyval.str) = mm_strdup("session_user");
 }
-#line 63013 "preproc.c"
+#line 63006 "preproc.c"
     break;
 
   case 3173: /* bare_label_keyword: SET  */
-#line 17146 "preproc.y"
+#line 17139 "preproc.y"
  { 
  (yyval.str) = mm_strdup("set");
 }
-#line 63021 "preproc.c"
+#line 63014 "preproc.c"
     break;
 
   case 3174: /* bare_label_keyword: SETOF  */
-#line 17150 "preproc.y"
+#line 17143 "preproc.y"
  { 
  (yyval.str) = mm_strdup("setof");
 }
-#line 63029 "preproc.c"
+#line 63022 "preproc.c"
     break;
 
   case 3175: /* bare_label_keyword: SETS  */
-#line 17154 "preproc.y"
+#line 17147 "preproc.y"
  { 
  (yyval.str) = mm_strdup("sets");
 }
-#line 63037 "preproc.c"
+#line 63030 "preproc.c"
     break;
 
   case 3176: /* bare_label_keyword: SHARE  */
-#line 17158 "preproc.y"
+#line 17151 "preproc.y"
  { 
  (yyval.str) = mm_strdup("share");
 }
-#line 63045 "preproc.c"
+#line 63038 "preproc.c"
     break;
 
   case 3177: /* bare_label_keyword: SHOW  */
-#line 17162 "preproc.y"
+#line 17155 "preproc.y"
  { 
  (yyval.str) = mm_strdup("show");
 }
-#line 63053 "preproc.c"
+#line 63046 "preproc.c"
     break;
 
   case 3178: /* bare_label_keyword: SIMILAR  */
-#line 17166 "preproc.y"
+#line 17159 "preproc.y"
  { 
  (yyval.str) = mm_strdup("similar");
 }
-#line 63061 "preproc.c"
+#line 63054 "preproc.c"
     break;
 
   case 3179: /* bare_label_keyword: SIMPLE  */
-#line 17170 "preproc.y"
+#line 17163 "preproc.y"
  { 
  (yyval.str) = mm_strdup("simple");
 }
-#line 63069 "preproc.c"
+#line 63062 "preproc.c"
     break;
 
   case 3180: /* bare_label_keyword: SKIP  */
-#line 17174 "preproc.y"
+#line 17167 "preproc.y"
  { 
  (yyval.str) = mm_strdup("skip");
 }
-#line 63077 "preproc.c"
+#line 63070 "preproc.c"
     break;
 
   case 3181: /* bare_label_keyword: SMALLINT  */
-#line 17178 "preproc.y"
+#line 17171 "preproc.y"
  { 
  (yyval.str) = mm_strdup("smallint");
 }
-#line 63085 "preproc.c"
+#line 63078 "preproc.c"
     break;
 
   case 3182: /* bare_label_keyword: SNAPSHOT  */
-#line 17182 "preproc.y"
+#line 17175 "preproc.y"
  { 
  (yyval.str) = mm_strdup("snapshot");
 }
-#line 63093 "preproc.c"
+#line 63086 "preproc.c"
     break;
 
   case 3183: /* bare_label_keyword: SOME  */
-#line 17186 "preproc.y"
+#line 17179 "preproc.y"
  { 
  (yyval.str) = mm_strdup("some");
 }
-#line 63101 "preproc.c"
+#line 63094 "preproc.c"
     break;
 
   case 3184: /* bare_label_keyword: SQL_P  */
-#line 17190 "preproc.y"
+#line 17183 "preproc.y"
  { 
  (yyval.str) = mm_strdup("sql");
 }
-#line 63109 "preproc.c"
+#line 63102 "preproc.c"
     break;
 
   case 3185: /* bare_label_keyword: STABLE  */
-#line 17194 "preproc.y"
+#line 17187 "preproc.y"
  { 
  (yyval.str) = mm_strdup("stable");
 }
-#line 63117 "preproc.c"
+#line 63110 "preproc.c"
     break;
 
   case 3186: /* bare_label_keyword: STANDALONE_P  */
-#line 17198 "preproc.y"
+#line 17191 "preproc.y"
  { 
  (yyval.str) = mm_strdup("standalone");
 }
-#line 63125 "preproc.c"
+#line 63118 "preproc.c"
     break;
 
   case 3187: /* bare_label_keyword: START  */
-#line 17202 "preproc.y"
+#line 17195 "preproc.y"
  { 
  (yyval.str) = mm_strdup("start");
 }
-#line 63133 "preproc.c"
+#line 63126 "preproc.c"
     break;
 
   case 3188: /* bare_label_keyword: STATEMENT  */
-#line 17206 "preproc.y"
+#line 17199 "preproc.y"
  { 
  (yyval.str) = mm_strdup("statement");
 }
-#line 63141 "preproc.c"
+#line 63134 "preproc.c"
     break;
 
   case 3189: /* bare_label_keyword: STATISTICS  */
-#line 17210 "preproc.y"
+#line 17203 "preproc.y"
  { 
  (yyval.str) = mm_strdup("statistics");
 }
-#line 63149 "preproc.c"
+#line 63142 "preproc.c"
     break;
 
   case 3190: /* bare_label_keyword: STDIN  */
-#line 17214 "preproc.y"
+#line 17207 "preproc.y"
  { 
  (yyval.str) = mm_strdup("stdin");
 }
-#line 63157 "preproc.c"
+#line 63150 "preproc.c"
     break;
 
   case 3191: /* bare_label_keyword: STDOUT  */
-#line 17218 "preproc.y"
+#line 17211 "preproc.y"
  { 
  (yyval.str) = mm_strdup("stdout");
 }
-#line 63165 "preproc.c"
+#line 63158 "preproc.c"
     break;
 
   case 3192: /* bare_label_keyword: STORAGE  */
-#line 17222 "preproc.y"
+#line 17215 "preproc.y"
  { 
  (yyval.str) = mm_strdup("storage");
 }
-#line 63173 "preproc.c"
+#line 63166 "preproc.c"
     break;
 
   case 3193: /* bare_label_keyword: STORED  */
-#line 17226 "preproc.y"
+#line 17219 "preproc.y"
  { 
  (yyval.str) = mm_strdup("stored");
 }
-#line 63181 "preproc.c"
+#line 63174 "preproc.c"
     break;
 
   case 3194: /* bare_label_keyword: STRICT_P  */
-#line 17230 "preproc.y"
+#line 17223 "preproc.y"
  { 
  (yyval.str) = mm_strdup("strict");
 }
-#line 63189 "preproc.c"
+#line 63182 "preproc.c"
     break;
 
   case 3195: /* bare_label_keyword: STRIP_P  */
-#line 17234 "preproc.y"
+#line 17227 "preproc.y"
  { 
  (yyval.str) = mm_strdup("strip");
 }
-#line 63197 "preproc.c"
+#line 63190 "preproc.c"
     break;
 
   case 3196: /* bare_label_keyword: SUBSCRIPTION  */
-#line 17238 "preproc.y"
+#line 17231 "preproc.y"
  { 
  (yyval.str) = mm_strdup("subscription");
 }
-#line 63205 "preproc.c"
+#line 63198 "preproc.c"
     break;
 
   case 3197: /* bare_label_keyword: SUBSTRING  */
-#line 17242 "preproc.y"
+#line 17235 "preproc.y"
  { 
  (yyval.str) = mm_strdup("substring");
 }
-#line 63213 "preproc.c"
+#line 63206 "preproc.c"
     break;
 
   case 3198: /* bare_label_keyword: SUPPORT  */
-#line 17246 "preproc.y"
+#line 17239 "preproc.y"
  { 
  (yyval.str) = mm_strdup("support");
 }
-#line 63221 "preproc.c"
+#line 63214 "preproc.c"
     break;
 
   case 3199: /* bare_label_keyword: SYMMETRIC  */
-#line 17250 "preproc.y"
+#line 17243 "preproc.y"
  { 
  (yyval.str) = mm_strdup("symmetric");
 }
-#line 63229 "preproc.c"
+#line 63222 "preproc.c"
     break;
 
   case 3200: /* bare_label_keyword: SYSID  */
-#line 17254 "preproc.y"
+#line 17247 "preproc.y"
  { 
  (yyval.str) = mm_strdup("sysid");
 }
-#line 63237 "preproc.c"
+#line 63230 "preproc.c"
     break;
 
   case 3201: /* bare_label_keyword: SYSTEM_P  */
-#line 17258 "preproc.y"
+#line 17251 "preproc.y"
  { 
  (yyval.str) = mm_strdup("system");
 }
-#line 63245 "preproc.c"
+#line 63238 "preproc.c"
     break;
 
   case 3202: /* bare_label_keyword: SYSTEM_USER  */
-#line 17262 "preproc.y"
+#line 17255 "preproc.y"
  { 
  (yyval.str) = mm_strdup("system_user");
 }
-#line 63253 "preproc.c"
+#line 63246 "preproc.c"
     break;
 
   case 3203: /* bare_label_keyword: TABLE  */
-#line 17266 "preproc.y"
+#line 17259 "preproc.y"
  { 
  (yyval.str) = mm_strdup("table");
 }
-#line 63261 "preproc.c"
+#line 63254 "preproc.c"
     break;
 
   case 3204: /* bare_label_keyword: TABLES  */
-#line 17270 "preproc.y"
+#line 17263 "preproc.y"
  { 
  (yyval.str) = mm_strdup("tables");
 }
-#line 63269 "preproc.c"
+#line 63262 "preproc.c"
     break;
 
   case 3205: /* bare_label_keyword: TABLESAMPLE  */
-#line 17274 "preproc.y"
+#line 17267 "preproc.y"
  { 
  (yyval.str) = mm_strdup("tablesample");
 }
-#line 63277 "preproc.c"
+#line 63270 "preproc.c"
     break;
 
   case 3206: /* bare_label_keyword: TABLESPACE  */
-#line 17278 "preproc.y"
+#line 17271 "preproc.y"
  { 
  (yyval.str) = mm_strdup("tablespace");
 }
-#line 63285 "preproc.c"
+#line 63278 "preproc.c"
     break;
 
   case 3207: /* bare_label_keyword: TEMP  */
-#line 17282 "preproc.y"
+#line 17275 "preproc.y"
  { 
  (yyval.str) = mm_strdup("temp");
 }
-#line 63293 "preproc.c"
+#line 63286 "preproc.c"
     break;
 
   case 3208: /* bare_label_keyword: TEMPLATE  */
-#line 17286 "preproc.y"
+#line 17279 "preproc.y"
  { 
  (yyval.str) = mm_strdup("template");
 }
-#line 63301 "preproc.c"
+#line 63294 "preproc.c"
     break;
 
   case 3209: /* bare_label_keyword: TEMPORARY  */
-#line 17290 "preproc.y"
+#line 17283 "preproc.y"
  { 
  (yyval.str) = mm_strdup("temporary");
 }
-#line 63309 "preproc.c"
+#line 63302 "preproc.c"
     break;
 
   case 3210: /* bare_label_keyword: TEXT_P  */
-#line 17294 "preproc.y"
+#line 17287 "preproc.y"
  { 
  (yyval.str) = mm_strdup("text");
 }
-#line 63317 "preproc.c"
+#line 63310 "preproc.c"
     break;
 
   case 3211: /* bare_label_keyword: THEN  */
-#line 17298 "preproc.y"
+#line 17291 "preproc.y"
  { 
  (yyval.str) = mm_strdup("then");
 }
-#line 63325 "preproc.c"
+#line 63318 "preproc.c"
     break;
 
   case 3212: /* bare_label_keyword: TIES  */
-#line 17302 "preproc.y"
+#line 17295 "preproc.y"
  { 
  (yyval.str) = mm_strdup("ties");
 }
-#line 63333 "preproc.c"
+#line 63326 "preproc.c"
     break;
 
   case 3213: /* bare_label_keyword: TIME  */
-#line 17306 "preproc.y"
+#line 17299 "preproc.y"
  { 
  (yyval.str) = mm_strdup("time");
 }
-#line 63341 "preproc.c"
+#line 63334 "preproc.c"
     break;
 
   case 3214: /* bare_label_keyword: TIMESTAMP  */
-#line 17310 "preproc.y"
+#line 17303 "preproc.y"
  { 
  (yyval.str) = mm_strdup("timestamp");
 }
-#line 63349 "preproc.c"
+#line 63342 "preproc.c"
     break;
 
   case 3215: /* bare_label_keyword: TRAILING  */
-#line 17314 "preproc.y"
+#line 17307 "preproc.y"
  { 
  (yyval.str) = mm_strdup("trailing");
 }
-#line 63357 "preproc.c"
+#line 63350 "preproc.c"
     break;
 
   case 3216: /* bare_label_keyword: TRANSACTION  */
-#line 17318 "preproc.y"
+#line 17311 "preproc.y"
  { 
  (yyval.str) = mm_strdup("transaction");
 }
-#line 63365 "preproc.c"
+#line 63358 "preproc.c"
     break;
 
   case 3217: /* bare_label_keyword: TRANSFORM  */
-#line 17322 "preproc.y"
+#line 17315 "preproc.y"
  { 
  (yyval.str) = mm_strdup("transform");
 }
-#line 63373 "preproc.c"
+#line 63366 "preproc.c"
     break;
 
   case 3218: /* bare_label_keyword: TREAT  */
-#line 17326 "preproc.y"
+#line 17319 "preproc.y"
  { 
  (yyval.str) = mm_strdup("treat");
 }
-#line 63381 "preproc.c"
+#line 63374 "preproc.c"
     break;
 
   case 3219: /* bare_label_keyword: TRIGGER  */
-#line 17330 "preproc.y"
+#line 17323 "preproc.y"
  { 
  (yyval.str) = mm_strdup("trigger");
 }
-#line 63389 "preproc.c"
+#line 63382 "preproc.c"
     break;
 
   case 3220: /* bare_label_keyword: TRIM  */
-#line 17334 "preproc.y"
+#line 17327 "preproc.y"
  { 
  (yyval.str) = mm_strdup("trim");
 }
-#line 63397 "preproc.c"
+#line 63390 "preproc.c"
     break;
 
   case 3221: /* bare_label_keyword: TRUE_P  */
-#line 17338 "preproc.y"
+#line 17331 "preproc.y"
  { 
  (yyval.str) = mm_strdup("true");
 }
-#line 63405 "preproc.c"
+#line 63398 "preproc.c"
     break;
 
   case 3222: /* bare_label_keyword: TRUNCATE  */
-#line 17342 "preproc.y"
+#line 17335 "preproc.y"
  { 
  (yyval.str) = mm_strdup("truncate");
 }
-#line 63413 "preproc.c"
+#line 63406 "preproc.c"
     break;
 
   case 3223: /* bare_label_keyword: TRUSTED  */
-#line 17346 "preproc.y"
+#line 17339 "preproc.y"
  { 
  (yyval.str) = mm_strdup("trusted");
 }
-#line 63421 "preproc.c"
+#line 63414 "preproc.c"
     break;
 
   case 3224: /* bare_label_keyword: TYPE_P  */
-#line 17350 "preproc.y"
+#line 17343 "preproc.y"
  { 
  (yyval.str) = mm_strdup("type");
 }
-#line 63429 "preproc.c"
+#line 63422 "preproc.c"
     break;
 
   case 3225: /* bare_label_keyword: TYPES_P  */
-#line 17354 "preproc.y"
+#line 17347 "preproc.y"
  { 
  (yyval.str) = mm_strdup("types");
 }
-#line 63437 "preproc.c"
+#line 63430 "preproc.c"
     break;
 
   case 3226: /* bare_label_keyword: UESCAPE  */
-#line 17358 "preproc.y"
+#line 17351 "preproc.y"
  { 
  (yyval.str) = mm_strdup("uescape");
 }
-#line 63445 "preproc.c"
+#line 63438 "preproc.c"
     break;
 
   case 3227: /* bare_label_keyword: UNBOUNDED  */
-#line 17362 "preproc.y"
+#line 17355 "preproc.y"
  { 
  (yyval.str) = mm_strdup("unbounded");
 }
-#line 63453 "preproc.c"
+#line 63446 "preproc.c"
     break;
 
   case 3228: /* bare_label_keyword: UNCOMMITTED  */
-#line 17366 "preproc.y"
+#line 17359 "preproc.y"
  { 
  (yyval.str) = mm_strdup("uncommitted");
 }
-#line 63461 "preproc.c"
+#line 63454 "preproc.c"
     break;
 
   case 3229: /* bare_label_keyword: UNENCRYPTED  */
-#line 17370 "preproc.y"
+#line 17363 "preproc.y"
  { 
  (yyval.str) = mm_strdup("unencrypted");
 }
-#line 63469 "preproc.c"
+#line 63462 "preproc.c"
     break;
 
   case 3230: /* bare_label_keyword: UNIQUE  */
-#line 17374 "preproc.y"
+#line 17367 "preproc.y"
  { 
  (yyval.str) = mm_strdup("unique");
 }
-#line 63477 "preproc.c"
+#line 63470 "preproc.c"
     break;
 
   case 3231: /* bare_label_keyword: UNKNOWN  */
-#line 17378 "preproc.y"
+#line 17371 "preproc.y"
  { 
  (yyval.str) = mm_strdup("unknown");
 }
-#line 63485 "preproc.c"
+#line 63478 "preproc.c"
     break;
 
   case 3232: /* bare_label_keyword: UNLISTEN  */
-#line 17382 "preproc.y"
+#line 17375 "preproc.y"
  { 
  (yyval.str) = mm_strdup("unlisten");
 }
-#line 63493 "preproc.c"
+#line 63486 "preproc.c"
     break;
 
   case 3233: /* bare_label_keyword: UNLOGGED  */
-#line 17386 "preproc.y"
+#line 17379 "preproc.y"
  { 
  (yyval.str) = mm_strdup("unlogged");
 }
-#line 63501 "preproc.c"
+#line 63494 "preproc.c"
     break;
 
   case 3234: /* bare_label_keyword: UNTIL  */
-#line 17390 "preproc.y"
+#line 17383 "preproc.y"
  { 
  (yyval.str) = mm_strdup("until");
 }
-#line 63509 "preproc.c"
+#line 63502 "preproc.c"
     break;
 
   case 3235: /* bare_label_keyword: UPDATE  */
-#line 17394 "preproc.y"
+#line 17387 "preproc.y"
  { 
  (yyval.str) = mm_strdup("update");
 }
-#line 63517 "preproc.c"
+#line 63510 "preproc.c"
     break;
 
   case 3236: /* bare_label_keyword: USER  */
-#line 17398 "preproc.y"
+#line 17391 "preproc.y"
  { 
  (yyval.str) = mm_strdup("user");
 }
-#line 63525 "preproc.c"
+#line 63518 "preproc.c"
     break;
 
   case 3237: /* bare_label_keyword: USING  */
-#line 17402 "preproc.y"
+#line 17395 "preproc.y"
  { 
  (yyval.str) = mm_strdup("using");
 }
-#line 63533 "preproc.c"
+#line 63526 "preproc.c"
     break;
 
   case 3238: /* bare_label_keyword: VACUUM  */
-#line 17406 "preproc.y"
+#line 17399 "preproc.y"
  { 
  (yyval.str) = mm_strdup("vacuum");
 }
-#line 63541 "preproc.c"
+#line 63534 "preproc.c"
     break;
 
   case 3239: /* bare_label_keyword: VALID  */
-#line 17410 "preproc.y"
+#line 17403 "preproc.y"
  { 
  (yyval.str) = mm_strdup("valid");
 }
-#line 63549 "preproc.c"
+#line 63542 "preproc.c"
     break;
 
   case 3240: /* bare_label_keyword: VALIDATE  */
-#line 17414 "preproc.y"
+#line 17407 "preproc.y"
  { 
  (yyval.str) = mm_strdup("validate");
 }
-#line 63557 "preproc.c"
+#line 63550 "preproc.c"
     break;
 
   case 3241: /* bare_label_keyword: VALIDATOR  */
-#line 17418 "preproc.y"
+#line 17411 "preproc.y"
  { 
  (yyval.str) = mm_strdup("validator");
 }
-#line 63565 "preproc.c"
+#line 63558 "preproc.c"
     break;
 
   case 3242: /* bare_label_keyword: VALUE_P  */
-#line 17422 "preproc.y"
+#line 17415 "preproc.y"
  { 
  (yyval.str) = mm_strdup("value");
 }
-#line 63573 "preproc.c"
+#line 63566 "preproc.c"
     break;
 
   case 3243: /* bare_label_keyword: VALUES  */
-#line 17426 "preproc.y"
+#line 17419 "preproc.y"
  { 
  (yyval.str) = mm_strdup("values");
 }
-#line 63581 "preproc.c"
+#line 63574 "preproc.c"
     break;
 
   case 3244: /* bare_label_keyword: VARCHAR  */
-#line 17430 "preproc.y"
+#line 17423 "preproc.y"
  { 
  (yyval.str) = mm_strdup("varchar");
 }
-#line 63589 "preproc.c"
+#line 63582 "preproc.c"
     break;
 
   case 3245: /* bare_label_keyword: VARIADIC  */
-#line 17434 "preproc.y"
+#line 17427 "preproc.y"
  { 
  (yyval.str) = mm_strdup("variadic");
 }
-#line 63597 "preproc.c"
+#line 63590 "preproc.c"
     break;
 
   case 3246: /* bare_label_keyword: VERBOSE  */
-#line 17438 "preproc.y"
+#line 17431 "preproc.y"
  { 
  (yyval.str) = mm_strdup("verbose");
 }
-#line 63605 "preproc.c"
+#line 63598 "preproc.c"
     break;
 
   case 3247: /* bare_label_keyword: VERSION_P  */
-#line 17442 "preproc.y"
+#line 17435 "preproc.y"
  { 
  (yyval.str) = mm_strdup("version");
 }
-#line 63613 "preproc.c"
+#line 63606 "preproc.c"
     break;
 
   case 3248: /* bare_label_keyword: VIEW  */
-#line 17446 "preproc.y"
+#line 17439 "preproc.y"
  { 
  (yyval.str) = mm_strdup("view");
 }
-#line 63621 "preproc.c"
+#line 63614 "preproc.c"
     break;
 
   case 3249: /* bare_label_keyword: VIEWS  */
-#line 17450 "preproc.y"
+#line 17443 "preproc.y"
  { 
  (yyval.str) = mm_strdup("views");
 }
-#line 63629 "preproc.c"
+#line 63622 "preproc.c"
     break;
 
   case 3250: /* bare_label_keyword: VOLATILE  */
-#line 17454 "preproc.y"
+#line 17447 "preproc.y"
  { 
  (yyval.str) = mm_strdup("volatile");
 }
-#line 63637 "preproc.c"
+#line 63630 "preproc.c"
     break;
 
   case 3251: /* bare_label_keyword: WHEN  */
-#line 17458 "preproc.y"
+#line 17451 "preproc.y"
  { 
  (yyval.str) = mm_strdup("when");
 }
-#line 63645 "preproc.c"
+#line 63638 "preproc.c"
     break;
 
   case 3252: /* bare_label_keyword: WHITESPACE_P  */
-#line 17462 "preproc.y"
+#line 17455 "preproc.y"
  { 
  (yyval.str) = mm_strdup("whitespace");
 }
-#line 63653 "preproc.c"
+#line 63646 "preproc.c"
     break;
 
   case 3253: /* bare_label_keyword: WORK  */
-#line 17466 "preproc.y"
+#line 17459 "preproc.y"
  { 
  (yyval.str) = mm_strdup("work");
 }
-#line 63661 "preproc.c"
+#line 63654 "preproc.c"
     break;
 
   case 3254: /* bare_label_keyword: WRAPPER  */
-#line 17470 "preproc.y"
+#line 17463 "preproc.y"
  { 
  (yyval.str) = mm_strdup("wrapper");
 }
-#line 63669 "preproc.c"
+#line 63662 "preproc.c"
     break;
 
   case 3255: /* bare_label_keyword: WRITE  */
-#line 17474 "preproc.y"
+#line 17467 "preproc.y"
  { 
  (yyval.str) = mm_strdup("write");
 }
-#line 63677 "preproc.c"
+#line 63670 "preproc.c"
     break;
 
   case 3256: /* bare_label_keyword: XML_P  */
-#line 17478 "preproc.y"
+#line 17471 "preproc.y"
  { 
  (yyval.str) = mm_strdup("xml");
 }
-#line 63685 "preproc.c"
+#line 63678 "preproc.c"
     break;
 
   case 3257: /* bare_label_keyword: XMLATTRIBUTES  */
-#line 17482 "preproc.y"
+#line 17475 "preproc.y"
  { 
  (yyval.str) = mm_strdup("xmlattributes");
 }
-#line 63693 "preproc.c"
+#line 63686 "preproc.c"
     break;
 
   case 3258: /* bare_label_keyword: XMLCONCAT  */
-#line 17486 "preproc.y"
+#line 17479 "preproc.y"
  { 
  (yyval.str) = mm_strdup("xmlconcat");
 }
-#line 63701 "preproc.c"
+#line 63694 "preproc.c"
     break;
 
   case 3259: /* bare_label_keyword: XMLELEMENT  */
-#line 17490 "preproc.y"
+#line 17483 "preproc.y"
  { 
  (yyval.str) = mm_strdup("xmlelement");
 }
-#line 63709 "preproc.c"
+#line 63702 "preproc.c"
     break;
 
   case 3260: /* bare_label_keyword: XMLEXISTS  */
-#line 17494 "preproc.y"
+#line 17487 "preproc.y"
  { 
  (yyval.str) = mm_strdup("xmlexists");
 }
-#line 63717 "preproc.c"
+#line 63710 "preproc.c"
     break;
 
   case 3261: /* bare_label_keyword: XMLFOREST  */
-#line 17498 "preproc.y"
+#line 17491 "preproc.y"
  { 
  (yyval.str) = mm_strdup("xmlforest");
 }
-#line 63725 "preproc.c"
+#line 63718 "preproc.c"
     break;
 
   case 3262: /* bare_label_keyword: XMLNAMESPACES  */
-#line 17502 "preproc.y"
+#line 17495 "preproc.y"
  { 
  (yyval.str) = mm_strdup("xmlnamespaces");
 }
-#line 63733 "preproc.c"
+#line 63726 "preproc.c"
     break;
 
   case 3263: /* bare_label_keyword: XMLPARSE  */
-#line 17506 "preproc.y"
+#line 17499 "preproc.y"
  { 
  (yyval.str) = mm_strdup("xmlparse");
 }
-#line 63741 "preproc.c"
+#line 63734 "preproc.c"
     break;
 
   case 3264: /* bare_label_keyword: XMLPI  */
-#line 17510 "preproc.y"
+#line 17503 "preproc.y"
  { 
  (yyval.str) = mm_strdup("xmlpi");
 }
-#line 63749 "preproc.c"
+#line 63742 "preproc.c"
     break;
 
   case 3265: /* bare_label_keyword: XMLROOT  */
-#line 17514 "preproc.y"
+#line 17507 "preproc.y"
  { 
  (yyval.str) = mm_strdup("xmlroot");
 }
-#line 63757 "preproc.c"
+#line 63750 "preproc.c"
     break;
 
   case 3266: /* bare_label_keyword: XMLSERIALIZE  */
-#line 17518 "preproc.y"
+#line 17511 "preproc.y"
  { 
  (yyval.str) = mm_strdup("xmlserialize");
 }
-#line 63765 "preproc.c"
+#line 63758 "preproc.c"
     break;
 
   case 3267: /* bare_label_keyword: XMLTABLE  */
-#line 17522 "preproc.y"
+#line 17515 "preproc.y"
  { 
  (yyval.str) = mm_strdup("xmltable");
 }
-#line 63773 "preproc.c"
+#line 63766 "preproc.c"
     break;
 
   case 3268: /* bare_label_keyword: YES_P  */
-#line 17526 "preproc.y"
+#line 17519 "preproc.y"
  { 
  (yyval.str) = mm_strdup("yes");
 }
-#line 63781 "preproc.c"
+#line 63774 "preproc.c"
     break;
 
   case 3269: /* bare_label_keyword: ZONE  */
-#line 17530 "preproc.y"
+#line 17523 "preproc.y"
  { 
  (yyval.str) = mm_strdup("zone");
 }
-#line 63789 "preproc.c"
+#line 63782 "preproc.c"
     break;
 
   case 3272: /* statement: ecpgstart at toplevel_stmt ';'  */
-#line 17544 "preproc.y"
+#line 17537 "preproc.y"
                                 {
 					if (connection)
 						free(connection);
 					connection = NULL;
 				}
-#line 63799 "preproc.c"
+#line 63792 "preproc.c"
     break;
 
   case 3273: /* statement: ecpgstart toplevel_stmt ';'  */
-#line 17550 "preproc.y"
+#line 17543 "preproc.y"
                                 {
 					if (connection)
 						free(connection);
 					connection = NULL;
 				}
-#line 63809 "preproc.c"
+#line 63802 "preproc.c"
     break;
 
   case 3274: /* statement: ecpgstart ECPGVarDeclaration  */
-#line 17556 "preproc.y"
+#line 17549 "preproc.y"
                                 {
 					fprintf(base_yyout, "%s", (yyvsp[0].str));
 					free((yyvsp[0].str));
 					output_line_number();
 				}
-#line 63819 "preproc.c"
+#line 63812 "preproc.c"
     break;
 
   case 3276: /* statement: c_thing  */
-#line 17562 "preproc.y"
+#line 17555 "preproc.y"
                                                         { fprintf(base_yyout, "%s", (yyvsp[0].str)); free((yyvsp[0].str)); }
-#line 63825 "preproc.c"
+#line 63818 "preproc.c"
     break;
 
   case 3277: /* statement: CPP_LINE  */
-#line 17563 "preproc.y"
+#line 17556 "preproc.y"
                                                         { fprintf(base_yyout, "%s", (yyvsp[0].str)); free((yyvsp[0].str)); }
-#line 63831 "preproc.c"
+#line 63824 "preproc.c"
     break;
 
   case 3278: /* statement: '{'  */
-#line 17564 "preproc.y"
+#line 17557 "preproc.y"
                                                         { braces_open++; fputs("{", base_yyout); }
-#line 63837 "preproc.c"
+#line 63830 "preproc.c"
     break;
 
   case 3279: /* statement: '}'  */
-#line 17566 "preproc.y"
+#line 17559 "preproc.y"
                 {
 			remove_typedefs(braces_open);
 			remove_variables(braces_open--);
@@ -63848,45 +63841,45 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			}
 			fputs("}", base_yyout);
 		}
-#line 63852 "preproc.c"
+#line 63845 "preproc.c"
     break;
 
   case 3280: /* $@1: %empty  */
-#line 17578 "preproc.y"
+#line 17571 "preproc.y"
                                                        {FoundInto = 0;}
-#line 63858 "preproc.c"
+#line 63851 "preproc.c"
     break;
 
   case 3281: /* CreateAsStmt: CREATE OptTemp TABLE create_as_target AS $@1 SelectStmt opt_with_data  */
-#line 17579 "preproc.y"
+#line 17572 "preproc.y"
                 {
 			if (FoundInto == 1)
 				mmerror(PARSE_ERROR, ET_ERROR, "CREATE TABLE AS cannot specify INTO");
 
 			(yyval.str) = cat_str(7, mm_strdup("create"), (yyvsp[-6].str), mm_strdup("table"), (yyvsp[-4].str), mm_strdup("as"), (yyvsp[-1].str), (yyvsp[0].str));
 		}
-#line 63869 "preproc.c"
+#line 63862 "preproc.c"
     break;
 
   case 3282: /* $@2: %empty  */
-#line 17585 "preproc.y"
+#line 17578 "preproc.y"
                                                                             {FoundInto = 0;}
-#line 63875 "preproc.c"
+#line 63868 "preproc.c"
     break;
 
   case 3283: /* CreateAsStmt: CREATE OptTemp TABLE IF_P NOT EXISTS create_as_target AS $@2 SelectStmt opt_with_data  */
-#line 17586 "preproc.y"
+#line 17579 "preproc.y"
                 {
 			if (FoundInto == 1)
 				mmerror(PARSE_ERROR, ET_ERROR, "CREATE TABLE AS cannot specify INTO");
 
 			(yyval.str) = cat_str(7, mm_strdup("create"), (yyvsp[-9].str), mm_strdup("table if not exists"), (yyvsp[-4].str), mm_strdup("as"), (yyvsp[-1].str), (yyvsp[0].str));
 		}
-#line 63886 "preproc.c"
+#line 63879 "preproc.c"
     break;
 
   case 3284: /* at: AT connection_object  */
-#line 17595 "preproc.y"
+#line 17588 "preproc.y"
                 {
 			connection = (yyvsp[0].str);
 			/*
@@ -63896,35 +63889,35 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			if (argsinsert != NULL)
 				argsinsert = NULL;
 		}
-#line 63900 "preproc.c"
+#line 63893 "preproc.c"
     break;
 
   case 3285: /* ECPGConnect: SQL_CONNECT TO connection_target opt_connection_name opt_user  */
-#line 17610 "preproc.y"
+#line 17603 "preproc.y"
                         { (yyval.str) = cat_str(5, (yyvsp[-2].str), mm_strdup(","), (yyvsp[0].str), mm_strdup(","), (yyvsp[-1].str)); }
-#line 63906 "preproc.c"
+#line 63899 "preproc.c"
     break;
 
   case 3286: /* ECPGConnect: SQL_CONNECT TO DEFAULT  */
-#line 17612 "preproc.y"
+#line 17605 "preproc.y"
                         { (yyval.str) = mm_strdup("NULL, NULL, NULL, \"DEFAULT\""); }
-#line 63912 "preproc.c"
+#line 63905 "preproc.c"
     break;
 
   case 3287: /* ECPGConnect: SQL_CONNECT ora_user  */
-#line 17615 "preproc.y"
+#line 17608 "preproc.y"
                         { (yyval.str) = cat_str(3, mm_strdup("NULL,"), (yyvsp[0].str), mm_strdup(", NULL")); }
-#line 63918 "preproc.c"
+#line 63911 "preproc.c"
     break;
 
   case 3288: /* ECPGConnect: DATABASE connection_target  */
-#line 17617 "preproc.y"
+#line 17610 "preproc.y"
                         { (yyval.str) = cat2_str((yyvsp[0].str), mm_strdup(", NULL, NULL, NULL")); }
-#line 63924 "preproc.c"
+#line 63917 "preproc.c"
     break;
 
   case 3289: /* connection_target: opt_database_name opt_server opt_port  */
-#line 17621 "preproc.y"
+#line 17614 "preproc.y"
                 {
 			/* old style: dbname[@server][:port] */
 			if (strlen((yyvsp[-1].str)) > 0 && *((yyvsp[-1].str)) != '@')
@@ -63936,11 +63929,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			else
 				(yyval.str) = make3_str(mm_strdup("\""), make3_str((yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)), mm_strdup("\""));
 		}
-#line 63940 "preproc.c"
+#line 63933 "preproc.c"
     break;
 
   case 3290: /* connection_target: db_prefix ':' server opt_port '/' opt_database_name opt_options  */
-#line 17633 "preproc.y"
+#line 17626 "preproc.y"
                 {
 			/* new style: <tcp|unix>:postgresql://server[:port][/dbname] */
 			if (strncmp((yyvsp[-6].str), "unix:postgresql", strlen("unix:postgresql")) != 0 && strncmp((yyvsp[-6].str), "tcp:postgresql", strlen("tcp:postgresql")) != 0)
@@ -63956,19 +63949,19 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
 			(yyval.str) = make3_str(make3_str(mm_strdup("\""), (yyvsp[-6].str), mm_strdup(":")), (yyvsp[-4].str), make3_str(make3_str((yyvsp[-3].str), mm_strdup("/"), (yyvsp[-1].str)), (yyvsp[0].str), mm_strdup("\"")));
 		}
-#line 63960 "preproc.c"
+#line 63953 "preproc.c"
     break;
 
   case 3291: /* connection_target: char_variable  */
-#line 17649 "preproc.y"
+#line 17642 "preproc.y"
                 {
 			(yyval.str) = (yyvsp[0].str);
 		}
-#line 63968 "preproc.c"
+#line 63961 "preproc.c"
     break;
 
   case 3292: /* connection_target: ecpg_sconst  */
-#line 17653 "preproc.y"
+#line 17646 "preproc.y"
                 {
 			/* We can only process double quoted strings not single quotes ones,
 			 * so we change the quotes.
@@ -63977,23 +63970,23 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			(yyvsp[0].str)[strlen((yyvsp[0].str))-1] = '\"';
 			(yyval.str) = (yyvsp[0].str);
 		}
-#line 63981 "preproc.c"
+#line 63974 "preproc.c"
     break;
 
   case 3293: /* opt_database_name: name  */
-#line 17663 "preproc.y"
+#line 17656 "preproc.y"
                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 63987 "preproc.c"
+#line 63980 "preproc.c"
     break;
 
   case 3294: /* opt_database_name: %empty  */
-#line 17664 "preproc.y"
+#line 17657 "preproc.y"
                                                 { (yyval.str) = EMPTY; }
-#line 63993 "preproc.c"
+#line 63986 "preproc.c"
     break;
 
   case 3295: /* db_prefix: ecpg_ident cvariable  */
-#line 17668 "preproc.y"
+#line 17661 "preproc.y"
                 {
 			if (strcmp((yyvsp[0].str), "postgresql") != 0 && strcmp((yyvsp[0].str), "postgres") != 0)
 				mmerror(PARSE_ERROR, ET_ERROR, "expected \"postgresql\", found \"%s\"", (yyvsp[0].str));
@@ -64003,134 +63996,134 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
 			(yyval.str) = make3_str((yyvsp[-1].str), mm_strdup(":"), (yyvsp[0].str));
 		}
-#line 64007 "preproc.c"
+#line 64000 "preproc.c"
     break;
 
   case 3296: /* server: Op server_name  */
-#line 17680 "preproc.y"
+#line 17673 "preproc.y"
                 {
 			if (strcmp((yyvsp[-1].str), "@") != 0 && strcmp((yyvsp[-1].str), "//") != 0)
 				mmerror(PARSE_ERROR, ET_ERROR, "expected \"@\" or \"://\", found \"%s\"", (yyvsp[-1].str));
 
 			(yyval.str) = make2_str((yyvsp[-1].str), (yyvsp[0].str));
 		}
-#line 64018 "preproc.c"
+#line 64011 "preproc.c"
     break;
 
   case 3297: /* opt_server: server  */
-#line 17688 "preproc.y"
+#line 17681 "preproc.y"
                                         { (yyval.str) = (yyvsp[0].str); }
-#line 64024 "preproc.c"
+#line 64017 "preproc.c"
     break;
 
   case 3298: /* opt_server: %empty  */
-#line 17689 "preproc.y"
+#line 17682 "preproc.y"
                                                 { (yyval.str) = EMPTY; }
-#line 64030 "preproc.c"
+#line 64023 "preproc.c"
     break;
 
   case 3299: /* server_name: ColId  */
-#line 17692 "preproc.y"
+#line 17685 "preproc.y"
                                                         { (yyval.str) = (yyvsp[0].str); }
-#line 64036 "preproc.c"
+#line 64029 "preproc.c"
     break;
 
   case 3300: /* server_name: ColId '.' server_name  */
-#line 17693 "preproc.y"
+#line 17686 "preproc.y"
                                                 { (yyval.str) = make3_str((yyvsp[-2].str), mm_strdup("."), (yyvsp[0].str)); }
-#line 64042 "preproc.c"
+#line 64035 "preproc.c"
     break;
 
   case 3301: /* server_name: IP  */
-#line 17694 "preproc.y"
+#line 17687 "preproc.y"
                                                                 { (yyval.str) = make_name(); }
-#line 64048 "preproc.c"
+#line 64041 "preproc.c"
     break;
 
   case 3302: /* opt_port: ':' Iconst  */
-#line 17697 "preproc.y"
+#line 17690 "preproc.y"
                                 { (yyval.str) = make2_str(mm_strdup(":"), (yyvsp[0].str)); }
-#line 64054 "preproc.c"
+#line 64047 "preproc.c"
     break;
 
   case 3303: /* opt_port: %empty  */
-#line 17698 "preproc.y"
+#line 17691 "preproc.y"
                                 { (yyval.str) = EMPTY; }
-#line 64060 "preproc.c"
+#line 64053 "preproc.c"
     break;
 
   case 3304: /* opt_connection_name: AS connection_object  */
-#line 17701 "preproc.y"
+#line 17694 "preproc.y"
                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 64066 "preproc.c"
+#line 64059 "preproc.c"
     break;
 
   case 3305: /* opt_connection_name: %empty  */
-#line 17702 "preproc.y"
+#line 17695 "preproc.y"
                                                 { (yyval.str) = mm_strdup("NULL"); }
-#line 64072 "preproc.c"
+#line 64065 "preproc.c"
     break;
 
   case 3306: /* opt_user: USER ora_user  */
-#line 17705 "preproc.y"
+#line 17698 "preproc.y"
                                 { (yyval.str) = (yyvsp[0].str); }
-#line 64078 "preproc.c"
+#line 64071 "preproc.c"
     break;
 
   case 3307: /* opt_user: %empty  */
-#line 17706 "preproc.y"
+#line 17699 "preproc.y"
                                                 { (yyval.str) = mm_strdup("NULL, NULL"); }
-#line 64084 "preproc.c"
+#line 64077 "preproc.c"
     break;
 
   case 3308: /* ora_user: user_name  */
-#line 17710 "preproc.y"
+#line 17703 "preproc.y"
                         { (yyval.str) = cat2_str((yyvsp[0].str), mm_strdup(", NULL")); }
-#line 64090 "preproc.c"
+#line 64083 "preproc.c"
     break;
 
   case 3309: /* ora_user: user_name '/' user_name  */
-#line 17712 "preproc.y"
+#line 17705 "preproc.y"
                         { (yyval.str) = cat_str(3, (yyvsp[-2].str), mm_strdup(","), (yyvsp[0].str)); }
-#line 64096 "preproc.c"
+#line 64089 "preproc.c"
     break;
 
   case 3310: /* ora_user: user_name SQL_IDENTIFIED BY user_name  */
-#line 17714 "preproc.y"
+#line 17707 "preproc.y"
                         { (yyval.str) = cat_str(3, (yyvsp[-3].str), mm_strdup(","), (yyvsp[0].str)); }
-#line 64102 "preproc.c"
+#line 64095 "preproc.c"
     break;
 
   case 3311: /* ora_user: user_name USING user_name  */
-#line 17716 "preproc.y"
+#line 17709 "preproc.y"
                         { (yyval.str) = cat_str(3, (yyvsp[-2].str), mm_strdup(","), (yyvsp[0].str)); }
-#line 64108 "preproc.c"
+#line 64101 "preproc.c"
     break;
 
   case 3312: /* user_name: RoleId  */
-#line 17720 "preproc.y"
+#line 17713 "preproc.y"
                 {
 			if ((yyvsp[0].str)[0] == '\"')
 				(yyval.str) = (yyvsp[0].str);
 			else
 				(yyval.str) = make3_str(mm_strdup("\""), (yyvsp[0].str), mm_strdup("\""));
 		}
-#line 64119 "preproc.c"
+#line 64112 "preproc.c"
     break;
 
   case 3313: /* user_name: ecpg_sconst  */
-#line 17727 "preproc.y"
+#line 17720 "preproc.y"
                 {
 			if ((yyvsp[0].str)[0] == '\"')
 				(yyval.str) = (yyvsp[0].str);
 			else
 				(yyval.str) = make3_str(mm_strdup("\""), (yyvsp[0].str), mm_strdup("\""));
 		}
-#line 64130 "preproc.c"
+#line 64123 "preproc.c"
     break;
 
   case 3314: /* user_name: civar  */
-#line 17734 "preproc.y"
+#line 17727 "preproc.y"
                 {
 			enum ECPGttype type = argsinsert->variable->type->type;
 
@@ -64144,11 +64137,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			else
 				(yyval.str) = mm_strdup(argsinsert->variable->name);
 		}
-#line 64148 "preproc.c"
+#line 64141 "preproc.c"
     break;
 
   case 3315: /* char_variable: cvariable  */
-#line 17750 "preproc.y"
+#line 17743 "preproc.y"
                 {
 			/* check if we have a string variable */
 			struct variable *p = find_variable((yyvsp[0].str));
@@ -64180,11 +64173,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 				}
 			}
 		}
-#line 64184 "preproc.c"
+#line 64177 "preproc.c"
     break;
 
   case 3316: /* opt_options: Op connect_options  */
-#line 17784 "preproc.y"
+#line 17777 "preproc.y"
                 {
 			if (strlen((yyvsp[-1].str)) == 0)
 				mmerror(PARSE_ERROR, ET_ERROR, "incomplete statement");
@@ -64194,25 +64187,25 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
 			(yyval.str) = make2_str(mm_strdup("?"), (yyvsp[0].str));
 		}
-#line 64198 "preproc.c"
+#line 64191 "preproc.c"
     break;
 
   case 3317: /* opt_options: %empty  */
-#line 17793 "preproc.y"
+#line 17786 "preproc.y"
                                 { (yyval.str) = EMPTY; }
-#line 64204 "preproc.c"
+#line 64197 "preproc.c"
     break;
 
   case 3318: /* connect_options: ColId opt_opt_value  */
-#line 17797 "preproc.y"
+#line 17790 "preproc.y"
                         {
 				(yyval.str) = make2_str((yyvsp[-1].str), (yyvsp[0].str));
 			}
-#line 64212 "preproc.c"
+#line 64205 "preproc.c"
     break;
 
   case 3319: /* connect_options: ColId opt_opt_value Op connect_options  */
-#line 17801 "preproc.y"
+#line 17794 "preproc.y"
                         {
 				if (strlen((yyvsp[-1].str)) == 0)
 					mmerror(PARSE_ERROR, ET_ERROR, "incomplete statement");
@@ -64222,35 +64215,35 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
 				(yyval.str) = cat_str(3, make2_str((yyvsp[-3].str), (yyvsp[-2].str)), (yyvsp[-1].str), (yyvsp[0].str));
 			}
-#line 64226 "preproc.c"
+#line 64219 "preproc.c"
     break;
 
   case 3320: /* opt_opt_value: %empty  */
-#line 17813 "preproc.y"
+#line 17806 "preproc.y"
                         { (yyval.str) = EMPTY; }
-#line 64232 "preproc.c"
+#line 64225 "preproc.c"
     break;
 
   case 3321: /* opt_opt_value: '=' Iconst  */
-#line 17815 "preproc.y"
+#line 17808 "preproc.y"
                         { (yyval.str) = make2_str(mm_strdup("="), (yyvsp[0].str)); }
-#line 64238 "preproc.c"
+#line 64231 "preproc.c"
     break;
 
   case 3322: /* opt_opt_value: '=' ecpg_ident  */
-#line 17817 "preproc.y"
+#line 17810 "preproc.y"
                         { (yyval.str) = make2_str(mm_strdup("="), (yyvsp[0].str)); }
-#line 64244 "preproc.c"
+#line 64237 "preproc.c"
     break;
 
   case 3323: /* opt_opt_value: '=' civar  */
-#line 17819 "preproc.y"
+#line 17812 "preproc.y"
                         { (yyval.str) = make2_str(mm_strdup("="), (yyvsp[0].str)); }
-#line 64250 "preproc.c"
+#line 64243 "preproc.c"
     break;
 
   case 3324: /* prepared_name: name  */
-#line 17823 "preproc.y"
+#line 17816 "preproc.y"
                 {
 			if ((yyvsp[0].str)[0] == '\"' && (yyvsp[0].str)[strlen((yyvsp[0].str))-1] == '\"') /* already quoted? */
 				(yyval.str) = (yyvsp[0].str);
@@ -64264,17 +64257,17 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 				(yyval.str) = make3_str(mm_strdup("\""), (yyvsp[0].str), mm_strdup("\""));
 			}
 		}
-#line 64268 "preproc.c"
+#line 64261 "preproc.c"
     break;
 
   case 3325: /* prepared_name: char_variable  */
-#line 17836 "preproc.y"
+#line 17829 "preproc.y"
                                 { (yyval.str) = (yyvsp[0].str); }
-#line 64274 "preproc.c"
+#line 64267 "preproc.c"
     break;
 
   case 3326: /* ECPGDeclareStmt: DECLARE prepared_name STATEMENT  */
-#line 17843 "preproc.y"
+#line 17836 "preproc.y"
                 {
 			struct declared_list *ptr = NULL;
 			/* Check whether the declared name has been defined or not */
@@ -64305,11 +64298,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
 			(yyval.str) = cat_str(3 , mm_strdup("/* declare "), mm_strdup((yyvsp[-1].str)), mm_strdup(" as an SQL identifier */"));
 		}
-#line 64309 "preproc.c"
+#line 64302 "preproc.c"
     break;
 
   case 3327: /* ECPGCursorStmt: DECLARE cursor_name cursor_options CURSOR opt_hold FOR prepared_name  */
-#line 17880 "preproc.y"
+#line 17873 "preproc.y"
                 {
 			struct cursor *ptr, *this;
 			char *cursor_marker = (yyvsp[-5].str)[0] == ':' ? mm_strdup("$0") : mm_strdup((yyvsp[-5].str));
@@ -64369,167 +64362,167 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			(yyval.str) = cat_str(2, adjust_outofscope_cursor_vars(this),
 					comment);
 		}
-#line 64373 "preproc.c"
+#line 64366 "preproc.c"
     break;
 
   case 3328: /* ECPGExecuteImmediateStmt: EXECUTE IMMEDIATE execstring  */
-#line 17942 "preproc.y"
+#line 17935 "preproc.y"
                         {
 			  /* execute immediate means prepare the statement and
 			   * immediately execute it */
 			  (yyval.str) = (yyvsp[0].str);
 			}
-#line 64383 "preproc.c"
+#line 64376 "preproc.c"
     break;
 
   case 3330: /* single_vt_declaration: type_declaration  */
-#line 17952 "preproc.y"
+#line 17945 "preproc.y"
                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 64389 "preproc.c"
+#line 64382 "preproc.c"
     break;
 
   case 3331: /* single_vt_declaration: var_declaration  */
-#line 17953 "preproc.y"
+#line 17946 "preproc.y"
                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 64395 "preproc.c"
+#line 64388 "preproc.c"
     break;
 
   case 3332: /* precision: NumericOnly  */
-#line 17956 "preproc.y"
+#line 17949 "preproc.y"
                                 { (yyval.str) = (yyvsp[0].str); }
-#line 64401 "preproc.c"
+#line 64394 "preproc.c"
     break;
 
   case 3333: /* opt_scale: ',' NumericOnly  */
-#line 17958 "preproc.y"
+#line 17951 "preproc.y"
                                 { (yyval.str) = (yyvsp[0].str); }
-#line 64407 "preproc.c"
+#line 64400 "preproc.c"
     break;
 
   case 3334: /* opt_scale: %empty  */
-#line 17959 "preproc.y"
+#line 17952 "preproc.y"
                                 { (yyval.str) = EMPTY; }
-#line 64413 "preproc.c"
+#line 64406 "preproc.c"
     break;
 
   case 3335: /* ecpg_interval: opt_interval  */
-#line 17962 "preproc.y"
+#line 17955 "preproc.y"
                                 { (yyval.str) = (yyvsp[0].str); }
-#line 64419 "preproc.c"
+#line 64412 "preproc.c"
     break;
 
   case 3336: /* ecpg_interval: YEAR_P TO MINUTE_P  */
-#line 17963 "preproc.y"
+#line 17956 "preproc.y"
                                         { (yyval.str) = mm_strdup("year to minute"); }
-#line 64425 "preproc.c"
+#line 64418 "preproc.c"
     break;
 
   case 3337: /* ecpg_interval: YEAR_P TO SECOND_P  */
-#line 17964 "preproc.y"
+#line 17957 "preproc.y"
                                         { (yyval.str) = mm_strdup("year to second"); }
-#line 64431 "preproc.c"
+#line 64424 "preproc.c"
     break;
 
   case 3338: /* ecpg_interval: DAY_P TO DAY_P  */
-#line 17965 "preproc.y"
+#line 17958 "preproc.y"
                                                 { (yyval.str) = mm_strdup("day to day"); }
-#line 64437 "preproc.c"
+#line 64430 "preproc.c"
     break;
 
   case 3339: /* ecpg_interval: MONTH_P TO MONTH_P  */
-#line 17966 "preproc.y"
+#line 17959 "preproc.y"
                                         { (yyval.str) = mm_strdup("month to month"); }
-#line 64443 "preproc.c"
+#line 64436 "preproc.c"
     break;
 
   case 3340: /* $@3: %empty  */
-#line 17973 "preproc.y"
+#line 17966 "preproc.y"
                 { fputs("/* exec sql begin declare section */", base_yyout); }
-#line 64449 "preproc.c"
+#line 64442 "preproc.c"
     break;
 
   case 3341: /* ECPGDeclaration: sql_startdeclare $@3 var_type_declarations sql_enddeclare  */
-#line 17975 "preproc.y"
+#line 17968 "preproc.y"
                 {
 			fprintf(base_yyout, "%s/* exec sql end declare section */", (yyvsp[-1].str));
 			free((yyvsp[-1].str));
 			output_line_number();
 		}
-#line 64459 "preproc.c"
+#line 64452 "preproc.c"
     break;
 
   case 3342: /* sql_startdeclare: ecpgstart BEGIN_P DECLARE SQL_SECTION ';'  */
-#line 17982 "preproc.y"
+#line 17975 "preproc.y"
                                                             {}
-#line 64465 "preproc.c"
+#line 64458 "preproc.c"
     break;
 
   case 3343: /* sql_enddeclare: ecpgstart END_P DECLARE SQL_SECTION ';'  */
-#line 17984 "preproc.y"
+#line 17977 "preproc.y"
                                                         {}
-#line 64471 "preproc.c"
+#line 64464 "preproc.c"
     break;
 
   case 3344: /* var_type_declarations: %empty  */
-#line 17986 "preproc.y"
+#line 17979 "preproc.y"
                                                         { (yyval.str) = EMPTY; }
-#line 64477 "preproc.c"
+#line 64470 "preproc.c"
     break;
 
   case 3345: /* var_type_declarations: vt_declarations  */
-#line 17987 "preproc.y"
+#line 17980 "preproc.y"
                                                         { (yyval.str) = (yyvsp[0].str); }
-#line 64483 "preproc.c"
+#line 64476 "preproc.c"
     break;
 
   case 3346: /* vt_declarations: single_vt_declaration  */
-#line 17990 "preproc.y"
+#line 17983 "preproc.y"
                                                         { (yyval.str) = (yyvsp[0].str); }
-#line 64489 "preproc.c"
+#line 64482 "preproc.c"
     break;
 
   case 3347: /* vt_declarations: CPP_LINE  */
-#line 17991 "preproc.y"
+#line 17984 "preproc.y"
                                                         { (yyval.str) = (yyvsp[0].str); }
-#line 64495 "preproc.c"
+#line 64488 "preproc.c"
     break;
 
   case 3348: /* vt_declarations: vt_declarations single_vt_declaration  */
-#line 17992 "preproc.y"
+#line 17985 "preproc.y"
                                                         { (yyval.str) = cat2_str((yyvsp[-1].str), (yyvsp[0].str)); }
-#line 64501 "preproc.c"
+#line 64494 "preproc.c"
     break;
 
   case 3349: /* vt_declarations: vt_declarations CPP_LINE  */
-#line 17993 "preproc.y"
+#line 17986 "preproc.y"
                                                         { (yyval.str) = cat2_str((yyvsp[-1].str), (yyvsp[0].str)); }
-#line 64507 "preproc.c"
+#line 64500 "preproc.c"
     break;
 
   case 3350: /* variable_declarations: var_declaration  */
-#line 17996 "preproc.y"
+#line 17989 "preproc.y"
                                         { (yyval.str) = (yyvsp[0].str); }
-#line 64513 "preproc.c"
+#line 64506 "preproc.c"
     break;
 
   case 3351: /* variable_declarations: variable_declarations var_declaration  */
-#line 17997 "preproc.y"
+#line 17990 "preproc.y"
                                                         { (yyval.str) = cat2_str((yyvsp[-1].str), (yyvsp[0].str)); }
-#line 64519 "preproc.c"
+#line 64512 "preproc.c"
     break;
 
   case 3352: /* $@4: %empty  */
-#line 18001 "preproc.y"
+#line 17994 "preproc.y"
         {
 		/* reset this variable so we see if there was */
 		/* an initializer specified */
 		initializer = 0;
 	}
-#line 64529 "preproc.c"
+#line 64522 "preproc.c"
     break;
 
   case 3353: /* type_declaration: S_TYPEDEF $@4 var_type opt_pointer ECPGColLabel opt_array_bounds ';'  */
-#line 18007 "preproc.y"
+#line 18000 "preproc.y"
         {
 		add_typedef((yyvsp[-2].str), (yyvsp[-1].index).index1, (yyvsp[-1].index).index2, (yyvsp[-4].type).type_enum, (yyvsp[-4].type).type_dimension, (yyvsp[-4].type).type_index, initializer, *(yyvsp[-3].str) ? 1 : 0);
 
@@ -64537,11 +64530,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 		output_line_number();
 		(yyval.str) = mm_strdup("");
 	}
-#line 64541 "preproc.c"
+#line 64534 "preproc.c"
     break;
 
   case 3354: /* $@5: %empty  */
-#line 18017 "preproc.y"
+#line 18010 "preproc.y"
                 {
 			actual_type[struct_level].type_storage = (yyvsp[-1].str);
 			actual_type[struct_level].type_enum = (yyvsp[0].type).type_enum;
@@ -64552,19 +64545,19 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
 			actual_startline[struct_level] = hashline_number();
 		}
-#line 64556 "preproc.c"
+#line 64549 "preproc.c"
     break;
 
   case 3355: /* var_declaration: storage_declaration var_type $@5 variable_list ';'  */
-#line 18028 "preproc.y"
+#line 18021 "preproc.y"
                 {
 			(yyval.str) = cat_str(5, actual_startline[struct_level], (yyvsp[-4].str), (yyvsp[-3].type).type_str, (yyvsp[-1].str), mm_strdup(";\n"));
 		}
-#line 64564 "preproc.c"
+#line 64557 "preproc.c"
     break;
 
   case 3356: /* $@6: %empty  */
-#line 18032 "preproc.y"
+#line 18025 "preproc.y"
                 {
 			actual_type[struct_level].type_storage = EMPTY;
 			actual_type[struct_level].type_enum = (yyvsp[0].type).type_enum;
@@ -64575,93 +64568,93 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
 			actual_startline[struct_level] = hashline_number();
 		}
-#line 64579 "preproc.c"
+#line 64572 "preproc.c"
     break;
 
   case 3357: /* var_declaration: var_type $@6 variable_list ';'  */
-#line 18043 "preproc.y"
+#line 18036 "preproc.y"
                 {
 			(yyval.str) = cat_str(4, actual_startline[struct_level], (yyvsp[-3].type).type_str, (yyvsp[-1].str), mm_strdup(";\n"));
 		}
-#line 64587 "preproc.c"
+#line 64580 "preproc.c"
     break;
 
   case 3358: /* var_declaration: struct_union_type_with_symbol ';'  */
-#line 18047 "preproc.y"
+#line 18040 "preproc.y"
                 {
 			(yyval.str) = cat2_str((yyvsp[-1].str), mm_strdup(";"));
 		}
-#line 64595 "preproc.c"
+#line 64588 "preproc.c"
     break;
 
   case 3359: /* opt_bit_field: ':' Iconst  */
-#line 18052 "preproc.y"
+#line 18045 "preproc.y"
                                 { (yyval.str) =cat2_str(mm_strdup(":"), (yyvsp[0].str)); }
-#line 64601 "preproc.c"
+#line 64594 "preproc.c"
     break;
 
   case 3360: /* opt_bit_field: %empty  */
-#line 18053 "preproc.y"
+#line 18046 "preproc.y"
                                 { (yyval.str) = EMPTY; }
-#line 64607 "preproc.c"
+#line 64600 "preproc.c"
     break;
 
   case 3361: /* storage_declaration: storage_clause storage_modifier  */
-#line 18057 "preproc.y"
+#line 18050 "preproc.y"
                         {(yyval.str) = cat2_str ((yyvsp[-1].str), (yyvsp[0].str)); }
-#line 64613 "preproc.c"
+#line 64606 "preproc.c"
     break;
 
   case 3362: /* storage_declaration: storage_clause  */
-#line 18058 "preproc.y"
+#line 18051 "preproc.y"
                                                 {(yyval.str) = (yyvsp[0].str); }
-#line 64619 "preproc.c"
+#line 64612 "preproc.c"
     break;
 
   case 3363: /* storage_declaration: storage_modifier  */
-#line 18059 "preproc.y"
+#line 18052 "preproc.y"
                                                 {(yyval.str) = (yyvsp[0].str); }
-#line 64625 "preproc.c"
+#line 64618 "preproc.c"
     break;
 
   case 3364: /* storage_clause: S_EXTERN  */
-#line 18062 "preproc.y"
+#line 18055 "preproc.y"
                                 { (yyval.str) = mm_strdup("extern"); }
-#line 64631 "preproc.c"
+#line 64624 "preproc.c"
     break;
 
   case 3365: /* storage_clause: S_STATIC  */
-#line 18063 "preproc.y"
+#line 18056 "preproc.y"
                                                 { (yyval.str) = mm_strdup("static"); }
-#line 64637 "preproc.c"
+#line 64630 "preproc.c"
     break;
 
   case 3366: /* storage_clause: S_REGISTER  */
-#line 18064 "preproc.y"
+#line 18057 "preproc.y"
                                         { (yyval.str) = mm_strdup("register"); }
-#line 64643 "preproc.c"
+#line 64636 "preproc.c"
     break;
 
   case 3367: /* storage_clause: S_AUTO  */
-#line 18065 "preproc.y"
+#line 18058 "preproc.y"
                                                 { (yyval.str) = mm_strdup("auto"); }
-#line 64649 "preproc.c"
+#line 64642 "preproc.c"
     break;
 
   case 3368: /* storage_modifier: S_CONST  */
-#line 18068 "preproc.y"
+#line 18061 "preproc.y"
                                 { (yyval.str) = mm_strdup("const"); }
-#line 64655 "preproc.c"
+#line 64648 "preproc.c"
     break;
 
   case 3369: /* storage_modifier: S_VOLATILE  */
-#line 18069 "preproc.y"
+#line 18062 "preproc.y"
                                         { (yyval.str) = mm_strdup("volatile"); }
-#line 64661 "preproc.c"
+#line 64654 "preproc.c"
     break;
 
   case 3370: /* var_type: simple_type  */
-#line 18073 "preproc.y"
+#line 18066 "preproc.y"
                 {
 			(yyval.type).type_enum = (yyvsp[0].type_enum);
 			(yyval.type).type_str = mm_strdup(ecpg_type_name((yyvsp[0].type_enum)));
@@ -64669,11 +64662,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			(yyval.type).type_index = mm_strdup("-1");
 			(yyval.type).type_sizeof = NULL;
 		}
-#line 64673 "preproc.c"
+#line 64666 "preproc.c"
     break;
 
   case 3371: /* var_type: struct_union_type  */
-#line 18081 "preproc.y"
+#line 18074 "preproc.y"
                 {
 			(yyval.type).type_str = (yyvsp[0].str);
 			(yyval.type).type_dimension = mm_strdup("-1");
@@ -64690,11 +64683,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 				(yyval.type).type_sizeof = NULL;
 			}
 		}
-#line 64694 "preproc.c"
+#line 64687 "preproc.c"
     break;
 
   case 3372: /* var_type: enum_type  */
-#line 18098 "preproc.y"
+#line 18091 "preproc.y"
                 {
 			(yyval.type).type_str = (yyvsp[0].str);
 			(yyval.type).type_enum = ECPGt_int;
@@ -64702,11 +64695,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			(yyval.type).type_index = mm_strdup("-1");
 			(yyval.type).type_sizeof = NULL;
 		}
-#line 64706 "preproc.c"
+#line 64699 "preproc.c"
     break;
 
   case 3373: /* var_type: NUMERIC '(' precision opt_scale ')'  */
-#line 18106 "preproc.y"
+#line 18099 "preproc.y"
                 {
 			(yyval.type).type_enum = ECPGt_numeric;
 			(yyval.type).type_str = mm_strdup("numeric");
@@ -64714,11 +64707,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			(yyval.type).type_index = mm_strdup("-1");
 			(yyval.type).type_sizeof = NULL;
 		}
-#line 64718 "preproc.c"
+#line 64711 "preproc.c"
     break;
 
   case 3374: /* var_type: DECIMAL_P '(' precision opt_scale ')'  */
-#line 18114 "preproc.y"
+#line 18107 "preproc.y"
                 {
 			(yyval.type).type_enum = ECPGt_decimal;
 			(yyval.type).type_str = mm_strdup("decimal");
@@ -64726,11 +64719,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			(yyval.type).type_index = mm_strdup("-1");
 			(yyval.type).type_sizeof = NULL;
 		}
-#line 64730 "preproc.c"
+#line 64723 "preproc.c"
     break;
 
   case 3375: /* var_type: IDENT '(' precision opt_scale ')'  */
-#line 18122 "preproc.y"
+#line 18115 "preproc.y"
                 {
 			/*
 			 * In C parsing mode, NUMERIC and DECIMAL are not keywords, so
@@ -64758,11 +64751,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			(yyval.type).type_index = mm_strdup("-1");
 			(yyval.type).type_sizeof = NULL;
 		}
-#line 64762 "preproc.c"
+#line 64755 "preproc.c"
     break;
 
   case 3376: /* var_type: VARCHAR  */
-#line 18150 "preproc.y"
+#line 18143 "preproc.y"
                 {
 			(yyval.type).type_enum = ECPGt_varchar;
 			(yyval.type).type_str = EMPTY; /*mm_strdup("varchar");*/
@@ -64770,11 +64763,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			(yyval.type).type_index = mm_strdup("-1");
 			(yyval.type).type_sizeof = NULL;
 		}
-#line 64774 "preproc.c"
+#line 64767 "preproc.c"
     break;
 
   case 3377: /* var_type: FLOAT_P  */
-#line 18158 "preproc.y"
+#line 18151 "preproc.y"
                 {
 			/* Note: DOUBLE is handled in simple_type */
 			(yyval.type).type_enum = ECPGt_float;
@@ -64783,11 +64776,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			(yyval.type).type_index = mm_strdup("-1");
 			(yyval.type).type_sizeof = NULL;
 		}
-#line 64787 "preproc.c"
+#line 64780 "preproc.c"
     break;
 
   case 3378: /* var_type: NUMERIC  */
-#line 18167 "preproc.y"
+#line 18160 "preproc.y"
                 {
 			(yyval.type).type_enum = ECPGt_numeric;
 			(yyval.type).type_str = mm_strdup("numeric");
@@ -64795,11 +64788,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			(yyval.type).type_index = mm_strdup("-1");
 			(yyval.type).type_sizeof = NULL;
 		}
-#line 64799 "preproc.c"
+#line 64792 "preproc.c"
     break;
 
   case 3379: /* var_type: DECIMAL_P  */
-#line 18175 "preproc.y"
+#line 18168 "preproc.y"
                 {
 			(yyval.type).type_enum = ECPGt_decimal;
 			(yyval.type).type_str = mm_strdup("decimal");
@@ -64807,11 +64800,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			(yyval.type).type_index = mm_strdup("-1");
 			(yyval.type).type_sizeof = NULL;
 		}
-#line 64811 "preproc.c"
+#line 64804 "preproc.c"
     break;
 
   case 3380: /* var_type: TIMESTAMP  */
-#line 18183 "preproc.y"
+#line 18176 "preproc.y"
                 {
 			(yyval.type).type_enum = ECPGt_timestamp;
 			(yyval.type).type_str = mm_strdup("timestamp");
@@ -64819,11 +64812,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			(yyval.type).type_index = mm_strdup("-1");
 			(yyval.type).type_sizeof = NULL;
 		}
-#line 64823 "preproc.c"
+#line 64816 "preproc.c"
     break;
 
   case 3381: /* var_type: INTERVAL ecpg_interval  */
-#line 18191 "preproc.y"
+#line 18184 "preproc.y"
                 {
 			(yyval.type).type_enum = ECPGt_interval;
 			(yyval.type).type_str = mm_strdup("interval");
@@ -64831,11 +64824,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			(yyval.type).type_index = mm_strdup("-1");
 			(yyval.type).type_sizeof = NULL;
 		}
-#line 64835 "preproc.c"
+#line 64828 "preproc.c"
     break;
 
   case 3382: /* var_type: IDENT ecpg_interval  */
-#line 18199 "preproc.y"
+#line 18192 "preproc.y"
                 {
 			/*
 			 * In C parsing mode, the above SQL type names are not keywords,
@@ -64955,11 +64948,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 				struct_member_list[struct_level] = ECPGstruct_member_dup(this->struct_member_list);
 			}
 		}
-#line 64959 "preproc.c"
+#line 64952 "preproc.c"
     break;
 
   case 3383: /* var_type: s_struct_union_symbol  */
-#line 18319 "preproc.y"
+#line 18312 "preproc.y"
                 {
 			/* this is for named structs/unions */
 			char *name;
@@ -64991,46 +64984,46 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 				struct_member_list[struct_level] = NULL;
 			}
 		}
-#line 64995 "preproc.c"
+#line 64988 "preproc.c"
     break;
 
   case 3384: /* enum_type: ENUM_P symbol enum_definition  */
-#line 18353 "preproc.y"
+#line 18346 "preproc.y"
                         { (yyval.str) = cat_str(3, mm_strdup("enum"), (yyvsp[-1].str), (yyvsp[0].str)); }
-#line 65001 "preproc.c"
+#line 64994 "preproc.c"
     break;
 
   case 3385: /* enum_type: ENUM_P enum_definition  */
-#line 18355 "preproc.y"
+#line 18348 "preproc.y"
                         { (yyval.str) = cat2_str(mm_strdup("enum"), (yyvsp[0].str)); }
-#line 65007 "preproc.c"
+#line 65000 "preproc.c"
     break;
 
   case 3386: /* enum_type: ENUM_P symbol  */
-#line 18357 "preproc.y"
+#line 18350 "preproc.y"
                         { (yyval.str) = cat2_str(mm_strdup("enum"), (yyvsp[0].str)); }
-#line 65013 "preproc.c"
+#line 65006 "preproc.c"
     break;
 
   case 3387: /* enum_definition: '{' c_list '}'  */
-#line 18361 "preproc.y"
+#line 18354 "preproc.y"
                         { (yyval.str) = cat_str(3, mm_strdup("{"), (yyvsp[-1].str), mm_strdup("}")); }
-#line 65019 "preproc.c"
+#line 65012 "preproc.c"
     break;
 
   case 3388: /* $@7: %empty  */
-#line 18364 "preproc.y"
+#line 18357 "preproc.y"
                 {
 			struct_member_list[struct_level++] = NULL;
 			if (struct_level >= STRUCT_DEPTH)
 				 mmerror(PARSE_ERROR, ET_ERROR, "too many levels in nested structure/union definition");
 			forward_name = mm_strdup((yyvsp[0].struct_union).symbol);
 		}
-#line 65030 "preproc.c"
+#line 65023 "preproc.c"
     break;
 
   case 3389: /* struct_union_type_with_symbol: s_struct_union_symbol $@7 '{' variable_declarations '}'  */
-#line 18371 "preproc.y"
+#line 18364 "preproc.y"
                 {
 			struct typedefs *ptr, *this;
 			struct this_type su_type;
@@ -65072,217 +65065,217 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			types = this;
 			(yyval.str) = cat_str(4, su_type.type_str, mm_strdup("{"), (yyvsp[-1].str), mm_strdup("}"));
 		}
-#line 65076 "preproc.c"
+#line 65069 "preproc.c"
     break;
 
   case 3390: /* struct_union_type: struct_union_type_with_symbol  */
-#line 18414 "preproc.y"
+#line 18407 "preproc.y"
                                                         { (yyval.str) = (yyvsp[0].str); }
-#line 65082 "preproc.c"
+#line 65075 "preproc.c"
     break;
 
   case 3391: /* $@8: %empty  */
-#line 18416 "preproc.y"
+#line 18409 "preproc.y"
                 {
 			struct_member_list[struct_level++] = NULL;
 			if (struct_level >= STRUCT_DEPTH)
 				 mmerror(PARSE_ERROR, ET_ERROR, "too many levels in nested structure/union definition");
 		}
-#line 65092 "preproc.c"
+#line 65085 "preproc.c"
     break;
 
   case 3392: /* struct_union_type: s_struct_union $@8 '{' variable_declarations '}'  */
-#line 18422 "preproc.y"
+#line 18415 "preproc.y"
                 {
 			ECPGfree_struct_member(struct_member_list[struct_level]);
 			struct_member_list[struct_level] = NULL;
 			struct_level--;
 			(yyval.str) = cat_str(4, (yyvsp[-4].str), mm_strdup("{"), (yyvsp[-1].str), mm_strdup("}"));
 		}
-#line 65103 "preproc.c"
+#line 65096 "preproc.c"
     break;
 
   case 3393: /* s_struct_union_symbol: SQL_STRUCT symbol  */
-#line 18431 "preproc.y"
+#line 18424 "preproc.y"
                 {
 			(yyval.struct_union).su = mm_strdup("struct");
 			(yyval.struct_union).symbol = (yyvsp[0].str);
 			ECPGstruct_sizeof = cat_str(3, mm_strdup("sizeof("), cat2_str(mm_strdup((yyval.struct_union).su), mm_strdup((yyval.struct_union).symbol)), mm_strdup(")"));
 		}
-#line 65113 "preproc.c"
+#line 65106 "preproc.c"
     break;
 
   case 3394: /* s_struct_union_symbol: UNION symbol  */
-#line 18437 "preproc.y"
+#line 18430 "preproc.y"
                 {
 			(yyval.struct_union).su = mm_strdup("union");
 			(yyval.struct_union).symbol = (yyvsp[0].str);
 		}
-#line 65122 "preproc.c"
+#line 65115 "preproc.c"
     break;
 
   case 3395: /* s_struct_union: SQL_STRUCT  */
-#line 18444 "preproc.y"
+#line 18437 "preproc.y"
                 {
 			ECPGstruct_sizeof = mm_strdup(""); /* This must not be NULL to distinguish from simple types. */
 			(yyval.str) = mm_strdup("struct");
 		}
-#line 65131 "preproc.c"
+#line 65124 "preproc.c"
     break;
 
   case 3396: /* s_struct_union: UNION  */
-#line 18449 "preproc.y"
+#line 18442 "preproc.y"
                 {
 			(yyval.str) = mm_strdup("union");
 		}
-#line 65139 "preproc.c"
+#line 65132 "preproc.c"
     break;
 
   case 3397: /* simple_type: unsigned_type  */
-#line 18454 "preproc.y"
+#line 18447 "preproc.y"
                                                                 { (yyval.type_enum)=(yyvsp[0].type_enum); }
-#line 65145 "preproc.c"
+#line 65138 "preproc.c"
     break;
 
   case 3398: /* simple_type: opt_signed signed_type  */
-#line 18455 "preproc.y"
+#line 18448 "preproc.y"
                                                                 { (yyval.type_enum)=(yyvsp[0].type_enum); }
-#line 65151 "preproc.c"
+#line 65144 "preproc.c"
     break;
 
   case 3399: /* unsigned_type: SQL_UNSIGNED SQL_SHORT  */
-#line 18458 "preproc.y"
+#line 18451 "preproc.y"
                                                 { (yyval.type_enum) = ECPGt_unsigned_short; }
-#line 65157 "preproc.c"
+#line 65150 "preproc.c"
     break;
 
   case 3400: /* unsigned_type: SQL_UNSIGNED SQL_SHORT INT_P  */
-#line 18459 "preproc.y"
+#line 18452 "preproc.y"
                                                 { (yyval.type_enum) = ECPGt_unsigned_short; }
-#line 65163 "preproc.c"
+#line 65156 "preproc.c"
     break;
 
   case 3401: /* unsigned_type: SQL_UNSIGNED  */
-#line 18460 "preproc.y"
+#line 18453 "preproc.y"
                                                                         { (yyval.type_enum) = ECPGt_unsigned_int; }
-#line 65169 "preproc.c"
+#line 65162 "preproc.c"
     break;
 
   case 3402: /* unsigned_type: SQL_UNSIGNED INT_P  */
-#line 18461 "preproc.y"
+#line 18454 "preproc.y"
                                                                 { (yyval.type_enum) = ECPGt_unsigned_int; }
-#line 65175 "preproc.c"
+#line 65168 "preproc.c"
     break;
 
   case 3403: /* unsigned_type: SQL_UNSIGNED SQL_LONG  */
-#line 18462 "preproc.y"
+#line 18455 "preproc.y"
                                                                 { (yyval.type_enum) = ECPGt_unsigned_long; }
-#line 65181 "preproc.c"
+#line 65174 "preproc.c"
     break;
 
   case 3404: /* unsigned_type: SQL_UNSIGNED SQL_LONG INT_P  */
-#line 18463 "preproc.y"
+#line 18456 "preproc.y"
                                                         { (yyval.type_enum) = ECPGt_unsigned_long; }
-#line 65187 "preproc.c"
+#line 65180 "preproc.c"
     break;
 
   case 3405: /* unsigned_type: SQL_UNSIGNED SQL_LONG SQL_LONG  */
-#line 18464 "preproc.y"
+#line 18457 "preproc.y"
                                                         { (yyval.type_enum) = ECPGt_unsigned_long_long; }
-#line 65193 "preproc.c"
+#line 65186 "preproc.c"
     break;
 
   case 3406: /* unsigned_type: SQL_UNSIGNED SQL_LONG SQL_LONG INT_P  */
-#line 18465 "preproc.y"
+#line 18458 "preproc.y"
                                                        { (yyval.type_enum) = ECPGt_unsigned_long_long; }
-#line 65199 "preproc.c"
+#line 65192 "preproc.c"
     break;
 
   case 3407: /* unsigned_type: SQL_UNSIGNED CHAR_P  */
-#line 18466 "preproc.y"
+#line 18459 "preproc.y"
                                                         { (yyval.type_enum) = ECPGt_unsigned_char; }
-#line 65205 "preproc.c"
+#line 65198 "preproc.c"
     break;
 
   case 3408: /* signed_type: SQL_SHORT  */
-#line 18469 "preproc.y"
+#line 18462 "preproc.y"
                                                 { (yyval.type_enum) = ECPGt_short; }
-#line 65211 "preproc.c"
+#line 65204 "preproc.c"
     break;
 
   case 3409: /* signed_type: SQL_SHORT INT_P  */
-#line 18470 "preproc.y"
+#line 18463 "preproc.y"
                                                         { (yyval.type_enum) = ECPGt_short; }
-#line 65217 "preproc.c"
+#line 65210 "preproc.c"
     break;
 
   case 3410: /* signed_type: INT_P  */
-#line 18471 "preproc.y"
+#line 18464 "preproc.y"
                                                                 { (yyval.type_enum) = ECPGt_int; }
-#line 65223 "preproc.c"
+#line 65216 "preproc.c"
     break;
 
   case 3411: /* signed_type: SQL_LONG  */
-#line 18472 "preproc.y"
+#line 18465 "preproc.y"
                                                                 { (yyval.type_enum) = ECPGt_long; }
-#line 65229 "preproc.c"
+#line 65222 "preproc.c"
     break;
 
   case 3412: /* signed_type: SQL_LONG INT_P  */
-#line 18473 "preproc.y"
+#line 18466 "preproc.y"
                                                         { (yyval.type_enum) = ECPGt_long; }
-#line 65235 "preproc.c"
+#line 65228 "preproc.c"
     break;
 
   case 3413: /* signed_type: SQL_LONG SQL_LONG  */
-#line 18474 "preproc.y"
+#line 18467 "preproc.y"
                                                         { (yyval.type_enum) = ECPGt_long_long; }
-#line 65241 "preproc.c"
+#line 65234 "preproc.c"
     break;
 
   case 3414: /* signed_type: SQL_LONG SQL_LONG INT_P  */
-#line 18475 "preproc.y"
+#line 18468 "preproc.y"
                                                 { (yyval.type_enum) = ECPGt_long_long; }
-#line 65247 "preproc.c"
+#line 65240 "preproc.c"
     break;
 
   case 3415: /* signed_type: SQL_BOOL  */
-#line 18476 "preproc.y"
+#line 18469 "preproc.y"
                                                                 { (yyval.type_enum) = ECPGt_bool; }
-#line 65253 "preproc.c"
+#line 65246 "preproc.c"
     break;
 
   case 3416: /* signed_type: CHAR_P  */
-#line 18477 "preproc.y"
+#line 18470 "preproc.y"
                                                                 { (yyval.type_enum) = ECPGt_char; }
-#line 65259 "preproc.c"
+#line 65252 "preproc.c"
     break;
 
   case 3417: /* signed_type: DOUBLE_P  */
-#line 18478 "preproc.y"
+#line 18471 "preproc.y"
                                                                 { (yyval.type_enum) = ECPGt_double; }
-#line 65265 "preproc.c"
+#line 65258 "preproc.c"
     break;
 
   case 3420: /* variable_list: variable  */
-#line 18486 "preproc.y"
+#line 18479 "preproc.y"
                         { (yyval.str) = (yyvsp[0].str); }
-#line 65271 "preproc.c"
+#line 65264 "preproc.c"
     break;
 
   case 3421: /* variable_list: variable_list ',' variable  */
-#line 18488 "preproc.y"
+#line 18481 "preproc.y"
                 {
 			if (actual_type[struct_level].type_enum == ECPGt_varchar || actual_type[struct_level].type_enum == ECPGt_bytea)
 				(yyval.str) = cat_str(4, (yyvsp[-2].str), mm_strdup(";"), mm_strdup(actual_type[struct_level].type_storage), (yyvsp[0].str));
 			else
 				(yyval.str) = cat_str(3, (yyvsp[-2].str), mm_strdup(","), (yyvsp[0].str));
 		}
-#line 65282 "preproc.c"
+#line 65275 "preproc.c"
     break;
 
   case 3422: /* variable: opt_pointer ECPGColLabel opt_array_bounds opt_bit_field opt_initializer  */
-#line 18497 "preproc.y"
+#line 18490 "preproc.y"
                 {
 			struct ECPGtype * type;
 			char *dimension = (yyvsp[-2].index).index1;	/* dimension of array */
@@ -65379,290 +65372,290 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
 			free((yyvsp[-3].str));
 		}
-#line 65383 "preproc.c"
+#line 65376 "preproc.c"
     break;
 
   case 3423: /* opt_initializer: %empty  */
-#line 18596 "preproc.y"
+#line 18589 "preproc.y"
                         { (yyval.str) = EMPTY; }
-#line 65389 "preproc.c"
+#line 65382 "preproc.c"
     break;
 
   case 3424: /* opt_initializer: '=' c_term  */
-#line 18598 "preproc.y"
+#line 18591 "preproc.y"
                 {
 			initializer = 1;
 			(yyval.str) = cat2_str(mm_strdup("="), (yyvsp[0].str));
 		}
-#line 65398 "preproc.c"
+#line 65391 "preproc.c"
     break;
 
   case 3425: /* opt_pointer: %empty  */
-#line 18604 "preproc.y"
+#line 18597 "preproc.y"
                                                 { (yyval.str) = EMPTY; }
-#line 65404 "preproc.c"
+#line 65397 "preproc.c"
     break;
 
   case 3426: /* opt_pointer: '*'  */
-#line 18605 "preproc.y"
+#line 18598 "preproc.y"
                                                                 { (yyval.str) = mm_strdup("*"); }
-#line 65410 "preproc.c"
+#line 65403 "preproc.c"
     break;
 
   case 3427: /* opt_pointer: '*' '*'  */
-#line 18606 "preproc.y"
+#line 18599 "preproc.y"
                                                                 { (yyval.str) = mm_strdup("**"); }
-#line 65416 "preproc.c"
+#line 65409 "preproc.c"
     break;
 
   case 3428: /* ECPGDeclare: DECLARE STATEMENT ecpg_ident  */
-#line 18613 "preproc.y"
+#line 18606 "preproc.y"
                 {
 			/* this is only supported for compatibility */
 			(yyval.str) = cat_str(3, mm_strdup("/* declare statement"), (yyvsp[0].str), mm_strdup("*/"));
 		}
-#line 65425 "preproc.c"
+#line 65418 "preproc.c"
     break;
 
   case 3429: /* ECPGDisconnect: SQL_DISCONNECT dis_name  */
-#line 18621 "preproc.y"
+#line 18614 "preproc.y"
                                         { (yyval.str) = (yyvsp[0].str); }
-#line 65431 "preproc.c"
+#line 65424 "preproc.c"
     break;
 
   case 3430: /* dis_name: connection_object  */
-#line 18624 "preproc.y"
+#line 18617 "preproc.y"
                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 65437 "preproc.c"
+#line 65430 "preproc.c"
     break;
 
   case 3431: /* dis_name: CURRENT_P  */
-#line 18625 "preproc.y"
+#line 18618 "preproc.y"
                                                 { (yyval.str) = mm_strdup("\"CURRENT\""); }
-#line 65443 "preproc.c"
+#line 65436 "preproc.c"
     break;
 
   case 3432: /* dis_name: ALL  */
-#line 18626 "preproc.y"
+#line 18619 "preproc.y"
                                                 { (yyval.str) = mm_strdup("\"ALL\""); }
-#line 65449 "preproc.c"
+#line 65442 "preproc.c"
     break;
 
   case 3433: /* dis_name: %empty  */
-#line 18627 "preproc.y"
+#line 18620 "preproc.y"
                                                 { (yyval.str) = mm_strdup("\"CURRENT\""); }
-#line 65455 "preproc.c"
+#line 65448 "preproc.c"
     break;
 
   case 3434: /* connection_object: name  */
-#line 18630 "preproc.y"
+#line 18623 "preproc.y"
                                                 { (yyval.str) = make3_str(mm_strdup("\""), (yyvsp[0].str), mm_strdup("\"")); }
-#line 65461 "preproc.c"
+#line 65454 "preproc.c"
     break;
 
   case 3435: /* connection_object: DEFAULT  */
-#line 18631 "preproc.y"
+#line 18624 "preproc.y"
                                                 { (yyval.str) = mm_strdup("\"DEFAULT\""); }
-#line 65467 "preproc.c"
+#line 65460 "preproc.c"
     break;
 
   case 3436: /* connection_object: char_variable  */
-#line 18632 "preproc.y"
+#line 18625 "preproc.y"
                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 65473 "preproc.c"
+#line 65466 "preproc.c"
     break;
 
   case 3437: /* execstring: char_variable  */
-#line 18636 "preproc.y"
+#line 18629 "preproc.y"
                         { (yyval.str) = (yyvsp[0].str); }
-#line 65479 "preproc.c"
+#line 65472 "preproc.c"
     break;
 
   case 3438: /* execstring: CSTRING  */
-#line 18638 "preproc.y"
+#line 18631 "preproc.y"
                         { (yyval.str) = make3_str(mm_strdup("\""), (yyvsp[0].str), mm_strdup("\"")); }
-#line 65485 "preproc.c"
+#line 65478 "preproc.c"
     break;
 
   case 3439: /* ECPGFree: SQL_FREE cursor_name  */
-#line 18645 "preproc.y"
+#line 18638 "preproc.y"
                                         { (yyval.str) = (yyvsp[0].str); }
-#line 65491 "preproc.c"
+#line 65484 "preproc.c"
     break;
 
   case 3440: /* ECPGFree: SQL_FREE ALL  */
-#line 18646 "preproc.y"
+#line 18639 "preproc.y"
                                 { (yyval.str) = mm_strdup("all"); }
-#line 65497 "preproc.c"
+#line 65490 "preproc.c"
     break;
 
   case 3441: /* ECPGOpen: SQL_OPEN cursor_name opt_ecpg_using  */
-#line 18653 "preproc.y"
+#line 18646 "preproc.y"
                 {
 			if ((yyvsp[-1].str)[0] == ':')
 				remove_variable_from_list(&argsinsert, find_variable((yyvsp[-1].str) + 1));
 			(yyval.str) = (yyvsp[-1].str);
 		}
-#line 65507 "preproc.c"
+#line 65500 "preproc.c"
     break;
 
   case 3442: /* opt_ecpg_using: %empty  */
-#line 18660 "preproc.y"
+#line 18653 "preproc.y"
                                 { (yyval.str) = EMPTY; }
-#line 65513 "preproc.c"
+#line 65506 "preproc.c"
     break;
 
   case 3443: /* opt_ecpg_using: ecpg_using  */
-#line 18661 "preproc.y"
+#line 18654 "preproc.y"
                                         { (yyval.str) = (yyvsp[0].str); }
-#line 65519 "preproc.c"
+#line 65512 "preproc.c"
     break;
 
   case 3444: /* ecpg_using: USING using_list  */
-#line 18664 "preproc.y"
+#line 18657 "preproc.y"
                                         { (yyval.str) = EMPTY; }
-#line 65525 "preproc.c"
+#line 65518 "preproc.c"
     break;
 
   case 3445: /* ecpg_using: using_descriptor  */
-#line 18665 "preproc.y"
+#line 18658 "preproc.y"
                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 65531 "preproc.c"
+#line 65524 "preproc.c"
     break;
 
   case 3446: /* using_descriptor: USING SQL_P SQL_DESCRIPTOR quoted_ident_stringvar  */
-#line 18669 "preproc.y"
+#line 18662 "preproc.y"
                 {
 			add_variable_to_head(&argsinsert, descriptor_variable((yyvsp[0].str),0), &no_indicator);
 			(yyval.str) = EMPTY;
 		}
-#line 65540 "preproc.c"
+#line 65533 "preproc.c"
     break;
 
   case 3447: /* using_descriptor: USING SQL_DESCRIPTOR name  */
-#line 18674 "preproc.y"
+#line 18667 "preproc.y"
                 {
 			add_variable_to_head(&argsinsert, sqlda_variable((yyvsp[0].str)), &no_indicator);
 			(yyval.str) = EMPTY;
 		}
-#line 65549 "preproc.c"
+#line 65542 "preproc.c"
     break;
 
   case 3448: /* into_descriptor: INTO SQL_P SQL_DESCRIPTOR quoted_ident_stringvar  */
-#line 18681 "preproc.y"
+#line 18674 "preproc.y"
                 {
 			add_variable_to_head(&argsresult, descriptor_variable((yyvsp[0].str),1), &no_indicator);
 			(yyval.str) = EMPTY;
 		}
-#line 65558 "preproc.c"
+#line 65551 "preproc.c"
     break;
 
   case 3449: /* into_descriptor: INTO SQL_DESCRIPTOR name  */
-#line 18686 "preproc.y"
+#line 18679 "preproc.y"
                 {
 			add_variable_to_head(&argsresult, sqlda_variable((yyvsp[0].str)), &no_indicator);
 			(yyval.str) = EMPTY;
 		}
-#line 65567 "preproc.c"
+#line 65560 "preproc.c"
     break;
 
   case 3450: /* into_sqlda: INTO name  */
-#line 18693 "preproc.y"
+#line 18686 "preproc.y"
                 {
 			add_variable_to_head(&argsresult, sqlda_variable((yyvsp[0].str)), &no_indicator);
 			(yyval.str) = EMPTY;
 		}
-#line 65576 "preproc.c"
+#line 65569 "preproc.c"
     break;
 
   case 3453: /* UsingValue: UsingConst  */
-#line 18702 "preproc.y"
+#line 18695 "preproc.y"
                 {
 			char *length = mm_alloc(32);
 
 			sprintf(length, "%zu", strlen((yyvsp[0].str)));
 			add_variable_to_head(&argsinsert, new_variable((yyvsp[0].str), ECPGmake_simple_type(ECPGt_const, length, 0), 0), &no_indicator);
 		}
-#line 65587 "preproc.c"
+#line 65580 "preproc.c"
     break;
 
   case 3454: /* UsingValue: civar  */
-#line 18708 "preproc.y"
+#line 18701 "preproc.y"
                         { (yyval.str) = EMPTY; }
-#line 65593 "preproc.c"
+#line 65586 "preproc.c"
     break;
 
   case 3455: /* UsingValue: civarind  */
-#line 18709 "preproc.y"
+#line 18702 "preproc.y"
                            { (yyval.str) = EMPTY; }
-#line 65599 "preproc.c"
+#line 65592 "preproc.c"
     break;
 
   case 3456: /* UsingConst: Iconst  */
-#line 18712 "preproc.y"
+#line 18705 "preproc.y"
                                         { (yyval.str) = (yyvsp[0].str); }
-#line 65605 "preproc.c"
+#line 65598 "preproc.c"
     break;
 
   case 3457: /* UsingConst: '+' Iconst  */
-#line 18713 "preproc.y"
+#line 18706 "preproc.y"
                                         { (yyval.str) = cat_str(2, mm_strdup("+"), (yyvsp[0].str)); }
-#line 65611 "preproc.c"
+#line 65604 "preproc.c"
     break;
 
   case 3458: /* UsingConst: '-' Iconst  */
-#line 18714 "preproc.y"
+#line 18707 "preproc.y"
                                         { (yyval.str) = cat_str(2, mm_strdup("-"), (yyvsp[0].str)); }
-#line 65617 "preproc.c"
+#line 65610 "preproc.c"
     break;
 
   case 3459: /* UsingConst: ecpg_fconst  */
-#line 18715 "preproc.y"
+#line 18708 "preproc.y"
                                         { (yyval.str) = (yyvsp[0].str); }
-#line 65623 "preproc.c"
+#line 65616 "preproc.c"
     break;
 
   case 3460: /* UsingConst: '+' ecpg_fconst  */
-#line 18716 "preproc.y"
+#line 18709 "preproc.y"
                                         { (yyval.str) = cat_str(2, mm_strdup("+"), (yyvsp[0].str)); }
-#line 65629 "preproc.c"
+#line 65622 "preproc.c"
     break;
 
   case 3461: /* UsingConst: '-' ecpg_fconst  */
-#line 18717 "preproc.y"
+#line 18710 "preproc.y"
                                         { (yyval.str) = cat_str(2, mm_strdup("-"), (yyvsp[0].str)); }
-#line 65635 "preproc.c"
+#line 65628 "preproc.c"
     break;
 
   case 3462: /* UsingConst: ecpg_sconst  */
-#line 18718 "preproc.y"
+#line 18711 "preproc.y"
                                         { (yyval.str) = (yyvsp[0].str); }
-#line 65641 "preproc.c"
+#line 65634 "preproc.c"
     break;
 
   case 3463: /* UsingConst: ecpg_bconst  */
-#line 18719 "preproc.y"
+#line 18712 "preproc.y"
                                         { (yyval.str) = (yyvsp[0].str); }
-#line 65647 "preproc.c"
+#line 65640 "preproc.c"
     break;
 
   case 3464: /* UsingConst: ecpg_xconst  */
-#line 18720 "preproc.y"
+#line 18713 "preproc.y"
                                         { (yyval.str) = (yyvsp[0].str); }
-#line 65653 "preproc.c"
+#line 65646 "preproc.c"
     break;
 
   case 3465: /* ECPGDescribe: SQL_DESCRIBE INPUT_P prepared_name using_descriptor  */
-#line 18727 "preproc.y"
+#line 18720 "preproc.y"
         {
 		(yyval.describe).input = 1;
 		(yyval.describe).stmt_name = (yyvsp[-1].str);
 	}
-#line 65662 "preproc.c"
+#line 65655 "preproc.c"
     break;
 
   case 3466: /* ECPGDescribe: SQL_DESCRIBE opt_output prepared_name using_descriptor  */
-#line 18732 "preproc.y"
+#line 18725 "preproc.y"
         {
 		struct variable *var;
 		var = argsinsert->variable;
@@ -65672,94 +65665,94 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 		(yyval.describe).input = 0;
 		(yyval.describe).stmt_name = (yyvsp[-1].str);
 	}
-#line 65676 "preproc.c"
+#line 65669 "preproc.c"
     break;
 
   case 3467: /* ECPGDescribe: SQL_DESCRIBE opt_output prepared_name into_descriptor  */
-#line 18742 "preproc.y"
+#line 18735 "preproc.y"
         {
 		(yyval.describe).input = 0;
 		(yyval.describe).stmt_name = (yyvsp[-1].str);
 	}
-#line 65685 "preproc.c"
+#line 65678 "preproc.c"
     break;
 
   case 3468: /* ECPGDescribe: SQL_DESCRIBE INPUT_P prepared_name into_sqlda  */
-#line 18747 "preproc.y"
+#line 18740 "preproc.y"
         {
 		(yyval.describe).input = 1;
 		(yyval.describe).stmt_name = (yyvsp[-1].str);
 	}
-#line 65694 "preproc.c"
+#line 65687 "preproc.c"
     break;
 
   case 3469: /* ECPGDescribe: SQL_DESCRIBE opt_output prepared_name into_sqlda  */
-#line 18752 "preproc.y"
+#line 18745 "preproc.y"
         {
 		(yyval.describe).input = 0;
 		(yyval.describe).stmt_name = (yyvsp[-1].str);
 	}
-#line 65703 "preproc.c"
+#line 65696 "preproc.c"
     break;
 
   case 3470: /* opt_output: SQL_OUTPUT  */
-#line 18758 "preproc.y"
+#line 18751 "preproc.y"
                                 { (yyval.str) = mm_strdup("output"); }
-#line 65709 "preproc.c"
+#line 65702 "preproc.c"
     break;
 
   case 3471: /* opt_output: %empty  */
-#line 18759 "preproc.y"
+#line 18752 "preproc.y"
                                 { (yyval.str) = EMPTY; }
-#line 65715 "preproc.c"
+#line 65708 "preproc.c"
     break;
 
   case 3472: /* ECPGAllocateDescr: SQL_ALLOCATE SQL_DESCRIPTOR quoted_ident_stringvar  */
-#line 18772 "preproc.y"
+#line 18765 "preproc.y"
                 {
 			add_descriptor((yyvsp[0].str),connection);
 			(yyval.str) = (yyvsp[0].str);
 		}
-#line 65724 "preproc.c"
+#line 65717 "preproc.c"
     break;
 
   case 3473: /* ECPGDeallocateDescr: DEALLOCATE SQL_DESCRIPTOR quoted_ident_stringvar  */
-#line 18783 "preproc.y"
+#line 18776 "preproc.y"
                 {
 			drop_descriptor((yyvsp[0].str),connection);
 			(yyval.str) = (yyvsp[0].str);
 		}
-#line 65733 "preproc.c"
+#line 65726 "preproc.c"
     break;
 
   case 3474: /* ECPGGetDescriptorHeader: SQL_GET SQL_DESCRIPTOR quoted_ident_stringvar ECPGGetDescHeaderItems  */
-#line 18794 "preproc.y"
+#line 18787 "preproc.y"
                         {  (yyval.str) = (yyvsp[-1].str); }
-#line 65739 "preproc.c"
+#line 65732 "preproc.c"
     break;
 
   case 3477: /* ECPGGetDescHeaderItem: cvariable '=' desc_header_item  */
-#line 18802 "preproc.y"
+#line 18795 "preproc.y"
                         { push_assignment((yyvsp[-2].str), (yyvsp[0].dtype_enum)); }
-#line 65745 "preproc.c"
+#line 65738 "preproc.c"
     break;
 
   case 3478: /* ECPGSetDescriptorHeader: SET SQL_DESCRIPTOR quoted_ident_stringvar ECPGSetDescHeaderItems  */
-#line 18807 "preproc.y"
+#line 18800 "preproc.y"
                         { (yyval.str) = (yyvsp[-1].str); }
-#line 65751 "preproc.c"
+#line 65744 "preproc.c"
     break;
 
   case 3481: /* ECPGSetDescHeaderItem: desc_header_item '=' IntConstVar  */
-#line 18815 "preproc.y"
+#line 18808 "preproc.y"
                 {
 			push_assignment((yyvsp[0].str), (yyvsp[-2].dtype_enum));
 		}
-#line 65759 "preproc.c"
+#line 65752 "preproc.c"
     break;
 
   case 3482: /* IntConstVar: Iconst  */
-#line 18821 "preproc.y"
+#line 18814 "preproc.y"
                 {
 			char *length = mm_alloc(sizeof(int) * CHAR_BIT * 10 / 3);
 
@@ -65767,51 +65760,51 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			new_variable((yyvsp[0].str), ECPGmake_simple_type(ECPGt_const, length, 0), 0);
 			(yyval.str) = (yyvsp[0].str);
 		}
-#line 65771 "preproc.c"
+#line 65764 "preproc.c"
     break;
 
   case 3483: /* IntConstVar: cvariable  */
-#line 18829 "preproc.y"
+#line 18822 "preproc.y"
                 {
 			(yyval.str) = (yyvsp[0].str);
 		}
-#line 65779 "preproc.c"
+#line 65772 "preproc.c"
     break;
 
   case 3484: /* desc_header_item: SQL_COUNT  */
-#line 18834 "preproc.y"
+#line 18827 "preproc.y"
                                                         { (yyval.dtype_enum) = ECPGd_count; }
-#line 65785 "preproc.c"
+#line 65778 "preproc.c"
     break;
 
   case 3485: /* ECPGGetDescriptor: SQL_GET SQL_DESCRIPTOR quoted_ident_stringvar VALUE_P IntConstVar ECPGGetDescItems  */
-#line 18842 "preproc.y"
+#line 18835 "preproc.y"
                         {  (yyval.descriptor).str = (yyvsp[-1].str); (yyval.descriptor).name = (yyvsp[-3].str); }
-#line 65791 "preproc.c"
+#line 65784 "preproc.c"
     break;
 
   case 3488: /* ECPGGetDescItem: cvariable '=' descriptor_item  */
-#line 18849 "preproc.y"
+#line 18842 "preproc.y"
                                                 { push_assignment((yyvsp[-2].str), (yyvsp[0].dtype_enum)); }
-#line 65797 "preproc.c"
+#line 65790 "preproc.c"
     break;
 
   case 3489: /* ECPGSetDescriptor: SET SQL_DESCRIPTOR quoted_ident_stringvar VALUE_P IntConstVar ECPGSetDescItems  */
-#line 18853 "preproc.y"
+#line 18846 "preproc.y"
                         {  (yyval.descriptor).str = (yyvsp[-1].str); (yyval.descriptor).name = (yyvsp[-3].str); }
-#line 65803 "preproc.c"
+#line 65796 "preproc.c"
     break;
 
   case 3492: /* ECPGSetDescItem: descriptor_item '=' AllConstVar  */
-#line 18861 "preproc.y"
+#line 18854 "preproc.y"
                 {
 			push_assignment((yyvsp[0].str), (yyvsp[-2].dtype_enum));
 		}
-#line 65811 "preproc.c"
+#line 65804 "preproc.c"
     break;
 
   case 3493: /* AllConstVar: ecpg_fconst  */
-#line 18867 "preproc.y"
+#line 18860 "preproc.y"
                 {
 			char *length = mm_alloc(sizeof(int) * CHAR_BIT * 10 / 3);
 
@@ -65819,19 +65812,19 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			new_variable((yyvsp[0].str), ECPGmake_simple_type(ECPGt_const, length, 0), 0);
 			(yyval.str) = (yyvsp[0].str);
 		}
-#line 65823 "preproc.c"
+#line 65816 "preproc.c"
     break;
 
   case 3494: /* AllConstVar: IntConstVar  */
-#line 18876 "preproc.y"
+#line 18869 "preproc.y"
                 {
 			(yyval.str) = (yyvsp[0].str);
 		}
-#line 65831 "preproc.c"
+#line 65824 "preproc.c"
     break;
 
   case 3495: /* AllConstVar: '-' ecpg_fconst  */
-#line 18881 "preproc.y"
+#line 18874 "preproc.y"
                 {
 			char *length = mm_alloc(sizeof(int) * CHAR_BIT * 10 / 3);
 			char *var = cat2_str(mm_strdup("-"), (yyvsp[0].str));
@@ -65840,11 +65833,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			new_variable(var, ECPGmake_simple_type(ECPGt_const, length, 0), 0);
 			(yyval.str) = var;
 		}
-#line 65844 "preproc.c"
+#line 65837 "preproc.c"
     break;
 
   case 3496: /* AllConstVar: '-' Iconst  */
-#line 18891 "preproc.y"
+#line 18884 "preproc.y"
                 {
 			char *length = mm_alloc(sizeof(int) * CHAR_BIT * 10 / 3);
 			char *var = cat2_str(mm_strdup("-"), (yyvsp[0].str));
@@ -65853,11 +65846,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			new_variable(var, ECPGmake_simple_type(ECPGt_const, length, 0), 0);
 			(yyval.str) = var;
 		}
-#line 65857 "preproc.c"
+#line 65850 "preproc.c"
     break;
 
   case 3497: /* AllConstVar: ecpg_sconst  */
-#line 18901 "preproc.y"
+#line 18894 "preproc.y"
                 {
 			char *length = mm_alloc(sizeof(int) * CHAR_BIT * 10 / 3);
 			char *var = (yyvsp[0].str) + 1;
@@ -65867,153 +65860,153 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			new_variable(var, ECPGmake_simple_type(ECPGt_const, length, 0), 0);
 			(yyval.str) = var;
 		}
-#line 65871 "preproc.c"
+#line 65864 "preproc.c"
     break;
 
   case 3498: /* descriptor_item: SQL_CARDINALITY  */
-#line 18912 "preproc.y"
+#line 18905 "preproc.y"
                                                         { (yyval.dtype_enum) = ECPGd_cardinality; }
-#line 65877 "preproc.c"
+#line 65870 "preproc.c"
     break;
 
   case 3499: /* descriptor_item: DATA_P  */
-#line 18913 "preproc.y"
+#line 18906 "preproc.y"
                                                         { (yyval.dtype_enum) = ECPGd_data; }
-#line 65883 "preproc.c"
+#line 65876 "preproc.c"
     break;
 
   case 3500: /* descriptor_item: SQL_DATETIME_INTERVAL_CODE  */
-#line 18914 "preproc.y"
+#line 18907 "preproc.y"
                                                         { (yyval.dtype_enum) = ECPGd_di_code; }
-#line 65889 "preproc.c"
+#line 65882 "preproc.c"
     break;
 
   case 3501: /* descriptor_item: SQL_DATETIME_INTERVAL_PRECISION  */
-#line 18915 "preproc.y"
+#line 18908 "preproc.y"
                                                         { (yyval.dtype_enum) = ECPGd_di_precision; }
-#line 65895 "preproc.c"
+#line 65888 "preproc.c"
     break;
 
   case 3502: /* descriptor_item: SQL_INDICATOR  */
-#line 18916 "preproc.y"
+#line 18909 "preproc.y"
                                                         { (yyval.dtype_enum) = ECPGd_indicator; }
-#line 65901 "preproc.c"
+#line 65894 "preproc.c"
     break;
 
   case 3503: /* descriptor_item: SQL_KEY_MEMBER  */
-#line 18917 "preproc.y"
+#line 18910 "preproc.y"
                                                         { (yyval.dtype_enum) = ECPGd_key_member; }
-#line 65907 "preproc.c"
+#line 65900 "preproc.c"
     break;
 
   case 3504: /* descriptor_item: SQL_LENGTH  */
-#line 18918 "preproc.y"
+#line 18911 "preproc.y"
                                                         { (yyval.dtype_enum) = ECPGd_length; }
-#line 65913 "preproc.c"
+#line 65906 "preproc.c"
     break;
 
   case 3505: /* descriptor_item: NAME_P  */
-#line 18919 "preproc.y"
+#line 18912 "preproc.y"
                                                         { (yyval.dtype_enum) = ECPGd_name; }
-#line 65919 "preproc.c"
+#line 65912 "preproc.c"
     break;
 
   case 3506: /* descriptor_item: SQL_NULLABLE  */
-#line 18920 "preproc.y"
+#line 18913 "preproc.y"
                                                         { (yyval.dtype_enum) = ECPGd_nullable; }
-#line 65925 "preproc.c"
+#line 65918 "preproc.c"
     break;
 
   case 3507: /* descriptor_item: SQL_OCTET_LENGTH  */
-#line 18921 "preproc.y"
+#line 18914 "preproc.y"
                                                         { (yyval.dtype_enum) = ECPGd_octet; }
-#line 65931 "preproc.c"
+#line 65924 "preproc.c"
     break;
 
   case 3508: /* descriptor_item: PRECISION  */
-#line 18922 "preproc.y"
+#line 18915 "preproc.y"
                                                         { (yyval.dtype_enum) = ECPGd_precision; }
-#line 65937 "preproc.c"
+#line 65930 "preproc.c"
     break;
 
   case 3509: /* descriptor_item: SQL_RETURNED_LENGTH  */
-#line 18923 "preproc.y"
+#line 18916 "preproc.y"
                                                         { (yyval.dtype_enum) = ECPGd_length; }
-#line 65943 "preproc.c"
+#line 65936 "preproc.c"
     break;
 
   case 3510: /* descriptor_item: SQL_RETURNED_OCTET_LENGTH  */
-#line 18924 "preproc.y"
+#line 18917 "preproc.y"
                                                         { (yyval.dtype_enum) = ECPGd_ret_octet; }
-#line 65949 "preproc.c"
+#line 65942 "preproc.c"
     break;
 
   case 3511: /* descriptor_item: SQL_SCALE  */
-#line 18925 "preproc.y"
+#line 18918 "preproc.y"
                                                         { (yyval.dtype_enum) = ECPGd_scale; }
-#line 65955 "preproc.c"
+#line 65948 "preproc.c"
     break;
 
   case 3512: /* descriptor_item: TYPE_P  */
-#line 18926 "preproc.y"
+#line 18919 "preproc.y"
                                                         { (yyval.dtype_enum) = ECPGd_type; }
-#line 65961 "preproc.c"
+#line 65954 "preproc.c"
     break;
 
   case 3513: /* ECPGSetAutocommit: SET SQL_AUTOCOMMIT '=' on_off  */
-#line 18933 "preproc.y"
+#line 18926 "preproc.y"
                                                         { (yyval.str) = (yyvsp[0].str); }
-#line 65967 "preproc.c"
+#line 65960 "preproc.c"
     break;
 
   case 3514: /* ECPGSetAutocommit: SET SQL_AUTOCOMMIT TO on_off  */
-#line 18934 "preproc.y"
+#line 18927 "preproc.y"
                                                   { (yyval.str) = (yyvsp[0].str); }
-#line 65973 "preproc.c"
+#line 65966 "preproc.c"
     break;
 
   case 3515: /* on_off: ON  */
-#line 18937 "preproc.y"
+#line 18930 "preproc.y"
                                         { (yyval.str) = mm_strdup("on"); }
-#line 65979 "preproc.c"
+#line 65972 "preproc.c"
     break;
 
   case 3516: /* on_off: OFF  */
-#line 18938 "preproc.y"
+#line 18931 "preproc.y"
                                         { (yyval.str) = mm_strdup("off"); }
-#line 65985 "preproc.c"
+#line 65978 "preproc.c"
     break;
 
   case 3517: /* ECPGSetConnection: SET CONNECTION TO connection_object  */
-#line 18945 "preproc.y"
+#line 18938 "preproc.y"
                                                             { (yyval.str) = (yyvsp[0].str); }
-#line 65991 "preproc.c"
+#line 65984 "preproc.c"
     break;
 
   case 3518: /* ECPGSetConnection: SET CONNECTION '=' connection_object  */
-#line 18946 "preproc.y"
+#line 18939 "preproc.y"
                                                        { (yyval.str) = (yyvsp[0].str); }
-#line 65997 "preproc.c"
+#line 65990 "preproc.c"
     break;
 
   case 3519: /* ECPGSetConnection: SET CONNECTION connection_object  */
-#line 18947 "preproc.y"
+#line 18940 "preproc.y"
                                                     { (yyval.str) = (yyvsp[0].str); }
-#line 66003 "preproc.c"
+#line 65996 "preproc.c"
     break;
 
   case 3520: /* $@9: %empty  */
-#line 18954 "preproc.y"
+#line 18947 "preproc.y"
                 {
 			/* reset this variable so we see if there was */
 			/* an initializer specified */
 			initializer = 0;
 		}
-#line 66013 "preproc.c"
+#line 66006 "preproc.c"
     break;
 
   case 3521: /* ECPGTypedef: TYPE_P $@9 ECPGColLabel IS var_type opt_array_bounds opt_reference  */
-#line 18960 "preproc.y"
+#line 18953 "preproc.y"
                 {
 			add_typedef((yyvsp[-4].str), (yyvsp[-1].index).index1, (yyvsp[-1].index).index2, (yyvsp[-2].type).type_enum, (yyvsp[-2].type).type_dimension, (yyvsp[-2].type).type_index, initializer, *(yyvsp[0].str) ? 1 : 0);
 
@@ -66022,33 +66015,33 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			else
 				(yyval.str) = cat_str(6, mm_strdup("typedef "), mm_strdup((yyvsp[-2].type).type_str), *(yyvsp[0].str)?mm_strdup("*"):mm_strdup(""), mm_strdup((yyvsp[-4].str)), mm_strdup((yyvsp[-1].index).str), mm_strdup(";"));
 		}
-#line 66026 "preproc.c"
+#line 66019 "preproc.c"
     break;
 
   case 3522: /* opt_reference: SQL_REFERENCE  */
-#line 18970 "preproc.y"
+#line 18963 "preproc.y"
                                         { (yyval.str) = mm_strdup("reference"); }
-#line 66032 "preproc.c"
+#line 66025 "preproc.c"
     break;
 
   case 3523: /* opt_reference: %empty  */
-#line 18971 "preproc.y"
+#line 18964 "preproc.y"
                                                                 { (yyval.str) = EMPTY; }
-#line 66038 "preproc.c"
+#line 66031 "preproc.c"
     break;
 
   case 3524: /* $@10: %empty  */
-#line 18978 "preproc.y"
+#line 18971 "preproc.y"
                 {
 			/* reset this variable so we see if there was */
 			/* an initializer specified */
 			initializer = 0;
 		}
-#line 66048 "preproc.c"
+#line 66041 "preproc.c"
     break;
 
   case 3525: /* ECPGVar: SQL_VAR $@10 ColLabel IS var_type opt_array_bounds opt_reference  */
-#line 18984 "preproc.y"
+#line 18977 "preproc.y"
                 {
 			struct variable *p = find_variable((yyvsp[-4].str));
 			char *dimension = (yyvsp[-1].index).index1;
@@ -66107,738 +66100,738 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 
 			(yyval.str) = cat_str(7, mm_strdup("/* exec sql var"), mm_strdup((yyvsp[-4].str)), mm_strdup("is"), mm_strdup((yyvsp[-2].type).type_str), mm_strdup((yyvsp[-1].index).str), (yyvsp[0].str), mm_strdup("*/"));
 		}
-#line 66111 "preproc.c"
+#line 66104 "preproc.c"
     break;
 
   case 3526: /* ECPGWhenever: SQL_WHENEVER SQL_SQLERROR action  */
-#line 19049 "preproc.y"
+#line 19042 "preproc.y"
                 {
 			when_error.code = (yyvsp[0].action).code;
 			when_error.command = (yyvsp[0].action).command;
 			(yyval.str) = cat_str(3, mm_strdup("/* exec sql whenever sqlerror "), (yyvsp[0].action).str, mm_strdup("; */"));
 		}
-#line 66121 "preproc.c"
+#line 66114 "preproc.c"
     break;
 
   case 3527: /* ECPGWhenever: SQL_WHENEVER NOT SQL_FOUND action  */
-#line 19055 "preproc.y"
+#line 19048 "preproc.y"
                 {
 			when_nf.code = (yyvsp[0].action).code;
 			when_nf.command = (yyvsp[0].action).command;
 			(yyval.str) = cat_str(3, mm_strdup("/* exec sql whenever not found "), (yyvsp[0].action).str, mm_strdup("; */"));
 		}
-#line 66131 "preproc.c"
+#line 66124 "preproc.c"
     break;
 
   case 3528: /* ECPGWhenever: SQL_WHENEVER SQL_SQLWARNING action  */
-#line 19061 "preproc.y"
+#line 19054 "preproc.y"
                 {
 			when_warn.code = (yyvsp[0].action).code;
 			when_warn.command = (yyvsp[0].action).command;
 			(yyval.str) = cat_str(3, mm_strdup("/* exec sql whenever sql_warning "), (yyvsp[0].action).str, mm_strdup("; */"));
 		}
-#line 66141 "preproc.c"
+#line 66134 "preproc.c"
     break;
 
   case 3529: /* action: CONTINUE_P  */
-#line 19069 "preproc.y"
+#line 19062 "preproc.y"
                 {
 			(yyval.action).code = W_NOTHING;
 			(yyval.action).command = NULL;
 			(yyval.action).str = mm_strdup("continue");
 		}
-#line 66151 "preproc.c"
+#line 66144 "preproc.c"
     break;
 
   case 3530: /* action: SQL_SQLPRINT  */
-#line 19075 "preproc.y"
+#line 19068 "preproc.y"
                 {
 			(yyval.action).code = W_SQLPRINT;
 			(yyval.action).command = NULL;
 			(yyval.action).str = mm_strdup("sqlprint");
 		}
-#line 66161 "preproc.c"
+#line 66154 "preproc.c"
     break;
 
   case 3531: /* action: SQL_STOP  */
-#line 19081 "preproc.y"
+#line 19074 "preproc.y"
                 {
 			(yyval.action).code = W_STOP;
 			(yyval.action).command = NULL;
 			(yyval.action).str = mm_strdup("stop");
 		}
-#line 66171 "preproc.c"
+#line 66164 "preproc.c"
     break;
 
   case 3532: /* action: SQL_GOTO name  */
-#line 19087 "preproc.y"
+#line 19080 "preproc.y"
                 {
 			(yyval.action).code = W_GOTO;
 			(yyval.action).command = mm_strdup((yyvsp[0].str));
 			(yyval.action).str = cat2_str(mm_strdup("goto "), (yyvsp[0].str));
 		}
-#line 66181 "preproc.c"
+#line 66174 "preproc.c"
     break;
 
   case 3533: /* action: SQL_GO TO name  */
-#line 19093 "preproc.y"
+#line 19086 "preproc.y"
                 {
 			(yyval.action).code = W_GOTO;
 			(yyval.action).command = mm_strdup((yyvsp[0].str));
 			(yyval.action).str = cat2_str(mm_strdup("goto "), (yyvsp[0].str));
 		}
-#line 66191 "preproc.c"
+#line 66184 "preproc.c"
     break;
 
   case 3534: /* action: DO name '(' c_args ')'  */
-#line 19099 "preproc.y"
+#line 19092 "preproc.y"
                 {
 			(yyval.action).code = W_DO;
 			(yyval.action).command = cat_str(4, (yyvsp[-3].str), mm_strdup("("), (yyvsp[-1].str), mm_strdup(")"));
 			(yyval.action).str = cat2_str(mm_strdup("do"), mm_strdup((yyval.action).command));
 		}
-#line 66201 "preproc.c"
+#line 66194 "preproc.c"
     break;
 
   case 3535: /* action: DO SQL_BREAK  */
-#line 19105 "preproc.y"
+#line 19098 "preproc.y"
                 {
 			(yyval.action).code = W_BREAK;
 			(yyval.action).command = NULL;
 			(yyval.action).str = mm_strdup("break");
 		}
-#line 66211 "preproc.c"
+#line 66204 "preproc.c"
     break;
 
   case 3536: /* action: DO CONTINUE_P  */
-#line 19111 "preproc.y"
+#line 19104 "preproc.y"
                 {
 			(yyval.action).code = W_CONTINUE;
 			(yyval.action).command = NULL;
 			(yyval.action).str = mm_strdup("continue");
 		}
-#line 66221 "preproc.c"
+#line 66214 "preproc.c"
     break;
 
   case 3537: /* action: CALL name '(' c_args ')'  */
-#line 19117 "preproc.y"
+#line 19110 "preproc.y"
                 {
 			(yyval.action).code = W_DO;
 			(yyval.action).command = cat_str(4, (yyvsp[-3].str), mm_strdup("("), (yyvsp[-1].str), mm_strdup(")"));
 			(yyval.action).str = cat2_str(mm_strdup("call"), mm_strdup((yyval.action).command));
 		}
-#line 66231 "preproc.c"
+#line 66224 "preproc.c"
     break;
 
   case 3538: /* action: CALL name  */
-#line 19123 "preproc.y"
+#line 19116 "preproc.y"
                 {
 			(yyval.action).code = W_DO;
 			(yyval.action).command = cat2_str((yyvsp[0].str), mm_strdup("()"));
 			(yyval.action).str = cat2_str(mm_strdup("call"), mm_strdup((yyval.action).command));
 		}
-#line 66241 "preproc.c"
+#line 66234 "preproc.c"
     break;
 
   case 3539: /* ECPGKeywords: ECPGKeywords_vanames  */
-#line 19133 "preproc.y"
+#line 19126 "preproc.y"
                                         { (yyval.str) = (yyvsp[0].str); }
-#line 66247 "preproc.c"
+#line 66240 "preproc.c"
     break;
 
   case 3540: /* ECPGKeywords: ECPGKeywords_rest  */
-#line 19134 "preproc.y"
+#line 19127 "preproc.y"
                                         { (yyval.str) = (yyvsp[0].str); }
-#line 66253 "preproc.c"
+#line 66246 "preproc.c"
     break;
 
   case 3541: /* ECPGKeywords_vanames: SQL_BREAK  */
-#line 19137 "preproc.y"
+#line 19130 "preproc.y"
                                                 { (yyval.str) = mm_strdup("break"); }
-#line 66259 "preproc.c"
+#line 66252 "preproc.c"
     break;
 
   case 3542: /* ECPGKeywords_vanames: SQL_CARDINALITY  */
-#line 19138 "preproc.y"
+#line 19131 "preproc.y"
                                                                 { (yyval.str) = mm_strdup("cardinality"); }
-#line 66265 "preproc.c"
+#line 66258 "preproc.c"
     break;
 
   case 3543: /* ECPGKeywords_vanames: SQL_COUNT  */
-#line 19139 "preproc.y"
+#line 19132 "preproc.y"
                                                                         { (yyval.str) = mm_strdup("count"); }
-#line 66271 "preproc.c"
+#line 66264 "preproc.c"
     break;
 
   case 3544: /* ECPGKeywords_vanames: SQL_DATETIME_INTERVAL_CODE  */
-#line 19140 "preproc.y"
+#line 19133 "preproc.y"
                                                 { (yyval.str) = mm_strdup("datetime_interval_code"); }
-#line 66277 "preproc.c"
+#line 66270 "preproc.c"
     break;
 
   case 3545: /* ECPGKeywords_vanames: SQL_DATETIME_INTERVAL_PRECISION  */
-#line 19141 "preproc.y"
+#line 19134 "preproc.y"
                                                         { (yyval.str) = mm_strdup("datetime_interval_precision"); }
-#line 66283 "preproc.c"
+#line 66276 "preproc.c"
     break;
 
   case 3546: /* ECPGKeywords_vanames: SQL_FOUND  */
-#line 19142 "preproc.y"
+#line 19135 "preproc.y"
                                                                         { (yyval.str) = mm_strdup("found"); }
-#line 66289 "preproc.c"
+#line 66282 "preproc.c"
     break;
 
   case 3547: /* ECPGKeywords_vanames: SQL_GO  */
-#line 19143 "preproc.y"
+#line 19136 "preproc.y"
                                                                         { (yyval.str) = mm_strdup("go"); }
-#line 66295 "preproc.c"
+#line 66288 "preproc.c"
     break;
 
   case 3548: /* ECPGKeywords_vanames: SQL_GOTO  */
-#line 19144 "preproc.y"
+#line 19137 "preproc.y"
                                                                         { (yyval.str) = mm_strdup("goto"); }
-#line 66301 "preproc.c"
+#line 66294 "preproc.c"
     break;
 
   case 3549: /* ECPGKeywords_vanames: SQL_IDENTIFIED  */
-#line 19145 "preproc.y"
+#line 19138 "preproc.y"
                                                                 { (yyval.str) = mm_strdup("identified"); }
-#line 66307 "preproc.c"
+#line 66300 "preproc.c"
     break;
 
   case 3550: /* ECPGKeywords_vanames: SQL_INDICATOR  */
-#line 19146 "preproc.y"
+#line 19139 "preproc.y"
                                                         { (yyval.str) = mm_strdup("indicator"); }
-#line 66313 "preproc.c"
+#line 66306 "preproc.c"
     break;
 
   case 3551: /* ECPGKeywords_vanames: SQL_KEY_MEMBER  */
-#line 19147 "preproc.y"
+#line 19140 "preproc.y"
                                                         { (yyval.str) = mm_strdup("key_member"); }
-#line 66319 "preproc.c"
+#line 66312 "preproc.c"
     break;
 
   case 3552: /* ECPGKeywords_vanames: SQL_LENGTH  */
-#line 19148 "preproc.y"
+#line 19141 "preproc.y"
                                                         { (yyval.str) = mm_strdup("length"); }
-#line 66325 "preproc.c"
+#line 66318 "preproc.c"
     break;
 
   case 3553: /* ECPGKeywords_vanames: SQL_NULLABLE  */
-#line 19149 "preproc.y"
+#line 19142 "preproc.y"
                                                         { (yyval.str) = mm_strdup("nullable"); }
-#line 66331 "preproc.c"
+#line 66324 "preproc.c"
     break;
 
   case 3554: /* ECPGKeywords_vanames: SQL_OCTET_LENGTH  */
-#line 19150 "preproc.y"
+#line 19143 "preproc.y"
                                                         { (yyval.str) = mm_strdup("octet_length"); }
-#line 66337 "preproc.c"
+#line 66330 "preproc.c"
     break;
 
   case 3555: /* ECPGKeywords_vanames: SQL_RETURNED_LENGTH  */
-#line 19151 "preproc.y"
+#line 19144 "preproc.y"
                                                 { (yyval.str) = mm_strdup("returned_length"); }
-#line 66343 "preproc.c"
+#line 66336 "preproc.c"
     break;
 
   case 3556: /* ECPGKeywords_vanames: SQL_RETURNED_OCTET_LENGTH  */
-#line 19152 "preproc.y"
+#line 19145 "preproc.y"
                                                 { (yyval.str) = mm_strdup("returned_octet_length"); }
-#line 66349 "preproc.c"
+#line 66342 "preproc.c"
     break;
 
   case 3557: /* ECPGKeywords_vanames: SQL_SCALE  */
-#line 19153 "preproc.y"
+#line 19146 "preproc.y"
                                                                 { (yyval.str) = mm_strdup("scale"); }
-#line 66355 "preproc.c"
+#line 66348 "preproc.c"
     break;
 
   case 3558: /* ECPGKeywords_vanames: SQL_SECTION  */
-#line 19154 "preproc.y"
+#line 19147 "preproc.y"
                                                         { (yyval.str) = mm_strdup("section"); }
-#line 66361 "preproc.c"
+#line 66354 "preproc.c"
     break;
 
   case 3559: /* ECPGKeywords_vanames: SQL_SQLERROR  */
-#line 19155 "preproc.y"
+#line 19148 "preproc.y"
                                                         { (yyval.str) = mm_strdup("sqlerror"); }
-#line 66367 "preproc.c"
+#line 66360 "preproc.c"
     break;
 
   case 3560: /* ECPGKeywords_vanames: SQL_SQLPRINT  */
-#line 19156 "preproc.y"
+#line 19149 "preproc.y"
                                                         { (yyval.str) = mm_strdup("sqlprint"); }
-#line 66373 "preproc.c"
+#line 66366 "preproc.c"
     break;
 
   case 3561: /* ECPGKeywords_vanames: SQL_SQLWARNING  */
-#line 19157 "preproc.y"
+#line 19150 "preproc.y"
                                                         { (yyval.str) = mm_strdup("sqlwarning"); }
-#line 66379 "preproc.c"
+#line 66372 "preproc.c"
     break;
 
   case 3562: /* ECPGKeywords_vanames: SQL_STOP  */
-#line 19158 "preproc.y"
+#line 19151 "preproc.y"
                                                                 { (yyval.str) = mm_strdup("stop"); }
-#line 66385 "preproc.c"
+#line 66378 "preproc.c"
     break;
 
   case 3563: /* ECPGKeywords_rest: SQL_CONNECT  */
-#line 19161 "preproc.y"
+#line 19154 "preproc.y"
                                         { (yyval.str) = mm_strdup("connect"); }
-#line 66391 "preproc.c"
+#line 66384 "preproc.c"
     break;
 
   case 3564: /* ECPGKeywords_rest: SQL_DESCRIBE  */
-#line 19162 "preproc.y"
+#line 19155 "preproc.y"
                                                         { (yyval.str) = mm_strdup("describe"); }
-#line 66397 "preproc.c"
+#line 66390 "preproc.c"
     break;
 
   case 3565: /* ECPGKeywords_rest: SQL_DISCONNECT  */
-#line 19163 "preproc.y"
+#line 19156 "preproc.y"
                                                         { (yyval.str) = mm_strdup("disconnect"); }
-#line 66403 "preproc.c"
+#line 66396 "preproc.c"
     break;
 
   case 3566: /* ECPGKeywords_rest: SQL_OPEN  */
-#line 19164 "preproc.y"
+#line 19157 "preproc.y"
                                                                 { (yyval.str) = mm_strdup("open"); }
-#line 66409 "preproc.c"
+#line 66402 "preproc.c"
     break;
 
   case 3567: /* ECPGKeywords_rest: SQL_VAR  */
-#line 19165 "preproc.y"
+#line 19158 "preproc.y"
                                                                 { (yyval.str) = mm_strdup("var"); }
-#line 66415 "preproc.c"
+#line 66408 "preproc.c"
     break;
 
   case 3568: /* ECPGKeywords_rest: SQL_WHENEVER  */
-#line 19166 "preproc.y"
+#line 19159 "preproc.y"
                                                         { (yyval.str) = mm_strdup("whenever"); }
-#line 66421 "preproc.c"
+#line 66414 "preproc.c"
     break;
 
   case 3569: /* ECPGTypeName: SQL_BOOL  */
-#line 19170 "preproc.y"
+#line 19163 "preproc.y"
                                                 { (yyval.str) = mm_strdup("bool"); }
-#line 66427 "preproc.c"
+#line 66420 "preproc.c"
     break;
 
   case 3570: /* ECPGTypeName: SQL_LONG  */
-#line 19171 "preproc.y"
+#line 19164 "preproc.y"
                                                                 { (yyval.str) = mm_strdup("long"); }
-#line 66433 "preproc.c"
+#line 66426 "preproc.c"
     break;
 
   case 3571: /* ECPGTypeName: SQL_OUTPUT  */
-#line 19172 "preproc.y"
+#line 19165 "preproc.y"
                                                         { (yyval.str) = mm_strdup("output"); }
-#line 66439 "preproc.c"
+#line 66432 "preproc.c"
     break;
 
   case 3572: /* ECPGTypeName: SQL_SHORT  */
-#line 19173 "preproc.y"
+#line 19166 "preproc.y"
                                                                 { (yyval.str) = mm_strdup("short"); }
-#line 66445 "preproc.c"
+#line 66438 "preproc.c"
     break;
 
   case 3573: /* ECPGTypeName: SQL_STRUCT  */
-#line 19174 "preproc.y"
+#line 19167 "preproc.y"
                                                         { (yyval.str) = mm_strdup("struct"); }
-#line 66451 "preproc.c"
+#line 66444 "preproc.c"
     break;
 
   case 3574: /* ECPGTypeName: SQL_SIGNED  */
-#line 19175 "preproc.y"
+#line 19168 "preproc.y"
                                                         { (yyval.str) = mm_strdup("signed"); }
-#line 66457 "preproc.c"
+#line 66450 "preproc.c"
     break;
 
   case 3575: /* ECPGTypeName: SQL_UNSIGNED  */
-#line 19176 "preproc.y"
+#line 19169 "preproc.y"
                                                         { (yyval.str) = mm_strdup("unsigned"); }
-#line 66463 "preproc.c"
+#line 66456 "preproc.c"
     break;
 
   case 3576: /* symbol: ColLabel  */
-#line 19179 "preproc.y"
+#line 19172 "preproc.y"
                                                         { (yyval.str) = (yyvsp[0].str); }
-#line 66469 "preproc.c"
+#line 66462 "preproc.c"
     break;
 
   case 3577: /* ECPGColId: ecpg_ident  */
-#line 19182 "preproc.y"
+#line 19175 "preproc.y"
                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 66475 "preproc.c"
+#line 66468 "preproc.c"
     break;
 
   case 3578: /* ECPGColId: unreserved_keyword  */
-#line 19183 "preproc.y"
+#line 19176 "preproc.y"
                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 66481 "preproc.c"
+#line 66474 "preproc.c"
     break;
 
   case 3579: /* ECPGColId: col_name_keyword  */
-#line 19184 "preproc.y"
+#line 19177 "preproc.y"
                                                         { (yyval.str) = (yyvsp[0].str); }
-#line 66487 "preproc.c"
+#line 66480 "preproc.c"
     break;
 
   case 3580: /* ECPGColId: ECPGunreserved_interval  */
-#line 19185 "preproc.y"
+#line 19178 "preproc.y"
                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 66493 "preproc.c"
+#line 66486 "preproc.c"
     break;
 
   case 3581: /* ECPGColId: ECPGKeywords  */
-#line 19186 "preproc.y"
+#line 19179 "preproc.y"
                                                         { (yyval.str) = (yyvsp[0].str); }
-#line 66499 "preproc.c"
+#line 66492 "preproc.c"
     break;
 
   case 3582: /* ECPGColId: ECPGCKeywords  */
-#line 19187 "preproc.y"
+#line 19180 "preproc.y"
                                                         { (yyval.str) = (yyvsp[0].str); }
-#line 66505 "preproc.c"
+#line 66498 "preproc.c"
     break;
 
   case 3583: /* ECPGColId: CHAR_P  */
-#line 19188 "preproc.y"
+#line 19181 "preproc.y"
                                                                 { (yyval.str) = mm_strdup("char"); }
-#line 66511 "preproc.c"
+#line 66504 "preproc.c"
     break;
 
   case 3584: /* ECPGColId: VALUES  */
-#line 19189 "preproc.y"
+#line 19182 "preproc.y"
                                                                 { (yyval.str) = mm_strdup("values"); }
-#line 66517 "preproc.c"
+#line 66510 "preproc.c"
     break;
 
   case 3585: /* ColId: ecpg_ident  */
-#line 19202 "preproc.y"
+#line 19195 "preproc.y"
                                                         { (yyval.str) = (yyvsp[0].str); }
-#line 66523 "preproc.c"
+#line 66516 "preproc.c"
     break;
 
   case 3586: /* ColId: all_unreserved_keyword  */
-#line 19203 "preproc.y"
+#line 19196 "preproc.y"
                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 66529 "preproc.c"
+#line 66522 "preproc.c"
     break;
 
   case 3587: /* ColId: col_name_keyword  */
-#line 19204 "preproc.y"
+#line 19197 "preproc.y"
                                                         { (yyval.str) = (yyvsp[0].str); }
-#line 66535 "preproc.c"
+#line 66528 "preproc.c"
     break;
 
   case 3588: /* ColId: ECPGKeywords  */
-#line 19205 "preproc.y"
+#line 19198 "preproc.y"
                                                         { (yyval.str) = (yyvsp[0].str); }
-#line 66541 "preproc.c"
+#line 66534 "preproc.c"
     break;
 
   case 3589: /* ColId: ECPGCKeywords  */
-#line 19206 "preproc.y"
+#line 19199 "preproc.y"
                                                         { (yyval.str) = (yyvsp[0].str); }
-#line 66547 "preproc.c"
+#line 66540 "preproc.c"
     break;
 
   case 3590: /* ColId: CHAR_P  */
-#line 19207 "preproc.y"
+#line 19200 "preproc.y"
                                                                 { (yyval.str) = mm_strdup("char"); }
-#line 66553 "preproc.c"
+#line 66546 "preproc.c"
     break;
 
   case 3591: /* ColId: VALUES  */
-#line 19208 "preproc.y"
+#line 19201 "preproc.y"
                                                                 { (yyval.str) = mm_strdup("values"); }
-#line 66559 "preproc.c"
+#line 66552 "preproc.c"
     break;
 
   case 3592: /* type_function_name: ecpg_ident  */
-#line 19213 "preproc.y"
+#line 19206 "preproc.y"
                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 66565 "preproc.c"
+#line 66558 "preproc.c"
     break;
 
   case 3593: /* type_function_name: all_unreserved_keyword  */
-#line 19214 "preproc.y"
+#line 19207 "preproc.y"
                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 66571 "preproc.c"
+#line 66564 "preproc.c"
     break;
 
   case 3594: /* type_function_name: type_func_name_keyword  */
-#line 19215 "preproc.y"
+#line 19208 "preproc.y"
                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 66577 "preproc.c"
+#line 66570 "preproc.c"
     break;
 
   case 3595: /* type_function_name: ECPGKeywords  */
-#line 19216 "preproc.y"
+#line 19209 "preproc.y"
                                                         { (yyval.str) = (yyvsp[0].str); }
-#line 66583 "preproc.c"
+#line 66576 "preproc.c"
     break;
 
   case 3596: /* type_function_name: ECPGCKeywords  */
-#line 19217 "preproc.y"
+#line 19210 "preproc.y"
                                                         { (yyval.str) = (yyvsp[0].str); }
-#line 66589 "preproc.c"
+#line 66582 "preproc.c"
     break;
 
   case 3597: /* type_function_name: ECPGTypeName  */
-#line 19218 "preproc.y"
+#line 19211 "preproc.y"
                                                         { (yyval.str) = (yyvsp[0].str); }
-#line 66595 "preproc.c"
+#line 66588 "preproc.c"
     break;
 
   case 3598: /* ColLabel: ECPGColLabel  */
-#line 19224 "preproc.y"
+#line 19217 "preproc.y"
                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 66601 "preproc.c"
+#line 66594 "preproc.c"
     break;
 
   case 3599: /* ColLabel: ECPGTypeName  */
-#line 19225 "preproc.y"
+#line 19218 "preproc.y"
                                                         { (yyval.str) = (yyvsp[0].str); }
-#line 66607 "preproc.c"
+#line 66600 "preproc.c"
     break;
 
   case 3600: /* ColLabel: CHAR_P  */
-#line 19226 "preproc.y"
+#line 19219 "preproc.y"
                                                                 { (yyval.str) = mm_strdup("char"); }
-#line 66613 "preproc.c"
+#line 66606 "preproc.c"
     break;
 
   case 3601: /* ColLabel: CURRENT_P  */
-#line 19227 "preproc.y"
+#line 19220 "preproc.y"
                                                                 { (yyval.str) = mm_strdup("current"); }
-#line 66619 "preproc.c"
+#line 66612 "preproc.c"
     break;
 
   case 3602: /* ColLabel: INPUT_P  */
-#line 19228 "preproc.y"
+#line 19221 "preproc.y"
                                                                 { (yyval.str) = mm_strdup("input"); }
-#line 66625 "preproc.c"
+#line 66618 "preproc.c"
     break;
 
   case 3603: /* ColLabel: INT_P  */
-#line 19229 "preproc.y"
+#line 19222 "preproc.y"
                                                                 { (yyval.str) = mm_strdup("int"); }
-#line 66631 "preproc.c"
+#line 66624 "preproc.c"
     break;
 
   case 3604: /* ColLabel: TO  */
-#line 19230 "preproc.y"
+#line 19223 "preproc.y"
                                                                 { (yyval.str) = mm_strdup("to"); }
-#line 66637 "preproc.c"
+#line 66630 "preproc.c"
     break;
 
   case 3605: /* ColLabel: UNION  */
-#line 19231 "preproc.y"
+#line 19224 "preproc.y"
                                                                 { (yyval.str) = mm_strdup("union"); }
-#line 66643 "preproc.c"
+#line 66636 "preproc.c"
     break;
 
   case 3606: /* ColLabel: VALUES  */
-#line 19232 "preproc.y"
+#line 19225 "preproc.y"
                                                                 { (yyval.str) = mm_strdup("values"); }
-#line 66649 "preproc.c"
+#line 66642 "preproc.c"
     break;
 
   case 3607: /* ColLabel: ECPGCKeywords  */
-#line 19233 "preproc.y"
+#line 19226 "preproc.y"
                                                         { (yyval.str) = (yyvsp[0].str); }
-#line 66655 "preproc.c"
+#line 66648 "preproc.c"
     break;
 
   case 3608: /* ColLabel: ECPGunreserved_interval  */
-#line 19234 "preproc.y"
+#line 19227 "preproc.y"
                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 66661 "preproc.c"
+#line 66654 "preproc.c"
     break;
 
   case 3609: /* ECPGColLabel: ecpg_ident  */
-#line 19237 "preproc.y"
+#line 19230 "preproc.y"
                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 66667 "preproc.c"
+#line 66660 "preproc.c"
     break;
 
   case 3610: /* ECPGColLabel: unreserved_keyword  */
-#line 19238 "preproc.y"
+#line 19231 "preproc.y"
                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 66673 "preproc.c"
+#line 66666 "preproc.c"
     break;
 
   case 3611: /* ECPGColLabel: col_name_keyword  */
-#line 19239 "preproc.y"
+#line 19232 "preproc.y"
                                                         { (yyval.str) = (yyvsp[0].str); }
-#line 66679 "preproc.c"
+#line 66672 "preproc.c"
     break;
 
   case 3612: /* ECPGColLabel: type_func_name_keyword  */
-#line 19240 "preproc.y"
+#line 19233 "preproc.y"
                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 66685 "preproc.c"
+#line 66678 "preproc.c"
     break;
 
   case 3613: /* ECPGColLabel: reserved_keyword  */
-#line 19241 "preproc.y"
+#line 19234 "preproc.y"
                                                         { (yyval.str) = (yyvsp[0].str); }
-#line 66691 "preproc.c"
+#line 66684 "preproc.c"
     break;
 
   case 3614: /* ECPGColLabel: ECPGKeywords_vanames  */
-#line 19242 "preproc.y"
+#line 19235 "preproc.y"
                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 66697 "preproc.c"
+#line 66690 "preproc.c"
     break;
 
   case 3615: /* ECPGColLabel: ECPGKeywords_rest  */
-#line 19243 "preproc.y"
+#line 19236 "preproc.y"
                                                         { (yyval.str) = (yyvsp[0].str); }
-#line 66703 "preproc.c"
+#line 66696 "preproc.c"
     break;
 
   case 3616: /* ECPGColLabel: CONNECTION  */
-#line 19244 "preproc.y"
+#line 19237 "preproc.y"
                                                         { (yyval.str) = mm_strdup("connection"); }
-#line 66709 "preproc.c"
+#line 66702 "preproc.c"
     break;
 
   case 3617: /* ECPGCKeywords: S_AUTO  */
-#line 19247 "preproc.y"
+#line 19240 "preproc.y"
                                                 { (yyval.str) = mm_strdup("auto"); }
-#line 66715 "preproc.c"
+#line 66708 "preproc.c"
     break;
 
   case 3618: /* ECPGCKeywords: S_CONST  */
-#line 19248 "preproc.y"
+#line 19241 "preproc.y"
                                                                 { (yyval.str) = mm_strdup("const"); }
-#line 66721 "preproc.c"
+#line 66714 "preproc.c"
     break;
 
   case 3619: /* ECPGCKeywords: S_EXTERN  */
-#line 19249 "preproc.y"
+#line 19242 "preproc.y"
                                                                 { (yyval.str) = mm_strdup("extern"); }
-#line 66727 "preproc.c"
+#line 66720 "preproc.c"
     break;
 
   case 3620: /* ECPGCKeywords: S_REGISTER  */
-#line 19250 "preproc.y"
+#line 19243 "preproc.y"
                                                         { (yyval.str) = mm_strdup("register"); }
-#line 66733 "preproc.c"
+#line 66726 "preproc.c"
     break;
 
   case 3621: /* ECPGCKeywords: S_STATIC  */
-#line 19251 "preproc.y"
+#line 19244 "preproc.y"
                                                                 { (yyval.str) = mm_strdup("static"); }
-#line 66739 "preproc.c"
+#line 66732 "preproc.c"
     break;
 
   case 3622: /* ECPGCKeywords: S_TYPEDEF  */
-#line 19252 "preproc.y"
+#line 19245 "preproc.y"
                                                                 { (yyval.str) = mm_strdup("typedef"); }
-#line 66745 "preproc.c"
+#line 66738 "preproc.c"
     break;
 
   case 3623: /* ECPGCKeywords: S_VOLATILE  */
-#line 19253 "preproc.y"
+#line 19246 "preproc.y"
                                                         { (yyval.str) = mm_strdup("volatile"); }
-#line 66751 "preproc.c"
+#line 66744 "preproc.c"
     break;
 
   case 3624: /* all_unreserved_keyword: unreserved_keyword  */
-#line 19270 "preproc.y"
+#line 19263 "preproc.y"
                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 66757 "preproc.c"
+#line 66750 "preproc.c"
     break;
 
   case 3625: /* all_unreserved_keyword: ECPGunreserved_interval  */
-#line 19271 "preproc.y"
+#line 19264 "preproc.y"
                                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 66763 "preproc.c"
+#line 66756 "preproc.c"
     break;
 
   case 3626: /* all_unreserved_keyword: CONNECTION  */
-#line 19272 "preproc.y"
+#line 19265 "preproc.y"
                                                                         { (yyval.str) = mm_strdup("connection"); }
-#line 66769 "preproc.c"
+#line 66762 "preproc.c"
     break;
 
   case 3627: /* ECPGunreserved_interval: DAY_P  */
-#line 19275 "preproc.y"
+#line 19268 "preproc.y"
                                                         { (yyval.str) = mm_strdup("day"); }
-#line 66775 "preproc.c"
+#line 66768 "preproc.c"
     break;
 
   case 3628: /* ECPGunreserved_interval: HOUR_P  */
-#line 19276 "preproc.y"
+#line 19269 "preproc.y"
                                                                                 { (yyval.str) = mm_strdup("hour"); }
-#line 66781 "preproc.c"
+#line 66774 "preproc.c"
     break;
 
   case 3629: /* ECPGunreserved_interval: MINUTE_P  */
-#line 19277 "preproc.y"
+#line 19270 "preproc.y"
                                                                                 { (yyval.str) = mm_strdup("minute"); }
-#line 66787 "preproc.c"
+#line 66780 "preproc.c"
     break;
 
   case 3630: /* ECPGunreserved_interval: MONTH_P  */
-#line 19278 "preproc.y"
+#line 19271 "preproc.y"
                                                                                 { (yyval.str) = mm_strdup("month"); }
-#line 66793 "preproc.c"
+#line 66786 "preproc.c"
     break;
 
   case 3631: /* ECPGunreserved_interval: SECOND_P  */
-#line 19279 "preproc.y"
+#line 19272 "preproc.y"
                                                                                 { (yyval.str) = mm_strdup("second"); }
-#line 66799 "preproc.c"
+#line 66792 "preproc.c"
     break;
 
   case 3632: /* ECPGunreserved_interval: YEAR_P  */
-#line 19280 "preproc.y"
+#line 19273 "preproc.y"
                                                                                 { (yyval.str) = mm_strdup("year"); }
-#line 66805 "preproc.c"
+#line 66798 "preproc.c"
     break;
 
   case 3635: /* ecpgstart: SQL_START  */
-#line 19287 "preproc.y"
+#line 19280 "preproc.y"
                         {
 				reset_variables();
 				pacounter = 1;
 			}
-#line 66814 "preproc.c"
+#line 66807 "preproc.c"
     break;
 
   case 3636: /* c_args: %empty  */
-#line 19293 "preproc.y"
+#line 19286 "preproc.y"
                                 { (yyval.str) = EMPTY; }
-#line 66820 "preproc.c"
+#line 66813 "preproc.c"
     break;
 
   case 3637: /* c_args: c_list  */
-#line 19294 "preproc.y"
+#line 19287 "preproc.y"
                                         { (yyval.str) = (yyvsp[0].str); }
-#line 66826 "preproc.c"
+#line 66819 "preproc.c"
     break;
 
   case 3638: /* coutputvariable: cvariable indicator  */
-#line 19298 "preproc.y"
+#line 19291 "preproc.y"
                         { add_variable_to_head(&argsresult, find_variable((yyvsp[-1].str)), find_variable((yyvsp[0].str))); }
-#line 66832 "preproc.c"
+#line 66825 "preproc.c"
     break;
 
   case 3639: /* coutputvariable: cvariable  */
-#line 19300 "preproc.y"
+#line 19293 "preproc.y"
                         { add_variable_to_head(&argsresult, find_variable((yyvsp[0].str)), &no_indicator); }
-#line 66838 "preproc.c"
+#line 66831 "preproc.c"
     break;
 
   case 3640: /* civarind: cvariable indicator  */
-#line 19305 "preproc.y"
+#line 19298 "preproc.y"
                 {
 			if (find_variable((yyvsp[0].str))->type->type == ECPGt_array)
 				mmerror(PARSE_ERROR, ET_ERROR, "arrays of indicators are not allowed on input");
@@ -66846,11 +66839,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			add_variable_to_head(&argsinsert, find_variable((yyvsp[-1].str)), find_variable((yyvsp[0].str)));
 			(yyval.str) = create_questionmarks((yyvsp[-1].str), false);
 		}
-#line 66850 "preproc.c"
+#line 66843 "preproc.c"
     break;
 
   case 3641: /* char_civar: char_variable  */
-#line 19315 "preproc.y"
+#line 19308 "preproc.y"
                 {
 			char *ptr = strstr((yyvsp[0].str), ".arr");
 
@@ -66859,38 +66852,38 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			add_variable_to_head(&argsinsert, find_variable((yyvsp[0].str)), &no_indicator);
 			(yyval.str) = (yyvsp[0].str);
 		}
-#line 66863 "preproc.c"
+#line 66856 "preproc.c"
     break;
 
   case 3642: /* civar: cvariable  */
-#line 19326 "preproc.y"
+#line 19319 "preproc.y"
                 {
 			add_variable_to_head(&argsinsert, find_variable((yyvsp[0].str)), &no_indicator);
 			(yyval.str) = create_questionmarks((yyvsp[0].str), false);
 		}
-#line 66872 "preproc.c"
+#line 66865 "preproc.c"
     break;
 
   case 3643: /* indicator: cvariable  */
-#line 19332 "preproc.y"
+#line 19325 "preproc.y"
                                                 { check_indicator((find_variable((yyvsp[0].str)))->type); (yyval.str) = (yyvsp[0].str); }
-#line 66878 "preproc.c"
+#line 66871 "preproc.c"
     break;
 
   case 3644: /* indicator: SQL_INDICATOR cvariable  */
-#line 19333 "preproc.y"
+#line 19326 "preproc.y"
                                                 { check_indicator((find_variable((yyvsp[0].str)))->type); (yyval.str) = (yyvsp[0].str); }
-#line 66884 "preproc.c"
+#line 66877 "preproc.c"
     break;
 
   case 3645: /* indicator: SQL_INDICATOR name  */
-#line 19334 "preproc.y"
+#line 19327 "preproc.y"
                                                 { check_indicator((find_variable((yyvsp[0].str)))->type); (yyval.str) = (yyvsp[0].str); }
-#line 66890 "preproc.c"
+#line 66883 "preproc.c"
     break;
 
   case 3646: /* cvariable: CVARIABLE  */
-#line 19338 "preproc.y"
+#line 19331 "preproc.y"
                 {
 			/* As long as multidimensional arrays are not implemented we have to check for those here */
 			char *ptr = (yyvsp[0].str);
@@ -66921,627 +66914,627 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 			}
 			(yyval.str) = (yyvsp[0].str);
 		}
-#line 66925 "preproc.c"
+#line 66918 "preproc.c"
     break;
 
   case 3647: /* ecpg_param: PARAM  */
-#line 19370 "preproc.y"
+#line 19363 "preproc.y"
                                 { (yyval.str) = make_name(); }
-#line 66931 "preproc.c"
+#line 66924 "preproc.c"
     break;
 
   case 3648: /* ecpg_bconst: BCONST  */
-#line 19372 "preproc.y"
+#line 19365 "preproc.y"
                                 { (yyval.str) = (yyvsp[0].str); }
-#line 66937 "preproc.c"
+#line 66930 "preproc.c"
     break;
 
   case 3649: /* ecpg_fconst: FCONST  */
-#line 19374 "preproc.y"
+#line 19367 "preproc.y"
                                 { (yyval.str) = make_name(); }
-#line 66943 "preproc.c"
+#line 66936 "preproc.c"
     break;
 
   case 3650: /* ecpg_sconst: SCONST  */
-#line 19376 "preproc.y"
+#line 19369 "preproc.y"
                                 { (yyval.str) = (yyvsp[0].str); }
-#line 66949 "preproc.c"
+#line 66942 "preproc.c"
     break;
 
   case 3651: /* ecpg_xconst: XCONST  */
-#line 19378 "preproc.y"
+#line 19371 "preproc.y"
                                 { (yyval.str) = (yyvsp[0].str); }
-#line 66955 "preproc.c"
+#line 66948 "preproc.c"
     break;
 
   case 3652: /* ecpg_ident: IDENT  */
-#line 19380 "preproc.y"
+#line 19373 "preproc.y"
                                 { (yyval.str) = (yyvsp[0].str); }
-#line 66961 "preproc.c"
+#line 66954 "preproc.c"
     break;
 
   case 3653: /* ecpg_ident: CSTRING  */
-#line 19381 "preproc.y"
+#line 19374 "preproc.y"
                                 { (yyval.str) = make3_str(mm_strdup("\""), (yyvsp[0].str), mm_strdup("\"")); }
-#line 66967 "preproc.c"
+#line 66960 "preproc.c"
     break;
 
   case 3654: /* quoted_ident_stringvar: name  */
-#line 19385 "preproc.y"
+#line 19378 "preproc.y"
                         { (yyval.str) = make3_str(mm_strdup("\""), (yyvsp[0].str), mm_strdup("\"")); }
-#line 66973 "preproc.c"
+#line 66966 "preproc.c"
     break;
 
   case 3655: /* quoted_ident_stringvar: char_variable  */
-#line 19387 "preproc.y"
+#line 19380 "preproc.y"
                         { (yyval.str) = make3_str(mm_strdup("("), (yyvsp[0].str), mm_strdup(")")); }
-#line 66979 "preproc.c"
+#line 66972 "preproc.c"
     break;
 
   case 3656: /* c_stuff_item: c_anything  */
-#line 19394 "preproc.y"
+#line 19387 "preproc.y"
                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 66985 "preproc.c"
+#line 66978 "preproc.c"
     break;
 
   case 3657: /* c_stuff_item: '(' ')'  */
-#line 19395 "preproc.y"
+#line 19388 "preproc.y"
                                                 { (yyval.str) = mm_strdup("()"); }
-#line 66991 "preproc.c"
+#line 66984 "preproc.c"
     break;
 
   case 3658: /* c_stuff_item: '(' c_stuff ')'  */
-#line 19397 "preproc.y"
+#line 19390 "preproc.y"
                         { (yyval.str) = cat_str(3, mm_strdup("("), (yyvsp[-1].str), mm_strdup(")")); }
-#line 66997 "preproc.c"
+#line 66990 "preproc.c"
     break;
 
   case 3659: /* c_stuff: c_stuff_item  */
-#line 19400 "preproc.y"
+#line 19393 "preproc.y"
                                         { (yyval.str) = (yyvsp[0].str); }
-#line 67003 "preproc.c"
+#line 66996 "preproc.c"
     break;
 
   case 3660: /* c_stuff: c_stuff c_stuff_item  */
-#line 19402 "preproc.y"
+#line 19395 "preproc.y"
                         { (yyval.str) = cat2_str((yyvsp[-1].str), (yyvsp[0].str)); }
-#line 67009 "preproc.c"
+#line 67002 "preproc.c"
     break;
 
   case 3661: /* c_list: c_term  */
-#line 19405 "preproc.y"
+#line 19398 "preproc.y"
                                         { (yyval.str) = (yyvsp[0].str); }
-#line 67015 "preproc.c"
+#line 67008 "preproc.c"
     break;
 
   case 3662: /* c_list: c_list ',' c_term  */
-#line 19406 "preproc.y"
+#line 19399 "preproc.y"
                                         { (yyval.str) = cat_str(3, (yyvsp[-2].str), mm_strdup(","), (yyvsp[0].str)); }
-#line 67021 "preproc.c"
+#line 67014 "preproc.c"
     break;
 
   case 3663: /* c_term: c_stuff  */
-#line 19409 "preproc.y"
+#line 19402 "preproc.y"
                                         { (yyval.str) = (yyvsp[0].str); }
-#line 67027 "preproc.c"
+#line 67020 "preproc.c"
     break;
 
   case 3664: /* c_term: '{' c_list '}'  */
-#line 19410 "preproc.y"
+#line 19403 "preproc.y"
                                         { (yyval.str) = cat_str(3, mm_strdup("{"), (yyvsp[-1].str), mm_strdup("}")); }
-#line 67033 "preproc.c"
+#line 67026 "preproc.c"
     break;
 
   case 3665: /* c_thing: c_anything  */
-#line 19413 "preproc.y"
+#line 19406 "preproc.y"
                                         { (yyval.str) = (yyvsp[0].str); }
-#line 67039 "preproc.c"
+#line 67032 "preproc.c"
     break;
 
   case 3666: /* c_thing: '('  */
-#line 19414 "preproc.y"
+#line 19407 "preproc.y"
                                         { (yyval.str) = mm_strdup("("); }
-#line 67045 "preproc.c"
+#line 67038 "preproc.c"
     break;
 
   case 3667: /* c_thing: ')'  */
-#line 19415 "preproc.y"
+#line 19408 "preproc.y"
                                         { (yyval.str) = mm_strdup(")"); }
-#line 67051 "preproc.c"
+#line 67044 "preproc.c"
     break;
 
   case 3668: /* c_thing: ','  */
-#line 19416 "preproc.y"
+#line 19409 "preproc.y"
                                         { (yyval.str) = mm_strdup(","); }
-#line 67057 "preproc.c"
+#line 67050 "preproc.c"
     break;
 
   case 3669: /* c_thing: ';'  */
-#line 19417 "preproc.y"
+#line 19410 "preproc.y"
                                         { (yyval.str) = mm_strdup(";"); }
-#line 67063 "preproc.c"
+#line 67056 "preproc.c"
     break;
 
   case 3670: /* c_anything: ecpg_ident  */
-#line 19420 "preproc.y"
+#line 19413 "preproc.y"
                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 67069 "preproc.c"
+#line 67062 "preproc.c"
     break;
 
   case 3671: /* c_anything: Iconst  */
-#line 19421 "preproc.y"
+#line 19414 "preproc.y"
                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 67075 "preproc.c"
+#line 67068 "preproc.c"
     break;
 
   case 3672: /* c_anything: ecpg_fconst  */
-#line 19422 "preproc.y"
+#line 19415 "preproc.y"
                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 67081 "preproc.c"
+#line 67074 "preproc.c"
     break;
 
   case 3673: /* c_anything: ecpg_sconst  */
-#line 19423 "preproc.y"
+#line 19416 "preproc.y"
                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 67087 "preproc.c"
+#line 67080 "preproc.c"
     break;
 
   case 3674: /* c_anything: '*'  */
-#line 19424 "preproc.y"
+#line 19417 "preproc.y"
                                                 { (yyval.str) = mm_strdup("*"); }
-#line 67093 "preproc.c"
+#line 67086 "preproc.c"
     break;
 
   case 3675: /* c_anything: '+'  */
-#line 19425 "preproc.y"
+#line 19418 "preproc.y"
                                                 { (yyval.str) = mm_strdup("+"); }
-#line 67099 "preproc.c"
+#line 67092 "preproc.c"
     break;
 
   case 3676: /* c_anything: '-'  */
-#line 19426 "preproc.y"
+#line 19419 "preproc.y"
                                                 { (yyval.str) = mm_strdup("-"); }
-#line 67105 "preproc.c"
+#line 67098 "preproc.c"
     break;
 
   case 3677: /* c_anything: '/'  */
-#line 19427 "preproc.y"
+#line 19420 "preproc.y"
                                                 { (yyval.str) = mm_strdup("/"); }
-#line 67111 "preproc.c"
+#line 67104 "preproc.c"
     break;
 
   case 3678: /* c_anything: '%'  */
-#line 19428 "preproc.y"
+#line 19421 "preproc.y"
                                                 { (yyval.str) = mm_strdup("%"); }
-#line 67117 "preproc.c"
+#line 67110 "preproc.c"
     break;
 
   case 3679: /* c_anything: NULL_P  */
-#line 19429 "preproc.y"
+#line 19422 "preproc.y"
                                                 { (yyval.str) = mm_strdup("NULL"); }
-#line 67123 "preproc.c"
+#line 67116 "preproc.c"
     break;
 
   case 3680: /* c_anything: S_ADD  */
-#line 19430 "preproc.y"
+#line 19423 "preproc.y"
                                                 { (yyval.str) = mm_strdup("+="); }
-#line 67129 "preproc.c"
+#line 67122 "preproc.c"
     break;
 
   case 3681: /* c_anything: S_AND  */
-#line 19431 "preproc.y"
+#line 19424 "preproc.y"
                                                 { (yyval.str) = mm_strdup("&&"); }
-#line 67135 "preproc.c"
+#line 67128 "preproc.c"
     break;
 
   case 3682: /* c_anything: S_ANYTHING  */
-#line 19432 "preproc.y"
+#line 19425 "preproc.y"
                                                 { (yyval.str) = make_name(); }
-#line 67141 "preproc.c"
+#line 67134 "preproc.c"
     break;
 
   case 3683: /* c_anything: S_AUTO  */
-#line 19433 "preproc.y"
+#line 19426 "preproc.y"
                                                 { (yyval.str) = mm_strdup("auto"); }
-#line 67147 "preproc.c"
+#line 67140 "preproc.c"
     break;
 
   case 3684: /* c_anything: S_CONST  */
-#line 19434 "preproc.y"
+#line 19427 "preproc.y"
                                                 { (yyval.str) = mm_strdup("const"); }
-#line 67153 "preproc.c"
+#line 67146 "preproc.c"
     break;
 
   case 3685: /* c_anything: S_DEC  */
-#line 19435 "preproc.y"
+#line 19428 "preproc.y"
                                                 { (yyval.str) = mm_strdup("--"); }
-#line 67159 "preproc.c"
+#line 67152 "preproc.c"
     break;
 
   case 3686: /* c_anything: S_DIV  */
-#line 19436 "preproc.y"
+#line 19429 "preproc.y"
                                                 { (yyval.str) = mm_strdup("/="); }
-#line 67165 "preproc.c"
+#line 67158 "preproc.c"
     break;
 
   case 3687: /* c_anything: S_DOTPOINT  */
-#line 19437 "preproc.y"
+#line 19430 "preproc.y"
                                                 { (yyval.str) = mm_strdup(".*"); }
-#line 67171 "preproc.c"
+#line 67164 "preproc.c"
     break;
 
   case 3688: /* c_anything: S_EQUAL  */
-#line 19438 "preproc.y"
+#line 19431 "preproc.y"
                                                 { (yyval.str) = mm_strdup("=="); }
-#line 67177 "preproc.c"
+#line 67170 "preproc.c"
     break;
 
   case 3689: /* c_anything: S_EXTERN  */
-#line 19439 "preproc.y"
+#line 19432 "preproc.y"
                                                 { (yyval.str) = mm_strdup("extern"); }
-#line 67183 "preproc.c"
+#line 67176 "preproc.c"
     break;
 
   case 3690: /* c_anything: S_INC  */
-#line 19440 "preproc.y"
+#line 19433 "preproc.y"
                                                 { (yyval.str) = mm_strdup("++"); }
-#line 67189 "preproc.c"
+#line 67182 "preproc.c"
     break;
 
   case 3691: /* c_anything: S_LSHIFT  */
-#line 19441 "preproc.y"
+#line 19434 "preproc.y"
                                                 { (yyval.str) = mm_strdup("<<"); }
-#line 67195 "preproc.c"
+#line 67188 "preproc.c"
     break;
 
   case 3692: /* c_anything: S_MEMBER  */
-#line 19442 "preproc.y"
+#line 19435 "preproc.y"
                                                 { (yyval.str) = mm_strdup("->"); }
-#line 67201 "preproc.c"
+#line 67194 "preproc.c"
     break;
 
   case 3693: /* c_anything: S_MEMPOINT  */
-#line 19443 "preproc.y"
+#line 19436 "preproc.y"
                                                 { (yyval.str) = mm_strdup("->*"); }
-#line 67207 "preproc.c"
+#line 67200 "preproc.c"
     break;
 
   case 3694: /* c_anything: S_MOD  */
-#line 19444 "preproc.y"
+#line 19437 "preproc.y"
                                                 { (yyval.str) = mm_strdup("%="); }
-#line 67213 "preproc.c"
+#line 67206 "preproc.c"
     break;
 
   case 3695: /* c_anything: S_MUL  */
-#line 19445 "preproc.y"
+#line 19438 "preproc.y"
                                                 { (yyval.str) = mm_strdup("*="); }
-#line 67219 "preproc.c"
+#line 67212 "preproc.c"
     break;
 
   case 3696: /* c_anything: S_NEQUAL  */
-#line 19446 "preproc.y"
+#line 19439 "preproc.y"
                                                 { (yyval.str) = mm_strdup("!="); }
-#line 67225 "preproc.c"
+#line 67218 "preproc.c"
     break;
 
   case 3697: /* c_anything: S_OR  */
-#line 19447 "preproc.y"
+#line 19440 "preproc.y"
                                                 { (yyval.str) = mm_strdup("||"); }
-#line 67231 "preproc.c"
+#line 67224 "preproc.c"
     break;
 
   case 3698: /* c_anything: S_REGISTER  */
-#line 19448 "preproc.y"
+#line 19441 "preproc.y"
                                                 { (yyval.str) = mm_strdup("register"); }
-#line 67237 "preproc.c"
+#line 67230 "preproc.c"
     break;
 
   case 3699: /* c_anything: S_RSHIFT  */
-#line 19449 "preproc.y"
+#line 19442 "preproc.y"
                                                 { (yyval.str) = mm_strdup(">>"); }
-#line 67243 "preproc.c"
+#line 67236 "preproc.c"
     break;
 
   case 3700: /* c_anything: S_STATIC  */
-#line 19450 "preproc.y"
+#line 19443 "preproc.y"
                                                 { (yyval.str) = mm_strdup("static"); }
-#line 67249 "preproc.c"
+#line 67242 "preproc.c"
     break;
 
   case 3701: /* c_anything: S_SUB  */
-#line 19451 "preproc.y"
+#line 19444 "preproc.y"
                                                 { (yyval.str) = mm_strdup("-="); }
-#line 67255 "preproc.c"
+#line 67248 "preproc.c"
     break;
 
   case 3702: /* c_anything: S_TYPEDEF  */
-#line 19452 "preproc.y"
+#line 19445 "preproc.y"
                                                 { (yyval.str) = mm_strdup("typedef"); }
-#line 67261 "preproc.c"
+#line 67254 "preproc.c"
     break;
 
   case 3703: /* c_anything: S_VOLATILE  */
-#line 19453 "preproc.y"
+#line 19446 "preproc.y"
                                                 { (yyval.str) = mm_strdup("volatile"); }
-#line 67267 "preproc.c"
+#line 67260 "preproc.c"
     break;
 
   case 3704: /* c_anything: SQL_BOOL  */
-#line 19454 "preproc.y"
+#line 19447 "preproc.y"
                                                 { (yyval.str) = mm_strdup("bool"); }
-#line 67273 "preproc.c"
+#line 67266 "preproc.c"
     break;
 
   case 3705: /* c_anything: ENUM_P  */
-#line 19455 "preproc.y"
+#line 19448 "preproc.y"
                                                 { (yyval.str) = mm_strdup("enum"); }
-#line 67279 "preproc.c"
+#line 67272 "preproc.c"
     break;
 
   case 3706: /* c_anything: HOUR_P  */
-#line 19456 "preproc.y"
+#line 19449 "preproc.y"
                                                 { (yyval.str) = mm_strdup("hour"); }
-#line 67285 "preproc.c"
+#line 67278 "preproc.c"
     break;
 
   case 3707: /* c_anything: INT_P  */
-#line 19457 "preproc.y"
+#line 19450 "preproc.y"
                                                 { (yyval.str) = mm_strdup("int"); }
-#line 67291 "preproc.c"
+#line 67284 "preproc.c"
     break;
 
   case 3708: /* c_anything: SQL_LONG  */
-#line 19458 "preproc.y"
+#line 19451 "preproc.y"
                                                 { (yyval.str) = mm_strdup("long"); }
-#line 67297 "preproc.c"
+#line 67290 "preproc.c"
     break;
 
   case 3709: /* c_anything: MINUTE_P  */
-#line 19459 "preproc.y"
+#line 19452 "preproc.y"
                                                 { (yyval.str) = mm_strdup("minute"); }
-#line 67303 "preproc.c"
+#line 67296 "preproc.c"
     break;
 
   case 3710: /* c_anything: MONTH_P  */
-#line 19460 "preproc.y"
+#line 19453 "preproc.y"
                                                 { (yyval.str) = mm_strdup("month"); }
-#line 67309 "preproc.c"
+#line 67302 "preproc.c"
     break;
 
   case 3711: /* c_anything: SECOND_P  */
-#line 19461 "preproc.y"
+#line 19454 "preproc.y"
                                                 { (yyval.str) = mm_strdup("second"); }
-#line 67315 "preproc.c"
+#line 67308 "preproc.c"
     break;
 
   case 3712: /* c_anything: SQL_SHORT  */
-#line 19462 "preproc.y"
+#line 19455 "preproc.y"
                                                 { (yyval.str) = mm_strdup("short"); }
-#line 67321 "preproc.c"
+#line 67314 "preproc.c"
     break;
 
   case 3713: /* c_anything: SQL_SIGNED  */
-#line 19463 "preproc.y"
+#line 19456 "preproc.y"
                                                 { (yyval.str) = mm_strdup("signed"); }
-#line 67327 "preproc.c"
+#line 67320 "preproc.c"
     break;
 
   case 3714: /* c_anything: SQL_STRUCT  */
-#line 19464 "preproc.y"
+#line 19457 "preproc.y"
                                                 { (yyval.str) = mm_strdup("struct"); }
-#line 67333 "preproc.c"
+#line 67326 "preproc.c"
     break;
 
   case 3715: /* c_anything: SQL_UNSIGNED  */
-#line 19465 "preproc.y"
+#line 19458 "preproc.y"
                                                 { (yyval.str) = mm_strdup("unsigned"); }
-#line 67339 "preproc.c"
+#line 67332 "preproc.c"
     break;
 
   case 3716: /* c_anything: YEAR_P  */
-#line 19466 "preproc.y"
+#line 19459 "preproc.y"
                                                 { (yyval.str) = mm_strdup("year"); }
-#line 67345 "preproc.c"
+#line 67338 "preproc.c"
     break;
 
   case 3717: /* c_anything: CHAR_P  */
-#line 19467 "preproc.y"
+#line 19460 "preproc.y"
                                                 { (yyval.str) = mm_strdup("char"); }
-#line 67351 "preproc.c"
+#line 67344 "preproc.c"
     break;
 
   case 3718: /* c_anything: FLOAT_P  */
-#line 19468 "preproc.y"
+#line 19461 "preproc.y"
                                                 { (yyval.str) = mm_strdup("float"); }
-#line 67357 "preproc.c"
+#line 67350 "preproc.c"
     break;
 
   case 3719: /* c_anything: TO  */
-#line 19469 "preproc.y"
+#line 19462 "preproc.y"
                                                 { (yyval.str) = mm_strdup("to"); }
-#line 67363 "preproc.c"
+#line 67356 "preproc.c"
     break;
 
   case 3720: /* c_anything: UNION  */
-#line 19470 "preproc.y"
+#line 19463 "preproc.y"
                                                 { (yyval.str) = mm_strdup("union"); }
-#line 67369 "preproc.c"
+#line 67362 "preproc.c"
     break;
 
   case 3721: /* c_anything: VARCHAR  */
-#line 19471 "preproc.y"
+#line 19464 "preproc.y"
                                                 { (yyval.str) = mm_strdup("varchar"); }
-#line 67375 "preproc.c"
+#line 67368 "preproc.c"
     break;
 
   case 3722: /* c_anything: '['  */
-#line 19472 "preproc.y"
+#line 19465 "preproc.y"
                                                 { (yyval.str) = mm_strdup("["); }
-#line 67381 "preproc.c"
+#line 67374 "preproc.c"
     break;
 
   case 3723: /* c_anything: ']'  */
-#line 19473 "preproc.y"
+#line 19466 "preproc.y"
                                                 { (yyval.str) = mm_strdup("]"); }
-#line 67387 "preproc.c"
+#line 67380 "preproc.c"
     break;
 
   case 3724: /* c_anything: '='  */
-#line 19474 "preproc.y"
+#line 19467 "preproc.y"
                                                 { (yyval.str) = mm_strdup("="); }
-#line 67393 "preproc.c"
+#line 67386 "preproc.c"
     break;
 
   case 3725: /* c_anything: ':'  */
-#line 19475 "preproc.y"
+#line 19468 "preproc.y"
                                                 { (yyval.str) = mm_strdup(":"); }
-#line 67399 "preproc.c"
+#line 67392 "preproc.c"
     break;
 
   case 3726: /* DeallocateStmt: DEALLOCATE prepared_name  */
-#line 19478 "preproc.y"
+#line 19471 "preproc.y"
                                                 { check_declared_list((yyvsp[0].str)); (yyval.str) = (yyvsp[0].str); }
-#line 67405 "preproc.c"
+#line 67398 "preproc.c"
     break;
 
   case 3727: /* DeallocateStmt: DEALLOCATE PREPARE prepared_name  */
-#line 19479 "preproc.y"
+#line 19472 "preproc.y"
                                                         { check_declared_list((yyvsp[0].str)); (yyval.str) = (yyvsp[0].str); }
-#line 67411 "preproc.c"
+#line 67404 "preproc.c"
     break;
 
   case 3728: /* DeallocateStmt: DEALLOCATE ALL  */
-#line 19480 "preproc.y"
+#line 19473 "preproc.y"
                                                                         { (yyval.str) = mm_strdup("all"); }
-#line 67417 "preproc.c"
+#line 67410 "preproc.c"
     break;
 
   case 3729: /* DeallocateStmt: DEALLOCATE PREPARE ALL  */
-#line 19481 "preproc.y"
+#line 19474 "preproc.y"
                                                                 { (yyval.str) = mm_strdup("all"); }
-#line 67423 "preproc.c"
+#line 67416 "preproc.c"
     break;
 
   case 3730: /* Iresult: Iconst  */
-#line 19484 "preproc.y"
+#line 19477 "preproc.y"
                                                         { (yyval.str) = (yyvsp[0].str); }
-#line 67429 "preproc.c"
+#line 67422 "preproc.c"
     break;
 
   case 3731: /* Iresult: '(' Iresult ')'  */
-#line 19485 "preproc.y"
+#line 19478 "preproc.y"
                                                         { (yyval.str) = cat_str(3, mm_strdup("("), (yyvsp[-1].str), mm_strdup(")")); }
-#line 67435 "preproc.c"
+#line 67428 "preproc.c"
     break;
 
   case 3732: /* Iresult: Iresult '+' Iresult  */
-#line 19486 "preproc.y"
+#line 19479 "preproc.y"
                                                 { (yyval.str) = cat_str(3, (yyvsp[-2].str), mm_strdup("+"), (yyvsp[0].str)); }
-#line 67441 "preproc.c"
+#line 67434 "preproc.c"
     break;
 
   case 3733: /* Iresult: Iresult '-' Iresult  */
-#line 19487 "preproc.y"
+#line 19480 "preproc.y"
                                                 { (yyval.str) = cat_str(3, (yyvsp[-2].str), mm_strdup("-"), (yyvsp[0].str)); }
-#line 67447 "preproc.c"
+#line 67440 "preproc.c"
     break;
 
   case 3734: /* Iresult: Iresult '*' Iresult  */
-#line 19488 "preproc.y"
+#line 19481 "preproc.y"
                                                 { (yyval.str) = cat_str(3, (yyvsp[-2].str), mm_strdup("*"), (yyvsp[0].str)); }
-#line 67453 "preproc.c"
+#line 67446 "preproc.c"
     break;
 
   case 3735: /* Iresult: Iresult '/' Iresult  */
-#line 19489 "preproc.y"
+#line 19482 "preproc.y"
                                                 { (yyval.str) = cat_str(3, (yyvsp[-2].str), mm_strdup("/"), (yyvsp[0].str)); }
-#line 67459 "preproc.c"
+#line 67452 "preproc.c"
     break;
 
   case 3736: /* Iresult: Iresult '%' Iresult  */
-#line 19490 "preproc.y"
+#line 19483 "preproc.y"
                                                 { (yyval.str) = cat_str(3, (yyvsp[-2].str), mm_strdup("%"), (yyvsp[0].str)); }
-#line 67465 "preproc.c"
+#line 67458 "preproc.c"
     break;
 
   case 3737: /* Iresult: ecpg_sconst  */
-#line 19491 "preproc.y"
+#line 19484 "preproc.y"
                                                         { (yyval.str) = (yyvsp[0].str); }
-#line 67471 "preproc.c"
+#line 67464 "preproc.c"
     break;
 
   case 3738: /* Iresult: ColId  */
-#line 19492 "preproc.y"
+#line 19485 "preproc.y"
                                                                 { (yyval.str) = (yyvsp[0].str); }
-#line 67477 "preproc.c"
+#line 67470 "preproc.c"
     break;
 
   case 3739: /* Iresult: ColId '(' var_type ')'  */
-#line 19493 "preproc.y"
+#line 19486 "preproc.y"
                                                 { if (pg_strcasecmp((yyvsp[-3].str), "sizeof") != 0)
 							mmerror(PARSE_ERROR, ET_ERROR, "operator not allowed in variable definition");
 						  else
 							(yyval.str) = cat_str(4, (yyvsp[-3].str), mm_strdup("("), (yyvsp[-1].type).type_str, mm_strdup(")"));
 						}
-#line 67487 "preproc.c"
+#line 67480 "preproc.c"
     break;
 
   case 3740: /* execute_rest: %empty  */
-#line 19500 "preproc.y"
+#line 19493 "preproc.y"
                                 { (yyval.str) = EMPTY; }
-#line 67493 "preproc.c"
+#line 67486 "preproc.c"
     break;
 
   case 3741: /* execute_rest: ecpg_using opt_ecpg_into  */
-#line 19501 "preproc.y"
+#line 19494 "preproc.y"
                                     { (yyval.str) = EMPTY; }
-#line 67499 "preproc.c"
+#line 67492 "preproc.c"
     break;
 
   case 3742: /* execute_rest: ecpg_into ecpg_using  */
-#line 19502 "preproc.y"
+#line 19495 "preproc.y"
                                 { (yyval.str) = EMPTY; }
-#line 67505 "preproc.c"
+#line 67498 "preproc.c"
     break;
 
   case 3743: /* execute_rest: ecpg_into  */
-#line 19503 "preproc.y"
+#line 19496 "preproc.y"
                                                 { (yyval.str) = EMPTY; }
-#line 67511 "preproc.c"
+#line 67504 "preproc.c"
     break;
 
   case 3744: /* ecpg_into: INTO into_list  */
-#line 19506 "preproc.y"
+#line 19499 "preproc.y"
                                 { (yyval.str) = EMPTY; }
-#line 67517 "preproc.c"
+#line 67510 "preproc.c"
     break;
 
   case 3745: /* ecpg_into: into_descriptor  */
-#line 19507 "preproc.y"
+#line 19500 "preproc.y"
                                         { (yyval.str) = (yyvsp[0].str); }
-#line 67523 "preproc.c"
+#line 67516 "preproc.c"
     break;
 
   case 3746: /* opt_ecpg_into: %empty  */
-#line 19510 "preproc.y"
+#line 19503 "preproc.y"
                                 { (yyval.str) = EMPTY; }
-#line 67529 "preproc.c"
+#line 67522 "preproc.c"
     break;
 
   case 3747: /* opt_ecpg_into: ecpg_into  */
-#line 19511 "preproc.y"
+#line 19504 "preproc.y"
                                 { (yyval.str) = (yyvsp[0].str); }
-#line 67535 "preproc.c"
+#line 67528 "preproc.c"
     break;
 
   case 3748: /* ecpg_fetch_into: ecpg_into  */
-#line 19514 "preproc.y"
+#line 19507 "preproc.y"
                                 { (yyval.str) = (yyvsp[0].str); }
-#line 67541 "preproc.c"
+#line 67534 "preproc.c"
     break;
 
   case 3749: /* ecpg_fetch_into: using_descriptor  */
-#line 19516 "preproc.y"
+#line 19509 "preproc.y"
         {
 		struct variable *var;
 
@@ -67550,23 +67543,23 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 		add_variable_to_head(&argsresult, var, &no_indicator);
 		(yyval.str) = (yyvsp[0].str);
 	}
-#line 67554 "preproc.c"
+#line 67547 "preproc.c"
     break;
 
   case 3750: /* opt_ecpg_fetch_into: %empty  */
-#line 19526 "preproc.y"
+#line 19519 "preproc.y"
                                         { (yyval.str) = EMPTY; }
-#line 67560 "preproc.c"
+#line 67553 "preproc.c"
     break;
 
   case 3751: /* opt_ecpg_fetch_into: ecpg_fetch_into  */
-#line 19527 "preproc.y"
+#line 19520 "preproc.y"
                                         { (yyval.str) = (yyvsp[0].str); }
-#line 67566 "preproc.c"
+#line 67559 "preproc.c"
     break;
 
 
-#line 67570 "preproc.c"
+#line 67563 "preproc.c"
 
       default: break;
     }
@@ -67765,7 +67758,7 @@ yyreturn:
   return yyresult;
 }
 
-#line 19530 "preproc.y"
+#line 19523 "preproc.y"
 
 
 void base_yyerror(const char *error)
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
index 204b8cb..31ec1c5 100644
--- a/src/interfaces/ecpg/preproc/preproc.y
+++ b/src/interfaces/ecpg/preproc/preproc.y
@@ -2469,12 +2469,10 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 }
 |  CREATE SCHEMA IF_P NOT EXISTS opt_single_name AUTHORIZATION RoleSpec OptSchemaEltList
  { 
-mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
  $$ = cat_str(5,mm_strdup("create schema if not exists"),$6,mm_strdup("authorization"),$8,$9);
 }
 |  CREATE SCHEMA IF_P NOT EXISTS ColId OptSchemaEltList
  { 
-mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
  $$ = cat_str(3,mm_strdup("create schema if not exists"),$6,$7);
 }
 ;
@@ -4319,7 +4317,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
  key_update:
  ON UPDATE key_action
  { 
-mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
  $$ = cat_str(2,mm_strdup("on update"),$3);
 }
 ;
@@ -5443,7 +5440,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 }
 |  CREATE opt_or_replace CONSTRAINT TRIGGER name AFTER TriggerEvents ON qualified_name OptConstrFromTable ConstraintAttributeSpec FOR EACH ROW TriggerWhen EXECUTE FUNCTION_or_PROCEDURE func_name '(' TriggerFuncArgs ')'
  { 
-mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
  $$ = cat_str(18,mm_strdup("create"),$2,mm_strdup("constraint trigger"),$5,mm_strdup("after"),$7,mm_strdup("on"),$9,$10,$11,mm_strdup("for each row"),$15,mm_strdup("execute"),$17,$18,mm_strdup("("),$20,mm_strdup(")"));
 }
 ;
@@ -7645,7 +7641,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
  aggr_arg:
  func_arg
  { 
-mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
  $$ = $1;
 }
 ;
@@ -9249,12 +9244,10 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server")
 }
 |  CREATE OptTemp RECURSIVE VIEW qualified_name '(' columnList ')' opt_reloptions AS SelectStmt opt_check_option
  { 
-mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
  $$ = cat_str(11,mm_strdup("create"),$2,mm_strdup("recursive view"),$5,mm_strdup("("),$7,mm_strdup(")"),$9,mm_strdup("as"),$11,$12);
 }
 |  CREATE OR REPLACE OptTemp RECURSIVE VIEW qualified_name '(' columnList ')' opt_reloptions AS SelectStmt opt_check_option
  { 
-mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
  $$ = cat_str(11,mm_strdup("create or replace"),$4,mm_strdup("recursive view"),$7,mm_strdup("("),$9,mm_strdup(")"),$11,mm_strdup("as"),$13,$14);
 }
 ;
diff --git a/src/interfaces/ecpg/preproc/type.h b/src/interfaces/ecpg/preproc/type.h
index 5935cd7..ce21243 100644
--- a/src/interfaces/ecpg/preproc/type.h
+++ b/src/interfaces/ecpg/preproc/type.h
@@ -163,13 +163,25 @@ struct typedefs
 	struct typedefs *next;
 };
 
+/*
+ * Info about a defined symbol (macro), coming from a -D command line switch
+ * or a define command in the program.  These are stored in a simple list.
+ * Because ecpg supports compiling multiple files per run, we have to remember
+ * the command-line definitions and be able to revert to those; this motivates
+ * storing cmdvalue separately from value.
+ * name and value are separately-malloc'd strings; cmdvalue typically isn't.
+ * used is NULL unless we are currently expanding the macro, in which case
+ * it points to the buffer before the one scanning the macro; we reset it
+ * to NULL upon returning to that buffer.  This is used to prevent recursive
+ * expansion of the macro.
+ */
 struct _defines
 {
-	char	   *olddef;
-	char	   *newdef;
-	int			pertinent;
-	void	   *used;
-	struct _defines *next;
+	char	   *name;			/* symbol's name */
+	char	   *value;			/* current value, or NULL if undefined */
+	const char *cmdvalue;		/* value set on command line, or NULL */
+	void	   *used;			/* buffer pointer, or NULL */
+	struct _defines *next;		/* list link */
 };
 
 /* This is a linked list of the variable names and types. */