summaryrefslogtreecommitdiff
path: root/src/include/parser/kwlist.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/include/parser/kwlist.h')
-rw-r--r--src/include/parser/kwlist.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/include/parser/kwlist.h b/src/include/parser/kwlist.h
index 5b1ee154240..faea99108c4 100644
--- a/src/include/parser/kwlist.h
+++ b/src/include/parser/kwlist.h
@@ -87,6 +87,7 @@ PG_KEYWORD("commit", COMMIT, UNRESERVED_KEYWORD)
PG_KEYWORD("committed", COMMITTED, UNRESERVED_KEYWORD)
PG_KEYWORD("concurrently", CONCURRENTLY, TYPE_FUNC_NAME_KEYWORD)
PG_KEYWORD("configuration", CONFIGURATION, UNRESERVED_KEYWORD)
+PG_KEYWORD("conflict", CONFLICT, UNRESERVED_KEYWORD)
PG_KEYWORD("connection", CONNECTION, UNRESERVED_KEYWORD)
PG_KEYWORD("constraint", CONSTRAINT, RESERVED_KEYWORD)
PG_KEYWORD("constraints", CONSTRAINTS, UNRESERVED_KEYWORD)