pg_query 2.2.0 → 4.2.1

data/ext/pg_query/include/pgtime.h

@@ -3,7 +3,7 @@
  * pgtime.h
  *	  PostgreSQL internal timezone library
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/include/pgtime.h
@@ -22,14 +22,23 @@
 
 typedef int64 pg_time_t;
 
+/*
+ * Data structure representing a broken-down timestamp.
+ *
+ * CAUTION: the IANA timezone library (src/timezone/) follows the POSIX
+ * convention that tm_mon counts from 0 and tm_year is relative to 1900.
+ * However, Postgres' datetime functions generally treat tm_mon as counting
+ * from 1 and tm_year as relative to 1 BC.  Be sure to make the appropriate
+ * adjustments when moving from one code domain to the other.
+ */
 struct pg_tm
 {
 	int			tm_sec;
 	int			tm_min;
 	int			tm_hour;
 	int			tm_mday;
-	int			tm_mon;			/* origin 1, not 0! */
-	int			tm_year;		/* relative to 1900 */
+	int			tm_mon;			/* see above */
+	int			tm_year;		/* see above */
 	int			tm_wday;
 	int			tm_yday;
 	int			tm_isdst;
@@ -37,6 +46,7 @@ struct pg_tm
 	const char *tm_zone;
 };
 
+/* These structs are opaque outside the timezone library */
 typedef struct pg_tz pg_tz;
 typedef struct pg_tzenum pg_tzenum;
 
@@ -71,7 +81,7 @@ extern size_t pg_strftime(char *s, size_t max, const char *format,
 /* these functions and variables are in pgtz.c */
 
 extern PGDLLIMPORT pg_tz *session_timezone;
-extern pg_tz *log_timezone;
+extern PGDLLIMPORT pg_tz *log_timezone;
 
 extern void pg_timezone_initialize(void);
 extern pg_tz *pg_tzset(const char *tzname);

data/ext/pg_query/include/pl_gram.h

@@ -120,29 +120,29 @@
      K_LAST = 336,
      K_LOG = 337,
      K_LOOP = 338,
-     K_MESSAGE = 339,
-     K_MESSAGE_TEXT = 340,
-     K_MOVE = 341,
-     K_NEXT = 342,
-     K_NO = 343,
-     K_NOT = 344,
-     K_NOTICE = 345,
-     K_NULL = 346,
-     K_OPEN = 347,
-     K_OPTION = 348,
-     K_OR = 349,
-     K_PERFORM = 350,
-     K_PG_CONTEXT = 351,
-     K_PG_DATATYPE_NAME = 352,
-     K_PG_EXCEPTION_CONTEXT = 353,
-     K_PG_EXCEPTION_DETAIL = 354,
-     K_PG_EXCEPTION_HINT = 355,
-     K_PRINT_STRICT_PARAMS = 356,
-     K_PRIOR = 357,
-     K_QUERY = 358,
-     K_RAISE = 359,
-     K_RELATIVE = 360,
-     K_RESET = 361,
+     K_MERGE = 339,
+     K_MESSAGE = 340,
+     K_MESSAGE_TEXT = 341,
+     K_MOVE = 342,
+     K_NEXT = 343,
+     K_NO = 344,
+     K_NOT = 345,
+     K_NOTICE = 346,
+     K_NULL = 347,
+     K_OPEN = 348,
+     K_OPTION = 349,
+     K_OR = 350,
+     K_PERFORM = 351,
+     K_PG_CONTEXT = 352,
+     K_PG_DATATYPE_NAME = 353,
+     K_PG_EXCEPTION_CONTEXT = 354,
+     K_PG_EXCEPTION_DETAIL = 355,
+     K_PG_EXCEPTION_HINT = 356,
+     K_PRINT_STRICT_PARAMS = 357,
+     K_PRIOR = 358,
+     K_QUERY = 359,
+     K_RAISE = 360,
+     K_RELATIVE = 361,
      K_RETURN = 362,
      K_RETURNED_SQLSTATE = 363,
      K_REVERSE = 364,
@@ -152,23 +152,22 @@
      K_SCHEMA = 368,
      K_SCHEMA_NAME = 369,
      K_SCROLL = 370,
-     K_SET = 371,
-     K_SLICE = 372,
-     K_SQLSTATE = 373,
-     K_STACKED = 374,
-     K_STRICT = 375,
-     K_TABLE = 376,
-     K_TABLE_NAME = 377,
-     K_THEN = 378,
-     K_TO = 379,
-     K_TYPE = 380,
-     K_USE_COLUMN = 381,
-     K_USE_VARIABLE = 382,
-     K_USING = 383,
-     K_VARIABLE_CONFLICT = 384,
-     K_WARNING = 385,
-     K_WHEN = 386,
-     K_WHILE = 387
+     K_SLICE = 371,
+     K_SQLSTATE = 372,
+     K_STACKED = 373,
+     K_STRICT = 374,
+     K_TABLE = 375,
+     K_TABLE_NAME = 376,
+     K_THEN = 377,
+     K_TO = 378,
+     K_TYPE = 379,
+     K_USE_COLUMN = 380,
+     K_USE_VARIABLE = 381,
+     K_USING = 382,
+     K_VARIABLE_CONFLICT = 383,
+     K_WARNING = 384,
+     K_WHEN = 385,
+     K_WHILE = 386
    };
 #endif
 /* Tokens.  */
