infrahub-server 1.2.11__py3-none-any.whl → 1.3.0__py3-none-any.whl

infrahub/core/migrations/graph/m019_restore_rels_to_time.py

@@ -97,8 +97,7 @@ class DeleteNodesRelsQuery(Query):
         // - on deleted edge branch
         // - or on any branch and deleted node is agnostic
         // - or deleted node is aware and rel is agnostic
-        CALL {
-            WITH rel, deleted_edge
+        CALL (rel, deleted_edge) {
             OPTIONAL MATCH (rel)-[peer_active_edge {status: "active"}]-(peer_1)
             WHERE (peer_active_edge.branch = deleted_edge.branch OR (rel.branch_support <> $branch_agnostic AND deleted_edge.branch = $global_branch))
             AND peer_active_edge.to IS NULL
@@ -160,62 +159,52 @@ class DeleteNodesRelsQuery(Query):
         // Below CALL subqueries are called once for each rel-peer_2 pair for which we want to create a deleted edge.
         // Note that with current infrahub relationships edges design, only one of this CALL should be matched per pair.
 
-        CALL {
-            WITH rel, peer_2, branch, branch_level, deleted_time
+        CALL (rel, peer_2, branch, branch_level, deleted_time) {
             MATCH (rel)-[:IS_RELATED]->(peer_2)
             MERGE (rel)-[:IS_RELATED {status: "deleted", branch: branch, branch_level: branch_level, from: deleted_time}]->(peer_2)
         }
 
-        CALL {
-            WITH rel, peer_2, branch, branch_level, deleted_time
+        CALL (rel, peer_2, branch, branch_level, deleted_time) {
             MATCH (rel)-[:IS_PROTECTED]->(peer_2)
             MERGE (rel)-[:IS_PROTECTED {status: "deleted", branch: branch, branch_level: branch_level, from: deleted_time}]->(peer_2)
         }
 
-        CALL {
-            WITH rel, peer_2, branch, branch_level, deleted_time
+        CALL (rel, peer_2, branch, branch_level, deleted_time) {
             MATCH (rel)-[:IS_VISIBLE]->(peer_2)
             MERGE (rel)-[:IS_VISIBLE {status: "deleted", branch: branch, branch_level: branch_level, from: deleted_time}]->(peer_2)
         }
 
-        CALL {
-            WITH rel, peer_2, branch, branch_level, deleted_time
+        CALL (rel, peer_2, branch, branch_level, deleted_time) {
             MATCH (rel)-[:HAS_OWNER]->(peer_2)
             MERGE (rel)-[:HAS_OWNER {status: "deleted", branch: branch, branch_level: branch_level, from: deleted_time}]->(peer_2)
         }
 
-        CALL {
-            WITH rel, peer_2, branch, branch_level, deleted_time
+        CALL (rel, peer_2, branch, branch_level, deleted_time) {
             MATCH (rel)-[:HAS_SOURCE]->(peer_2)
             MERGE (rel)-[:HAS_SOURCE {status: "deleted", branch: branch, branch_level: branch_level, from: deleted_time}]->(peer_2)
         }
 
-        CALL {
-            WITH rel, peer_2, branch, branch_level, deleted_time
+        CALL (rel, peer_2, branch, branch_level, deleted_time) {
             MATCH (rel)<-[:IS_RELATED]-(peer_2)
             MERGE (rel)<-[:IS_RELATED {status: "deleted", branch: branch, branch_level: branch_level, from: deleted_time}]-(peer_2)
         }
 
-        CALL {
-            WITH rel, peer_2, branch, branch_level, deleted_time
+        CALL (rel, peer_2, branch, branch_level, deleted_time) {
             MATCH (rel)<-[:IS_PROTECTED]-(peer_2)
             MERGE (rel)<-[:IS_PROTECTED {status: "deleted", branch: branch, branch_level: branch_level, from: deleted_time}]-(peer_2)
         }
 
-        CALL {
-            WITH rel, peer_2, branch, branch_level, deleted_time
+        CALL (rel, peer_2, branch, branch_level, deleted_time) {
             MATCH (rel)<-[:IS_VISIBLE]-(peer_2)
             MERGE (rel)<-[:IS_VISIBLE {status: "deleted", branch: branch, branch_level: branch_level, from: deleted_time}]-(peer_2)
         }
 
-        CALL {
-            WITH rel, peer_2, branch, branch_level, deleted_time
+        CALL (rel, peer_2, branch, branch_level, deleted_time) {
             MATCH (rel)<-[:HAS_OWNER]-(peer_2)
             MERGE (rel)<-[:HAS_OWNER {status: "deleted", branch: branch, branch_level: branch_level, from: deleted_time}]-(peer_2)
         }
 
-        CALL {
-            WITH rel, peer_2, branch, branch_level, deleted_time
+        CALL (rel, peer_2, branch, branch_level, deleted_time) {
             MATCH (rel)<-[:HAS_SOURCE]-(peer_2)
             MERGE (rel)<-[:HAS_SOURCE {status: "deleted", branch: branch, branch_level: branch_level, from: deleted_time}]-(peer_2)
         }

infrahub/core/migrations/graph/m020_duplicate_edges.py

@@ -33,8 +33,7 @@ WHERE num_duplicate_edges > 1
 // -------------------
 WITH DISTINCT a, branch, branch_level, status, from, to, attr_val, attr_default
 WITH attr_val, attr_default, collect([a, branch, branch_level, status, from, to]) AS details_list
-CALL {
-    WITH attr_val, attr_default
+CALL (attr_val, attr_default) {
     MATCH (av:AttributeValue {value: attr_val, is_default: attr_default})
     RETURN av AS the_one_av
     ORDER by %(id_func)s(av) ASC
@@ -53,11 +52,10 @@ WITH a, branch, status, from, to, attr_val, attr_default, %(id_func)s(fresh_e) A
 // -------------------
 // get the identical edges for a given set of Attribute node, edge properties, AttributeValue.value
 // -------------------
-CALL {
+CALL (a, branch, status, from, to, attr_val, attr_default, e_id_to_keep) {
     // -------------------
     // delete the duplicate edges a given set of Attribute node, edge properties, AttributeValue.value
     // -------------------
-    WITH a, branch, status, from, to, attr_val, attr_default, e_id_to_keep
     MATCH (a)-[e:HAS_VALUE]->(av:AttributeValue {value: attr_val, is_default: attr_default})
     WHERE %(id_func)s(e) <> e_id_to_keep
     AND e.branch = branch AND e.status = status AND e.from = from
@@ -99,8 +97,7 @@ WITH DISTINCT a, branch, branch_level, status, from, to, b
 CREATE (a)-[fresh_e:%(edge_type)s {branch: branch, branch_level: branch_level, status: status, from: from}]->(b)
 SET fresh_e.to = to
 WITH a, branch, status, from, to, b, %(id_func)s(fresh_e) AS e_id_to_keep
-CALL {
-    WITH a, branch, status, from, to, b, e_id_to_keep
+CALL (a, branch, status, from, to, b, e_id_to_keep) {
     MATCH (a)-[e:%(edge_type)s]->(b)
     WHERE %(id_func)s(e) <> e_id_to_keep
     AND e.branch = branch AND e.status = status AND e.from = from

infrahub/core/migrations/graph/m021_missing_hierarchy_merge.py

@@ -24,8 +24,7 @@ class SetMissingHierarchyQuery(Query):
         WITH r.default_branch AS default_branch
         MATCH (n:Node)-[main_e:IS_RELATED {branch: default_branch}]-(rel:Relationship)
         WHERE main_e.hierarchy IS NULL
-        CALL {
-            WITH n, main_e, rel
+        CALL (n, main_e, rel) {
             MATCH (n)-[branch_e:IS_RELATED]-(rel)
             WHERE branch_e.hierarchy IS NOT NULL
             AND branch_e.branch <> main_e.branch

infrahub/core/migrations/graph/m023_deduplicate_cardinality_one_relationships.py

@@ -52,7 +52,7 @@ class DedupCardinalityOneRelsQuery(Query):
         # of a one-to-many BIDIR relationship.
         query = """
 
-        CALL {
+        CALL () {
             MATCH (rel_node: Relationship)-[edge:IS_RELATED]->(n: Node)<-[edge_2:IS_RELATED]-(rel_node_2: Relationship {name: rel_node.name})
             WHERE rel_node.name in $rel_one_identifiers_inbound[n.kind]
                 AND edge.branch = edge_2.branch
@@ -64,7 +64,7 @@ class DedupCardinalityOneRelsQuery(Query):
             DETACH DELETE rel_node
         }
 
-        CALL {
+        CALL () {
             MATCH (rel_node_3: Relationship)<-[edge_3:IS_RELATED]-(n: Node)-[edge_4:IS_RELATED]->(rel_node_4: Relationship {name: rel_node_3.name})
             WHERE rel_node_3.name in $rel_one_identifiers_outbound[n.kind]
                 AND edge_3.branch = edge_4.branch

infrahub/core/migrations/graph/m024_missing_hierarchy_backfill.py

@@ -39,8 +39,7 @@ class BackfillMissingHierarchyQuery(Query):
         MATCH (rel:Relationship {name: "parent__child"})-[e:IS_RELATED]-(n:Node)
         WHERE e.hierarchy IS NULL
         WITH DISTINCT rel, n, default_branch
-        CALL {
-            WITH rel, n, default_branch
+        CALL (rel, n, default_branch) {
             MATCH (rel)-[e:IS_RELATED {branch: default_branch}]-(n)
             RETURN e
             ORDER BY e.from DESC

infrahub/core/migrations/graph/m028_delete_diffs.py

@@ -33,6 +33,5 @@ class Migration028(ArbitraryMigration):
         component_registry = get_component_registry()
         diff_repo = await component_registry.get_component(DiffRepository, db=db, branch=default_branch)
 
-        diff_roots = await diff_repo.get_roots_metadata()
-        await diff_repo.delete_diff_roots(diff_root_uuids=[d.uuid for d in diff_roots])
+        await diff_repo.delete_all_diff_roots()
         return MigrationResult()