Merge pull request #41903 from ShammiL/sql-time-resolution-8

[2201.8.x] Fix time module resolution error in SQL compiler plugin tests
ballerina-platform · Dec 19, 2023 · 218ea39 · 218ea39
2 parents 9613b1c + 58cfc84
commit 218ea39
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/...rina-lang/src/main/java/io/ballerina/projects/internal/PackageDependencyGraphBuilder.java b/...rina-lang/src/main/java/io/ballerina/projects/internal/PackageDependencyGraphBuilder.java
@@ -326,14 +326,16 @@ private NodeStatus addNewVertex(Vertex vertex, DependencyNode newPkgDep, boolean
             if (resolutionOptions.dumpRawGraphs()) {
                 rawGraphBuilder.add(resolvedPkgDep);
             }
-            // Update the scope of dependencies
-            for (Vertex depVertex : depGraph.get(vertex)) {
-                DependencyNode dependencyNode = vertices.get(depVertex);
-                DependencyNode newDependencyNode = new DependencyNode(dependencyNode.pkgDesc(), resolvedPkgDep.scope(),
-                        dependencyNode.resolutionType());
-                vertices.put(depVertex, newDependencyNode);
-                if (resolutionOptions.dumpRawGraphs()) {
-                    rawGraphBuilder.addDependency(resolvedPkgDep, newDependencyNode);
+            // Update the scope of dependencies only if rejected node scope is DEFAULT
+            if (resolvedPkgDep.scope() == PackageDependencyScope.DEFAULT) {
+                for (Vertex depVertex : depGraph.get(vertex)) {
+                    DependencyNode dependencyNode = vertices.get(depVertex);
+                    DependencyNode newDependencyNode = new DependencyNode(dependencyNode.pkgDesc(),
+                            resolvedPkgDep.scope(), dependencyNode.resolutionType());
+                    vertices.put(depVertex, newDependencyNode);
+                    if (resolutionOptions.dumpRawGraphs()) {
+                        rawGraphBuilder.addDependency(resolvedPkgDep, newDependencyNode);
+                    }
                 }
             }
         }