MDL-66827 ddl: Fix detection of primary keys in index checks in pgsql

bwalkerl · bwalkerl · commit f5f2ae8ceb63 · 2025-11-21T19:06:12.000+10:00
diff --git a/public/lib/dml/pgsql_native_moodle_database.php b/public/lib/dml/pgsql_native_moodle_database.php
@@ -530,7 +530,7 @@ public function get_indexes($table) {
                 if (!preg_match('/CREATE (|UNIQUE )INDEX ([^\s]+) ON (|'.$row['schemaname'].'\.)'.$tablename.' USING ([^\s]+) \(([^\)]+)\)/i', $row['indexdef'], $matches)) {
                     continue;
                 }
-                if ($matches[5] === 'id') {
+                if ($matches[5] === 'id' && str_ends_with($matches[2], '_pk')) {
                     continue;
                 }
                 $columns = explode(',', $matches[5]);

Original file line number	Diff line number	Diff line change
`@@ -530,7 +530,7 @@ public function get_indexes($table) {`
`530`	`530`	`if (!preg_match('/CREATE (\|UNIQUE )INDEX ([^\s]+) ON (\|'.$row['schemaname'].'\.)'.$tablename.' USING ([^\s]+) \(([^\)]+)\)/i', $row['indexdef'], $matches)) {`
`531`	`531`	`continue;`
`532`	`532`	`}`
`533`		`- if ($matches[5] === 'id') {`
	`533`	`+ if ($matches[5] === 'id' && str_ends_with($matches[2], '_pk')) {`
`534`	`534`	`continue;`
`535`	`535`	`}`
`536`	`536`	`$columns = explode(',', $matches[5]);`