From 20ab467d76d78271006818d2baf4c9c8658d1f38 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 14 Mar 2006 22:48:25 +0000 Subject: Improve parser so that we can show an error cursor position for errors during parse analysis, not only errors detected in the flex/bison stages. This is per my earlier proposal. This commit includes all the basic infrastructure, but locations are only tracked and reported for errors involving column references, function calls, and operators. More could be done later but this seems like a good set to start with. I've also moved the ReportSyntaxErrorPosition logic out of psql and into libpq, which should make it available to more people --- even within psql this is an improvement because warnings weren't handled by ReportSyntaxErrorPosition. --- src/backend/commands/functioncmds.c | 50 ++++++------------------------------- 1 file changed, 8 insertions(+), 42 deletions(-) (limited to 'src/backend/commands/functioncmds.c') diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c index 4a78db5200a..1da1cf66cb3 100644 --- a/src/backend/commands/functioncmds.c +++ b/src/backend/commands/functioncmds.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.72 2006/03/05 15:58:24 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.73 2006/03/14 22:48:18 tgl Exp $ * * DESCRIPTION * These routines take the parse tree and pick out the @@ -75,7 +75,7 @@ compute_return_type(TypeName *returnType, Oid languageOid, { Oid rettype; - rettype = LookupTypeName(returnType); + rettype = LookupTypeName(NULL, returnType); if (OidIsValid(rettype)) { @@ -174,7 +174,7 @@ examine_parameter_list(List *parameters, Oid languageOid, TypeName *t = fp->argType; Oid toid; - toid = LookupTypeName(t); + toid = LookupTypeName(NULL, t); if (OidIsValid(toid)) { if (!get_typisdefined(toid)) @@ -1152,33 +1152,10 @@ CreateCast(CreateCastStmt *stmt) ObjectAddress myself, referenced; - sourcetypeid = LookupTypeName(stmt->sourcetype); - if (!OidIsValid(sourcetypeid)) - ereport(ERROR, - (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("source data type %s does not exist", - TypeNameToString(stmt->sourcetype)))); - - targettypeid = LookupTypeName(stmt->targettype); - if (!OidIsValid(targettypeid)) - ereport(ERROR, - (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("target data type %s does not exist", - TypeNameToString(stmt->targettype)))); - - /* No shells, no pseudo-types allowed */ - if (!get_typisdefined(sourcetypeid)) - ereport(ERROR, - (errcode(ERRCODE_WRONG_OBJECT_TYPE), - errmsg("source data type %s is only a shell", - TypeNameToString(stmt->sourcetype)))); - - if (!get_typisdefined(targettypeid)) - ereport(ERROR, - (errcode(ERRCODE_WRONG_OBJECT_TYPE), - errmsg("target data type %s is only a shell", - TypeNameToString(stmt->targettype)))); + sourcetypeid = typenameTypeId(NULL, stmt->sourcetype); + targettypeid = typenameTypeId(NULL, stmt->targettype); + /* No pseudo-types allowed */ if (get_typtype(sourcetypeid) == 'p') ereport(ERROR, (errcode(ERRCODE_WRONG_OBJECT_TYPE), @@ -1400,19 +1377,8 @@ DropCast(DropCastStmt *stmt) HeapTuple tuple; ObjectAddress object; - sourcetypeid = LookupTypeName(stmt->sourcetype); - if (!OidIsValid(sourcetypeid)) - ereport(ERROR, - (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("source data type %s does not exist", - TypeNameToString(stmt->sourcetype)))); - - targettypeid = LookupTypeName(stmt->targettype); - if (!OidIsValid(targettypeid)) - ereport(ERROR, - (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("target data type %s does not exist", - TypeNameToString(stmt->targettype)))); + sourcetypeid = typenameTypeId(NULL, stmt->sourcetype); + targettypeid = typenameTypeId(NULL, stmt->targettype); tuple = SearchSysCache(CASTSOURCETARGET, ObjectIdGetDatum(sourcetypeid), -- cgit v1.2.3