fix: support merge statement in pg versions 15+

ericmustin · ericmustin · commit a7cb8cf32b8f · 2024-12-26T15:53:56.000-05:00
diff --git a/instrumentation/pg/lib/opentelemetry/instrumentation/pg/constants.rb b/instrumentation/pg/lib/opentelemetry/instrumentation/pg/constants.rb
@@ -40,10 +40,10 @@ module Constants
           LISTEN
           LOAD
           LOCK
+          MERGE
           MOVE
           NOTIFY
           PREPARE
-          PREPARE
           REASSIGN
           REFRESH
           REINDEX
@@ -54,7 +54,6 @@ module Constants
           SAVEPOINT
           SECURITY
           SELECT
-          SELECT
           SET
           SHOW
           START
diff --git a/instrumentation/pg/test/fixtures/sql_table_name.json b/instrumentation/pg/test/fixtures/sql_table_name.json
@@ -54,5 +54,9 @@
     {
       "name": "table_name_with_double_quotes",
       "sql": "SELECT columns FROM \"test_table\""
+    },
+    {
+      "name": "merge",
+      "sql": "MERGE into test_table using other_table on other_table.id = test_table.id WHEN matched then update set x = test_table.x + 1 when not matched then insert (id,x,status) values (other_table.id,other_table.x,other_table.status); "
     }
 ]

Original file line number	Diff line number	Diff line change
`@@ -54,5 +54,9 @@`
`54`	`54`	`{`
`55`	`55`	`"name": "table_name_with_double_quotes",`
`56`	`56`	`"sql": "SELECT columns FROM \"test_table\""`
	`57`	`+ },`
	`58`	`+ {`
	`59`	`+ "name": "merge",`
	`60`	`+ "sql": "MERGE into test_table using other_table on other_table.id = test_table.id WHEN matched then update set x = test_table.x + 1 when not matched then insert (id,x,status) values (other_table.id,other_table.x,other_table.status); "`
`57`	`61`	`}`
`58`	`62`	`]`