Skip to content

handle migrated kind nodes in diff and merge logic #6401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 28 commits into from
May 12, 2025
Merged

handle migrated kind nodes in diff and merge logic #6401

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
46cdeb0
fix bug in rel create for migrated kind nodes
ajtmccarty May 6, 2025
a93fafd
handle agnostic rels correctly
ajtmccarty May 6, 2025
36499e1
WIP on including migrated kinds in diff
ajtmccarty May 2, 2025
bf01fdb
small changes to diff calculation queries for properties of nodes with
ajtmccarty May 6, 2025
8ece551
expand unit test for migrated kind diff... big time
ajtmccarty May 6, 2025
12f9647
finish up giant unit test
ajtmccarty May 6, 2025
0ec811c
use db_id instead of labels, will need it for merge updates
ajtmccarty May 7, 2025
895e989
move is_node_kind_migration outside of existing diff queries
ajtmccarty May 8, 2025
d2bac2d
format
ajtmccarty May 8, 2025
127ec33
fix broken tests/query
ajtmccarty May 8, 2025
e7e8fb8
update DiffCombiner with identifiers
ajtmccarty May 8, 2025
0ce777d
Merge branch 'stable' into ajtm-05022024-diff-kind-migrations
ajtmccarty May 8, 2025
eebfb77
Merge branch 'ajtm-05082025-rel-query-updates' into ajtm-05022024-dif…
ajtmccarty May 9, 2025
c8c37a8
undo some changes in DiffQueryParser that are no longer needed
ajtmccarty May 9, 2025
49beff0
comment placement fix
ajtmccarty May 9, 2025
e59d7ea
test and support for merging branch with migrated kind node
ajtmccarty May 9, 2025
8d129ba
update unit test for is_node_kind_migration
ajtmccarty May 9, 2025
15c67bb
add changelog
ajtmccarty May 9, 2025
545fa09
remove commented out code
ajtmccarty May 9, 2025
4638dea
handle migrated node that is later deleted
ajtmccarty May 10, 2025
fe791b8
add cypher comment
ajtmccarty May 12, 2025
9e63513
remove unused property
ajtmccarty May 12, 2025
e88d946
update comment, remove unnecessary int() casting
ajtmccarty May 12, 2025
5a215ec
Merge branch 'stable' into ajtm-05022024-diff-kind-migrations
ajtmccarty May 12, 2025
b95380e
linting
ajtmccarty May 12, 2025
1688c1f
one more test
ajtmccarty May 12, 2025
3edc685
add migration to delete diffs b/c they must be recalculated
ajtmccarty May 12, 2025
33a6f93
actually include the migration
ajtmccarty May 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add migration to delete diffs b/c they must be recalculated
  • Loading branch information
@ajtmccarty
ajtmccarty committed May 12, 2025
commit 3edc685476da9926da2bd2cb9985ab89935b50f0
2 changes: 1 addition & 1 deletion backend/infrahub/core/graph/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
GRAPH_VERSION = 27
GRAPH_VERSION = 28
Empty file added backend/infrahub/core/migrations/graph/m028_delete_diffs.py
View file
Open in desktop
Empty file.
Loading