diff -r bd5a52b2681a src/backend/access/common/tupdesc.c --- a/src/backend/access/common/tupdesc.c +++ b/src/backend/access/common/tupdesc.c @@ -532,10 +532,10 @@ attnum++; attname = entry->colname; - atttypid = typenameTypeId(NULL, entry->typename, &atttypmod); - attdim = list_length(entry->typename->arrayBounds); + atttypid = typenameTypeId(NULL, entry->typeName, &atttypmod); + attdim = list_length(entry->typeName->arrayBounds); - if (entry->typename->setof) + if (entry->typeName->setof) ereport(ERROR, (errcode(ERRCODE_INVALID_TABLE_DEFINITION), errmsg("column \"%s\" cannot be declared SETOF", diff -r bd5a52b2681a src/backend/commands/sequence.c --- a/src/backend/commands/sequence.c +++ b/src/backend/commands/sequence.c @@ -141,53 +141,53 @@ switch (i) { case SEQ_COL_NAME: - coldef->typename = makeTypeNameFromOid(NAMEOID, -1); + coldef->typeName = makeTypeNameFromOid(NAMEOID, -1); coldef->colname = "sequence_name"; namestrcpy(&name, seq->sequence->relname); value[i - 1] = NameGetDatum(&name); break; case SEQ_COL_LASTVAL: - coldef->typename = makeTypeNameFromOid(INT8OID, -1); + coldef->typeName = makeTypeNameFromOid(INT8OID, -1); coldef->colname = "last_value"; value[i - 1] = Int64GetDatumFast(new.last_value); break; case SEQ_COL_STARTVAL: - coldef->typename = makeTypeNameFromOid(INT8OID, -1); + coldef->typeName = makeTypeNameFromOid(INT8OID, -1); coldef->colname = "start_value"; value[i - 1] = Int64GetDatumFast(new.start_value); break; case SEQ_COL_INCBY: - coldef->typename = makeTypeNameFromOid(INT8OID, -1); + coldef->typeName = makeTypeNameFromOid(INT8OID, -1); coldef->colname = "increment_by"; value[i - 1] = Int64GetDatumFast(new.increment_by); break; case SEQ_COL_MAXVALUE: - coldef->typename = makeTypeNameFromOid(INT8OID, -1); + coldef->typeName = makeTypeNameFromOid(INT8OID, -1); coldef->colname = "max_value"; value[i - 1] = Int64GetDatumFast(new.max_value); break; case SEQ_COL_MINVALUE: - coldef->typename = makeTypeNameFromOid(INT8OID, -1); + coldef->typeName = makeTypeNameFromOid(INT8OID, -1); coldef->colname = "min_value"; value[i - 1] = Int64GetDatumFast(new.min_value); break; case SEQ_COL_CACHE: - coldef->typename = makeTypeNameFromOid(INT8OID, -1); + coldef->typeName = makeTypeNameFromOid(INT8OID, -1); coldef->colname = "cache_value"; value[i - 1] = Int64GetDatumFast(new.cache_value); break; case SEQ_COL_LOG: - coldef->typename = makeTypeNameFromOid(INT8OID, -1); + coldef->typeName = makeTypeNameFromOid(INT8OID, -1); coldef->colname = "log_cnt"; value[i - 1] = Int64GetDatum((int64) 1); break; case SEQ_COL_CYCLE: - coldef->typename = makeTypeNameFromOid(BOOLOID, -1); + coldef->typeName = makeTypeNameFromOid(BOOLOID, -1); coldef->colname = "is_cycled"; value[i - 1] = BoolGetDatum(new.is_cycled); break; case SEQ_COL_CALLED: - coldef->typename = makeTypeNameFromOid(BOOLOID, -1); + coldef->typeName = makeTypeNameFromOid(BOOLOID, -1); coldef->colname = "is_called"; value[i - 1] = BoolGetDatum(false); break; diff -r bd5a52b2681a src/backend/commands/tablecmds.c --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -303,7 +303,7 @@ bool recurse, bool recursing, AlterTableCmd *cmd); static void ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel, - const char *colName, TypeName *typename); + const char *colName, TypeName *typeName); static void ATPostAlterTypeCleanup(List **wqueue, AlteredTableInfo *tab); static void ATPostAlterTypeParse(char *cmd, List **wqueue); static void change_owner_recurse_to_sequences(Oid relationOid, @@ -1251,7 +1251,7 @@ (errmsg("merging multiple inherited definitions of column \"%s\"", attributeName))); def = (ColumnDef *) list_nth(inhSchema, exist_attno - 1); - defTypeId = typenameTypeId(NULL, def->typename, &deftypmod); + defTypeId = typenameTypeId(NULL, def->typeName, &deftypmod); if (defTypeId != attribute->atttypid || deftypmod != attribute->atttypmod) ereport(ERROR, @@ -1259,7 +1259,7 @@ errmsg("inherited column \"%s\" has a type conflict", attributeName), errdetail("%s versus %s", - TypeNameToString(def->typename), + TypeNameToString(def->typeName), format_type_be(attribute->atttypid)))); def->inhcount++; /* Merge of NOT NULL constraints = OR 'em together */ @@ -1274,7 +1274,7 @@ */ def = makeNode(ColumnDef); def->colname = pstrdup(attributeName); - def->typename = makeTypeNameFromOid(attribute->atttypid, + def->typeName = makeTypeNameFromOid(attribute->atttypid, attribute->atttypmod); def->inhcount = 1; def->is_local = false; @@ -1409,16 +1409,16 @@ (errmsg("merging column \"%s\" with inherited definition", attributeName))); def = (ColumnDef *) list_nth(inhSchema, exist_attno - 1); - defTypeId = typenameTypeId(NULL, def->typename, &deftypmod); - newTypeId = typenameTypeId(NULL, newdef->typename, &newtypmod); + defTypeId = typenameTypeId(NULL, def->typeName, &deftypmod); + newTypeId = typenameTypeId(NULL, newdef->typeName, &newtypmod); if (defTypeId != newTypeId || deftypmod != newtypmod) ereport(ERROR, (errcode(ERRCODE_DATATYPE_MISMATCH), errmsg("column \"%s\" has a type conflict", attributeName), errdetail("%s versus %s", - TypeNameToString(def->typename), - TypeNameToString(newdef->typename)))); + TypeNameToString(def->typeName), + TypeNameToString(newdef->typeName)))); /* Mark the column as locally defined */ def->is_local = true; /* Merge of NOT NULL constraints = OR 'em together */ @@ -3480,7 +3480,7 @@ int32 ctypmod; /* Okay if child matches by type */ - ctypeId = typenameTypeId(NULL, colDef->typename, &ctypmod); + ctypeId = typenameTypeId(NULL, colDef->typeName, &ctypmod); if (ctypeId != childatt->atttypid || ctypmod != childatt->atttypmod) ereport(ERROR, @@ -3535,7 +3535,7 @@ MaxHeapAttributeNumber))); i = minattnum + 1; - typeTuple = typenameType(NULL, colDef->typename, &typmod); + typeTuple = typenameType(NULL, colDef->typeName, &typmod); tform = (Form_pg_type) GETSTRUCT(typeTuple); typeOid = HeapTupleGetOid(typeTuple); @@ -3551,7 +3551,7 @@ attribute.atttypmod = typmod; attribute.attnum = i; attribute.attbyval = tform->typbyval; - attribute.attndims = list_length(colDef->typename->arrayBounds); + attribute.attndims = list_length(colDef->typeName->arrayBounds); attribute.attstorage = tform->typstorage; attribute.attalign = tform->typalign; attribute.attnotnull = colDef->is_not_null; @@ -5415,7 +5415,7 @@ AlterTableCmd *cmd) { char *colName = cmd->name; - TypeName *typename = (TypeName *) cmd->def; + TypeName *typeName = (TypeName *) cmd->def; HeapTuple tuple; Form_pg_attribute attTup; AttrNumber attnum; @@ -5450,7 +5450,7 @@ colName))); /* Look up the target type */ - targettype = typenameTypeId(NULL, typename, &targettypmod); + targettype = typenameTypeId(NULL, typeName, &targettypmod); /* make sure datatype is legal for a column */ CheckAttributeType(colName, targettype); @@ -5541,7 +5541,7 @@ static void ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel, - const char *colName, TypeName *typename) + const char *colName, TypeName *typeName) { HeapTuple heapTup; Form_pg_attribute attTup; @@ -5578,7 +5578,7 @@ colName))); /* Look up the target type (should not fail, since prep found it) */ - typeTuple = typenameType(NULL, typename, &targettypmod); + typeTuple = typenameType(NULL, typeName, &targettypmod); tform = (Form_pg_type) GETSTRUCT(typeTuple); targettype = HeapTupleGetOid(typeTuple); @@ -5825,7 +5825,7 @@ */ attTup->atttypid = targettype; attTup->atttypmod = targettypmod; - attTup->attndims = list_length(typename->arrayBounds); + attTup->attndims = list_length(typeName->arrayBounds); attTup->attlen = tform->typlen; attTup->attbyval = tform->typbyval; attTup->attalign = tform->typalign; diff -r bd5a52b2681a src/backend/commands/typecmds.c --- a/src/backend/commands/typecmds.c +++ b/src/backend/commands/typecmds.c @@ -676,7 +676,7 @@ bool saw_default = false; bool typNotNull = false; bool nullDefined = false; - int32 typNDims = list_length(stmt->typename->arrayBounds); + int32 typNDims = list_length(stmt->typeName->arrayBounds); HeapTuple typeTup; List *schema = stmt->constraints; ListCell *listptr; @@ -716,7 +716,7 @@ /* * Look up the base type. */ - typeTup = typenameType(NULL, stmt->typename, &basetypeMod); + typeTup = typenameType(NULL, stmt->typeName, &basetypeMod); baseType = (Form_pg_type) GETSTRUCT(typeTup); basetypeoid = HeapTupleGetOid(typeTup); @@ -732,7 +732,7 @@ ereport(ERROR, (errcode(ERRCODE_DATATYPE_MISMATCH), errmsg("\"%s\" is not a valid base type for a domain", - TypeNameToString(stmt->typename)))); + TypeNameToString(stmt->typeName)))); /* passed by value */ byValue = baseType->typbyval; @@ -1013,7 +1013,7 @@ Relation pg_type; /* Convert list of names to a name and namespace */ - enumNamespace = QualifiedNameGetCreationNamespace(stmt->typename, + enumNamespace = QualifiedNameGetCreationNamespace(stmt->typeName, &enumName); /* Check we have creation rights in target namespace */ diff -r bd5a52b2681a src/backend/commands/view.c --- a/src/backend/commands/view.c +++ b/src/backend/commands/view.c @@ -118,7 +118,7 @@ ColumnDef *def = makeNode(ColumnDef); def->colname = pstrdup(tle->resname); - def->typename = makeTypeNameFromOid(exprType((Node *) tle->expr), + def->typeName = makeTypeNameFromOid(exprType((Node *) tle->expr), exprTypmod((Node *) tle->expr)); def->inhcount = 0; def->is_local = true; diff -r bd5a52b2681a src/backend/nodes/copyfuncs.c --- a/src/backend/nodes/copyfuncs.c +++ b/src/backend/nodes/copyfuncs.c @@ -1491,7 +1491,7 @@ COPY_SCALAR_FIELD(isNatural); COPY_NODE_FIELD(larg); COPY_NODE_FIELD(rarg); - COPY_NODE_FIELD(using); + COPY_NODE_FIELD(usingClause); COPY_NODE_FIELD(quals); COPY_NODE_FIELD(alias); COPY_SCALAR_FIELD(rtindex); @@ -1915,7 +1915,7 @@ TypeName *newnode = makeNode(TypeName); COPY_NODE_FIELD(names); - COPY_SCALAR_FIELD(typeid); + COPY_SCALAR_FIELD(typeOid); COPY_SCALAR_FIELD(setof); COPY_SCALAR_FIELD(pct_type); COPY_NODE_FIELD(typmods); @@ -1969,7 +1969,7 @@ TypeCast *newnode = makeNode(TypeCast); COPY_NODE_FIELD(arg); - COPY_NODE_FIELD(typename); + COPY_NODE_FIELD(typeName); COPY_LOCATION_FIELD(location); return newnode; @@ -1995,7 +1995,7 @@ ColumnDef *newnode = makeNode(ColumnDef); COPY_STRING_FIELD(colname); - COPY_NODE_FIELD(typename); + COPY_NODE_FIELD(typeName); COPY_SCALAR_FIELD(inhcount); COPY_SCALAR_FIELD(is_local); COPY_SCALAR_FIELD(is_not_null); @@ -2052,7 +2052,7 @@ COPY_SCALAR_FIELD(xmloption); COPY_NODE_FIELD(expr); - COPY_NODE_FIELD(typename); + COPY_NODE_FIELD(typeName); COPY_LOCATION_FIELD(location); return newnode; @@ -2204,7 +2204,7 @@ AlterDomainStmt *newnode = makeNode(AlterDomainStmt); COPY_SCALAR_FIELD(subtype); - COPY_NODE_FIELD(typename); + COPY_NODE_FIELD(typeName); COPY_STRING_FIELD(name); COPY_NODE_FIELD(def); COPY_SCALAR_FIELD(behavior); @@ -2622,7 +2622,7 @@ { CreateEnumStmt *newnode = makeNode(CreateEnumStmt); - COPY_NODE_FIELD(typename); + COPY_NODE_FIELD(typeName); COPY_NODE_FIELD(vals); return newnode; @@ -2657,7 +2657,7 @@ CreateDomainStmt *newnode = makeNode(CreateDomainStmt); COPY_NODE_FIELD(domainname); - COPY_NODE_FIELD(typename); + COPY_NODE_FIELD(typeName); COPY_NODE_FIELD(constraints); return newnode; diff -r bd5a52b2681a src/backend/nodes/equalfuncs.c --- a/src/backend/nodes/equalfuncs.c +++ b/src/backend/nodes/equalfuncs.c @@ -688,7 +688,7 @@ COMPARE_SCALAR_FIELD(isNatural); COMPARE_NODE_FIELD(larg); COMPARE_NODE_FIELD(rarg); - COMPARE_NODE_FIELD(using); + COMPARE_NODE_FIELD(usingClause); COMPARE_NODE_FIELD(quals); COMPARE_NODE_FIELD(alias); COMPARE_SCALAR_FIELD(rtindex); @@ -957,7 +957,7 @@ _equalAlterDomainStmt(AlterDomainStmt *a, AlterDomainStmt *b) { COMPARE_SCALAR_FIELD(subtype); - COMPARE_NODE_FIELD(typename); + COMPARE_NODE_FIELD(typeName); COMPARE_STRING_FIELD(name); COMPARE_NODE_FIELD(def); COMPARE_SCALAR_FIELD(behavior); @@ -1311,7 +1311,7 @@ static bool _equalCreateEnumStmt(CreateEnumStmt *a, CreateEnumStmt *b) { - COMPARE_NODE_FIELD(typename); + COMPARE_NODE_FIELD(typeName); COMPARE_NODE_FIELD(vals); return true; @@ -1340,7 +1340,7 @@ _equalCreateDomainStmt(CreateDomainStmt *a, CreateDomainStmt *b) { COMPARE_NODE_FIELD(domainname); - COMPARE_NODE_FIELD(typename); + COMPARE_NODE_FIELD(typeName); COMPARE_NODE_FIELD(constraints); return true; @@ -1852,7 +1852,7 @@ _equalTypeName(TypeName *a, TypeName *b) { COMPARE_NODE_FIELD(names); - COMPARE_SCALAR_FIELD(typeid); + COMPARE_SCALAR_FIELD(typeOid); COMPARE_SCALAR_FIELD(setof); COMPARE_SCALAR_FIELD(pct_type); COMPARE_NODE_FIELD(typmods); @@ -1867,7 +1867,7 @@ _equalTypeCast(TypeCast *a, TypeCast *b) { COMPARE_NODE_FIELD(arg); - COMPARE_NODE_FIELD(typename); + COMPARE_NODE_FIELD(typeName); COMPARE_LOCATION_FIELD(location); return true; @@ -1920,7 +1920,7 @@ _equalColumnDef(ColumnDef *a, ColumnDef *b) { COMPARE_STRING_FIELD(colname); - COMPARE_NODE_FIELD(typename); + COMPARE_NODE_FIELD(typeName); COMPARE_SCALAR_FIELD(inhcount); COMPARE_SCALAR_FIELD(is_local); COMPARE_SCALAR_FIELD(is_not_null); @@ -2062,7 +2062,7 @@ { COMPARE_SCALAR_FIELD(xmloption); COMPARE_NODE_FIELD(expr); - COMPARE_NODE_FIELD(typename); + COMPARE_NODE_FIELD(typeName); COMPARE_LOCATION_FIELD(location); return true; diff -r bd5a52b2681a src/backend/nodes/makefuncs.c --- a/src/backend/nodes/makefuncs.c +++ b/src/backend/nodes/makefuncs.c @@ -316,11 +316,11 @@ * build a TypeName node to represent a type already known by OID/typmod. */ TypeName * -makeTypeNameFromOid(Oid typeid, int32 typmod) +makeTypeNameFromOid(Oid typeOid, int32 typmod) { TypeName *n = makeNode(TypeName); - n->typeid = typeid; + n->typeOid = typeOid; n->typemod = typmod; n->location = -1; return n; diff -r bd5a52b2681a src/backend/nodes/nodeFuncs.c --- a/src/backend/nodes/nodeFuncs.c +++ b/src/backend/nodes/nodeFuncs.c @@ -860,7 +860,7 @@ * so any of the components might be leftmost. */ loc = exprLocation(tc->arg); - loc = leftmostLoc(loc, tc->typename->location); + loc = leftmostLoc(loc, tc->typeName->location); loc = leftmostLoc(loc, tc->location); } break; @@ -2359,7 +2359,7 @@ if (walker(tc->arg, context)) return true; - if (walker(tc->typename, context)) + if (walker(tc->typeName, context)) return true; } break; @@ -2400,7 +2400,7 @@ { ColumnDef *coldef = (ColumnDef *) node; - if (walker(coldef->typename, context)) + if (walker(coldef->typeName, context)) return true; if (walker(coldef->raw_default, context)) return true; @@ -2415,7 +2415,7 @@ if (walker(xs->expr, context)) return true; - if (walker(xs->typename, context)) + if (walker(xs->typeName, context)) return true; } break; diff -r bd5a52b2681a src/backend/nodes/outfuncs.c --- a/src/backend/nodes/outfuncs.c +++ b/src/backend/nodes/outfuncs.c @@ -1207,7 +1207,7 @@ WRITE_BOOL_FIELD(isNatural); WRITE_NODE_FIELD(larg); WRITE_NODE_FIELD(rarg); - WRITE_NODE_FIELD(using); + WRITE_NODE_FIELD(usingClause); WRITE_NODE_FIELD(quals); WRITE_NODE_FIELD(alias); WRITE_INT_FIELD(rtindex); @@ -1772,7 +1772,7 @@ WRITE_ENUM_FIELD(xmloption, XmlOptionType); WRITE_NODE_FIELD(expr); - WRITE_NODE_FIELD(typename); + WRITE_NODE_FIELD(typeName); WRITE_LOCATION_FIELD(location); } @@ -1782,7 +1782,7 @@ WRITE_NODE_TYPE("COLUMNDEF"); WRITE_STRING_FIELD(colname); - WRITE_NODE_FIELD(typename); + WRITE_NODE_FIELD(typeName); WRITE_INT_FIELD(inhcount); WRITE_BOOL_FIELD(is_local); WRITE_BOOL_FIELD(is_not_null); @@ -1797,7 +1797,7 @@ WRITE_NODE_TYPE("TYPENAME"); WRITE_NODE_FIELD(names); - WRITE_OID_FIELD(typeid); + WRITE_OID_FIELD(typeOid); WRITE_BOOL_FIELD(setof); WRITE_BOOL_FIELD(pct_type); WRITE_NODE_FIELD(typmods); @@ -1812,7 +1812,7 @@ WRITE_NODE_TYPE("TYPECAST"); WRITE_NODE_FIELD(arg); - WRITE_NODE_FIELD(typename); + WRITE_NODE_FIELD(typeName); WRITE_LOCATION_FIELD(location); } diff -r bd5a52b2681a src/backend/nodes/readfuncs.c --- a/src/backend/nodes/readfuncs.c +++ b/src/backend/nodes/readfuncs.c @@ -984,7 +984,7 @@ READ_BOOL_FIELD(isNatural); READ_NODE_FIELD(larg); READ_NODE_FIELD(rarg); - READ_NODE_FIELD(using); + READ_NODE_FIELD(usingClause); READ_NODE_FIELD(quals); READ_NODE_FIELD(alias); READ_INT_FIELD(rtindex); diff -r bd5a52b2681a src/backend/parser/gram.y --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -2021,7 +2021,7 @@ { ColumnDef *n = makeNode(ColumnDef); n->colname = $1; - n->typename = $2; + n->typeName = $2; n->constraints = $3; n->is_local = true; $$ = (Node *)n; @@ -2468,7 +2468,7 @@ { ColumnDef *n = makeNode(ColumnDef); n->colname = $1; - n->typename = NULL; + n->typeName = NULL; n->inhcount = 0; n->is_local = true; n->is_not_null = false; @@ -3056,7 +3056,7 @@ | CREATE TYPE_P any_name AS ENUM_P '(' enum_val_list ')' { CreateEnumStmt *n = makeNode(CreateEnumStmt); - n->typename = $3; + n->typeName = $3; n->vals = $7; $$ = (Node *)n; } @@ -5622,7 +5622,7 @@ { CreateDomainStmt *n = makeNode(CreateDomainStmt); n->domainname = $3; - n->typename = $5; + n->typeName = $5; n->constraints = $6; $$ = (Node *)n; } @@ -5634,7 +5634,7 @@ { AlterDomainStmt *n = makeNode(AlterDomainStmt); n->subtype = 'T'; - n->typename = $3; + n->typeName = $3; n->def = $4; $$ = (Node *)n; } @@ -5643,7 +5643,7 @@ { AlterDomainStmt *n = makeNode(AlterDomainStmt); n->subtype = 'N'; - n->typename = $3; + n->typeName = $3; $$ = (Node *)n; } /* ALTER DOMAIN SET NOT NULL */ @@ -5651,7 +5651,7 @@ { AlterDomainStmt *n = makeNode(AlterDomainStmt); n->subtype = 'O'; - n->typename = $3; + n->typeName = $3; $$ = (Node *)n; } /* ALTER DOMAIN ADD CONSTRAINT ... */ @@ -5659,7 +5659,7 @@ { AlterDomainStmt *n = makeNode(AlterDomainStmt); n->subtype = 'C'; - n->typename = $3; + n->typeName = $3; n->def = $5; $$ = (Node *)n; } @@ -5668,7 +5668,7 @@ { AlterDomainStmt *n = makeNode(AlterDomainStmt); n->subtype = 'X'; - n->typename = $3; + n->typeName = $3; n->name = $6; n->behavior = $7; $$ = (Node *)n; @@ -6920,7 +6920,7 @@ n->isNatural = FALSE; n->larg = $1; n->rarg = $4; - n->using = NIL; + n->usingClause = NIL; n->quals = NULL; $$ = n; } @@ -6932,7 +6932,7 @@ n->larg = $1; n->rarg = $4; if ($5 != NULL && IsA($5, List)) - n->using = (List *) $5; /* USING clause */ + n->usingClause = (List *) $5; /* USING clause */ else n->quals = $5; /* ON clause */ $$ = n; @@ -6946,7 +6946,7 @@ n->larg = $1; n->rarg = $3; if ($4 != NULL && IsA($4, List)) - n->using = (List *) $4; /* USING clause */ + n->usingClause = (List *) $4; /* USING clause */ else n->quals = $4; /* ON clause */ $$ = n; @@ -6958,7 +6958,7 @@ n->isNatural = TRUE; n->larg = $1; n->rarg = $5; - n->using = NIL; /* figure out which columns later... */ + n->usingClause = NIL; /* figure out which columns later... */ n->quals = NULL; /* fill later */ $$ = n; } @@ -6970,7 +6970,7 @@ n->isNatural = TRUE; n->larg = $1; n->rarg = $4; - n->using = NIL; /* figure out which columns later... */ + n->usingClause = NIL; /* figure out which columns later... */ n->quals = NULL; /* fill later */ $$ = n; } @@ -7135,7 +7135,7 @@ { ColumnDef *n = makeNode(ColumnDef); n->colname = $1; - n->typename = $2; + n->typeName = $2; n->constraints = NIL; n->is_local = true; $$ = (Node *)n; @@ -8694,7 +8694,7 @@ XmlSerialize *n = makeNode(XmlSerialize); n->xmloption = $3; n->expr = $4; - n->typename = $6; + n->typeName = $6; n->location = @1; $$ = (Node *)n; } @@ -9906,7 +9906,7 @@ { TypeCast *n = makeNode(TypeCast); n->arg = arg; - n->typename = typename; + n->typeName = typename; n->location = location; return (Node *) n; } diff -r bd5a52b2681a src/backend/parser/parse_clause.c --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -772,7 +772,7 @@ ListCell *lx, *rx; - Assert(j->using == NIL); /* shouldn't have USING() too */ + Assert(j->usingClause == NIL); /* shouldn't have USING() too */ foreach(lx, l_colnames) { @@ -795,7 +795,7 @@ rlist = lappend(rlist, m_name); } - j->using = rlist; + j->usingClause = rlist; } /* @@ -804,14 +804,14 @@ res_colnames = NIL; res_colvars = NIL; - if (j->using) + if (j->usingClause) { /* * JOIN/USING (or NATURAL JOIN, as transformed above). Transform * the list into an explicit ON-condition, and generate a list of * merged result columns. */ - List *ucols = j->using; + List *ucols = j->usingClause; List *l_usingvars = NIL; List *r_usingvars = NIL; ListCell *ucol; diff -r bd5a52b2681a src/backend/parser/parse_expr.c --- a/src/backend/parser/parse_expr.c +++ b/src/backend/parser/parse_expr.c @@ -159,7 +159,7 @@ Oid elementType; int32 targetTypmod; - targetType = typenameTypeId(pstate, tc->typename, + targetType = typenameTypeId(pstate, tc->typeName, &targetTypmod); elementType = get_element_type(targetType); if (OidIsValid(elementType)) @@ -1770,7 +1770,7 @@ XMLOID, "XMLSERIALIZE")); - targetType = typenameTypeId(pstate, xs->typename, &targetTypmod); + targetType = typenameTypeId(pstate, xs->typeName, &targetTypmod); xexpr->xmloption = xs->xmloption; xexpr->location = xs->location; @@ -1994,7 +1994,7 @@ int32 targetTypmod; int location; - targetType = typenameTypeId(pstate, tc->typename, &targetTypmod); + targetType = typenameTypeId(pstate, tc->typeName, &targetTypmod); if (inputType == InvalidOid) return expr; /* do nothing if NULL input */ @@ -2006,7 +2006,7 @@ */ location = tc->location; if (location < 0) - location = tc->typename->location; + location = tc->typeName->location; result = coerce_to_target_type(pstate, expr, inputType, targetType, targetTypmod, diff -r bd5a52b2681a src/backend/parser/parse_relation.c --- a/src/backend/parser/parse_relation.c +++ b/src/backend/parser/parse_relation.c @@ -1067,13 +1067,13 @@ int32 attrtypmod; attrname = pstrdup(n->colname); - if (n->typename->setof) + if (n->typeName->setof) ereport(ERROR, (errcode(ERRCODE_INVALID_TABLE_DEFINITION), errmsg("column \"%s\" cannot be declared SETOF", attrname), - parser_errposition(pstate, n->typename->location))); - attrtype = typenameTypeId(pstate, n->typename, &attrtypmod); + parser_errposition(pstate, n->typeName->location))); + attrtype = typenameTypeId(pstate, n->typeName, &attrtypmod); eref->colnames = lappend(eref->colnames, makeString(attrname)); rte->funccoltypes = lappend_oid(rte->funccoltypes, attrtype); rte->funccoltypmods = lappend_int(rte->funccoltypmods, attrtypmod); diff -r bd5a52b2681a src/backend/parser/parse_target.c --- a/src/backend/parser/parse_target.c +++ b/src/backend/parser/parse_target.c @@ -1355,9 +1355,9 @@ name); if (strength <= 1) { - if (((TypeCast *) node)->typename != NULL) + if (((TypeCast *) node)->typeName != NULL) { - *name = strVal(llast(((TypeCast *) node)->typename->names)); + *name = strVal(llast(((TypeCast *) node)->typeName->names)); return 1; } } diff -r bd5a52b2681a src/backend/parser/parse_type.c --- a/src/backend/parser/parse_type.c +++ b/src/backend/parser/parse_type.c @@ -27,7 +27,7 @@ #include "utils/syscache.h" -static int32 typenameTypeMod(ParseState *pstate, const TypeName *typename, +static int32 typenameTypeMod(ParseState *pstate, const TypeName *typeName, Type typ); @@ -54,57 +54,57 @@ * pstate is only used for error location info, and may be NULL. */ Type -LookupTypeName(ParseState *pstate, const TypeName *typename, +LookupTypeName(ParseState *pstate, const TypeName *typeName, int32 *typmod_p) { Oid typoid; HeapTuple tup; int32 typmod; - if (typename->names == NIL) + if (typeName->names == NIL) { /* We have the OID already if it's an internally generated TypeName */ - typoid = typename->typeid; + typoid = typeName->typeOid; } - else if (typename->pct_type) + else if (typeName->pct_type) { /* Handle %TYPE reference to type of an existing field */ - RangeVar *rel = makeRangeVar(NULL, NULL, typename->location); + RangeVar *rel = makeRangeVar(NULL, NULL, typeName->location); char *field = NULL; Oid relid; AttrNumber attnum; /* deconstruct the name list */ - switch (list_length(typename->names)) + switch (list_length(typeName->names)) { case 1: ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), errmsg("improper %%TYPE reference (too few dotted names): %s", - NameListToString(typename->names)), - parser_errposition(pstate, typename->location))); + NameListToString(typeName->names)), + parser_errposition(pstate, typeName->location))); break; case 2: - rel->relname = strVal(linitial(typename->names)); - field = strVal(lsecond(typename->names)); + rel->relname = strVal(linitial(typeName->names)); + field = strVal(lsecond(typeName->names)); break; case 3: - rel->schemaname = strVal(linitial(typename->names)); - rel->relname = strVal(lsecond(typename->names)); - field = strVal(lthird(typename->names)); + rel->schemaname = strVal(linitial(typeName->names)); + rel->relname = strVal(lsecond(typeName->names)); + field = strVal(lthird(typeName->names)); break; case 4: - rel->catalogname = strVal(linitial(typename->names)); - rel->schemaname = strVal(lsecond(typename->names)); - rel->relname = strVal(lthird(typename->names)); - field = strVal(lfourth(typename->names)); + rel->catalogname = strVal(linitial(typeName->names)); + rel->schemaname = strVal(lsecond(typeName->names)); + rel->relname = strVal(lthird(typeName->names)); + field = strVal(lfourth(typeName->names)); break; default: ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), errmsg("improper %%TYPE reference (too many dotted names): %s", - NameListToString(typename->names)), - parser_errposition(pstate, typename->location))); + NameListToString(typeName->names)), + parser_errposition(pstate, typeName->location))); break; } @@ -116,16 +116,16 @@ (errcode(ERRCODE_UNDEFINED_COLUMN), errmsg("column \"%s\" of relation \"%s\" does not exist", field, rel->relname), - parser_errposition(pstate, typename->location))); + parser_errposition(pstate, typeName->location))); typoid = get_atttype(relid, attnum); /* this construct should never have an array indicator */ - Assert(typename->arrayBounds == NIL); + Assert(typeName->arrayBounds == NIL); /* emit nuisance notice (intentionally not errposition'd) */ ereport(NOTICE, (errmsg("type reference %s converted to %s", - TypeNameToString(typename), + TypeNameToString(typeName), format_type_be(typoid)))); } else @@ -135,7 +135,7 @@ char *typname; /* deconstruct the name list */ - DeconstructQualifiedName(typename->names, &schemaname, &typname); + DeconstructQualifiedName(typeName->names, &schemaname, &typname); if (schemaname) { @@ -155,7 +155,7 @@ } /* If an array reference, return the array type instead */ - if (typename->arrayBounds != NIL) + if (typeName->arrayBounds != NIL) typoid = get_array_type(typoid); } @@ -172,7 +172,7 @@ if (!HeapTupleIsValid(tup)) /* should not happen */ elog(ERROR, "cache lookup failed for type %u", typoid); - typmod = typenameTypeMod(pstate, typename, (Type) tup); + typmod = typenameTypeMod(pstate, typeName, (Type) tup); if (typmod_p) *typmod_p = typmod; @@ -188,23 +188,23 @@ * Callers of this can therefore assume the result is a fully valid type. */ Type -typenameType(ParseState *pstate, const TypeName *typename, int32 *typmod_p) +typenameType(ParseState *pstate, const TypeName *typeName, int32 *typmod_p) { Type tup; - tup = LookupTypeName(pstate, typename, typmod_p); + tup = LookupTypeName(pstate, typeName, typmod_p); if (tup == NULL) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("type \"%s\" does not exist", - TypeNameToString(typename)), - parser_errposition(pstate, typename->location))); + TypeNameToString(typeName)), + parser_errposition(pstate, typeName->location))); if (!((Form_pg_type) GETSTRUCT(tup))->typisdefined) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("type \"%s\" is only a shell", - TypeNameToString(typename)), - parser_errposition(pstate, typename->location))); + TypeNameToString(typeName)), + parser_errposition(pstate, typeName->location))); return tup; } @@ -215,12 +215,12 @@ * not the syscache entry. */ Oid -typenameTypeId(ParseState *pstate, const TypeName *typename, int32 *typmod_p) +typenameTypeId(ParseState *pstate, const TypeName *typeName, int32 *typmod_p) { Oid typoid; Type tup; - tup = typenameType(pstate, typename, typmod_p); + tup = typenameType(pstate, typeName, typmod_p); typoid = HeapTupleGetOid(tup); ReleaseSysCache(tup); @@ -239,7 +239,7 @@ * pstate is only used for error location info, and may be NULL. */ static int32 -typenameTypeMod(ParseState *pstate, const TypeName *typename, Type typ) +typenameTypeMod(ParseState *pstate, const TypeName *typeName, Type typ) { int32 result; Oid typmodin; @@ -250,8 +250,8 @@ ParseCallbackState pcbstate; /* Return prespecified typmod if no typmod expressions */ - if (typename->typmods == NIL) - return typename->typemod; + if (typeName->typmods == NIL) + return typeName->typemod; /* * Else, type had better accept typmods. We give a special error message @@ -262,8 +262,8 @@ ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), errmsg("type modifier cannot be specified for shell type \"%s\"", - TypeNameToString(typename)), - parser_errposition(pstate, typename->location))); + TypeNameToString(typeName)), + parser_errposition(pstate, typeName->location))); typmodin = ((Form_pg_type) GETSTRUCT(typ))->typmodin; @@ -271,17 +271,17 @@ ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), errmsg("type modifier is not allowed for type \"%s\"", - TypeNameToString(typename)), - parser_errposition(pstate, typename->location))); + TypeNameToString(typeName)), + parser_errposition(pstate, typeName->location))); /* * Convert the list of raw-grammar-output expressions to a cstring array. * Currently, we allow simple numeric constants, string literals, and * identifiers; possibly this list could be extended. */ - datums = (Datum *) palloc(list_length(typename->typmods) * sizeof(Datum)); + datums = (Datum *) palloc(list_length(typeName->typmods) * sizeof(Datum)); n = 0; - foreach(l, typename->typmods) + foreach(l, typeName->typmods) { Node *tm = (Node *) lfirst(l); char *cstr = NULL; @@ -314,7 +314,7 @@ ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), errmsg("type modifiers must be simple constants or identifiers"), - parser_errposition(pstate, typename->location))); + parser_errposition(pstate, typeName->location))); datums[n++] = CStringGetDatum(cstr); } @@ -323,7 +323,7 @@ -2, false, 'c'); /* arrange to report location if type's typmodin function fails */ - setup_parser_errposition_callback(&pcbstate, pstate, typename->location); + setup_parser_errposition_callback(&pcbstate, pstate, typeName->location); result = DatumGetInt32(OidFunctionCall1(typmodin, PointerGetDatum(arrtypmod))); @@ -345,16 +345,16 @@ * it is mostly used for reporting lookup errors. */ static void -appendTypeNameToBuffer(const TypeName *typename, StringInfo string) +appendTypeNameToBuffer(const TypeName *typeName, StringInfo string) { - if (typename->names != NIL) + if (typeName->names != NIL) { /* Emit possibly-qualified name as-is */ ListCell *l; - foreach(l, typename->names) + foreach(l, typeName->names) { - if (l != list_head(typename->names)) + if (l != list_head(typeName->names)) appendStringInfoChar(string, '.'); appendStringInfoString(string, strVal(lfirst(l))); } @@ -362,17 +362,17 @@ else { /* Look up internally-specified type */ - appendStringInfoString(string, format_type_be(typename->typeid)); + appendStringInfoString(string, format_type_be(typeName->typeOid)); } /* * Add decoration as needed, but only for fields considered by * LookupTypeName */ - if (typename->pct_type) + if (typeName->pct_type) appendStringInfoString(string, "%TYPE"); - if (typename->arrayBounds != NIL) + if (typeName->arrayBounds != NIL) appendStringInfoString(string, "[]"); } @@ -384,12 +384,12 @@ * it is mostly used for reporting lookup errors. */ char * -TypeNameToString(const TypeName *typename) +TypeNameToString(const TypeName *typeName) { StringInfoData string; initStringInfo(&string); - appendTypeNameToBuffer(typename, &string); + appendTypeNameToBuffer(typeName, &string); return string.data; } @@ -406,12 +406,12 @@ initStringInfo(&string); foreach(l, typenames) { - TypeName *typename = (TypeName *) lfirst(l); + TypeName *typeName = (TypeName *) lfirst(l); - Assert(IsA(typename, TypeName)); + Assert(IsA(typeName, TypeName)); if (l != list_head(typenames)) appendStringInfoChar(&string, ','); - appendTypeNameToBuffer(typename, &string); + appendTypeNameToBuffer(typeName, &string); } return string.data; } @@ -574,7 +574,7 @@ SelectStmt *stmt; ResTarget *restarget; TypeCast *typecast; - TypeName *typename; + TypeName *typeName; ErrorContextCallback ptserrcontext; /* make sure we give useful error for empty input */ @@ -633,14 +633,14 @@ typecast->arg == NULL || !IsA(typecast->arg, A_Const)) goto fail; - typename = typecast->typename; - if (typename == NULL || - !IsA(typename, TypeName)) + typeName = typecast->typeName; + if (typeName == NULL || + !IsA(typeName, TypeName)) goto fail; - if (typename->setof) + if (typeName->setof) goto fail; - *type_id = typenameTypeId(NULL, typename, typmod_p); + *type_id = typenameTypeId(NULL, typeName, typmod_p); pfree(buf.data); diff -r bd5a52b2681a src/backend/parser/parse_utilcmd.c --- a/src/backend/parser/parse_utilcmd.c +++ b/src/backend/parser/parse_utilcmd.c @@ -266,24 +266,24 @@ /* Check for SERIAL pseudo-types */ is_serial = false; - if (list_length(column->typename->names) == 1 && - !column->typename->pct_type) + if (list_length(column->typeName->names) == 1 && + !column->typeName->pct_type) { - char *typname = strVal(linitial(column->typename->names)); + char *typname = strVal(linitial(column->typeName->names)); if (strcmp(typname, "serial") == 0 || strcmp(typname, "serial4") == 0) { is_serial = true; - column->typename->names = NIL; - column->typename->typeid = INT4OID; + column->typeName->names = NIL; + column->typeName->typeOid = INT4OID; } else if (strcmp(typname, "bigserial") == 0 || strcmp(typname, "serial8") == 0) { is_serial = true; - column->typename->names = NIL; - column->typename->typeid = INT8OID; + column->typeName->names = NIL; + column->typeName->typeOid = INT8OID; } /* @@ -291,7 +291,7 @@ * set typeid, LookupTypeName won't notice arrayBounds. We don't * need any special coding for serial(typmod) though. */ - if (is_serial && column->typename->arrayBounds != NIL) + if (is_serial && column->typeName->arrayBounds != NIL) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("array of serial is not implemented"))); @@ -382,7 +382,7 @@ snamenode->val.val.str = qstring; snamenode->location = -1; castnode = makeNode(TypeCast); - castnode->typename = SystemTypeName("regclass"); + castnode->typeName = SystemTypeName("regclass"); castnode->arg = (Node *) snamenode; castnode->location = -1; funccallnode = makeNode(FuncCall); @@ -622,7 +622,7 @@ */ def = makeNode(ColumnDef); def->colname = pstrdup(attributeName); - def->typename = makeTypeNameFromOid(attribute->atttypid, + def->typeName = makeTypeNameFromOid(attribute->atttypid, attribute->atttypmod); def->inhcount = 0; def->is_local = true; @@ -1962,7 +1962,7 @@ /* * All we really need to do here is verify that the type is valid. */ - Type ctype = typenameType(pstate, column->typename, NULL); + Type ctype = typenameType(pstate, column->typeName, NULL); ReleaseSysCache(ctype); } diff -r bd5a52b2681a src/backend/tcop/utility.c --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -602,23 +602,23 @@ * Recursively alter column default for table and, if * requested, for descendants */ - AlterDomainDefault(stmt->typename, + AlterDomainDefault(stmt->typeName, stmt->def); break; case 'N': /* ALTER DOMAIN DROP NOT NULL */ - AlterDomainNotNull(stmt->typename, + AlterDomainNotNull(stmt->typeName, false); break; case 'O': /* ALTER DOMAIN SET NOT NULL */ - AlterDomainNotNull(stmt->typename, + AlterDomainNotNull(stmt->typeName, true); break; case 'C': /* ADD CONSTRAINT */ - AlterDomainAddConstraint(stmt->typename, + AlterDomainAddConstraint(stmt->typeName, stmt->def); break; case 'X': /* DROP CONSTRAINT */ - AlterDomainDropConstraint(stmt->typename, + AlterDomainDropConstraint(stmt->typeName, stmt->name, stmt->behavior); break; diff -r bd5a52b2681a src/backend/utils/adt/ruleutils.c --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -5539,14 +5539,14 @@ if (!j->isNatural) { - if (j->using) + if (j->usingClause) { ListCell *col; appendStringInfo(buf, " USING ("); - foreach(col, j->using) - { - if (col != list_head(j->using)) + foreach(col, j->usingClause) + { + if (col != list_head(j->usingClause)) appendStringInfo(buf, ", "); appendStringInfoString(buf, quote_identifier(strVal(lfirst(col)))); @@ -5878,18 +5878,18 @@ /* * quote_qualified_identifier - Quote a possibly-qualified identifier * - * Return a name of the form namespace.ident, or just ident if namespace + * Return a name of the form qualifier.ident, or just ident if qualifier * is NULL, quoting each component if necessary. The result is palloc'd. */ char * -quote_qualified_identifier(const char *namespace, +quote_qualified_identifier(const char *qualifier, const char *ident) { StringInfoData buf; initStringInfo(&buf); - if (namespace) - appendStringInfo(&buf, "%s.", quote_identifier(namespace)); + if (qualifier) + appendStringInfo(&buf, "%s.", quote_identifier(qualifier)); appendStringInfoString(&buf, quote_identifier(ident)); return buf.data; } diff -r bd5a52b2681a src/backend/utils/misc/guc.c --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -5370,7 +5370,7 @@ { Node *arg = (Node *) lfirst(l); char *val; - TypeName *typename = NULL; + TypeName *typeName = NULL; A_Const *con; if (l != list_head(args)) @@ -5381,7 +5381,7 @@ TypeCast *tc = (TypeCast *) arg; arg = tc->arg; - typename = tc->typename; + typeName = tc->typeName; } if (!IsA(arg, A_Const)) @@ -5399,7 +5399,7 @@ break; case T_String: val = strVal(&con->val); - if (typename != NULL) + if (typeName != NULL) { /* * Must be a ConstInterval argument for TIME ZONE. Coerce @@ -5411,7 +5411,7 @@ Datum interval; char *intervalout; - typoid = typenameTypeId(NULL, typename, &typmod); + typoid = typenameTypeId(NULL, typeName, &typmod); Assert(typoid == INTERVALOID); interval = diff -r bd5a52b2681a src/backend/utils/mmgr/mcxt.c --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -193,7 +193,7 @@ } } } - (*context->methods->delete) (context); + (*context->methods->delete_context) (context); pfree(context); } diff -r bd5a52b2681a src/include/c.h --- a/src/include/c.h +++ b/src/include/c.h @@ -150,7 +150,7 @@ * dummyret is used to set return values in macros that use ?: to make * assignments. gcc wants these to be void, other compilers like char */ -#ifdef __GNUC__ /* GNU cc */ +#if defined(__GNUC__) && !defined(__cplusplus) /* GNU cc */ #define dummyret void #else #define dummyret char diff -r bd5a52b2681a src/include/nodes/makefuncs.h --- a/src/include/nodes/makefuncs.h +++ b/src/include/nodes/makefuncs.h @@ -60,7 +60,7 @@ extern TypeName *makeTypeName(char *typnam); extern TypeName *makeTypeNameFromNameList(List *names); -extern TypeName *makeTypeNameFromOid(Oid typeid, int32 typmod); +extern TypeName *makeTypeNameFromOid(Oid typeOid, int32 typmod); extern FuncExpr *makeFuncExpr(Oid funcid, Oid rettype, List *args, CoercionForm fformat); diff -r bd5a52b2681a src/include/nodes/memnodes.h --- a/src/include/nodes/memnodes.h +++ b/src/include/nodes/memnodes.h @@ -41,7 +41,7 @@ void *(*realloc) (MemoryContext context, void *pointer, Size size); void (*init) (MemoryContext context); void (*reset) (MemoryContext context); - void (*delete) (MemoryContext context); + void (*delete_context) (MemoryContext context); Size (*get_chunk_space) (MemoryContext context, void *pointer); bool (*is_empty) (MemoryContext context); void (*stats) (MemoryContext context, int level); diff -r bd5a52b2681a src/include/nodes/parsenodes.h --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -157,7 +157,7 @@ * * For TypeName structures generated internally, it is often easier to * specify the type by OID than by name. If "names" is NIL then the - * actual type OID is given by typeid, otherwise typeid is unused. + * actual type OID is given by typeOid, otherwise typeOid is unused. * Similarly, if "typmods" is NIL then the actual typmod is expected to * be prespecified in typemod, otherwise typemod is unused. * @@ -169,7 +169,7 @@ { NodeTag type; List *names; /* qualified name (list of Value strings) */ - Oid typeid; /* type identified by OID */ + Oid typeOid; /* type identified by OID */ bool setof; /* is a set? */ bool pct_type; /* %TYPE specified? */ List *typmods; /* type modifier expression(s) */ @@ -252,7 +252,7 @@ { NodeTag type; Node *arg; /* the expression being casted */ - TypeName *typename; /* the target type */ + TypeName *typeName; /* the target type */ int location; /* token location, or -1 if unknown */ } TypeCast; @@ -409,7 +409,7 @@ { NodeTag type; char *colname; /* name of column */ - TypeName *typename; /* type of column */ + TypeName *typeName; /* type of column */ int inhcount; /* number of times column is inherited */ bool is_local; /* column has local (non-inherited) def'n */ bool is_not_null; /* NOT NULL constraint specified? */ @@ -490,7 +490,7 @@ NodeTag type; XmlOptionType xmloption; /* DOCUMENT or CONTENT */ Node *expr; - TypeName *typename; + TypeName *typeName; int location; /* token location, or -1 if unknown */ } XmlSerialize; @@ -1059,7 +1059,7 @@ * X = drop constraint *------------ */ - List *typename; /* domain to work on */ + List *typeName; /* domain to work on */ char *name; /* column or constraint name to act on */ Node *def; /* definition of default or constraint */ DropBehavior behavior; /* RESTRICT or CASCADE for DROP cases */ @@ -1459,7 +1459,7 @@ { NodeTag type; List *domainname; /* qualified name (list of Value strings) */ - TypeName *typename; /* the base type */ + TypeName *typeName; /* the base type */ List *constraints; /* constraints (list of Constraint nodes) */ } CreateDomainStmt; @@ -1872,7 +1872,7 @@ typedef struct CreateEnumStmt { NodeTag type; - List *typename; /* qualified name (list of Value strings) */ + List *typeName; /* qualified name (list of Value strings) */ List *vals; /* enum values (list of Value strings) */ } CreateEnumStmt; diff -r bd5a52b2681a src/include/nodes/primnodes.h --- a/src/include/nodes/primnodes.h +++ b/src/include/nodes/primnodes.h @@ -1107,8 +1107,8 @@ /*---------- * JoinExpr - for SQL JOIN expressions * - * isNatural, using, and quals are interdependent. The user can write only - * one of NATURAL, USING(), or ON() (this is enforced by the grammar). + * isNatural, usingClause, and quals are interdependent. The user can write + * only one of NATURAL, USING(), or ON() (this is enforced by the grammar). * If he writes NATURAL then parse analysis generates the equivalent USING() * list, and from that fills in "quals" with the right equality comparisons. * If he writes USING() then "quals" is filled with equality comparisons. @@ -1132,7 +1132,7 @@ bool isNatural; /* Natural join? Will need to shape table */ Node *larg; /* left subtree */ Node *rarg; /* right subtree */ - List *using; /* USING clause, if any (list of String) */ + List *usingClause; /* USING clause, if any (list of String) */ Node *quals; /* qualifiers on join, if any */ Alias *alias; /* user-written alias clause, if any */ int rtindex; /* RT index assigned for join */ diff -r bd5a52b2681a src/include/parser/parse_type.h --- a/src/include/parser/parse_type.h +++ b/src/include/parser/parse_type.h @@ -19,14 +19,14 @@ typedef HeapTuple Type; -extern Type LookupTypeName(ParseState *pstate, const TypeName *typename, +extern Type LookupTypeName(ParseState *pstate, const TypeName *typeName, int32 *typmod_p); -extern Type typenameType(ParseState *pstate, const TypeName *typename, +extern Type typenameType(ParseState *pstate, const TypeName *typeName, int32 *typmod_p); -extern Oid typenameTypeId(ParseState *pstate, const TypeName *typename, +extern Oid typenameTypeId(ParseState *pstate, const TypeName *typeName, int32 *typmod_p); -extern char *TypeNameToString(const TypeName *typename); +extern char *TypeNameToString(const TypeName *typeName); extern char *TypeNameListToString(List *typenames); extern Type typeidType(Oid id); diff -r bd5a52b2681a src/include/utils/builtins.h --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -560,7 +560,7 @@ extern List *deparse_context_for_plan(Node *plan, Node *outer_plan, List *rtable, List *subplans); extern const char *quote_identifier(const char *ident); -extern char *quote_qualified_identifier(const char *namespace, +extern char *quote_qualified_identifier(const char *qualifier, const char *ident); /* tid.c */