Fix compilation of logtriga on PostgreSQL 9

This patch copies the is_keyword function from sql/pgq/triggers/stringutil.c
and uses it instead of calling ScanKeywordLookup directly. It also avoid
quoting some strings that are not reserved keywords.

diff --git a/sql/logtriga/textbuf.c b/sql/logtriga/textbuf.c
index 6f6e4dd209160ff8a7813b1fe56f5f7fd48f6471..a2e6d6b9faa065d8ea73d699e13998dd12de4fae 100644 (file)
--- a/sql/logtriga/textbuf.c
+++ b/sql/logtriga/textbuf.c
@@ -226,6 +226,27 @@ static int quote_literal(char *dst, const uint8 *src, int srclen)
        return cp2 - dst;
 }
 
+/* check if ident is keyword that needs quoting */
+static bool is_keyword(const char *ident)
+{
+       const ScanKeyword *kw;
+
+       /* do the lookup */
+#if PG_VERSION_NUM >= 80500
+       kw = ScanKeywordLookup(ident, ScanKeywords, NumScanKeywords);
+#else
+       kw = ScanKeywordLookup(ident);
+#endif
+
+       /* unreserved? */
+#if PG_VERSION_NUM >= 80300
+       if (kw && kw->category == UNRESERVED_KEYWORD)
+               return false;
+#endif
+
+       /* found anything? */
+       return kw != NULL;
+}
 
 /*
  * slon_quote_identifier                     - Quote an identifier only if needed
@@ -276,19 +297,9 @@ quote_ident(char *dst, const uint8 *src, int srclen)
                         nquotes++;
         }
 
-        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() does case-insensitive comparison, but
-                 * that's fine, since we already know we have all-lower-case.
-                 */
-                if (ScanKeywordLookup(ident) != NULL)
-                        safe = false;
+        if (safe) {
+            if (is_keyword(ident))
+                safe = false;
         }
 
                optr = dst;