pg_query 2.0.3 → 5.1.0

data/ext/pg_query/pg_query_normalize.c

@@ -1,5 +1,6 @@
 #include "pg_query.h"
 #include "pg_query_internal.h"
+#include "pg_query_fingerprint.h"
 
 #include "parser/parser.h"
 #include "parser/scanner.h"
@@ -7,6 +8,8 @@
 #include "mb/pg_wchar.h"
 #include "nodes/nodeFuncs.h"
 
+#include "pg_query_outfuncs.h"
+
 /*
  * Struct for tracking locations/lengths of constants during normalization
  */
@@ -14,6 +17,7 @@ typedef struct pgssLocationLen
 {
 	int			location;		/* start offset in query text */
 	int			length;			/* length in bytes, or -1 to ignore */
+	int			param_id;		/* Param id to use - if negative prefix, need to abs(..) and add highest_extern_param_id */
 } pgssLocationLen;
 
 /*
@@ -30,14 +34,32 @@ typedef struct pgssConstLocations
 	/* Current number of valid entries in clocations array */
 	int			clocations_count;
 
+	/* highest Param id we have assigned, not yet taking into account external param refs */
+	int			highest_normalize_param_id;
+
 	/* highest Param id we've seen, in order to start normalization correctly */
 	int			highest_extern_param_id;
 
 	/* query text */
 	const char * query;
 	int			query_len;
+
+	/* optional recording of assigned or discovered param refs, only active if param_refs is not NULL */
+	int *param_refs;
+	int param_refs_buf_size;
+	int param_refs_count;
 } pgssConstLocations;
 
+/*
+ * Intermediate working state struct to remember param refs for individual target list elements
+ */
+typedef struct FpAndParamRefs
+{
+	uint64_t fp;
+	int* param_refs;
+	int param_refs_count;
+} FpAndParamRefs;
+
 /*
  * comp_location: comparator for qsorting pgssLocationLen structs by location
  */