@@ -253,29 +252,29 @@
 #define K_LAST 336
 #define K_LOG 337
 #define K_LOOP 338
-#define K_MESSAGE 339
-#define K_MESSAGE_TEXT 340
-#define K_MOVE 341
-#define K_NEXT 342
-#define K_NO 343
-#define K_NOT 344
-#define K_NOTICE 345
-#define K_NULL 346
-#define K_OPEN 347
-#define K_OPTION 348
-#define K_OR 349
-#define K_PERFORM 350
-#define K_PG_CONTEXT 351
-#define K_PG_DATATYPE_NAME 352
-#define K_PG_EXCEPTION_CONTEXT 353
-#define K_PG_EXCEPTION_DETAIL 354
-#define K_PG_EXCEPTION_HINT 355
-#define K_PRINT_STRICT_PARAMS 356
-#define K_PRIOR 357
-#define K_QUERY 358
-#define K_RAISE 359
-#define K_RELATIVE 360
-#define K_RESET 361
+#define K_MERGE 339
+#define K_MESSAGE 340
+#define K_MESSAGE_TEXT 341
+#define K_MOVE 342
+#define K_NEXT 343
+#define K_NO 344
+#define K_NOT 345
+#define K_NOTICE 346
+#define K_NULL 347
+#define K_OPEN 348
+#define K_OPTION 349
+#define K_OR 350
+#define K_PERFORM 351
+#define K_PG_CONTEXT 352
+#define K_PG_DATATYPE_NAME 353
+#define K_PG_EXCEPTION_CONTEXT 354
+#define K_PG_EXCEPTION_DETAIL 355
+#define K_PG_EXCEPTION_HINT 356
+#define K_PRINT_STRICT_PARAMS 357
+#define K_PRIOR 358
+#define K_QUERY 359
+#define K_RAISE 360
+#define K_RELATIVE 361
 #define K_RETURN 362
 #define K_RETURNED_SQLSTATE 363
 #define K_REVERSE 364
@@ -285,23 +284,22 @@
 #define K_SCHEMA 368
 #define K_SCHEMA_NAME 369
 #define K_SCROLL 370
-#define K_SET 371
-#define K_SLICE 372
-#define K_SQLSTATE 373
-#define K_STACKED 374
-#define K_STRICT 375
-#define K_TABLE 376
-#define K_TABLE_NAME 377
-#define K_THEN 378
-#define K_TO 379
-#define K_TYPE 380
-#define K_USE_COLUMN 381
-#define K_USE_VARIABLE 382
-#define K_USING 383
-#define K_VARIABLE_CONFLICT 384
-#define K_WARNING 385
-#define K_WHEN 386
-#define K_WHILE 387
+#define K_SLICE 371
+#define K_SQLSTATE 372
+#define K_STACKED 373
+#define K_STRICT 374
+#define K_TABLE 375
+#define K_TABLE_NAME 376
+#define K_THEN 377
+#define K_TO 378
+#define K_TYPE 379
+#define K_USE_COLUMN 380
+#define K_USE_VARIABLE 381
+#define K_USING 382
+#define K_VARIABLE_CONFLICT 383
+#define K_WARNING 384
+#define K_WHEN 385
+#define K_WHILE 386
 
 
 
