Skip to content

Legend SQL - fix func source flow #4504

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

Open
gs-jp1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Legend SQL - fix func source flow #4504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion ...iler/src/test/java/org/finos/legend/engine/sql/compiler/test/TestCompilerFromGrammar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
public class TestCompilerFromGrammar
{
@Test
public void testSimple()
public void testCSV()
{
testCompile("function pack::f():Boolean[1]\n" +
"{\n" +
Expand All @@ -34,6 +34,20 @@ public void testSimple()
"}");
}

@Test
public void testFunc()
{
testCompile("function pack::f2(): Relation<Any>[1]\n" +
"{\n" +
" #SQL{select a,b from csv('a,b\\n1,2')}#;\n" +
" '';\n" +
"}\n\n" + "function pack::f(): String[1]\n" +
"{\n" +
" #SQL{select * from func('pack::f2__Relation_1_')}#;\n" +
" '';\n" +
"}\n");
}

@Test
public void testSimpleWithError()
{
Expand Down
2 changes: 1 addition & 1 deletion ...xt-sql-pure/src/main/resources/core_external_query_sql/binding/fromPure/compileUtils.pure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ function meta::external::query::sql::transformation::compile::utils::_extractDep
if (!$alreadyProcessed->contains($v),
| let newProcessedList = $v->match([p:PackageableElement[1]|$alreadyProcessed->concatenate($p),a:Any[1]|$alreadyProcessed]);
$v->match([
z:FunctionDefinition<Any>[1] |if($z->instanceOf(PackageableElement) && $z->elementToPath()->contains('::tests::'),|$z->cast(@PackageableElement),|[])->concatenate($z.expressionSequence->evaluateAndDeactivate()->map(x|$x->_extractDependencies($newProcessedList)));,
z:FunctionDefinition<Any>[1] |if($z->instanceOf(PackageableElement) && (!$z->isWithinPackage(meta) || $z->elementToPath()->contains('::tests::')),|$z->cast(@PackageableElement),|[])->concatenate($z.expressionSequence->evaluateAndDeactivate()->map(x|$x->_extractDependencies($newProcessedList)));,
x:SimpleFunctionExpression[1]|let res = $x.parametersValues->evaluateAndDeactivate()->map(p|$p->_extractDependencies($alreadyProcessed));
$res->concatenate($x.func->_extractDependencies($newProcessedList));,
i: InstanceValue[1] | $i.values->evaluateAndDeactivate()->map(p|$p->_extractDependencies($newProcessedList)),
Expand Down
3 changes: 2 additions & 1 deletion ...ine-xt-sql-pure/src/main/resources/core_external_query_sql/binding/fromPure/fromPure.pure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1544,7 +1544,8 @@ function <<access.private>> meta::external::query::sql::transformation::queryToP
let vs = evaluate($d.generationFunction, [list($tableFunc), list($_context)]);

let columns = $vs->match([
s:SimpleFunctionExpression[1] | $s->evaluateAndDeactivate().genericType.typeArguments.rawType->cast(@meta::pure::metamodel::relation::RelationType<Any>).columns,
s:SimpleFunctionExpression[1] | $s->evaluateAndDeactivate().func->cast(@FunctionDefinition<Any>).expressionSequence
->evaluateAndDeactivate()->last().genericType.typeArguments.rawType->cast(@meta::pure::metamodel::relation::RelationType<Any>).columns,
v:Any[1] | $vs->genericType().typeArguments->at(0).rawType->cast(@meta::pure::metamodel::relation::RelationType<Any>).columns
]);

Expand Down
Loading