@@ -230,7 +252,8 @@ generate_normalized_query(pgssConstLocations *jstate, int query_loc, int* query_
 	for (i = 0; i < jstate->clocations_count; i++)
 	{
 		int			off,		/* Offset from start for cur tok */
-					tok_len;	/* Length (in bytes) of that tok */
+					tok_len,	/* Length (in bytes) of that tok */
+					param_id;	/* Param ID to be assigned */
 
 		off = jstate->clocations[i].location;
 		/* Adjust recorded location if we're dealing with partial string */
@@ -250,8 +273,10 @@ generate_normalized_query(pgssConstLocations *jstate, int query_loc, int* query_
 		n_quer_loc += len_to_wrt;
 
 		/* And insert a param symbol in place of the constant token */
-		n_quer_loc += sprintf(norm_query + n_quer_loc, "$%d",
-							  i + 1 + jstate->highest_extern_param_id);
+		param_id = (jstate->clocations[i].param_id < 0) ?
+					jstate->highest_extern_param_id + abs(jstate->clocations[i].param_id) :
+					jstate->clocations[i].param_id;
+		n_quer_loc += sprintf(norm_query + n_quer_loc, "$%d", param_id);
 
 		quer_loc = off + tok_len;
 		last_off = off;
@@ -292,10 +317,43 @@ static void RecordConstLocation(pgssConstLocations *jstate, int location)
 		jstate->clocations[jstate->clocations_count].location = location;
 		/* initialize lengths to -1 to simplify fill_in_constant_lengths */
 		jstate->clocations[jstate->clocations_count].length = -1;
+		/* by default we assume that we need a new param ref */
+		jstate->clocations[jstate->clocations_count].param_id = - jstate->highest_normalize_param_id;
+		jstate->highest_normalize_param_id++;
+		/* record param ref number if requested */
+		if (jstate->param_refs != NULL) {
+			jstate->param_refs[jstate->param_refs_count] = jstate->clocations[jstate->clocations_count].param_id;
+			jstate->param_refs_count++;
+			if (jstate->param_refs_count >= jstate->param_refs_buf_size) {
+				jstate->param_refs_buf_size *= 2;
+				jstate->param_refs = (int *) repalloc(jstate->param_refs, jstate->param_refs_buf_size * sizeof(int));
+			}
+		}
 		jstate->clocations_count++;
 	}
 }
 
+static void record_defelem_arg_location(pgssConstLocations *jstate, int location)
+{
+	for (int i = location; i < jstate->query_len; i++) {
+		if (jstate->query[i] == '\'' || jstate->query[i] == '$') {
+			RecordConstLocation(jstate, i);
+			break;
+		}
+	}
+}
+
+static void record_matching_string(pgssConstLocations *jstate, const char *str)
+{
+	char *loc = NULL;
+	if (str == NULL)
+		return;
+
+	loc = strstr(jstate->query, str);
+	if (loc != NULL)
+		RecordConstLocation(jstate, loc - jstate->query - 1);
+}
+
 static bool const_record_walker(Node *node, pgssConstLocations *jstate)
 {
 	bool result;
@@ -303,71 +361,201 @@ static bool const_record_walker(Node *node, pgssConstLocations *jstate)
 
 	if (node == NULL) return false;
 
-	if (IsA(node, A_Const))
-	{
-		RecordConstLocation(jstate, castNode(A_Const, node)->location);
-	}
-	else if (IsA(node, ParamRef))
-	{
-		/* Track the highest ParamRef number */
-		if (((ParamRef *) node)->number > jstate->highest_extern_param_id)
-			jstate->highest_extern_param_id = castNode(ParamRef, node)->number;
-	}
-	else if (IsA(node, DefElem))
+	switch (nodeTag(node))
 	{
-		DefElem * defElem = (DefElem *) node;
-		if (defElem->arg != NULL && IsA(defElem->arg, String)) {
-			for (int i = defElem->location; i < jstate->query_len; i++) {
-				if (jstate->query[i] == '\'') {
-					RecordConstLocation(jstate, i);
-					break;
-			  }
+		case T_A_Const:
+			RecordConstLocation(jstate, castNode(A_Const, node)->location);
+			break;
+		case T_ParamRef:
+			{
+				/* Track the highest ParamRef number */
+				if (((ParamRef *) node)->number > jstate->highest_extern_param_id)
+					jstate->highest_extern_param_id = castNode(ParamRef, node)->number;
+
+				if (jstate->param_refs != NULL) {
+					jstate->param_refs[jstate->param_refs_count] = ((ParamRef *) node)->number;
+					jstate->param_refs_count++;
+					if (jstate->param_refs_count >= jstate->param_refs_buf_size) {
+						jstate->param_refs_buf_size *= 2;
+						jstate->param_refs = (int *) repalloc(jstate->param_refs, jstate->param_refs_buf_size * sizeof(int));
+					}
+				}
 			}
-		}
-		return const_record_walker((Node *) ((DefElem *) node)->arg, jstate);
-	}
-	else if (IsA(node, RawStmt))
-	{
-		return const_record_walker((Node *) ((RawStmt *) node)->stmt, jstate);
-	}
-	else if (IsA(node, VariableSetStmt))
-	{
-		return const_record_walker((Node *) ((VariableSetStmt *) node)->args, jstate);
-	}
-	else if (IsA(node, CopyStmt))
-	{
-		return const_record_walker((Node *) ((CopyStmt *) node)->query, jstate);
-	}
-	else if (IsA(node, ExplainStmt))
-	{
-		return const_record_walker((Node *) ((ExplainStmt *) node)->query, jstate);
-	}
-	else if (IsA(node, CreateRoleStmt))
-	{
-		return const_record_walker((Node *) ((CreateRoleStmt *) node)->options, jstate);
-	}
-	else if (IsA(node, AlterRoleStmt))
-	{
-		return const_record_walker((Node *) ((AlterRoleStmt *) node)->options, jstate);
-	}
-	else if (IsA(node, DeclareCursorStmt))
-	{
-		return const_record_walker((Node *) ((DeclareCursorStmt *) node)->query, jstate);
-	}
+			break;
+		case T_DefElem:
+			{
+				DefElem * defElem = (DefElem *) node;
+				if (defElem->arg == NULL) {
+					// No argument
+				} else if (IsA(defElem->arg, String)) {
+					record_defelem_arg_location(jstate, defElem->location);
+				} else if (IsA(defElem->arg, List) && list_length((List *) defElem->arg) == 1 && IsA(linitial((List *) defElem->arg), String)) {
+					record_defelem_arg_location(jstate, defElem->location);
+				}
+				return const_record_walker((Node *) ((DefElem *) node)->arg, jstate);
+			}
+			break;
+		case T_RawStmt:
+			return const_record_walker((Node *) ((RawStmt *) node)->stmt, jstate);
+		case T_VariableSetStmt:
+			return const_record_walker((Node *) ((VariableSetStmt *) node)->args, jstate);
+		case T_CopyStmt:
+			return const_record_walker((Node *) ((CopyStmt *) node)->query, jstate);
+		case T_ExplainStmt:
+			return const_record_walker((Node *) ((ExplainStmt *) node)->query, jstate);
+		case T_CreateRoleStmt:
+			return const_record_walker((Node *) ((CreateRoleStmt *) node)->options, jstate);
+		case T_AlterRoleStmt:
+			return const_record_walker((Node *) ((AlterRoleStmt *) node)->options, jstate);
+		case T_DeclareCursorStmt:
+			return const_record_walker((Node *) ((DeclareCursorStmt *) node)->query, jstate);
+		case T_CreateFunctionStmt:
+			return const_record_walker((Node *) ((CreateFunctionStmt *) node)->options, jstate);
+		case T_DoStmt:
+			return const_record_walker((Node *) ((DoStmt *) node)->args, jstate);
+		case T_CreateSubscriptionStmt:
+			record_matching_string(jstate, ((CreateSubscriptionStmt *) node)->conninfo);
+			break;
+		case T_AlterSubscriptionStmt:
+			record_matching_string(jstate, ((AlterSubscriptionStmt *) node)->conninfo);
+			break;
+		case T_CreateUserMappingStmt:
+			return const_record_walker((Node *) ((CreateUserMappingStmt *) node)->options, jstate);
+		case T_AlterUserMappingStmt:
+			return const_record_walker((Node *) ((AlterUserMappingStmt *) node)->options, jstate);
+		case T_TypeName:
+			/* Don't normalize constants in typmods or arrayBounds */
+			return false;
+		case T_SelectStmt:
+			{
+				SelectStmt *stmt = (SelectStmt *) node;
+				ListCell *lc;
+				List *fp_and_param_refs_list = NIL;
+
+				if (const_record_walker((Node *) stmt->distinctClause, jstate))
+					return true;
+				if (const_record_walker((Node *) stmt->intoClause, jstate))
+					return true;
+				foreach(lc, stmt->targetList)
+				{
+					ResTarget *res_target = lfirst_node(ResTarget, lc);
+					FpAndParamRefs *fp_and_param_refs = palloc0(sizeof(FpAndParamRefs));
+
+					/* Save all param refs we encounter or assign */
+					jstate->param_refs = palloc0(1 * sizeof(int));
+					jstate->param_refs_buf_size = 1;
+					jstate->param_refs_count = 0;
+
+					/* Walk the element */
+					if (const_record_walker((Node *) res_target, jstate))
+						return true;
+
+					/* Remember fingerprint and param refs for later */
+					fp_and_param_refs->fp = pg_query_fingerprint_node(res_target->val);
+					fp_and_param_refs->param_refs = jstate->param_refs;
+					fp_and_param_refs->param_refs_count = jstate->param_refs_count;
+					fp_and_param_refs_list = lappend(fp_and_param_refs_list, fp_and_param_refs);
+
+					/* Reset for next element, or stop recording if this is the last element */
+					jstate->param_refs = NULL;
+					jstate->param_refs_buf_size = 0;
+					jstate->param_refs_count = 0;
+				}
+				if (const_record_walker((Node *) stmt->fromClause, jstate))
+					return true;
+				if (const_record_walker((Node *) stmt->whereClause, jstate))
+					return true;
 
-	PG_TRY();
-	{
-		result = raw_expression_tree_walker(node, const_record_walker, (void*) jstate);
-	}
-	PG_CATCH();
-	{
-		MemoryContextSwitchTo(normalize_context);
-		result = false;
-		FlushErrorState();
+				/*
+				 * Instead of walking all of groupClause (like raw_expression_tree_walker does),
+				 * only walk certain items.
+				 */
+				foreach(lc, stmt->groupClause)
+				{
+					/*
+					 * Do not walk A_Const values that are simple integers, this avoids
+					 * turning "GROUP BY 1" into "GROUP BY $n", which obscures an important
+					 * semantic meaning. This matches how pg_stat_statements handles the
+					 * GROUP BY clause (i.e. it doesn't touch these constants)
+					 */
+					if (IsA(lfirst(lc), A_Const) && IsA(&castNode(A_Const, lfirst(lc))->val, Integer))
+						continue;
+
+					/*
+					 * Match up GROUP BY clauses against the target list, to assign the same
+					 * param refs as used in the target list - this ensures the query is valid,
+					 * instead of throwing a bogus "columns ... must appear in the GROUP BY
+					 * clause or be used in an aggregate function" error
+					 */
+					uint64_t fp = pg_query_fingerprint_node(lfirst(lc));
+					FpAndParamRefs *fppr = NULL;
+					ListCell *lc2;
+					foreach(lc2, fp_and_param_refs_list) {
+						if (fp == ((FpAndParamRefs *) lfirst(lc2))->fp) {
+							fppr = (FpAndParamRefs *) lfirst(lc2);
+							foreach_delete_current(fp_and_param_refs_list, lc2);
+							break;
+						}
+					}
+
+					int prev_cloc_count = jstate->clocations_count;
+					if (const_record_walker((Node *) lfirst(lc), jstate))
+						return true;
+
+					if (fppr != NULL && fppr->param_refs_count == jstate->clocations_count - prev_cloc_count) {
+						for (int i = prev_cloc_count; i < jstate->clocations_count; i++) {
+							jstate->clocations[i].param_id = fppr->param_refs[i - prev_cloc_count];
+						}
+						jstate->highest_normalize_param_id -= fppr->param_refs_count;
+					}
+				}
+				foreach(lc, stmt->sortClause)
+				{
+					/* Similarly, don't turn "ORDER BY 1" into "ORDER BY $n" */
+					if (IsA(lfirst(lc), SortBy) && IsA(castNode(SortBy, lfirst(lc))->node, A_Const) &&
+					    IsA(&castNode(A_Const, castNode(SortBy, lfirst(lc))->node)->val, Integer))
+						continue;
+
+					if (const_record_walker((Node *) lfirst(lc), jstate))
+						return true;
+				}
+				if (const_record_walker((Node *) stmt->havingClause, jstate))
+					return true;
+				if (const_record_walker((Node *) stmt->windowClause, jstate))
+					return true;
+				if (const_record_walker((Node *) stmt->valuesLists, jstate))
+					return true;
+				if (const_record_walker((Node *) stmt->limitOffset, jstate))
+					return true;
+				if (const_record_walker((Node *) stmt->limitCount, jstate))
+					return true;
+				if (const_record_walker((Node *) stmt->lockingClause, jstate))
+					return true;
+				if (const_record_walker((Node *) stmt->withClause, jstate))
+					return true;
+				if (const_record_walker((Node *) stmt->larg, jstate))
+					return true;
+				if (const_record_walker((Node *) stmt->rarg, jstate))
+					return true;
+
+				return false;
+			}
+		default:
+			{
+				PG_TRY();
+				{
+					return raw_expression_tree_walker(node, const_record_walker, (void*) jstate);
+				}
+				PG_CATCH();
+				{
+					MemoryContextSwitchTo(normalize_context);
+					FlushErrorState();
+				}
+				PG_END_TRY();
+			}
 	}
-	PG_END_TRY();
 
-	return result;
+	return false;
 }
 
 PgQueryNormalizeResult pg_query_normalize(const char* input)
@@ -384,7 +572,7 @@ PgQueryNormalizeResult pg_query_normalize(const char* input)
 		int query_len;
 
 		/* Parse query */
-		tree = raw_parser(input);
+		tree = raw_parser(input, RAW_PARSE_DEFAULT);
 
 		query_len = (int) strlen(input);
 
@@ -393,9 +581,13 @@ PgQueryNormalizeResult pg_query_normalize(const char* input)
 		jstate.clocations = (pgssLocationLen *)
 			palloc(jstate.clocations_buf_size * sizeof(pgssLocationLen));
 		jstate.clocations_count = 0;
+		jstate.highest_normalize_param_id = 1;
 		jstate.highest_extern_param_id = 0;
 		jstate.query = input;
 		jstate.query_len = query_len;
+		jstate.param_refs = NULL;
+		jstate.param_refs_buf_size = 0;
+		jstate.param_refs_count = 0;
 
 		/* Walk tree and record const locations */
 		const_record_walker((Node *) tree, &jstate);
@@ -414,6 +606,8 @@ PgQueryNormalizeResult pg_query_normalize(const char* input)
 		error = malloc(sizeof(PgQueryError));
 		error->message   = strdup(error_data->message);
 		error->filename  = strdup(error_data->filename);
+		error->funcname  = strdup(error_data->funcname);
+		error->context   = NULL;
 		error->lineno    = error_data->lineno;
 		error->cursorpos = error_data->cursorpos;
 
@@ -432,6 +626,7 @@ void pg_query_free_normalize_result(PgQueryNormalizeResult result)
   if (result.error) {
     free(result.error->message);
     free(result.error->filename);
+    free(result.error->funcname);
     free(result.error);
   }
 

data/ext/pg_query/pg_query_outfuncs.h

@@ -5,6 +5,7 @@
 
 PgQueryProtobuf pg_query_nodes_to_protobuf(const void *obj);
 
+char *pg_query_node_to_json(const void *obj);
 char *pg_query_nodes_to_json(const void *obj);
 
 #endif

data/ext/pg_query/pg_query_outfuncs_json.c

@@ -36,6 +36,12 @@
 		appendStringInfo(out, "\"" CppAsString(outname_json) "\":%u,", node->fldname); \
 	}
 
+/* Write an unsigned integer field */
+#define WRITE_UINT64_FIELD(outname, outname_json, fldname) \
+	if (node->fldname != 0) { \
+		appendStringInfo(out, "\"" CppAsString(outname_json) "\":" UINT64_FORMAT ",", node->fldname); \
+	}
+
 /* Write a long-integer field */
 #define WRITE_LONG_FIELD(outname, outname_json, fldname) \
 	if (node->fldname != 0) { \
@@ -195,39 +201,77 @@ _outOidList(StringInfo out, const List *node)
 }
 
 static void
-_outInteger(StringInfo out, const Value *node)
+_outInteger(StringInfo out, const Integer *node)
 {
-	appendStringInfo(out, "\"ival\":%d,", node->val.ival);
+	if (node->ival > 0)
+		appendStringInfo(out, "\"ival\":%d", node->ival);
 }
 
 static void
-_outFloat(StringInfo out, const Value *node)
+_outBoolean(StringInfo out, const Boolean *node)
 {
-	appendStringInfo(out, "\"str\":");
-	_outToken(out, node->val.str);
-	appendStringInfo(out, ",");
+	appendStringInfo(out, "\"boolval\":%s", booltostr(node->boolval));
 }
 
 static void
-_outString(StringInfo out, const Value *node)
+_outFloat(StringInfo out, const Float *node)
 {
-	appendStringInfo(out, "\"str\":");
-	_outToken(out, node->val.str);
-	appendStringInfo(out, ",");
+	appendStringInfo(out, "\"fval\":");
+	_outToken(out, node->fval);
 }
 
 static void
-_outBitString(StringInfo out, const Value *node)
+_outString(StringInfo out, const String *node)
 {
-	appendStringInfo(out, "\"str\":");
-	_outToken(out, node->val.str);
-	appendStringInfo(out, ",");
+	appendStringInfo(out, "\"sval\":");
+	_outToken(out, node->sval);
+}
+
+static void
+_outBitString(StringInfo out, const BitString *node)
+{
+	appendStringInfo(out, "\"bsval\":");
+	_outToken(out, node->bsval);
 }
 
 static void
-_outNull(StringInfo out, const Value *node)
+_outAConst(StringInfo out, const A_Const *node)
 {
-	// No fields
+	if (node->isnull) {
+		appendStringInfo(out, "\"isnull\":true");
+	} else {
+		switch (node->val.node.type) {
+			case T_Integer:
+				appendStringInfoString(out, "\"ival\":{");
+				_outInteger(out, &node->val.ival);
+				appendStringInfoChar(out, '}');
+				break;
+			case T_Float:
+				appendStringInfoString(out, "\"fval\":{");
+				_outFloat(out, &node->val.fval);
+				appendStringInfoChar(out, '}');
+				break;
+			case T_Boolean:
+				appendStringInfo(out, "\"boolval\":{%s}", node->val.boolval.boolval ? "\"boolval\":true" : "");
+				break;
+			case T_String:
+				appendStringInfoString(out, "\"sval\":{");
+				_outString(out, &node->val.sval);
+				appendStringInfoChar(out, '}');
+				break;
+			case T_BitString:
+				appendStringInfoString(out, "\"bsval\":{");
+				_outBitString(out, &node->val.bsval);
+				appendStringInfoChar(out, '}');
+				break;
+
+			// Unreachable, A_Const cannot contain any other nodes.
+			default:
+				Assert(false);
+		}
+	}
+
+	appendStringInfo(out, ",\"location\":%d", node->location);
 }
 
 #include "pg_query_enum_defs.c"
@@ -259,6 +303,17 @@ _outNode(StringInfo out, const void *obj)
 	}
 }
 
