pg_query 4.2.2 → 5.0.0

data/ext/pg_query/src_pl_plpgsql_src_pl_handler.c

@@ -10,7 +10,7 @@
  * pl_handler.c		- Handler for the PL/pgSQL
  *			  procedural language
  *
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *

data/ext/pg_query/src_pl_plpgsql_src_pl_reserved_kwlist_d.h

@@ -12,7 +12,7 @@
  * pl_reserved_kwlist_d.h
  *    List of keywords represented as a ScanKeywordList.
  *
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES

data/ext/pg_query/src_pl_plpgsql_src_pl_scanner.c

@@ -38,7 +38,7 @@
  *	  lexical scanning for PL/pgSQL
  *
  *
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *

data/ext/pg_query/src_pl_plpgsql_src_pl_unreserved_kwlist_d.h

@@ -12,7 +12,7 @@
  * pl_unreserved_kwlist_d.h
  *    List of keywords represented as a ScanKeywordList.
  *
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES
@@ -89,6 +89,7 @@ static const char UnreservedPLKeywords_kw_string[] =
 	"pg_exception_context\0"
 	"pg_exception_detail\0"
 	"pg_exception_hint\0"
+	"pg_routine_oid\0"
 	"print_strict_params\0"
 	"prior\0"
 	"query\0"
@@ -174,63 +175,64 @@ static const uint16 UnreservedPLKeywords_kw_offsets[] = {
 	420,
 	440,
 	458,
-	478,
-	484,
-	490,
-	496,
+	473,
+	493,
+	499,
 	505,
-	512,
-	530,
-	538,
-	547,
-	557,
-	565,
+	511,
+	520,
+	527,
+	545,
+	553,
+	562,
 	572,
-	584,
-	591,
-	597,
+	580,
+	587,
+	599,
 	606,
-	614,
-	620,
-	631,
-	636,
-	647,
-	660,
-	678,
+	612,
+	621,
+	629,
+	635,
+	646,
+	651,
+	662,
+	675,
+	693,
 };
 
