pg_query 2.2.0 → 6.1.0

data/ext/pg_query/pg_query_parse_plpgsql.c

@@ -1,4 +1,3 @@
-#define _GNU_SOURCE // Necessary to get asprintf (which is a GNU extension)
 #include <stdio.h>
 
 #include "pg_query.h"
@@ -220,20 +219,19 @@ static PLpgSQL_function *compile_create_function_stmt(CreateFunctionStmt* stmt)
 	foreach(lc, stmt->parameters)
 	{
 		FunctionParameter *param = lfirst_node(FunctionParameter, lc);
+		char buf[32];
+		PLpgSQL_type *argdtype;
+		PLpgSQL_variable *argvariable;
+		PLpgSQL_nsitem_type argitemtype;
+		snprintf(buf, sizeof(buf), "$%d", foreach_current_index(lc) + 1);
+		argdtype = plpgsql_build_datatype(UNKNOWNOID, -1, InvalidOid, param->argType);
+		argvariable = plpgsql_build_variable(param->name ? param->name : buf, 0, argdtype, false);
+		if (param->mode == FUNC_PARAM_OUT || param->mode == FUNC_PARAM_INOUT || param->mode == FUNC_PARAM_TABLE)
+			function->out_param_varno = argvariable->dno;
+		argitemtype = argvariable->dtype == PLPGSQL_DTYPE_VAR ? PLPGSQL_NSTYPE_VAR : PLPGSQL_NSTYPE_REC;
+		plpgsql_ns_additem(argitemtype, argvariable->dno, buf);
 		if (param->name != NULL)
-		{
-			char buf[32];
-			PLpgSQL_type *argdtype;
-			PLpgSQL_variable *argvariable;
-			PLpgSQL_nsitem_type argitemtype;
-			snprintf(buf, sizeof(buf), "$%d", foreach_current_index(lc) + 1);
-			argdtype = plpgsql_build_datatype(UNKNOWNOID, -1, InvalidOid, NULL);
-			argvariable = plpgsql_build_variable(param->name ? param->name : buf, 0, argdtype, false);
-			argitemtype = argvariable->dtype == PLPGSQL_DTYPE_VAR ? PLPGSQL_NSTYPE_VAR : PLPGSQL_NSTYPE_REC;
-			plpgsql_ns_additem(argitemtype, argvariable->dno, buf);
-			if (param->name != NULL)
-				plpgsql_ns_additem(argitemtype, argvariable->dno, param->name);
-		}
+			plpgsql_ns_additem(argitemtype, argvariable->dno, param->name);
 	}
 
 	/* Set up as though in a function returning VOID */
@@ -449,7 +447,7 @@ PgQueryPlpgsqlParseResult pg_query_parse_plpgsql(const char* input)
 
 	ctx = pg_query_enter_memory_context();
 
