Skip to content

Enable TDS->Relational for Project #9

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: finos-master
Choose a base branch
from
Open

Enable TDS->Relational for Project #9

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
11 changes: 5 additions & 6 deletions ...gine-pure-code-compiled-core/src/main/resources/core/pure/tds/relation/tdsToRelation.pure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,12 @@ function meta::pure::tds::toRelation::transform(a:AppliedFunction[1], extensions

appliedFunction(project_C_MANY__FuncColSpecArray_1__Relation_1_, [$a.parameters->at(0)->transform($extensions), $columns]);
),
//TODO activate when relation inference is fixed on project
// pair(project_TabularDataSet_1__ColumnSpecification_MANY__TabularDataSet_1_->cast(@Function<Any>),
// |
// let columns = $a.parameters->at(1)->colsToColSpecArrayInstance($extensions);
pair(project_TabularDataSet_1__ColumnSpecification_MANY__TabularDataSet_1_->cast(@Function<Any>),
|
let columns = $a.parameters->at(1)->colsToColSpecArrayInstance($extensions);

// appliedFunction(project_Relation_1__FuncColSpecArray_1__Relation_1_, [$a.parameters->at(0)->transform($extensions), $columns]);
// ),
appliedFunction(project_Relation_1__FuncColSpecArray_1__Relation_1_, [$a.parameters->at(0)->transform($extensions), $columns]);
),
pair(groupBy_K_MANY__Function_MANY__AggregateValue_MANY__String_MANY__TabularDataSet_1_->cast(@Function<Any>),
|
let groupByColumns = $a.parameters->at(1)->fromCollection()->cast(@Lambda);
Expand Down
61 changes: 30 additions & 31 deletions ...-pure-code-compiled-core/src/main/resources/core/pure/tds/relation/testTdsToRelation.pure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,38 +69,37 @@ function <<test.Test>> meta::pure::tds::toRelation::testProjectSingle():Boolean[
);
}

//TODO activate when relation inference is fixed on project
// function <<test.Test>> meta::pure::tds::toRelation::testTDSProjectSingle():Boolean[1]
// {
// test(
// {| TestClass.all()
// ->project(col(x | $x.string, 'str'))
// ->project(col(x:TDSRow[1] | $x.getString('str')->toOne() + 'abc', 'newCol'))},
// {| TestClass.all()
// ->project(~[str: x | $x.string])
// ->project(~[newCol : x | $x.str->toOne() + 'abc'])}
// );
// }

// function <<test.Test>> meta::pure::tds::toRelation::testTDSProjectMulti():Boolean[1]
// {
// test(
// {| TestClass.all()
// ->project([col(x | $x.string, 'str'), col(x | $x.integer, 'int')])
// ->project([
// col(x:TDSRow[1] | $x.getString('str')->toOne() + 'abc', 'newCol'),
// col(x:TDSRow[1] | $x.getString('str')->toOne() + 'def', 'newCol2')
// ])},
// {| TestClass.all()
// ->project(~[str: x | $x.string, int: x | $x.integer])
// ->project(~[
// newCol : x | $x.str->toOne() + 'abc',
// newCol2 : x | $x.str->toOne() + 'def'
// ])
// }
// );
// }

function <<test.Test>> meta::pure::tds::toRelation::testTDSProjectSingle():Boolean[1]
{
test(
{| TestClass.all()
->project(col(x | $x.string, 'str'))
->project(col(x:TDSRow[1] | $x.getString('str')->toOne() + 'abc', 'newCol'))},
{| TestClass.all()
->project(~[str: x | $x.string])
->project(~[newCol : x | $x.str->toOne() + 'abc'])}
);
}

function <<test.Test>> meta::pure::tds::toRelation::testTDSProjectMulti():Boolean[1]
{
test(
{| TestClass.all()
->project([col(x | $x.string, 'str'), col(x | $x.integer, 'int')])
->project([
col(x:TDSRow[1] | $x.getString('str')->toOne() + 'abc', 'newCol'),
col(x:TDSRow[1] | $x.getString('str')->toOne() + 'def', 'newCol2')
])},
{| TestClass.all()
->project(~[str: x | $x.string, int: x | $x.integer])
->project(~[
newCol : x | $x.str->toOne() + 'abc',
newCol2 : x | $x.str->toOne() + 'def'
])
}
);
}

function <<test.Test>> meta::pure::tds::toRelation::testExtendSingle():Boolean[1]
{
Expand Down