@@ -310,57 +308,57 @@
 typedef union YYSTYPE
 #line 120 "pl_gram.y"
 {
-		core_YYSTYPE			core_yystype;
-		/* these fields must match core_YYSTYPE: */
-		int						ival;
-		char					*str;
-		const char				*keyword;
+	core_YYSTYPE core_yystype;
+	/* these fields must match core_YYSTYPE: */
+	int			ival;
+	char	   *str;
+	const char *keyword;
 
-		PLword					word;
-		PLcword					cword;
-		PLwdatum				wdatum;
-		bool					boolean;
-		Oid						oid;
-		struct
-		{
-			char *name;
-			int  lineno;
-		}						varname;
-		struct
-		{
-			char *name;
-			int  lineno;
-			PLpgSQL_datum   *scalar;
-			PLpgSQL_datum   *row;
-		}						forvariable;
-		struct
-		{
-			char *label;
-			int  n_initvars;
-			int  *initvarnos;
-		}						declhdr;
-		struct
-		{
-			List *stmts;
-			char *end_label;
-			int   end_label_location;
-		}						loop_body;
-		List					*list;
-		PLpgSQL_type			*dtype;
-		PLpgSQL_datum			*datum;
-		PLpgSQL_var				*var;
-		PLpgSQL_expr			*expr;
-		PLpgSQL_stmt			*stmt;
-		PLpgSQL_condition		*condition;
-		PLpgSQL_exception		*exception;
-		PLpgSQL_exception_block	*exception_block;
-		PLpgSQL_nsitem			*nsitem;
-		PLpgSQL_diag_item		*diagitem;
-		PLpgSQL_stmt_fetch		*fetch;
-		PLpgSQL_case_when		*casewhen;
+	PLword		word;
+	PLcword		cword;
+	PLwdatum	wdatum;
+	bool		boolean;
+	Oid			oid;
+	struct
+	{
+		char	   *name;
+		int			lineno;
+	}			varname;
+	struct
+	{
+		char	   *name;
+		int			lineno;
+		PLpgSQL_datum *scalar;
+		PLpgSQL_datum *row;
+	}			forvariable;
+	struct
+	{
+		char	   *label;
+		int			n_initvars;
+		int		   *initvarnos;
+	}			declhdr;
+	struct
+	{
+		List	   *stmts;
+		char	   *end_label;
+		int			end_label_location;
+	}			loop_body;
+	List	   *list;
+	PLpgSQL_type *dtype;
+	PLpgSQL_datum *datum;
+	PLpgSQL_var	*var;
+	PLpgSQL_expr *expr;
+	PLpgSQL_stmt *stmt;
+	PLpgSQL_condition *condition;
+	PLpgSQL_exception *exception;
+	PLpgSQL_exception_block	*exception_block;
+	PLpgSQL_nsitem *nsitem;
+	PLpgSQL_diag_item *diagitem;
+	PLpgSQL_stmt_fetch *fetch;
+	PLpgSQL_case_when *casewhen;
 }
 /* Line 1529 of yacc.c.  */
-#line 364 "pl_gram.h"
+#line 362 "pl_gram.h"
 	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1

data/ext/pg_query/include/pl_reserved_kwlist.h

@@ -7,7 +7,7 @@
  * by the PG_KEYWORD macro, which is not defined in this file; it can
  * be defined by the caller for special purposes.
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/pl/plpgsql/src/pl_reserved_kwlist.h

data/ext/pg_query/include/pl_reserved_kwlist_d.h