-#define UNRESERVEDPLKEYWORDS_NUM_KEYWORDS 82
+#define UNRESERVEDPLKEYWORDS_NUM_KEYWORDS 83
 
 static int
 UnreservedPLKeywords_hash_func(const void *key, size_t keylen)
 {
-	static const int16 h[165] = {
-		58,    0,     26,    32767, 0,     0,     9,     32767,
-		0,     32767, 37,    74,    32767, -7,    32767, 39,
-		58,    -5,    32767, 31,    32767, 32767, 75,    -23,
-		32767, 0,     32767, 32767, 32767, -14,   32767, 81,
-		32767, 32767, 32767, -36,   -9,    32767, 32767, 32767,
-		40,    32767, 54,    10,    11,    43,    32767, 0,
-		52,    105,   -22,   15,    32767, -33,   49,    -65,
-		48,    32767, 32767, 32767, 25,    49,    -47,   37,
-		21,    32767, 32767, -15,   70,    32767, 32767, 64,
-		-10,   126,   32767, 51,    0,     36,    32767, -55,
-		-22,   32767, 32767, 32767, 32767, 32767, -26,   -35,
-		32767, 61,    32767, 32767, 32767, -23,   98,    48,
-		23,    19,    32767, 7,     35,    5,     -18,   71,
-		28,    5,     32767, 32767, 32767, 74,    32767, 82,
-		32767, 0,     32767, 32767, 66,    0,     0,     50,
-		32767, 32767, 5,     2,     0,     32767, 55,    32767,
-		32767, 45,    79,    32767, 32767, 73,    22,    0,
-		103,   32767, -20,   72,    32767, 0,     29,    32767,
-		0,     32767, 32767, 0,     50,    28,    32767, -40,
-		32767, 32767, 34,    56,    32767, 32767, 32767, 17,
-		-36,   32767, 67,    32767, 0
+	static const int16 h[167] = {
+		0,     -26,   32767, 0,     74,    -36,   32767, 32767,
+		93,    0,     35,    14,    34,    -65,   -42,   78,
+		-22,   8,     10,    0,     5,     32767, 10,    26,
+		32767, 4,     32767, 32767, -81,   -9,    -25,   32767,
+		-17,   11,    0,     -43,   11,    8,     45,    0,
+		32767, 32767, 32767, 12,    0,     32767, 32,    32767,
+		0,     32767, -18,   64,    32767, -2,    31,    32767,
+		50,    80,    -75,   32767, 32767, 32767, 0,     32767,
+		32767, 0,     54,    82,    32767, 32767, 69,    60,
+		43,    32767, 0,     95,    21,    1,     27,    0,
+		120,   32767, -46,   32767, -57,   32767, 32767, 55,
+		70,    32767, 28,    32767, 0,     -14,   -38,   32767,
+		57,    0,     32767, 19,    98,    0,     32767, 68,
+		32767, 32767, 32767, 32767, -26,   13,    27,    35,
+		37,    32767, 49,    -44,   65,    -35,   0,     32767,
+		32767, 32767, 30,    0,     0,     32767, 26,    42,
+		7,     32767, 72,    -43,   32767, 0,     32767, 89,
+		36,    48,    32767, 32,    38,    3,     32767, 49,
+		32767, 0,     51,    0,     32767, 73,    32767, 32767,
+		79,    32767, 30,    32767, 0,     0,     50,    32767,
+		0,     32767, 32767, 32767, 0,     32767, 32767
 	};
 
 	const unsigned char *k = (const unsigned char *) key;
 	uint32		a = 0;
-	uint32		b = 0;
+	uint32		b = 1;
 
 	while (keylen--)
 	{
@@ -239,7 +241,7 @@ UnreservedPLKeywords_hash_func(const void *key, size_t keylen)
 		a = a * 257 + c;
 		b = b * 8191 + c;
 	}
-	return h[a % 165] + h[b % 165];
+	return h[a % 167] + h[b % 167];
 }
 
 static const ScanKeywordList UnreservedPLKeywords = {

data/ext/pg_query/src_port_pg_bitutils.c

@@ -10,7 +10,7 @@
  * pg_bitutils.c
  *	  Miscellaneous functions for bit-wise operations.
  *
- * Copyright (c) 2019-2022, PostgreSQL Global Development Group
+ * Copyright (c) 2019-2023, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/port/pg_bitutils.c

data/ext/pg_query/src_port_pgstrcasecmp.c

@@ -1,5 +1,6 @@
 /*--------------------------------------------------------------------
  * Symbols referenced in this file:
+ * - pg_strcasecmp
  * - pg_toupper
  *--------------------------------------------------------------------
  */
@@ -24,7 +25,7 @@
  * C library thinks the locale is.
  *
  *
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  *
  * src/port/pgstrcasecmp.c
  *
@@ -38,7 +39,34 @@
 /*
  * Case-independent comparison of two null-terminated strings.
  */
+int
+pg_strcasecmp(const char *s1, const char *s2)
+{
+	for (;;)
+	{
+		unsigned char ch1 = (unsigned char) *s1++;
+		unsigned char ch2 = (unsigned char) *s2++;
+
+		if (ch1 != ch2)
+		{
+			if (ch1 >= 'A' && ch1 <= 'Z')
+				ch1 += 'a' - 'A';
+			else if (IS_HIGHBIT_SET(ch1) && isupper(ch1))
+				ch1 = tolower(ch1);
 
+			if (ch2 >= 'A' && ch2 <= 'Z')
+				ch2 += 'a' - 'A';
+			else if (IS_HIGHBIT_SET(ch2) && isupper(ch2))
+				ch2 = tolower(ch2);
+
+			if (ch1 != ch2)
+				return (int) ch1 - (int) ch2;
+		}
+		if (ch1 == 0)
+			break;
+	}
+	return 0;
+}
 
 /*
  * Case-independent comparison of two not-necessarily-null-terminated strings.

data/ext/pg_query/src_port_snprintf.c

@@ -30,7 +30,7 @@
  * Copyright (c) 1983, 1995, 1996 Eric P. Allman
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -780,12 +780,8 @@ find_arguments(const char *format, va_list args,
 	int			longflag;
 	int			fmtpos;
 	int			i;
-	int			last_dollar;
-	PrintfArgType argtypes[PG_NL_ARGMAX + 1];
-
-	/* Initialize to "no dollar arguments known" */
-	last_dollar = 0;
-	MemSet(argtypes, 0, sizeof(argtypes));
+	int			last_dollar = 0;	/* Init to "no dollar arguments known" */
+	PrintfArgType argtypes[PG_NL_ARGMAX + 1] = {0};
 
 	/*
 	 * This loop must accept the same format strings as the one in dopr().

data/ext/pg_query/src_port_strerror.c

@@ -11,7 +11,7 @@
  * strerror.c
  *	  Replacements for standard strerror() and strerror_r() functions
  *
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *

data/ext/pg_query/src_port_strnlen.c

@@ -10,7 +10,7 @@
  *		Fallback implementation of strnlen().
  *
  *
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION