Match default values when querying views #900
Conversation
Signed-off-by: Julius Härtl <jus@bitgrid.net>
lib/Db/Row2Mapper.php
Outdated
| ->leftJoin('sl', 'tables_row_cells_' . $column->getType(), 'v', $qb->expr()->andX( | ||
| $qb->expr()->eq('sl.id', 'v.row_id'), | ||
| $qb->expr()->eq('v.column_id', $qb->createNamedParameter($column->getId(), IQueryBuilder::PARAM_INT)), | ||
| $qb->expr()->eq('sl.table_id', $qb->createNamedParameter($column->getTableId(), IQueryBuilder::PARAM_INT)) |
There was a problem hiding this comment.
Being a left join and since it is not establishing a condition between sl and v, this is rather to be understood as part of the general where clause, no?
There was a problem hiding this comment.
Yes, good catch for the sl.table_id, the v.column_id we need to also include NULL values on the join where the row_id does not match
There was a problem hiding this comment.
yes, my comment is only about the sl.table_id, sorry for being unprecise.
When gathering rows that are visible in views we need to take rows into account that have no corresponding entry in the columns_TYPE tables. For those we can match the filter in PHP and include row ids from a left join where there is no entry. Taking an example of a yes/no selection: If the default value of a column doesn't match we end up using the same query as before for collecting row ids ... `id` IN (SELECT `row_id` FROM `oc_tables_row_cells_selection` WHERE (`column_id` = 7) AND (`value` LIKE '"false"')) ... If the default value matches, we need to include those that do not have an entry ... `id` IN (SELECT `row_id` FROM `oc_tables_row_cells_selection` WHERE (`column_id` = 7) AND (`value` LIKE '"false"')) OR `id` IN (select sl.id from oc_tables_row_sleeves sl LEFT JOIN oc_tables_row_cells_selection se ON sl.id = se.row_id AND se.column_id = 7 WHERE se.id IS NULL) ... Signed-off-by: Julius Härtl <jus@bitgrid.net>
juliushaertl
force-pushed
the
fix/match-default-values
branch
from
f918c27
to
83238bb
Compare
|
So I would love to have comprehensive tests for this but lack time at the moment. Also still a bit unsure how to cover that. Behat tests might just be to verbose for test definition, so I might go with a phpunit tests that still writes to the DB to cover the different value conversions more easily in a dataProvider. Nevertheless I'd follow up this if you're fine with it @blizzz |
Not a fan of unit tests for DB logic tbh, but would be a way to tackle it.
Welcome to the club 😐 perhaps add an issue for tracking. You have my blessing ;) |
When gathering rows that are visible in views we need to take rows into
account that have no corresponding entry in the columns_TYPE tables. For
those we can match the filter in PHP and include row ids from a left
join where there is no entry.
Taking an example of a yes/no selection:
If the default value of a column doesn't match we end up using the same
query as before for collecting row ids
If the default value matches, we need to include those that do not have
an entry
Steps to reproduce