summaryrefslogtreecommitdiff
path: root/src/backend/parser
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/parser')
-rw-r--r--src/backend/parser/analyze.c4
-rw-r--r--src/backend/parser/gram.y44
-rw-r--r--src/backend/parser/parse_utilcmd.c6
3 files changed, 27 insertions, 27 deletions
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 401da5dedf..c159fb2957 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -229,7 +229,7 @@ transformOptionalSelectInto(ParseState *pstate, Node *parseTree)
ctas->query = parseTree;
ctas->into = stmt->intoClause;
- ctas->relkind = OBJECT_TABLE;
+ ctas->objtype = OBJECT_TABLE;
ctas->is_select_into = true;
/*
@@ -2572,7 +2572,7 @@ transformCreateTableAsStmt(ParseState *pstate, CreateTableAsStmt *stmt)
stmt->query = (Node *) query;
/* additional work needed for CREATE MATERIALIZED VIEW */
- if (stmt->relkind == OBJECT_MATVIEW)
+ if (stmt->objtype == OBJECT_MATVIEW)
{
/*
* Prohibit a data-modifying CTE in the query used to create a
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 1ea1fba43a..dbb47d4982 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -1844,7 +1844,7 @@ AlterTableStmt:
AlterTableStmt *n = makeNode(AlterTableStmt);
n->relation = $3;
n->cmds = $4;
- n->relkind = OBJECT_TABLE;
+ n->objtype = OBJECT_TABLE;
n->missing_ok = false;
$$ = (Node *)n;
}
@@ -1853,7 +1853,7 @@ AlterTableStmt:
AlterTableStmt *n = makeNode(AlterTableStmt);
n->relation = $5;
n->cmds = $6;
- n->relkind = OBJECT_TABLE;
+ n->objtype = OBJECT_TABLE;
n->missing_ok = true;
$$ = (Node *)n;
}
@@ -1862,7 +1862,7 @@ AlterTableStmt:
AlterTableStmt *n = makeNode(AlterTableStmt);
n->relation = $3;
n->cmds = list_make1($4);
- n->relkind = OBJECT_TABLE;
+ n->objtype = OBJECT_TABLE;
n->missing_ok = false;
$$ = (Node *)n;
}
@@ -1871,7 +1871,7 @@ AlterTableStmt:
AlterTableStmt *n = makeNode(AlterTableStmt);
n->relation = $5;
n->cmds = list_make1($6);
- n->relkind = OBJECT_TABLE;
+ n->objtype = OBJECT_TABLE;
n->missing_ok = true;
$$ = (Node *)n;
}
@@ -1902,7 +1902,7 @@ AlterTableStmt:
AlterTableStmt *n = makeNode(AlterTableStmt);
n->relation = $3;
n->cmds = $4;
- n->relkind = OBJECT_INDEX;
+ n->objtype = OBJECT_INDEX;
n->missing_ok = false;
$$ = (Node *)n;
}
@@ -1911,7 +1911,7 @@ AlterTableStmt:
AlterTableStmt *n = makeNode(AlterTableStmt);
n->relation = $5;
n->cmds = $6;
- n->relkind = OBJECT_INDEX;
+ n->objtype = OBJECT_INDEX;
n->missing_ok = true;
$$ = (Node *)n;
}
@@ -1920,7 +1920,7 @@ AlterTableStmt:
AlterTableStmt *n = makeNode(AlterTableStmt);
n->relation = $3;
n->cmds = list_make1($4);
- n->relkind = OBJECT_INDEX;
+ n->objtype = OBJECT_INDEX;
n->missing_ok = false;
$$ = (Node *)n;
}
@@ -1951,7 +1951,7 @@ AlterTableStmt:
AlterTableStmt *n = makeNode(AlterTableStmt);
n->relation = $3;
n->cmds = $4;
- n->relkind = OBJECT_SEQUENCE;
+ n->objtype = OBJECT_SEQUENCE;
n->missing_ok = false;
$$ = (Node *)n;
}
@@ -1960,7 +1960,7 @@ AlterTableStmt:
AlterTableStmt *n = makeNode(AlterTableStmt);
n->relation = $5;
n->cmds = $6;
- n->relkind = OBJECT_SEQUENCE;
+ n->objtype = OBJECT_SEQUENCE;
n->missing_ok = true;
$$ = (Node *)n;
}
@@ -1969,7 +1969,7 @@ AlterTableStmt:
AlterTableStmt *n = makeNode(AlterTableStmt);
n->relation = $3;
n->cmds = $4;
- n->relkind = OBJECT_VIEW;
+ n->objtype = OBJECT_VIEW;
n->missing_ok = false;
$$ = (Node *)n;
}
@@ -1978,7 +1978,7 @@ AlterTableStmt:
AlterTableStmt *n = makeNode(AlterTableStmt);
n->relation = $5;
n->cmds = $6;
- n->relkind = OBJECT_VIEW;
+ n->objtype = OBJECT_VIEW;
n->missing_ok = true;
$$ = (Node *)n;
}
@@ -1987,7 +1987,7 @@ AlterTableStmt:
AlterTableStmt *n = makeNode(AlterTableStmt);
n->relation = $4;
n->cmds = $5;
- n->relkind = OBJECT_MATVIEW;
+ n->objtype = OBJECT_MATVIEW;
n->missing_ok = false;
$$ = (Node *)n;
}
@@ -1996,7 +1996,7 @@ AlterTableStmt:
AlterTableStmt *n = makeNode(AlterTableStmt);
n->relation = $6;
n->cmds = $7;
- n->relkind = OBJECT_MATVIEW;
+ n->objtype = OBJECT_MATVIEW;
n->missing_ok = true;
$$ = (Node *)n;
}
@@ -2027,7 +2027,7 @@ AlterTableStmt:
AlterTableStmt *n = makeNode(AlterTableStmt);
n->relation = $4;
n->cmds = $5;
- n->relkind = OBJECT_FOREIGN_TABLE;
+ n->objtype = OBJECT_FOREIGN_TABLE;
n->missing_ok = false;
$$ = (Node *)n;
}
@@ -2036,7 +2036,7 @@ AlterTableStmt:
AlterTableStmt *n = makeNode(AlterTableStmt);
n->relation = $6;
n->cmds = $7;
- n->relkind = OBJECT_FOREIGN_TABLE;
+ n->objtype = OBJECT_FOREIGN_TABLE;
n->missing_ok = true;
$$ = (Node *)n;
}
@@ -2856,7 +2856,7 @@ AlterCompositeTypeStmt:
/* can't use qualified_name, sigh */
n->relation = makeRangeVarFromAnyName($3, @3, yyscanner);
n->cmds = $4;
- n->relkind = OBJECT_TYPE;
+ n->objtype = OBJECT_TYPE;
$$ = (Node *)n;
}
;
@@ -4072,7 +4072,7 @@ CreateAsStmt:
CreateTableAsStmt *ctas = makeNode(CreateTableAsStmt);
ctas->query = $6;
ctas->into = $4;
- ctas->relkind = OBJECT_TABLE;
+ ctas->objtype = OBJECT_TABLE;
ctas->is_select_into = false;
ctas->if_not_exists = false;
/* cram additional flags into the IntoClause */
@@ -4085,7 +4085,7 @@ CreateAsStmt:
CreateTableAsStmt *ctas = makeNode(CreateTableAsStmt);
ctas->query = $9;
ctas->into = $7;
- ctas->relkind = OBJECT_TABLE;
+ ctas->objtype = OBJECT_TABLE;
ctas->is_select_into = false;
ctas->if_not_exists = true;
/* cram additional flags into the IntoClause */
@@ -4131,7 +4131,7 @@ CreateMatViewStmt:
CreateTableAsStmt *ctas = makeNode(CreateTableAsStmt);
ctas->query = $7;
ctas->into = $5;
- ctas->relkind = OBJECT_MATVIEW;
+ ctas->objtype = OBJECT_MATVIEW;
ctas->is_select_into = false;
ctas->if_not_exists = false;
/* cram additional flags into the IntoClause */
@@ -4144,7 +4144,7 @@ CreateMatViewStmt:
CreateTableAsStmt *ctas = makeNode(CreateTableAsStmt);
ctas->query = $10;
ctas->into = $8;
- ctas->relkind = OBJECT_MATVIEW;
+ ctas->objtype = OBJECT_MATVIEW;
ctas->is_select_into = false;
ctas->if_not_exists = true;
/* cram additional flags into the IntoClause */
@@ -10695,7 +10695,7 @@ ExecuteStmt: EXECUTE name execute_param_clause
n->params = $8;
ctas->query = (Node *) n;
ctas->into = $4;
- ctas->relkind = OBJECT_TABLE;
+ ctas->objtype = OBJECT_TABLE;
ctas->is_select_into = false;
ctas->if_not_exists = false;
/* cram additional flags into the IntoClause */
@@ -10712,7 +10712,7 @@ ExecuteStmt: EXECUTE name execute_param_clause
n->params = $11;
ctas->query = (Node *) n;
ctas->into = $7;
- ctas->relkind = OBJECT_TABLE;
+ ctas->objtype = OBJECT_TABLE;
ctas->is_select_into = false;
ctas->if_not_exists = true;
/* cram additional flags into the IntoClause */
diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c
index 0e4caa6ad4..25abc544fc 100644
--- a/src/backend/parser/parse_utilcmd.c
+++ b/src/backend/parser/parse_utilcmd.c
@@ -829,7 +829,7 @@ transformColumnDefinition(CreateStmtContext *cxt, ColumnDef *column)
stmt = makeNode(AlterTableStmt);
stmt->relation = cxt->relation;
stmt->cmds = NIL;
- stmt->relkind = OBJECT_FOREIGN_TABLE;
+ stmt->objtype = OBJECT_FOREIGN_TABLE;
stmt->cmds = lappend(stmt->cmds, cmd);
cxt->alist = lappend(cxt->alist, stmt);
@@ -2508,7 +2508,7 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt)
alterstmt->relation = copyObject(cxt->relation);
alterstmt->cmds = notnullcmds;
- alterstmt->relkind = OBJECT_TABLE;
+ alterstmt->objtype = OBJECT_TABLE;
alterstmt->missing_ok = false;
cxt->alist = lappend(cxt->alist, alterstmt);
@@ -2610,7 +2610,7 @@ transformFKConstraints(CreateStmtContext *cxt,
alterstmt->relation = cxt->relation;
alterstmt->cmds = NIL;
- alterstmt->relkind = OBJECT_TABLE;
+ alterstmt->objtype = OBJECT_TABLE;
foreach(fkclist, cxt->fkconstraints)
{