PMM-13133 Upgrade pg_query_go to v5 (#3000)

* Bump google.golang.org/protobuf from 1.32.0 to 1.34.1 in /tools Bumps google.golang.org/protobuf from 1.32.0 to 1.34.1. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * chore: upgrade google.golang.org/protobuf in the root as well * chore: upgrade github.com/bufbuild/buf to the latest * chore: upgrade github.com/pganalyze/pg_query_go to the latest * fix: postgresql query test * fix: pgstatstatements test * Merge branch 'main' into dependabot-tools-google.golang.org-protobuf-1.34.1 * Merge branch 'main' into dependabot-tools-google.golang.org-protobuf-1.34.1 * Merge branch 'main' into dependabot-tools-google.golang.org-protobuf-1.34.1 --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
percona · Jun 19, 2024 · 6a0ee17 · 6a0ee17
1 parent 04465d6
commit 6a0ee17
Show file tree

Hide file tree

Showing 70 changed files with 239 additions and 214 deletions.
diff --git a/agent/agents/postgres/parser/parser.go b/agent/agents/postgres/parser/parser.go
@@ -21,7 +21,7 @@ import (
 	"sort"
 	"strings"
 
-	pgquery "github.com/pganalyze/pg_query_go/v2"
+	pgquery "github.com/pganalyze/pg_query_go/v5"
 	"github.com/pkg/errors"
 )
 

diff --git a/agent/agents/postgres/parser/testdata/query019.json b/agent/agents/postgres/parser/testdata/query019.json
@@ -1,3 +1,8 @@
 {
-  "error": "error on parsing sql query: subquery in FROM must have an alias"
+  "tables": [
+    "credit_card_wo_complaints",
+    "without_complaints"
+  ],
+  "error": ""
 }
+
diff --git a/agent/agents/postgres/pgstatmonitor/stat_monitor_cache.go b/agent/agents/postgres/pgstatmonitor/stat_monitor_cache.go
@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"github.com/AlekSi/pointer"
-	pgquery "github.com/pganalyze/pg_query_go/v2"
+	pgquery "github.com/pganalyze/pg_query_go/v5"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"gopkg.in/reform.v1"

diff --git a/agent/agents/postgres/pgstatstatements/pgstatstatements_test.go b/agent/agents/postgres/pgstatstatements/pgstatstatements_test.go
@@ -398,10 +398,12 @@ func TestPGStatStatementsQAN(t *testing.T) {
 		require.Len(t, buckets, 1)
 
 		var fingerprint string
+		tables := []string{tableName}
+
 		switch engineVersion {
 		case "9.4", "9.5", "9.6":
 			fingerprint = fmt.Sprintf(`INSERT /* CheckMBlkReadTime controller='test' */ INTO %s (customer_id, first_name, last_name, active) VALUES (?, ?, ?, ?)`, tableName)
-
+			tables = []string{}
 		default:
 			fingerprint = fmt.Sprintf(`INSERT /* CheckMBlkReadTime controller='test' */ INTO %s (customer_id, first_name, last_name, active) VALUES ($1, $2, $3, $4)`, tableName)
 		}
@@ -412,7 +414,7 @@ func TestPGStatStatementsQAN(t *testing.T) {
 				Queryid:             actual.Common.Queryid,
 				Fingerprint:         fingerprint,
 				Database:            "pmm-agent",
-				Tables:              []string{tableName},
+				Tables:              tables,
 				Comments:            map[string]string{"controller": "test"},
 				Username:            "pmm-agent",
 				AgentId:             "agent_id",

diff --git a/api/agentlocalpb/agentlocal.pb.go b/api/agentlocalpb/agentlocal.pb.go
diff --git a/api/agentpb/agent.pb.go b/api/agentpb/agent.pb.go
diff --git a/api/agentpb/collector.pb.go b/api/agentpb/collector.pb.go
diff --git a/api/common/metrics_resolutions.pb.go b/api/common/metrics_resolutions.pb.go
diff --git a/api/inventorypb/agent_status.pb.go b/api/inventorypb/agent_status.pb.go
diff --git a/api/inventorypb/agents.pb.go b/api/inventorypb/agents.pb.go
diff --git a/api/inventorypb/log_level.pb.go b/api/inventorypb/log_level.pb.go
diff --git a/api/inventorypb/nodes.pb.go b/api/inventorypb/nodes.pb.go
diff --git a/api/inventorypb/services.pb.go b/api/inventorypb/services.pb.go
diff --git a/api/managementpb/actions.pb.go b/api/managementpb/actions.pb.go
diff --git a/api/managementpb/agent/agent.pb.go b/api/managementpb/agent/agent.pb.go
diff --git a/api/managementpb/alerting/alerting.pb.go b/api/managementpb/alerting/alerting.pb.go
diff --git a/api/managementpb/alerting/params.pb.go b/api/managementpb/alerting/params.pb.go
diff --git a/api/managementpb/annotation.pb.go b/api/managementpb/annotation.pb.go
diff --git a/api/managementpb/azure/azure.pb.go b/api/managementpb/azure/azure.pb.go
diff --git a/api/managementpb/backup/artifacts.pb.go b/api/managementpb/backup/artifacts.pb.go
diff --git a/api/managementpb/backup/backups.pb.go b/api/managementpb/backup/backups.pb.go
diff --git a/api/managementpb/backup/common.pb.go b/api/managementpb/backup/common.pb.go
diff --git a/api/managementpb/backup/errors.pb.go b/api/managementpb/backup/errors.pb.go
diff --git a/api/managementpb/backup/locations.pb.go b/api/managementpb/backup/locations.pb.go
diff --git a/api/managementpb/backup/restores.pb.go b/api/managementpb/backup/restores.pb.go
diff --git a/api/managementpb/boolean_flag.pb.go b/api/managementpb/boolean_flag.pb.go
diff --git a/api/managementpb/checks.pb.go b/api/managementpb/checks.pb.go
diff --git a/api/managementpb/dbaas/components.pb.go b/api/managementpb/dbaas/components.pb.go
diff --git a/api/managementpb/dbaas/db_clusters.pb.go b/api/managementpb/dbaas/db_clusters.pb.go
diff --git a/api/managementpb/dbaas/dbaas.pb.go b/api/managementpb/dbaas/dbaas.pb.go
diff --git a/api/managementpb/dbaas/kubernetes.pb.go b/api/managementpb/dbaas/kubernetes.pb.go
diff --git a/api/managementpb/dbaas/logs.pb.go b/api/managementpb/dbaas/logs.pb.go
diff --git a/api/managementpb/dbaas/psmdb_clusters.pb.go b/api/managementpb/dbaas/psmdb_clusters.pb.go
diff --git a/api/managementpb/dbaas/pxc_clusters.pb.go b/api/managementpb/dbaas/pxc_clusters.pb.go
diff --git a/api/managementpb/dbaas/templates.pb.go b/api/managementpb/dbaas/templates.pb.go
diff --git a/api/managementpb/dump/dump.pb.go b/api/managementpb/dump/dump.pb.go
diff --git a/api/managementpb/external.pb.go b/api/managementpb/external.pb.go
diff --git a/api/managementpb/haproxy.pb.go b/api/managementpb/haproxy.pb.go
diff --git a/api/managementpb/ia/alerts.pb.go b/api/managementpb/ia/alerts.pb.go
diff --git a/api/managementpb/ia/channels.pb.go b/api/managementpb/ia/channels.pb.go
diff --git a/api/managementpb/ia/rules.pb.go b/api/managementpb/ia/rules.pb.go
diff --git a/api/managementpb/ia/status.pb.go b/api/managementpb/ia/status.pb.go
diff --git a/api/managementpb/metrics.pb.go b/api/managementpb/metrics.pb.go
diff --git a/api/managementpb/mongodb.pb.go b/api/managementpb/mongodb.pb.go
diff --git a/api/managementpb/mysql.pb.go b/api/managementpb/mysql.pb.go
diff --git a/api/managementpb/node.pb.go b/api/managementpb/node.pb.go
diff --git a/api/managementpb/node/node.pb.go b/api/managementpb/node/node.pb.go