diff options
author | Bruce Momjian <bruce@momjian.us> | 2011-06-09 14:32:50 -0400 |
---|---|---|
committer | Bruce Momjian <bruce@momjian.us> | 2011-06-09 14:32:50 -0400 |
commit | 6560407c7db2c7e32926a46f5fb52175ac10d9e5 (patch) | |
tree | 9641e538893819410634624a8e0cb86a13d857a6 /src/backend/parser | |
parent | adf43b2b36ca3d7f988933990051c74a4bd0d6f8 (diff) | |
download | postgresql-6560407c7db2c7e32926a46f5fb52175ac10d9e5.tar.gz postgresql-6560407c7db2c7e32926a46f5fb52175ac10d9e5.zip |
Pgindent run before 9.1 beta2.
Diffstat (limited to 'src/backend/parser')
-rw-r--r-- | src/backend/parser/analyze.c | 18 | ||||
-rw-r--r-- | src/backend/parser/parse_coerce.c | 6 | ||||
-rw-r--r-- | src/backend/parser/parse_utilcmd.c | 10 |
3 files changed, 17 insertions, 17 deletions
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index 4867685c7f9..e4a4e3a5e48 100644 --- a/src/backend/parser/analyze.c +++ b/src/backend/parser/analyze.c @@ -575,7 +575,7 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt) * We must assign collations now because assign_query_collations * doesn't process rangetable entries. We just assign all the * collations independently in each row, and don't worry about - * whether they are consistent vertically. The outer INSERT query + * whether they are consistent vertically. The outer INSERT query * isn't going to care about the collations of the VALUES columns, * so it's not worth the effort to identify a common collation for * each one here. (But note this does have one user-visible @@ -1100,16 +1100,16 @@ transformValuesClause(ParseState *pstate, SelectStmt *stmt) * doesn't process rangetable entries, and (2) we need to label the VALUES * RTE with column collations for use in the outer query. We don't * consider conflict of implicit collations to be an error here; instead - * the column will just show InvalidOid as its collation, and you'll get - * a failure later if that results in failure to resolve a collation. + * the column will just show InvalidOid as its collation, and you'll get a + * failure later if that results in failure to resolve a collation. * * Note we modify the per-column expression lists in-place. */ collations = NIL; for (i = 0; i < sublist_length; i++) { - Oid coltype; - Oid colcoll; + Oid coltype; + Oid colcoll; coltype = select_common_type(pstate, colexprs[i], "VALUES", NULL); @@ -1210,7 +1210,7 @@ transformValuesClause(ParseState *pstate, SelectStmt *stmt) (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("VALUES must not contain table references"), parser_errposition(pstate, - locate_var_of_level((Node *) exprsLists, 0)))); + locate_var_of_level((Node *) exprsLists, 0)))); /* * Another thing we can't currently support is NEW/OLD references in rules @@ -1225,7 +1225,7 @@ transformValuesClause(ParseState *pstate, SelectStmt *stmt) errmsg("VALUES must not contain OLD or NEW references"), errhint("Use SELECT ... UNION ALL ... instead."), parser_errposition(pstate, - locate_var_of_level((Node *) exprsLists, 0)))); + locate_var_of_level((Node *) exprsLists, 0)))); qry->rtable = pstate->p_rtable; qry->jointree = makeFromExpr(pstate->p_joinlist, NULL); @@ -1237,13 +1237,13 @@ transformValuesClause(ParseState *pstate, SelectStmt *stmt) (errcode(ERRCODE_GROUPING_ERROR), errmsg("cannot use aggregate function in VALUES"), parser_errposition(pstate, - locate_agg_of_level((Node *) exprsLists, 0)))); + locate_agg_of_level((Node *) exprsLists, 0)))); if (pstate->p_hasWindowFuncs) ereport(ERROR, (errcode(ERRCODE_WINDOWING_ERROR), errmsg("cannot use window function in VALUES"), parser_errposition(pstate, - locate_windowfunc((Node *) exprsLists)))); + locate_windowfunc((Node *) exprsLists)))); assign_query_collations(pstate, qry); diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c index 3c5be6bc888..f26c69abddd 100644 --- a/src/backend/parser/parse_coerce.c +++ b/src/backend/parser/parse_coerce.c @@ -167,7 +167,7 @@ coerce_type(ParseState *pstate, Node *node, * * These cases are unlike the ones above because the exposed type of * the argument must be an actual array or enum type. In particular - * the argument must *not* be an UNKNOWN constant. If it is, we just + * the argument must *not* be an UNKNOWN constant. If it is, we just * fall through; below, we'll call anyarray_in or anyenum_in, which * will produce an error. Also, if what we have is a domain over * array or enum, we have to relabel it to its base type. @@ -1290,7 +1290,7 @@ coerce_to_common_type(ParseState *pstate, Node *node, * * Domains over arrays match ANYARRAY, and are immediately flattened to their * base type. (Thus, for example, we will consider it a match if one ANYARRAY - * argument is a domain over int4[] while another one is just int4[].) Also + * argument is a domain over int4[] while another one is just int4[].) Also * notice that such a domain does *not* match ANYNONARRAY. * * If we have UNKNOWN input (ie, an untyped literal) for any polymorphic @@ -1444,7 +1444,7 @@ check_generic_type_consistency(Oid *actual_arg_types, * is an extra restriction if not.) * * Domains over arrays match ANYARRAY arguments, and are immediately flattened - * to their base type. (In particular, if the return type is also ANYARRAY, + * to their base type. (In particular, if the return type is also ANYARRAY, * we'll set it to the base type not the domain type.) * * When allow_poly is false, we are not expecting any of the actual_arg_types diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c index 5588cfac0bd..efb8fddbc39 100644 --- a/src/backend/parser/parse_utilcmd.c +++ b/src/backend/parser/parse_utilcmd.c @@ -157,7 +157,7 @@ transformCreateStmt(CreateStmt *stmt, const char *queryString) stmt = (CreateStmt *) copyObject(stmt); /* - * Look up the creation namespace. This also checks permissions on the + * Look up the creation namespace. This also checks permissions on the * target namespace, so that we throw any permissions error as early as * possible. */ @@ -169,7 +169,7 @@ transformCreateStmt(CreateStmt *stmt, const char *queryString) */ if (stmt->if_not_exists) { - Oid existing_relid; + Oid existing_relid; existing_relid = get_relname_relid(stmt->relation->relname, namespaceid); @@ -178,7 +178,7 @@ transformCreateStmt(CreateStmt *stmt, const char *queryString) ereport(NOTICE, (errcode(ERRCODE_DUPLICATE_TABLE), errmsg("relation \"%s\" already exists, skipping", - stmt->relation->relname))); + stmt->relation->relname))); return NIL; } } @@ -2544,8 +2544,8 @@ transformColumnType(CreateStmtContext *cxt, ColumnDef *column) Form_pg_type typtup = (Form_pg_type) GETSTRUCT(ctype); LookupCollation(cxt->pstate, - column->collClause->collname, - column->collClause->location); + column->collClause->collname, + column->collClause->location); /* Complain if COLLATE is applied to an uncollatable type */ if (!OidIsValid(typtup->typcollation)) ereport(ERROR, |