Skip to content
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

[2201.8.x] Fix time module resolution error in SQL compiler plugin tests #41903

Merged
merged 3 commits into from
Dec 19, 2023
Merged

[2201.8.x] Fix time module resolution error in SQL compiler plugin tests #41903

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9fd70c1
Fix sql time module resolution error
ShammiL Dec 18, 2023
dd8ee9a
Update comment for changes
ShammiL Dec 18, 2023
58cfc84
Fix checkstyle errors
ShammiL Dec 19, 2023
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
18 changes: 10 additions & 8 deletions ...rina-lang/src/main/java/io/ballerina/projects/internal/PackageDependencyGraphBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,14 +326,16 @@
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);

Check warning on line 337 in compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/PackageDependencyGraphBuilder.java

View check run for this annotation

Codecov / codecov/patch

compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/PackageDependencyGraphBuilder.java#L337 

Added line #L337 was not covered by tests
}
}
}
}
Expand Down
Loading