src/bin/psql/variables.c (1)

979-983: First-character check now locale-dependent – consider pg_isalpha for consistency

isalpha() is invoked on ASCII bytes to decide if the first char is a letter.
Although you guard with !IS_HIGHBIT_SET, behaviour of isalpha() still depends on the current locale, whereas the rest of the function uses an explicit ASCII whitelist for subsequent characters.
For complete locale-independence and consistency with the rest of the scan rules, prefer pg_isalpha() (or revert to the explicit ASCII table) instead of <ctype.h>’s isalpha().

src/bin/psql/mainloop.c (1)

485-514: Off-by-one risk when duplicating quotes

pg_malloc0(strlen(bind_var->init_value) * 2) can leave no room for
the terminating '\0' in the worst-case (input of length 1 produces
output length 1 plus NUL → need +1).
Allocate *2 + 1 to be safe:

- char *str_double_quote = pg_malloc0(strlen(bind_var->init_value) * 2);
+ char *str_double_quote = pg_malloc0(strlen(bind_var->init_value) * 2 + 1);

src/bin/psql/psqlplus.h (5)

23-27: Good rationale on keyword categories; consider preventing drift with grammar

These comments help future readers. To avoid divergence from psqlplusparse.y over time, consider generating the keyword tables from a single source (e.g., an X-macro .def file included by both the scanner and parser).

---

42-44: Prefer designated initializers for robustness

This avoids ordering mistakes if the struct changes later and improves readability.

Apply:

-/* Macro for defining keywords */
-#define PSQL_KEYWORD(name,value,category) {name,value,category},
+/* Macro for defining keywords (designated initializers for clarity) */
+#define PSQL_KEYWORD(name_, value_, category_) \
+	{ .name = (name_), .value = (value_), .category = (category_) },

---

49-53: OID docs — good; consider an explicit “FE-only” guard

Nice explanation. Optional: add a brief note that these defines must never be seen when including backend headers to avoid macro redefinition if someone accidentally includes pg_type_d.h in FE code.

---

63-66: Clarify units (bytes vs characters) for max lengths

Oracle’s limits depend on CHAR vs BYTE semantics. Consider noting whether these maxima are in characters, bytes, or dependent on NLS length semantics to prevent misinterpretation downstream.

---

83-86: Don’t define objects in headers; move callbacks to a .c/.l module

Defining a (file-scope) static in a header creates one copy per TU and can go stale. Prefer an extern declaration in the header and a single definition in the scanner module. Also consider zero-initialization instead of a “placeholder” element to avoid assumptions about struct shape.

Apply in header:

-/* Callback functions for the flex lexer */
-static const Ora_psqlScanCallbacks psqlplus_callbacks = {
-	NULL,	 /* placeholder for future callback functions */
-};
+/* Callback functions for the flex lexer (defined in psqlplus.l/.c) */
+extern const Ora_psqlScanCallbacks psqlplus_callbacks;

And define once (e.g., in psqlplus.l or a new psqlplus_callbacks.c):

const Ora_psqlScanCallbacks psqlplus_callbacks = { 0 };

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro