fix: map primary keys to tuple positions

Summary

• fix: map primary keys to tuple positions

---

• Close #1284 (closed)
• Cherry-pick to: none
• Docs follow-up: not necessary
• Changelog is updated