scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-09 22:55:34 +08:00
Code Issues Projects Releases Packages Wiki Activity

Add alias to cell sort query, to prevent join conflicts [SCI-6649] (#3953)

Browse source 
* Add alias to cell sort query, to prevent join conflicts [SCI-6649]

* Added value_type to join condition to make use of DB index [SCI-6649]
This commit is contained in:
artoscinote 2022-03-28 16:48:05 +02:00 • committed by GitHub
parent 673f8c1a2a
commit 725549c8ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/services/repository_datatable_service.rb
View file

@ -433,21 +433,25 @@ class RepositoryDatatableService
return records unless sorting_column
sorting_data_type = sorting_column.data_type.constantize
cells = sorting_data_type.joins(:repository_cell)
.where('repository_cells.repository_column_id': sorting_column.id)
cells = sorting_data_type.joins(
"INNER JOIN repository_cells AS repository_sort_cells "\
"ON repository_sort_cells.value_id = #{sorting_data_type.table_name}.id "\
"AND repository_sort_cells.value_type = '#{sorting_data_type}'"
).where('repository_sort_cells.repository_column_id': sorting_column.id)
if sorting_data_type.const_defined?('EXTRA_SORTABLE_VALUE_INCLUDE')
cells = cells.joins(sorting_data_type::EXTRA_SORTABLE_VALUE_INCLUDE)
end
cells = if sorting_column.repository_checklist_value?
cells
.select("repository_cells.repository_row_id, \
.select("repository_sort_cells.repository_row_id, \
STRING_AGG(#{sorting_data_type::SORTABLE_COLUMN_NAME}, ' ' \
ORDER BY #{sorting_data_type::SORTABLE_COLUMN_NAME}) AS value")
.group('repository_cells.repository_row_id')
.group('repository_sort_cells.repository_row_id')
else
cells
.select("repository_cells.repository_row_id, #{sorting_data_type::SORTABLE_COLUMN_NAME} AS value")
.select("repository_sort_cells.repository_row_id, #{sorting_data_type::SORTABLE_COLUMN_NAME} AS value")
end
records.joins("LEFT OUTER JOIN (#{cells.to_sql}) AS values ON values.repository_row_id = repository_rows.id")