Fix tracing up tree to handle branches#1852
Merged
shangyian merged 6 commits intoDataJunction:mainfrom Mar 10, 2026
Merged
Conversation
✅ Deploy Preview for thriving-cassata-78ae72 canceled.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
The old implementation had two traversal strategies that ran somewhat independently: a string hierarchy batch query and an iterative FK chain loop. The FK chain would follow
parent_namespacelinks from any namespace in the chain, even ones without git_branch set, which caused it to incorrectly resolve repo info for partially-configured namespaces.The new implementation models the actual intended data structure:
git_branchset. Found by walking string ancestors (nearest/most-specific first).github_repo_path/git_path. Found either via one FK hop frombranch_ns.parent_namespace(when the root is a sibling, not a string ancestor), or from the string ancestors directly (when root is a string ancestor and no explicit parent_namespace link is needed).This is at most two queries (one batch + one point lookup), and correctly returns None when no
branch_nsexists, even ifparent_namespaceis set on the namespace. That fixes the case where a namespace hasparent_namespacebut nogit_branch(incomplete config) and was previously leaking through to GitHub auth.Test Plan
make checkpassesmake testshows 100% unit test coverageDeployment Plan