From 53311358c2ef777ac1122f9699ba505b60e65fa0 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Mon, 6 Dec 1999 02:37:17 +0000
Subject: [PATCH] Rule deparser needs to quote identifiers that are spelled the
same as SQL keywords.
---
src/backend/utils/adt/ruleutils.c | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index a4f182770b9..b62559ccdde 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -3,7 +3,7 @@
* out of it's tuple
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.33 1999/11/24 16:52:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.34 1999/12/06 02:37:17 tgl Exp $
*
* This software is copyrighted by Jan Wieck - Hamburg.
*
@@ -48,6 +48,7 @@
#include "lib/stringinfo.h"
#include "optimizer/clauses.h"
#include "optimizer/tlist.h"
+#include "parser/keywords.h"
#include "parser/parsetree.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
@@ -1764,8 +1765,8 @@ quote_identifier(char *ident)
{
/*
* Can avoid quoting if ident starts with a lowercase letter and
- * contains only lowercase letters, digits, and underscores.
- * Otherwise, supply quotes.
+ * contains only lowercase letters, digits, and underscores,
+ * *and* is not any SQL keyword. Otherwise, supply quotes.
*/
bool safe;
char *result;
@@ -1791,6 +1792,21 @@ quote_identifier(char *ident)
}
}
+ if (safe)
+ {
+ /*
+ * Check for keyword. This test is overly strong, since many of
+ * the "keywords" known to the parser are usable as column names,
+ * but the parser doesn't provide any easy way to test for whether
+ * an identifier is safe or not... so be safe not sorry.
+ *
+ * Note: ScanKeywordLookup() expects an all-lower-case input, but
+ * we've already checked we have that.
+ */
+ if (ScanKeywordLookup(ident) != NULL)
+ safe = false;
+ }
+
if (safe)
return ident; /* no change needed */
--
GitLab