pg_query 6.2.3 → 6.2.5

data/ext/pg_query/pg_query.pb-c.c

@@ -25990,7 +25990,7 @@ const ProtobufCMessageDescriptor pg_query__index_elem__descriptor =
   (ProtobufCMessageInit) pg_query__index_elem__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-static const ProtobufCFieldDescriptor pg_query__def_elem__field_descriptors[5] =
+static const ProtobufCFieldDescriptor pg_query__def_elem__field_descriptors[6] =
 {
   {
     "defnamespace",
@@ -26052,9 +26052,22 @@ static const ProtobufCFieldDescriptor pg_query__def_elem__field_descriptors[5] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "arg_location",
+    6,
+    PROTOBUF_C_LABEL_NONE,
+    PROTOBUF_C_TYPE_INT32,
+    0,   /* quantifier_offset */
+    offsetof(PgQuery__DefElem, arg_location),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned pg_query__def_elem__field_indices_by_name[] = {
   2,   /* field[2] = arg */
+  5,   /* field[5] = arg_location */
   3,   /* field[3] = defaction */
   1,   /* field[1] = defname */
   0,   /* field[0] = defnamespace */
@@ -26063,7 +26076,7 @@ static const unsigned pg_query__def_elem__field_indices_by_name[] = {
 static const ProtobufCIntRange pg_query__def_elem__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 5 }
+  { 0, 6 }
 };
 const ProtobufCMessageDescriptor pg_query__def_elem__descriptor =
 {
@@ -26073,7 +26086,7 @@ const ProtobufCMessageDescriptor pg_query__def_elem__descriptor =
   "PgQuery__DefElem",
   "pg_query",
   sizeof(PgQuery__DefElem),
-  5,
+  6,
   pg_query__def_elem__field_descriptors,
   pg_query__def_elem__field_indices_by_name,
   1,  pg_query__def_elem__number_ranges,
@@ -37842,7 +37855,7 @@ const ProtobufCMessageDescriptor pg_query__rule_stmt__descriptor =
   (ProtobufCMessageInit) pg_query__rule_stmt__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-static const ProtobufCFieldDescriptor pg_query__notify_stmt__field_descriptors[2] =
+static const ProtobufCFieldDescriptor pg_query__notify_stmt__field_descriptors[3] =
 {
   {
     "conditionname",
@@ -37868,15 +37881,28 @@ static const ProtobufCFieldDescriptor pg_query__notify_stmt__field_descriptors[2
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "payload_location",
+    3,
+    PROTOBUF_C_LABEL_NONE,
+    PROTOBUF_C_TYPE_INT32,
+    0,   /* quantifier_offset */
+    offsetof(PgQuery__NotifyStmt, payload_location),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned pg_query__notify_stmt__field_indices_by_name[] = {
   0,   /* field[0] = conditionname */
   1,   /* field[1] = payload */
+  2,   /* field[2] = payload_location */
 };
 static const ProtobufCIntRange pg_query__notify_stmt__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 2 }
+  { 0, 3 }
 };
 const ProtobufCMessageDescriptor pg_query__notify_stmt__descriptor =
 {
@@ -37886,7 +37912,7 @@ const ProtobufCMessageDescriptor pg_query__notify_stmt__descriptor =
   "PgQuery__NotifyStmt",
   "pg_query",
   sizeof(PgQuery__NotifyStmt),
-  2,
+  3,
   pg_query__notify_stmt__field_descriptors,
   pg_query__notify_stmt__field_indices_by_name,
   1,  pg_query__notify_stmt__number_ranges,
@@ -40433,7 +40459,7 @@ const ProtobufCMessageDescriptor pg_query__alter_publication_stmt__descriptor =
   (ProtobufCMessageInit) pg_query__alter_publication_stmt__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-static const ProtobufCFieldDescriptor pg_query__create_subscription_stmt__field_descriptors[4] =
+static const ProtobufCFieldDescriptor pg_query__create_subscription_stmt__field_descriptors[5] =
 {
   {
     "subname",
@@ -40483,9 +40509,22 @@ static const ProtobufCFieldDescriptor pg_query__create_subscription_stmt__field_
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "conninfo_location",
+    5,
+    PROTOBUF_C_LABEL_NONE,
+    PROTOBUF_C_TYPE_INT32,
+    0,   /* quantifier_offset */
+    offsetof(PgQuery__CreateSubscriptionStmt, conninfo_location),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned pg_query__create_subscription_stmt__field_indices_by_name[] = {
   1,   /* field[1] = conninfo */
+  4,   /* field[4] = conninfo_location */
   3,   /* field[3] = options */
   2,   /* field[2] = publication */
   0,   /* field[0] = subname */
@@ -40493,7 +40532,7 @@ static const unsigned pg_query__create_subscription_stmt__field_indices_by_name[
 static const ProtobufCIntRange pg_query__create_subscription_stmt__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 4 }
+  { 0, 5 }
 };
 const ProtobufCMessageDescriptor pg_query__create_subscription_stmt__descriptor =
 {
@@ -40503,14 +40542,14 @@ const ProtobufCMessageDescriptor pg_query__create_subscription_stmt__descriptor
   "PgQuery__CreateSubscriptionStmt",
   "pg_query",
   sizeof(PgQuery__CreateSubscriptionStmt),
-  4,
+  5,
   pg_query__create_subscription_stmt__field_descriptors,
   pg_query__create_subscription_stmt__field_indices_by_name,
   1,  pg_query__create_subscription_stmt__number_ranges,
   (ProtobufCMessageInit) pg_query__create_subscription_stmt__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-static const ProtobufCFieldDescriptor pg_query__alter_subscription_stmt__field_descriptors[5] =
+static const ProtobufCFieldDescriptor pg_query__alter_subscription_stmt__field_descriptors[6] =
 {
   {
     "kind",
@@ -40572,9 +40611,22 @@ static const ProtobufCFieldDescriptor pg_query__alter_subscription_stmt__field_d
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "conninfo_location",
+    6,
+    PROTOBUF_C_LABEL_NONE,
+    PROTOBUF_C_TYPE_INT32,
+    0,   /* quantifier_offset */
+    offsetof(PgQuery__AlterSubscriptionStmt, conninfo_location),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned pg_query__alter_subscription_stmt__field_indices_by_name[] = {
   2,   /* field[2] = conninfo */
+  5,   /* field[5] = conninfo_location */
   0,   /* field[0] = kind */
   4,   /* field[4] = options */
   3,   /* field[3] = publication */
@@ -40583,7 +40635,7 @@ static const unsigned pg_query__alter_subscription_stmt__field_indices_by_name[]
 static const ProtobufCIntRange pg_query__alter_subscription_stmt__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 5 }
+  { 0, 6 }
 };
 const ProtobufCMessageDescriptor pg_query__alter_subscription_stmt__descriptor =
 {
@@ -40593,7 +40645,7 @@ const ProtobufCMessageDescriptor pg_query__alter_subscription_stmt__descriptor =
   "PgQuery__AlterSubscriptionStmt",
   "pg_query",
   sizeof(PgQuery__AlterSubscriptionStmt),
-  5,
+  6,
   pg_query__alter_subscription_stmt__field_descriptors,
   pg_query__alter_subscription_stmt__field_indices_by_name,
   1,  pg_query__alter_subscription_stmt__number_ranges,

data/ext/pg_query/pg_query_normalize.c

@@ -255,8 +255,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 */
-					param_id;	/* Param ID to be assigned */
+					tok_len;	/* Length (in bytes) of that tok */
+		int64_t		param_id;	/* Param ID to be assigned */
 
 		off = jstate->clocations[i].location;
 		/* Adjust recorded location if we're dealing with partial string */
@@ -267,6 +267,16 @@ generate_normalized_query(pgssConstLocations *jstate, int query_loc, int* query_
 		if (tok_len < 0)
 			continue;			/* ignore any duplicates */
 
+		/*
+		 * Defend against constant locations that overlap the previous
+		 * constant or run past the end of the query. Locations come from the
+		 * parser and so should never do either, but getting this wrong means
+		 * a negative length below and a write outside of norm_query, so check
+		 * it at runtime rather than only asserting it.
+		 */
+		if (off < last_off + last_tok_len || off > query_len || tok_len > query_len - off)
+			continue;
+
 		/* Copy next chunk (what precedes the next constant) */
 		len_to_wrt = off - last_off;
 		len_to_wrt -= last_tok_len;
@@ -277,9 +287,9 @@ generate_normalized_query(pgssConstLocations *jstate, int query_loc, int* query_
 
 		/* And insert a param symbol in place of the constant token */
 		param_id = (jstate->clocations[i].param_id < 0) ?
-					jstate->highest_extern_param_id + abs(jstate->clocations[i].param_id) :
+					(int64_t) 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);
+		n_quer_loc += sprintf(norm_query + n_quer_loc, "$" INT64_FORMAT, (int64) param_id);
 
 		quer_loc = off + tok_len;
 		last_off = off;
@@ -336,37 +346,6 @@ static void RecordConstLocation(pgssConstLocations *jstate, int location)
 	}
 }
 
-static bool is_string_delimiter(char c)
-{
-	return c == '\'' || c == '$';
-}
-
-static bool is_special_string_start(char c)
-{
-	return c == 'b' || c == 'B' || c == 'x' || c == 'X' || c == 'n' || c == 'N' || c == 'e' || c == 'E';
-}
-
-static void record_defelem_arg_location(pgssConstLocations *jstate, int location)
-{
-	for (int i = location; i < jstate->query_len; i++) {
-		if (is_string_delimiter(jstate->query[i]) || (i + 1 < jstate->query_len && is_special_string_start(jstate->query[i]) && is_string_delimiter(jstate->query[i + 1]))) {
-			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;
@@ -398,14 +377,15 @@ static bool const_record_walker(Node *node, pgssConstLocations *jstate)
 		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);
+
+				/*
+				 * The grammar records where the option's string constant
+				 * starts, and leaves this as -1 when the argument wasn't
+				 * written as a string constant.
+				 */
+				RecordConstLocation(jstate, defElem->arg_location);
+
+				return const_record_walker((Node *) defElem->arg, jstate);
 			}
 			break;
 		case T_RawStmt:
@@ -435,11 +415,21 @@ static bool const_record_walker(Node *node, pgssConstLocations *jstate)
 			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);
-			break;
+			{
+				CreateSubscriptionStmt *stmt = (CreateSubscriptionStmt *) node;
+
+				if (stmt->conninfo != NULL)
+					RecordConstLocation(jstate, stmt->conninfo_location);
+				break;
+			}
 		case T_AlterSubscriptionStmt:
-			record_matching_string(jstate, ((AlterSubscriptionStmt *) node)->conninfo);
-			break;
+			{
+				AlterSubscriptionStmt *stmt = (AlterSubscriptionStmt *) node;
+
+				if (stmt->conninfo != NULL)
+					RecordConstLocation(jstate, stmt->conninfo_location);
+				break;
+			}
 		case T_CreateUserMappingStmt:
 			return const_record_walker((Node *) ((CreateUserMappingStmt *) node)->options, jstate);
 		case T_AlterUserMappingStmt:
@@ -567,6 +557,14 @@ static bool const_record_walker(Node *node, pgssConstLocations *jstate)
 				if (jstate->normalize_utility_only) return false;
 				return raw_expression_tree_walker(node, const_record_walker, (void*) jstate);
 			}
+		case T_NotifyStmt:
+			{
+				NotifyStmt *stmt = castNode(NotifyStmt, node);
+
+				if (stmt->payload != NULL)
+					RecordConstLocation(jstate, stmt->payload_location);
+				break;
+			}
 		case T_InsertStmt:
 			{
 				if (jstate->normalize_utility_only) return false;

data/ext/pg_query/pg_query_readfuncs_protobuf.c

@@ -160,15 +160,18 @@ List * pg_query_protobuf_to_nodes(PgQueryProtobuf protobuf)
 
 	result = pg_query__parse_result__unpack(NULL, protobuf.len, (const uint8_t *) protobuf.data);
 
-	// TODO: Handle this by returning an error instead
-	Assert(result != NULL);
+	if (result == NULL)
+		elog(ERROR, "could not unpack protobuf parse tree");
 
-	// TODO: Handle this by returning an error instead
-	Assert(result->version == PG_VERSION_NUM);
+	if (result->version != PG_VERSION_NUM)
+	{
+		pg_query__parse_result__free_unpacked(result, NULL);
+		elog(ERROR, "protobuf parse tree version mismatch: %d (expected %d)", result->version, PG_VERSION_NUM);
+	}
 
 	if (result->n_stmts > 0)
 		list = list_make1(_readRawStmt(result->stmts[0]));
-    for (i = 1; i < result->n_stmts; i++)
+	for (i = 1; i < result->n_stmts; i++)
 		list = lappend(list, _readRawStmt(result->stmts[i]));
 
 	pg_query__parse_result__free_unpacked(result, NULL);