diff options
Diffstat (limited to 'src/backend/parser')
| -rw-r--r-- | src/backend/parser/parse_relation.c | 4 | ||||
| -rw-r--r-- | src/backend/parser/parse_utilcmd.c | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c index 81332b57d93..1e3ecbc51ef 100644 --- a/src/backend/parser/parse_relation.c +++ b/src/backend/parser/parse_relation.c @@ -3083,8 +3083,8 @@ errorMissingColumn(ParseState *pstate, errmsg("column %s.%s does not exist", relname, colname) : errmsg("column \"%s\" does not exist", colname), state->rfirst ? closestfirst ? - errhint("Perhaps you meant to reference the column \"%s.%s\".", - state->rfirst->eref->aliasname, closestfirst) : + errhint("Perhaps you meant to reference the column \"%s.%s\".", + state->rfirst->eref->aliasname, closestfirst) : errhint("There is a column named \"%s\" in table \"%s\", but it cannot be referenced from this part of the query.", colname, state->rfirst->eref->aliasname) : 0, parser_errposition(pstate, location))); diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c index 65284941ed9..6313087174d 100644 --- a/src/backend/parser/parse_utilcmd.c +++ b/src/backend/parser/parse_utilcmd.c @@ -124,7 +124,7 @@ static void transformFKConstraints(CreateStmtContext *cxt, bool skipValidation, bool isAddConstraint); static void transformCheckConstraints(CreateStmtContext *cxt, - bool skipValidation); + bool skipValidation); static void transformConstraintAttrs(CreateStmtContext *cxt, List *constraintList); static void transformColumnType(CreateStmtContext *cxt, ColumnDef *column); @@ -287,15 +287,14 @@ transformCreateStmt(CreateStmt *stmt, const char *queryString) if (like_found) { /* - * To match INHERITS, the existence of any LIKE table with OIDs - * causes the new table to have oids. For the same reason, - * WITH/WITHOUT OIDs is also ignored with LIKE. We prepend - * because the first oid option list entry is honored. Our - * prepended WITHOUT OIDS clause will be overridden if an - * inherited table has oids. + * To match INHERITS, the existence of any LIKE table with OIDs causes + * the new table to have oids. For the same reason, WITH/WITHOUT OIDs + * is also ignored with LIKE. We prepend because the first oid option + * list entry is honored. Our prepended WITHOUT OIDS clause will be + * overridden if an inherited table has oids. */ stmt->options = lcons(makeDefElem("oids", - (Node *)makeInteger(cxt.hasoids)), stmt->options); + (Node *) makeInteger(cxt.hasoids)), stmt->options); } foreach(elements, stmt->tableElts) @@ -305,6 +304,7 @@ transformCreateStmt(CreateStmt *stmt, const char *queryString) if (nodeTag(element) == T_Constraint) transformTableConstraint(&cxt, (Constraint *) element); } + /* * transformIndexConstraints wants cxt.alist to contain only index * statements, so transfer anything we already have into save_alist. @@ -1949,8 +1949,8 @@ transformCheckConstraints(CreateStmtContext *cxt, bool skipValidation) /* * If creating a new table, we can safely skip validation of check - * constraints, and nonetheless mark them valid. (This will override - * any user-supplied NOT VALID flag.) + * constraints, and nonetheless mark them valid. (This will override any + * user-supplied NOT VALID flag.) */ if (skipValidation) { |