pg_query 5.1.0 → 6.0.0

data/ext/pg_query/pg_query_normalize.c

@@ -48,6 +48,9 @@ typedef struct pgssConstLocations
 	int *param_refs;
 	int param_refs_buf_size;
 	int param_refs_count;
+
+	/* Should only utility statements be normalized? Set by pg_query_normalize_utility */
+	bool normalize_utility_only;
 } pgssConstLocations;
 
 /*
@@ -398,8 +401,10 @@ static bool const_record_walker(Node *node, pgssConstLocations *jstate)
 		case T_RawStmt:
 			return const_record_walker((Node *) ((RawStmt *) node)->stmt, jstate);
 		case T_VariableSetStmt:
+			if (jstate->normalize_utility_only) return false;
 			return const_record_walker((Node *) ((VariableSetStmt *) node)->args, jstate);
 		case T_CopyStmt:
+			if (jstate->normalize_utility_only) return false;
 			return const_record_walker((Node *) ((CopyStmt *) node)->query, jstate);
 		case T_ExplainStmt:
 			return const_record_walker((Node *) ((ExplainStmt *) node)->query, jstate);
@@ -408,10 +413,13 @@ static bool const_record_walker(Node *node, pgssConstLocations *jstate)
 		case T_AlterRoleStmt:
 			return const_record_walker((Node *) ((AlterRoleStmt *) node)->options, jstate);
 		case T_DeclareCursorStmt:
+			if (jstate->normalize_utility_only) return false;
 			return const_record_walker((Node *) ((DeclareCursorStmt *) node)->query, jstate);
 		case T_CreateFunctionStmt:
+			if (jstate->normalize_utility_only) return false;
 			return const_record_walker((Node *) ((CreateFunctionStmt *) node)->options, jstate);
 		case T_DoStmt:
+			if (jstate->normalize_utility_only) return false;
 			return const_record_walker((Node *) ((DoStmt *) node)->args, jstate);
 		case T_CreateSubscriptionStmt:
 			record_matching_string(jstate, ((CreateSubscriptionStmt *) node)->conninfo);
@@ -428,6 +436,7 @@ static bool const_record_walker(Node *node, pgssConstLocations *jstate)
 			return false;
 		case T_SelectStmt:
 			{
+				if (jstate->normalize_utility_only) return false;
 				SelectStmt *stmt = (SelectStmt *) node;
 				ListCell *lc;
 				List *fp_and_param_refs_list = NIL;
@@ -540,6 +549,26 @@ static bool const_record_walker(Node *node, pgssConstLocations *jstate)
 
 				return false;
 			}
+		case T_MergeStmt:
+			{
+				if (jstate->normalize_utility_only) return false;
+				return raw_expression_tree_walker(node, const_record_walker, (void*) jstate);
+			}
+		case T_InsertStmt:
+			{
+				if (jstate->normalize_utility_only) return false;
+				return raw_expression_tree_walker(node, const_record_walker, (void*) jstate);
+			}
+		case T_UpdateStmt:
+			{
+				if (jstate->normalize_utility_only) return false;
+				return raw_expression_tree_walker(node, const_record_walker, (void*) jstate);
+			}
+		case T_DeleteStmt:
+			{
+				if (jstate->normalize_utility_only) return false;
+				return raw_expression_tree_walker(node, const_record_walker, (void*) jstate);
+			}
 		default:
 			{
 				PG_TRY();
@@ -558,7 +587,7 @@ static bool const_record_walker(Node *node, pgssConstLocations *jstate)
 	return false;
 }
 
-PgQueryNormalizeResult pg_query_normalize(const char* input)
+PgQueryNormalizeResult pg_query_normalize_ext(const char* input, bool normalize_utility_only)
 {
 	MemoryContext ctx = NULL;
 	PgQueryNormalizeResult result = {0};
@@ -588,6 +617,7 @@ PgQueryNormalizeResult pg_query_normalize(const char* input)
 		jstate.param_refs = NULL;
 		jstate.param_refs_buf_size = 0;
 		jstate.param_refs_count = 0;
+		jstate.normalize_utility_only = normalize_utility_only;
 
 		/* Walk tree and record const locations */
 		const_record_walker((Node *) tree, &jstate);
@@ -621,6 +651,17 @@ PgQueryNormalizeResult pg_query_normalize(const char* input)
 	return result;
 }
 
+PgQueryNormalizeResult pg_query_normalize(const char* input)
+{
+	return pg_query_normalize_ext(input, false);
+}
+
+
+PgQueryNormalizeResult pg_query_normalize_utility(const char* input)
+{
+	return pg_query_normalize_ext(input, true);
+}
+
 void pg_query_free_normalize_result(PgQueryNormalizeResult result)
 {
   if (result.error) {

data/ext/pg_query/pg_query_outfuncs_json.c

@@ -203,7 +203,9 @@ _outOidList(StringInfo out, const List *node)
 static void
 _outInteger(StringInfo out, const Integer *node)
 {
-	if (node->ival > 0)
+	/* Don't output anything if the value is the default (0), to match
+	 * protobuf's behavior. */
+	if (node->ival != 0)
 		appendStringInfo(out, "\"ival\":%d", node->ival);
 }
 

data/ext/pg_query/pg_query_parse_plpgsql.c

@@ -219,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 */

data/ext/pg_query/pg_query_readfuncs_protobuf.c

@@ -50,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) \

data/ext/pg_query/pg_query_ruby_freebsd.sym

@@ -1,2 +1 @@
-_Init_pg_query
 Init_pg_query

data/ext/pg_query/pg_query_scan.c

@@ -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;