+char *
+pg_query_node_to_json(const void *obj)
+{
+	StringInfoData out;
+
+	initStringInfo(&out);
+	_outNode(&out, obj);
+
+	return out.data;
+}
+
 char *
 pg_query_nodes_to_json(const void *obj)
 {

data/ext/pg_query/pg_query_outfuncs_protobuf.c

@@ -23,6 +23,7 @@
 
 #define WRITE_INT_FIELD(outname, outname_json, fldname) out->outname = node->fldname;
 #define WRITE_UINT_FIELD(outname, outname_json, fldname) out->outname = node->fldname;
+#define WRITE_UINT64_FIELD(outname, outname_json, fldname) out->outname = node->fldname;
 #define WRITE_LONG_FIELD(outname, outname_json, fldname) out->outname = node->fldname;
 #define WRITE_FLOAT_FIELD(outname, outname_json, fldname) out->outname = node->fldname;
 #define WRITE_BOOL_FIELD(outname, outname_json, fldname) out->outname = node->fldname;
@@ -57,11 +58,11 @@
 #define WRITE_BITMAPSET_FIELD(outname, outname_json, fldname) \
 	if (!bms_is_empty(node->fldname)) \
 	{ \
-		int x = 0; \
+		int x = -1; \
 		int i = 0; \
 		out->n_##outname = bms_num_members(node->fldname); \
 		out->outname = palloc(sizeof(PgQuery__Node*) * out->n_##outname); \
-		while ((x = bms_first_member(node->fldname)) >= 0) \
+		while ((x = bms_next_member(node->fldname, x)) >= 0) \
 			out->outname[i++] = x; \
     }
 
@@ -150,33 +151,93 @@ _outOidList(PgQuery__OidList* out, const List *node)
 // TODO: Add Bitmapset
 
 static void
-_outInteger(PgQuery__Integer* out, const Value *node)
+_outInteger(PgQuery__Integer* out, const Integer *node)
 {
-  out->ival = node->val.ival;
+  out->ival = node->ival;
 }
 
 static void
-_outFloat(PgQuery__Float* out, const Value *node)
+_outFloat(PgQuery__Float* out, const Float *node)
 {
-  out->str = node->val.str;
+  out->fval = node->fval;
 }
 
 static void
-_outString(PgQuery__String* out, const Value *node)
+_outBoolean(PgQuery__Boolean* out, const Boolean *node)
 {
-  out->str = node->val.str;
+  out->boolval = node->boolval;
 }
 
 static void
-_outBitString(PgQuery__BitString* out, const Value *node)
+_outString(PgQuery__String* out, const String *node)
 {
-  out->str = node->val.str;
+  out->sval = node->sval;
 }
 
 static void
-_outNull(PgQuery__Null* out, const Value *node)
+_outBitString(PgQuery__BitString* out, const BitString *node)
 {
-  // Null has no fields
+  out->bsval = node->bsval;
+}
+
+static void
+_outAConst(PgQuery__AConst* out, const A_Const *node)
+{
+  out->isnull = node->isnull;
+  out->location = node->location;
+
+  if (!node->isnull) {
+    switch (nodeTag(&node->val.node)) {
+      case T_Integer: {
+        PgQuery__Integer *value = palloc(sizeof(PgQuery__Integer));
+        pg_query__integer__init(value);
+        value->ival = node->val.ival.ival;
+
+        out->val_case = PG_QUERY__A__CONST__VAL_IVAL;
+        out->ival = value;
+        break;
+      }
+      case T_Float: {
+        PgQuery__Float *value = palloc(sizeof(PgQuery__Float));
+        pg_query__float__init(value);
+        value->fval = pstrdup(node->val.fval.fval);
+
+        out->val_case = PG_QUERY__A__CONST__VAL_FVAL;
+        out->fval = value;
+        break;
+      }
+      case T_Boolean: {
+        PgQuery__Boolean *value = palloc(sizeof(PgQuery__Boolean));
+        pg_query__boolean__init(value);
+        value->boolval = node->val.boolval.boolval;
+
+        out->val_case = PG_QUERY__A__CONST__VAL_BOOLVAL;
+        out->boolval = value;
+        break;
+      }
+      case T_String: {
+        PgQuery__String *value = palloc(sizeof(PgQuery__String));
+	pg_query__string__init(value);
+	value->sval = pstrdup(node->val.sval.sval);
+
+	out->val_case = PG_QUERY__A__CONST__VAL_SVAL;
+	out->sval = value;
+	break;
+      }
+      case T_BitString: {
+        PgQuery__BitString *value = palloc(sizeof(PgQuery__BitString));
+	pg_query__bit_string__init(value);
+	value->bsval = pstrdup(node->val.bsval.bsval);
+
+	out->val_case = PG_QUERY__A__CONST__VAL_BSVAL;
+	out->bsval = value;
+	break;
+      }
+      default:
+        // Unreachable
+        Assert(false);
+    }
+  }
 }
 
 #include "pg_query_enum_defs.c"