Skip to content

Commit 4db050f

Browse files
author
Josh Berkus
committed
Merge branch 'master' of github.com:pgexperts/pgx_scripts
Conflicts: indexes/fk_no_index.sql
2 parents a8f4075 + ffe908a commit 4db050f

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

indexes/fk_no_index.sql

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,12 @@ fk_index_match AS (
6161
JOIN fk_cols_list USING (fkoid)
6262
LEFT OUTER JOIN index_list
6363
ON conrelid = indrelid
64+
<<<<<<< HEAD
6465
AND (indkey::int2[])[0:(array_length(key_cols,1) -1)] @> key_cols
66+
=======
67+
-- lower bound of indkey is known to be 0
68+
AND (indkey::int2[])[0:array_length(key_cols,1) -1] @> key_cols
69+
>>>>>>> ffe908a21bff958ff4debd7160c00565ccbf5fa5
6570
),
6671
fk_perfect_match AS (
6772
SELECT fkoid

0 commit comments

Comments
 (0)