This commit is contained in:
Lukas Eder 2020-12-17 16:39:56 +01:00
parent 005f0ef426
commit 69e8532a39

View File

@ -12569,7 +12569,7 @@ final class ParserContext {
if (t.value instanceof JoinTable) {
found = resolveInTableScope(
Arrays.asList(
Arrays.<Value<Table<?>>>asList(
new Value<>(t.scopeLevel, ((JoinTable) t.value).lhs),
new Value<>(t.scopeLevel, ((JoinTable) t.value).rhs)
),
@ -12585,10 +12585,10 @@ final class ParserContext {
Name q = lookupName.qualifier();
boolean x = q.qualified();
if (x && q.equals(t.value.getQualifiedName()) || !x && q.last().equals(t.value.getName()))
if ((found = Value.of(t.scopeLevel, t.value.field(lookup.getName()))) != null)
if ((found = Value.<Field<?>>of(t.scopeLevel, t.value.field(lookup.getName()))) != null)
break tableScopeLoop;
}
else if ((f = Value.of(t.scopeLevel, t.value.field(lookup.getName()))) != null) {
else if ((f = Value.<Field<?>>of(t.scopeLevel, t.value.field(lookup.getName()))) != null) {
if (found == null || found.scopeLevel < f.scopeLevel) {
found = f;
}