mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for SQL92 delimited identifiers.

Browse Source 
Add support for SQL3 IS TRUE and IS FALSE.
Augment support for SQL92 SET TIME ZONE...
This commit is contained in:
Thomas G. Lockhart 1997-10-30 16:39:27 +00:00
parent 0a9be2db9b
commit 770352d279
1 changed files with 76 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
src/backend/parser/gram.y
View File

@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.59 1997/10/28 14:56:08 vadim Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.60 1997/10/30 16:39:27 thomas Exp $
* *
* HISTORY * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
@ -63,6 +63,7 @@ static char *xlateSqlType(char *);
static Node *makeA_Expr(int oper, char *opname, Node *lexpr, Node *rexpr); static Node *makeA_Expr(int oper, char *opname, Node *lexpr, Node *rexpr);
static List *makeConstantList( A_Const *node); static List *makeConstantList( A_Const *node);
static char *FlattenStringList(List *list); static char *FlattenStringList(List *list);
static char *fmtId(char *rawid);
/* old versions of flex define this as a macro */ /* old versions of flex define this as a macro */
#if defined(yywrap) #if defined(yywrap)
@ -400,6 +401,12 @@ VariableShowStmt: SHOW ColId
n->name = $2; n->name = $2;
$$ = (Node *) n; $$ = (Node *) n;
} }
| SHOW TIME ZONE
{
VariableShowStmt *n = makeNode(VariableShowStmt);
n->name = "timezone";
$$ = (Node *) n;
}
; ;
VariableResetStmt: RESET ColId VariableResetStmt: RESET ColId
@ -408,6 +415,12 @@ VariableResetStmt: RESET ColId
n->name = $2; n->name = $2;
$$ = (Node *) n; $$ = (Node *) n;
} }
| RESET TIME ZONE
{
VariableResetStmt *n = makeNode(VariableResetStmt);
n->name = "timezone";
$$ = (Node *) n;
}
; ;
@ -498,10 +511,12 @@ default_expr: AexprConst
{ $$ = lcons( makeString( "|"), $2); } { $$ = lcons( makeString( "|"), $2); }
| default_expr TYPECAST Typename | default_expr TYPECAST Typename
{ {
$3->name = fmtId($3->name);
$$ = nconc( lcons( makeString( "CAST"), $1), makeList( makeString("AS"), $3, -1)); $$ = nconc( lcons( makeString( "CAST"), $1), makeList( makeString("AS"), $3, -1));
} }
| CAST default_expr AS Typename | CAST default_expr AS Typename
{ {
$4->name = fmtId($4->name);
$$ = nconc( lcons( makeString( "CAST"), $2), makeList( makeString("AS"), $4, -1)); $$ = nconc( lcons( makeString( "CAST"), $2), makeList( makeString("AS"), $4, -1));
} }
| '(' default_expr ')' | '(' default_expr ')'
@ -714,7 +729,7 @@ ConstraintList:
ConstraintElem: ConstraintElem:
CONSTRAINT name ConstraintDef CONSTRAINT name ConstraintDef
{ {
$3->name = $2; $3->name = fmtId($2);
$$ = $3; $$ = $3;
} }
| ConstraintDef { $$ = $1; } | ConstraintDef { $$ = $1; }
@ -751,7 +766,7 @@ constraint_elem: AexprConst
#ifdef PARSEDEBUG #ifdef PARSEDEBUG
printf( "ColId is %s\n", $1); printf( "ColId is %s\n", $1);
#endif #endif
$$ = lcons( makeString($1), NIL); $$ = lcons( makeString(fmtId($1)), NIL);
} }
| '-' constraint_elem %prec UMINUS | '-' constraint_elem %prec UMINUS
{ $$ = lcons( makeString( "-"), $2); } { $$ = lcons( makeString( "-"), $2); }
@ -777,10 +792,12 @@ printf( "ColId is %s\n", $1);
{ $$ = lcons( makeString( "|"), $2); } { $$ = lcons( makeString( "|"), $2); }
| constraint_elem TYPECAST Typename | constraint_elem TYPECAST Typename
{ {
$3->name = fmtId($3->name);
$$ = nconc( lcons( makeString( "CAST"), $1), makeList( makeString("AS"), $3, -1)); $$ = nconc( lcons( makeString( "CAST"), $1), makeList( makeString("AS"), $3, -1));
} }
| CAST constraint_elem AS Typename | CAST constraint_elem AS Typename
{ {
$4->name = fmtId($4->name);
$$ = nconc( lcons( makeString( "CAST"), $2), makeList( makeString("AS"), $4, -1)); $$ = nconc( lcons( makeString( "CAST"), $2), makeList( makeString("AS"), $4, -1));
} }
| '(' constraint_elem ')' | '(' constraint_elem ')'
@ -801,6 +818,14 @@ printf( "ColId is %s\n", $1);
{ $$ = lcons( makeString( $1), $2); } { $$ = lcons( makeString( $1), $2); }
| constraint_elem Op | constraint_elem Op
{ $$ = lappend( $1, makeString( $2)); } { $$ = lappend( $1, makeString( $2)); }
| constraint_elem IS TRUE_P
{ $$ = lappend( $1, makeString( "IS TRUE")); }
| constraint_elem IS FALSE_P
{ $$ = lappend( $1, makeString( "IS FALSE")); }
| constraint_elem IS NOT TRUE_P
{ $$ = lappend( $1, makeString( "IS NOT TRUE")); }
| constraint_elem IS NOT FALSE_P
{ $$ = lappend( $1, makeString( "IS NOT FALSE")); }
; ;
key_match: MATCH FULL { $$ = NULL; } key_match: MATCH FULL { $$ = NULL; }
@ -2933,31 +2958,31 @@ a_expr: attr opt_indirection
{ $$ = makeA_Expr(NOTNULL, NULL, $1, NULL); } { $$ = makeA_Expr(NOTNULL, NULL, $1, NULL); }
| a_expr IS TRUE_P | a_expr IS TRUE_P
{ {
A_Const *n = makeNode(A_Const); FuncCall *n = makeNode(FuncCall);
n->val.type = T_String; n->funcname = "istrue";
n->val.val.str = "t"; n->args = lcons($1,NIL);
$$ = makeA_Expr(OP, "=", $1, (Node *)n); $$ = (Node *)n;
} }
| a_expr IS FALSE_P | a_expr IS FALSE_P
{ {
A_Const *n = makeNode(A_Const); FuncCall *n = makeNode(FuncCall);
n->val.type = T_String; n->funcname = "isfalse";
n->val.val.str = "f"; n->args = lcons($1,NIL);
$$ = makeA_Expr(OP, "=", $1, (Node *)n); $$ = (Node *)n;
} }
| a_expr IS NOT TRUE_P | a_expr IS NOT TRUE_P
{ {
A_Const *n = makeNode(A_Const); FuncCall *n = makeNode(FuncCall);
n->val.type = T_String; n->funcname = "isfalse";
n->val.val.str = "f"; n->args = lcons($1,NIL);
$$ = makeA_Expr(OP, "=", $1, (Node *)n); $$ = (Node *)n;
} }
| a_expr IS NOT FALSE_P | a_expr IS NOT FALSE_P
{ {
A_Const *n = makeNode(A_Const); FuncCall *n = makeNode(FuncCall);
n->val.type = T_String; n->funcname = "istrue";
n->val.val.str = "t"; n->args = lcons($1,NIL);
$$ = makeA_Expr(OP, "=", $1, (Node *)n); $$ = (Node *)n;
} }
| a_expr BETWEEN AexprConst AND AexprConst | a_expr BETWEEN AexprConst AND AexprConst
{ {
@ -3636,3 +3661,31 @@ printf( "AexprConst argument is \"%s\"\n", defval);
return( lcons( makeString(defval), NIL)); return( lcons( makeString(defval), NIL));
} /* makeConstantList() */ } /* makeConstantList() */
/* fmtId()
* Check input string for non-lowercase/non-numeric characters.
* Returns either input string or input surrounded by double quotes.
*/
static char *
fmtId(char *rawid)
{
static char *cp;
for (cp = rawid; *cp != '\0'; cp++)
if (! (islower(*cp) || isdigit(*cp) || (*cp == '_'))) break;
if (*cp != '\0') {
cp = palloc(strlen(rawid)+1);
strcpy(cp,"\"");
strcat(cp,rawid);
strcat(cp,"\"");
} else {
cp = rawid;
};
#ifdef PARSEDEBUG
printf("fmtId- %sconvert %s to %s\n", ((cp == rawid)? "do not ": ""), rawid, cp);
#endif
return(cp);
} /* fmtId() */