]> git.ipfire.org Git - thirdparty/postgresql.git/commitdiff
Deliver better error message when a relation name is used in an expression.
authorTom Lane <tgl@sss.pgh.pa.us>
Fri, 27 Dec 2002 20:06:19 +0000 (20:06 +0000)
committerTom Lane <tgl@sss.pgh.pa.us>
Fri, 27 Dec 2002 20:06:19 +0000 (20:06 +0000)
Per report from Ian Barwick.

src/backend/parser/parse_expr.c

index db0667ef16ec6c6370720158e216ad11035ffcf0..9705ca5d7de558a26c183987e6e68253df8694e6 100644 (file)
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.137 2002/12/12 20:35:13 tgl Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.138 2002/12/27 20:06:19 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -934,6 +934,7 @@ exprType(Node *expr)
                                        if (!qtree || !IsA(qtree, Query))
                                                elog(ERROR, "exprType: Cannot get type for untransformed sublink");
                                        tent = (TargetEntry *) lfirst(qtree->targetList);
+                                       Assert(IsA(tent, TargetEntry));
                                        type = tent->resdom->restype;
                                }
                                else
@@ -967,6 +968,16 @@ exprType(Node *expr)
                case T_ConstraintTestValue:
                        type = ((ConstraintTestValue *) expr)->typeId;
                        break;
+               case T_RangeVar:
+                       /*
+                        * If someone uses a bare relation name in an expression,
+                        * we will likely first notice a problem here (see comments in
+                        * transformColumnRef()).  Issue an appropriate error message.
+                        */
+                       elog(ERROR, "Relation reference \"%s\" cannot be used in an expression",
+                                ((RangeVar *) expr)->relname);
+                       type = InvalidOid;      /* keep compiler quiet */
+                       break;
                default:
                        elog(ERROR, "exprType: Do not know how to get type for %d node",
                                 nodeTag(expr));