-	parse_result = pg_query_raw_parse(input);
+	parse_result = pg_query_raw_parse(input, PG_QUERY_PARSE_DEFAULT);
 	result.error = parse_result.error;
 	if (result.error != NULL) {
 		pg_query_exit_memory_context(ctx);
@@ -486,14 +484,17 @@ PgQueryPlpgsqlParseResult pg_query_parse_plpgsql(const char* input)
 		if (func_and_error.func != NULL) {
 			char *func_json;
 			char *new_out;
+			size_t new_out_len;
 
 			func_json = plpgsqlToJSON(func_and_error.func);
 			plpgsql_free_function_memory(func_and_error.func);
 
-			int err = asprintf(&new_out, "%s%s,\n", result.plpgsql_funcs, func_json);
-			if (err == -1) {
+			new_out_len = strlen(result.plpgsql_funcs) + strlen(func_json) + 3;
+			new_out = malloc(new_out_len);
+			int n = snprintf(new_out, new_out_len, "%s%s,\n", result.plpgsql_funcs, func_json);
+			if (n < 0 || n >= new_out_len) {
 				PgQueryError* error = malloc(sizeof(PgQueryError));
-				error->message = strdup("Failed to output PL/pgSQL functions due to asprintf failure");
+				error->message = strdup("Failed to output PL/pgSQL functions due to snprintf failure");
 				result.error = error;
 			} else {
 				free(result.plpgsql_funcs);

data/ext/pg_query/pg_query_readfuncs_protobuf.c

@@ -14,6 +14,7 @@
 
 #define READ_INT_FIELD(outname, outname_json, fldname) node->fldname = msg->outname;
 #define READ_UINT_FIELD(outname, outname_json, fldname) node->fldname = msg->outname;
+#define READ_UINT64_FIELD(outname, outname_json, fldname) node->fldname = msg->outname;
 #define READ_LONG_FIELD(outname, outname_json, fldname) node->fldname = msg->outname;
 #define READ_FLOAT_FIELD(outname, outname_json, fldname) node->fldname = msg->outname;
 #define READ_BOOL_FIELD(outname, outname_json, fldname) node->fldname = msg->outname;
@@ -49,9 +50,9 @@
 		node->fldname = _readNode(msg->outname); \
 	}
 
-#define READ_EXPR_PTR_FIELD(outname, outname_json, fldname) \
+#define READ_ABSTRACT_PTR_FIELD(outname, outname_json, fldname, fldtype) \
 	if (msg->outname != NULL) { \
-		node->fldname = (Expr *) _readNode(msg->outname); \
+		node->fldname = (fldtype) _readNode(msg->outname); \
 	}
 
 #define READ_VALUE_FIELD(outname, outname_json, fldname) \
@@ -74,6 +75,12 @@
 
 static Node * _readNode(PgQuery__Node *msg);
 
+static String *
+_readString(PgQuery__String* msg)
+{
+	return makeString(pstrdup(msg->sval));
+}
+
 #include "pg_query_enum_defs.c"
 #include "pg_query_readfuncs_defs.c"
 
@@ -96,17 +103,45 @@ static Node * _readNode(PgQuery__Node *msg)
 		case PG_QUERY__NODE__NODE_INTEGER:
 			return (Node *) makeInteger(msg->integer->ival);
 		case PG_QUERY__NODE__NODE_FLOAT:
-			return (Node *) makeFloat(pstrdup(msg->float_->str));
+			return (Node *) makeFloat(pstrdup(msg->float_->fval));
+		case PG_QUERY__NODE__NODE_BOOLEAN:
+			return (Node *) makeBoolean(msg->boolean->boolval);
 		case PG_QUERY__NODE__NODE_STRING:
-			return (Node *) makeString(pstrdup(msg->string->str));
+			return (Node *) makeString(pstrdup(msg->string->sval));
 		case PG_QUERY__NODE__NODE_BIT_STRING:
-			return (Node *) makeBitString(pstrdup(msg->bit_string->str));
-		case PG_QUERY__NODE__NODE_NULL:
-			{
-				Value *v = makeNode(Value);
-				v->type = T_Null;
-				return (Node *) v;
+			return (Node *) makeBitString(pstrdup(msg->bit_string->bsval));
+		case PG_QUERY__NODE__NODE_A_CONST: {
+			A_Const *ac = makeNode(A_Const);
+			ac->location = msg->a_const->location;
+
+			if (msg->a_const->isnull) {
+				ac->isnull = true;
+			} else {
+				switch (msg->a_const->val_case) {
+					case PG_QUERY__A__CONST__VAL_IVAL:
+						ac->val.ival = *makeInteger(msg->a_const->ival->ival);
+						break;
+					case PG_QUERY__A__CONST__VAL_FVAL:
+						ac->val.fval = *makeFloat(pstrdup(msg->a_const->fval->fval));
+						break;
+					case PG_QUERY__A__CONST__VAL_BOOLVAL:
+						ac->val.boolval = *makeBoolean(msg->a_const->boolval->boolval);
+						break;
+					case PG_QUERY__A__CONST__VAL_SVAL:
+						ac->val.sval = *makeString(pstrdup(msg->a_const->sval->sval));
+						break;
+					case PG_QUERY__A__CONST__VAL_BSVAL:
+						ac->val.bsval = *makeBitString(pstrdup(msg->a_const->bsval->bsval));
+						break;
+					case PG_QUERY__A__CONST__VAL__NOT_SET:
+					case _PG_QUERY__A__CONST__VAL__CASE_IS_INT_SIZE:
+						Assert(false);
+						break;
+				}
 			}
+
+			return (Node *) ac;
+		}
 		case PG_QUERY__NODE__NODE_LIST:
 			return (Node *) _readList(msg->list);
 		case PG_QUERY__NODE__NODE__NOT_SET:

data/ext/pg_query/pg_query_ruby.c

@@ -221,5 +221,10 @@ VALUE pg_query_ruby_hash_xxh3_64(VALUE self, VALUE input, VALUE seed)
 	Check_Type(input, T_STRING);
 	Check_Type(seed, T_FIXNUM);
 
+#ifdef HAVE_LONG_LONG
+	return ULL2NUM(XXH3_64bits_withSeed(StringValuePtr(input), RSTRING_LEN(input), NUM2ULONG(seed)));
+#else
 	return ULONG2NUM(XXH3_64bits_withSeed(StringValuePtr(input), RSTRING_LEN(input), NUM2ULONG(seed)));
+#endif
+	
 }

data/ext/pg_query/pg_query_scan.c

@@ -1,7 +1,7 @@
 #include "pg_query.h"
 #include "pg_query_internal.h"
 
-#include "parser/gramparse.h"
+#include "gramparse.h"
 #include "lib/stringinfo.h"
 
 #include "protobuf/pg_query.pb-c.h"
@@ -93,7 +93,7 @@ PgQueryScanResult pg_query_scan(const char* input)
       output_tokens[i] = malloc(sizeof(PgQuery__ScanToken));
       pg_query__scan_token__init(output_tokens[i]);
       output_tokens[i]->start = yylloc;
-      if (tok == SCONST || tok == BCONST || tok == XCONST || tok == IDENT || tok == C_COMMENT) {
+      if (tok == SCONST || tok == USCONST || tok == BCONST || tok == XCONST || tok == IDENT || tok == UIDENT || tok == C_COMMENT) {
         output_tokens[i]->end = yyextra.yyllocend;
       } else {
         output_tokens[i]->end = yylloc + ((struct yyguts_t*) yyscanner)->yyleng_r;
@@ -101,8 +101,9 @@ PgQueryScanResult pg_query_scan(const char* input)
       output_tokens[i]->token = tok;
 
       switch (tok) {
-      #define PG_KEYWORD(a,b,c) case b: output_tokens[i]->keyword_kind = c + 1; break;
+      #define PG_KEYWORD(a,b,c,d) case b: output_tokens[i]->keyword_kind = c + 1; break;
       #include "parser/kwlist.h"
+      #undef PG_KEYWORD
       default: output_tokens[i]->keyword_kind = 0;
       }
     }

data/ext/pg_query/pg_query_split.c

@@ -1,7 +1,7 @@
 #include "pg_query.h"
 #include "pg_query_internal.h"
 
-#include "parser/gramparse.h"
+#include "gramparse.h"
 #include "lib/stringinfo.h"
 
 #include <unistd.h>
@@ -59,8 +59,9 @@ PgQuerySplitResult pg_query_split_with_scanner(const char* input)
     {
       int tok = core_yylex(&yylval, &yylloc, yyscanner);
       switch (tok) {
-      #define PG_KEYWORD(a,b,c) case b: is_keyword = true; break;
+      #define PG_KEYWORD(a,b,c,d) case b: is_keyword = true; break;
       #include "parser/kwlist.h"
+      #undef PG_KEYWORD
       default: is_keyword = false;
       }
       if (is_keyword)
@@ -88,7 +89,7 @@ PgQuerySplitResult pg_query_split_with_scanner(const char* input)
     {
       int tok = core_yylex(&yylval, &yylloc, yyscanner);
       switch (tok) {
-      #define PG_KEYWORD(a,b,c) case b: is_keyword = true; break;
+      #define PG_KEYWORD(a,b,c,d) case b: is_keyword = true; break;
       #include "parser/kwlist.h"
       default: is_keyword = false;
       }
@@ -165,11 +166,11 @@ PgQuerySplitResult pg_query_split_with_parser(const char* input)
 {
 	MemoryContext ctx = NULL;
 	PgQueryInternalParsetreeAndError parsetree_and_error;
-	PgQuerySplitResult result = {};
+	PgQuerySplitResult result = {0};
 
 	ctx = pg_query_enter_memory_context();
 
-	parsetree_and_error = pg_query_raw_parse(input);
+	parsetree_and_error = pg_query_raw_parse(input, PG_QUERY_PARSE_DEFAULT);
 
 	// These are all malloc-ed and will survive exiting the memory context, the caller is responsible to free them now
 	result.stderr_buffer = parsetree_and_error.stderr_buffer;