@@ -3,7 +3,7 @@
  * pl_reserved_kwlist_d.h
  *    List of keywords represented as a ScanKeywordList.
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES
@@ -80,13 +80,13 @@ static int
 ReservedPLKeywords_hash_func(const void *key, size_t keylen)
 {
 	static const int8 h[49] = {
-		    -2,    127,      7,    127,      0,    127,    127,    127,
-		    18,      5,    127,     27,    127,      0,    127,    127,
-		     0,     39,     32,     22,     10,    127,     19,    -26,
-		   127,    -11,      0,     12,    127,    127,     -1,     28,
-		    20,      0,     23,    127,      0,     14,     -8,    127,
-		   127,    127,     13,      5,    127,    -23,      1,      0,
-		   127,
+		127,   7,     127,   127,   -2,    127,   13,    127,
+		127,   5,     0,     23,    0,     2,     127,   0,
+		17,    0,     127,   19,    5,     127,   6,     2,
+		-3,    17,    0,     6,     127,   8,     18,    127,
+		-6,    3,     -5,    0,     127,   0,     0,     11,
+		15,    127,   127,   127,   13,    127,   0,     17,
+		127
 	};
 
 	const unsigned char *k = (const unsigned char *) key;
@@ -97,8 +97,8 @@ ReservedPLKeywords_hash_func(const void *key, size_t keylen)
 	{
 		unsigned char c = *k++ | 0x20;
 
-		a = a * 31 + c;
-		b = b * 127 + c;
+		a = a * 257 + c;
+		b = b * 8191 + c;
 	}
 	return h[a % 49] + h[b % 49];
 }

data/ext/pg_query/include/pl_unreserved_kwlist.h

@@ -7,7 +7,7 @@
  * by the PG_KEYWORD macro, which is not defined in this file; it can
  * be defined by the caller for special purposes.
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/pl/plpgsql/src/pl_unreserved_kwlist.h
@@ -70,6 +70,7 @@ PG_KEYWORD("insert", K_INSERT)
 PG_KEYWORD("is", K_IS)
 PG_KEYWORD("last", K_LAST)
 PG_KEYWORD("log", K_LOG)
+PG_KEYWORD("merge", K_MERGE)
 PG_KEYWORD("message", K_MESSAGE)
 PG_KEYWORD("message_text", K_MESSAGE_TEXT)
 PG_KEYWORD("move", K_MOVE)
@@ -89,7 +90,6 @@ PG_KEYWORD("prior", K_PRIOR)
 PG_KEYWORD("query", K_QUERY)
 PG_KEYWORD("raise", K_RAISE)
 PG_KEYWORD("relative", K_RELATIVE)
-PG_KEYWORD("reset", K_RESET)
 PG_KEYWORD("return", K_RETURN)
 PG_KEYWORD("returned_sqlstate", K_RETURNED_SQLSTATE)
 PG_KEYWORD("reverse", K_REVERSE)
@@ -99,7 +99,6 @@ PG_KEYWORD("rowtype", K_ROWTYPE)
 PG_KEYWORD("schema", K_SCHEMA)
 PG_KEYWORD("schema_name", K_SCHEMA_NAME)
 PG_KEYWORD("scroll", K_SCROLL)
-PG_KEYWORD("set", K_SET)
 PG_KEYWORD("slice", K_SLICE)
 PG_KEYWORD("sqlstate", K_SQLSTATE)
 PG_KEYWORD("stacked", K_STACKED)

data/ext/pg_query/include/pl_unreserved_kwlist_d.h

@@ -3,7 +3,7 @@
  * pl_unreserved_kwlist_d.h
  *    List of keywords represented as a ScanKeywordList.
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES
@@ -65,6 +65,7 @@ static const char UnreservedPLKeywords_kw_string[] =
 	"is\0"
 	"last\0"
 	"log\0"
+	"merge\0"
 	"message\0"
 	"message_text\0"
 	"move\0"
@@ -84,7 +85,6 @@ static const char UnreservedPLKeywords_kw_string[] =
 	"query\0"
 	"raise\0"
 	"relative\0"
-	"reset\0"
 	"return\0"
 	"returned_sqlstate\0"
 	"reverse\0"
@@ -94,7 +94,6 @@ static const char UnreservedPLKeywords_kw_string[] =
 	"schema\0"
 	"schema_name\0"
 	"scroll\0"
-	"set\0"
 	"slice\0"
 	"sqlstate\0"
 	"stacked\0"
@@ -151,25 +150,25 @@ static const uint16 UnreservedPLKeywords_kw_offsets[] = {
 	295,
 	300,
 	304,
-	312,
-	325,
-	330,
-	335,
-	338,
-	345,
-	350,
-	357,
-	365,
-	376,
-	393,
-	414,
-	434,
-	452,
-	472,
+	310,
+	318,
+	331,
+	336,
+	341,
+	344,
+	351,
+	356,
+	363,
+	371,
+	382,
+	399,
+	420,
+	440,
+	458,
 	478,
 	484,
 	490,
-	499,
+	496,
 	505,
 	512,
 	530,
@@ -180,59 +179,58 @@ static const uint16 UnreservedPLKeywords_kw_offsets[] = {
 	572,
 	584,
 	591,
-	595,
-	601,
-	610,
-	618,
-	624,
-	635,
-	640,
-	651,
-	664,
-	682,
+	597,
+	606,
+	614,
+	620,
+	631,
+	636,
+	647,
+	660,
+	678,
 };
 
-#define UNRESERVEDPLKEYWORDS_NUM_KEYWORDS 83
+#define UNRESERVEDPLKEYWORDS_NUM_KEYWORDS 82
 
 static int
 UnreservedPLKeywords_hash_func(const void *key, size_t keylen)
 {
-	static const int16 h[167] = {
-		    10,  32767,  32767,     57,  32767,     62,     21,  32767,
-		    54,     18,  32767,     58,     59,    -54,     47,      0,
-		   -22,    -64,  32767,    -22,     33,     44,     -5,  32767,
-		 32767,     43,     57,    102,  32767,    -65,      7,  32767,
-		    13,  32767,    -28,     14,  32767,  32767,     82,  32767,
-		     0,      0,  32767,      8,    -43,      0,     19,      8,
-		    75,    -58,  32767,  32767,      0,     22,     29,  32767,
-		   -50,      6,  32767,      0,     30,  32767,  32767,     29,
-		     0,    104,  32767,  32767,     26,      0,  32767,  32767,
-		    -9,      2,  32767,     50,     39,     38,     39,     80,
-		 32767,  32767,  32767,  32767,    -67,     89,  32767,    -40,
-		    64,  32767,  32767,     26,     10,     27,  32767,     19,
-		    51,    -13,     26,  32767,  32767,  32767,     84,     23,
-		     0,     66,     12,     -5,  32767,  32767,      0,     50,
-		   141,     72,     45,  32767,  32767,      0,    -22,      0,
-		 32767,  32767,    -34,      0,     19,     -5,  32767,  32767,
-		 32767,      0,     37,     13,  32767,  32767,  32767,  32767,
-		   -68,     -4,  32767,  32767,     78,  32767,  32767,      0,
-		    85,  32767,  32767,  32767,    -93,  32767,      0,      0,
-		 32767,     74,      5,  32767,  32767,     71,      0,  32767,
-		 32767,      0,  32767,  32767,  32767,     46,     70,
+	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
 	};
 
 	const unsigned char *k = (const unsigned char *) key;
 	uint32		a = 0;
-	uint32		b = 1;
+	uint32		b = 0;
 
 	while (keylen--)
 	{
 		unsigned char c = *k++ | 0x20;
 
-		a = a * 31 + c;
-		b = b * 127 + c;
+		a = a * 257 + c;
+		b = b * 8191 + c;
 	}
-	return h[a % 167] + h[b % 167];
+	return h[a % 165] + h[b % 165];
 }
 
 static const ScanKeywordList UnreservedPLKeywords = {

data/ext/pg_query/include/plerrcodes.h

@@ -1,5 +1,6 @@
 /* autogenerated from src/backend/utils/errcodes.txt, do not edit */
 /* there is deliberately not an #ifndef PLERRCODES_H here */
+
 {
 	"sql_statement_not_yet_complete", ERRCODE_SQL_STATEMENT_NOT_YET_COMPLETE
 },
@@ -348,6 +349,10 @@
 	"sql_json_scalar_required", ERRCODE_SQL_JSON_SCALAR_REQUIRED
 },
 
+{
+	"sql_json_item_cannot_be_cast_to_target_type", ERRCODE_SQL_JSON_ITEM_CANNOT_BE_CAST_TO_TARGET_TYPE
+},
+
 {
 	"integrity_constraint_violation", ERRCODE_INTEGRITY_CONSTRAINT_VIOLATION
 },
@@ -820,6 +825,10 @@
 	"database_dropped", ERRCODE_DATABASE_DROPPED
 },
 
+{
+	"idle_session_timeout", ERRCODE_IDLE_SESSION_TIMEOUT
+},
+
 {
 	"system_error", ERRCODE_SYSTEM_ERROR
 },
@@ -987,4 +996,3 @@
 {
 	"index_corrupted", ERRCODE_INDEX_CORRUPTED
 },
-