redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#1080 Postgresql compatibility

Browse Source
This commit is contained in:
Karel Pičman 2020-03-04 16:18:18 +01:00
parent bea9ce62aa
commit 2e4ec971f7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/models/dmsf_query.rb
View File

@ -128,7 +128,7 @@ class DmsfQuery < Query
@statement = filters_clauses.join(' AND '). @statement = filters_clauses.join(' AND ').
gsub("#{queried_class.table_name}.", '') gsub("#{queried_class.table_name}.", '')
DmsfFileRevisionCustomField.visible.pluck(:id, :name).each do |id, name| DmsfFileRevisionCustomField.visible.pluck(:id, :name).each do |id, name|
@statement.gsub!("cf_#{id}", "`#{name}`") @statement.gsub!("cf_#{id}", "\"#{name}\"")
end end
end end
end end
@ -142,7 +142,7 @@ class DmsfQuery < Query
order_option = ['sort', group_by_sort_order, (options[:order] || sort_clause[0]), 'title'].flatten.reject(&:blank?) order_option = ['sort', group_by_sort_order, (options[:order] || sort_clause[0]), 'title'].flatten.reject(&:blank?)
if order_option.size > 2 if order_option.size > 2
DmsfFileRevisionCustomField.visible.pluck(:id, :name).each do |id, name| DmsfFileRevisionCustomField.visible.pluck(:id, :name).each do |id, name|
order_option[1].gsub!("COALESCE(cf_#{id}.value, '')", "`#{name}`") order_option[1].gsub!("COALESCE(cf_#{id}.value, '')", "\"#{name}\"")
end end
order_option[1].gsub!(',', " #{$1},") order_option[1].gsub!(',', " #{$1},")
if order_option[1] =~ /(DESC|ASC)$/ if order_option[1] =~ /(DESC|ASC)$/
@ -166,7 +166,7 @@ class DmsfQuery < Query
def dmsf_folders_scope def dmsf_folders_scope
cf_columns = +'' cf_columns = +''
DmsfFileRevisionCustomField.visible.order(:position).pluck(:id, :name).each do |id, name| DmsfFileRevisionCustomField.visible.order(:position).pluck(:id, :name).each do |id, name|
cf_columns << ",(SELECT value from custom_values WHERE custom_field_id = #{id} AND customized_type = 'DmsfFolder' AND customized_id = dmsf_folders.id) AS `#{name}`" cf_columns << ",(SELECT value from custom_values WHERE custom_field_id = #{id} AND customized_type = 'DmsfFolder' AND customized_id = dmsf_folders.id) AS \"#{name}\""
end end
scope = DmsfFolder. scope = DmsfFolder.
select(%{ select(%{
@ -200,7 +200,7 @@ class DmsfQuery < Query
def dmsf_folder_links_scope def dmsf_folder_links_scope
cf_columns = +'' cf_columns = +''
DmsfFileRevisionCustomField.visible.order(:position).pluck(:id, :name).each do |id, name| DmsfFileRevisionCustomField.visible.order(:position).pluck(:id, :name).each do |id, name|
cf_columns << ",(SELECT value from custom_values WHERE custom_field_id = #{id} AND customized_type = 'DmsfFolder' AND customized_id = dmsf_folders.id) AS `#{name}`" cf_columns << ",(SELECT value from custom_values WHERE custom_field_id = #{id} AND customized_type = 'DmsfFolder' AND customized_id = dmsf_folders.id) AS \"#{name}\""
end end
scope = DmsfLink. scope = DmsfLink.
select(%{ select(%{
@ -235,7 +235,7 @@ class DmsfQuery < Query
def dmsf_files_scope def dmsf_files_scope
cf_columns = +'' cf_columns = +''
DmsfFileRevisionCustomField.visible.order(:position).pluck(:id, :name).each do |id, name| DmsfFileRevisionCustomField.visible.order(:position).pluck(:id, :name).each do |id, name|
cf_columns << ",(SELECT value from custom_values WHERE custom_field_id = #{id} AND customized_type = 'DmsfFolder' AND customized_id = dmsf_files.id) AS `#{name}`" cf_columns << ",(SELECT value from custom_values WHERE custom_field_id = #{id} AND customized_type = 'DmsfFolder' AND customized_id = dmsf_files.id) AS \"#{name}\""
end end
scope = DmsfFile. scope = DmsfFile.
select(%{ select(%{
@ -270,7 +270,7 @@ class DmsfQuery < Query
def dmsf_file_links_scope def dmsf_file_links_scope
cf_columns = +'' cf_columns = +''
DmsfFileRevisionCustomField.visible.order(:position).pluck(:id, :name).each do |id, name| DmsfFileRevisionCustomField.visible.order(:position).pluck(:id, :name).each do |id, name|
cf_columns << ",(SELECT value from custom_values WHERE custom_field_id = #{id} AND customized_type = 'DmsfFolder' AND customized_id = dmsf_files.id) AS `#{name}`" cf_columns << ",(SELECT value from custom_values WHERE custom_field_id = #{id} AND customized_type = 'DmsfFolder' AND customized_id = dmsf_files.id) AS \"#{name}\""
end end
scope = DmsfLink. scope = DmsfLink.
select(%{ select(%{
@ -306,7 +306,7 @@ class DmsfQuery < Query
def dmsf_url_links_scope def dmsf_url_links_scope
cf_columns = +'' cf_columns = +''
DmsfFileRevisionCustomField.visible.order(:position).pluck(:name).each do |name| DmsfFileRevisionCustomField.visible.order(:position).pluck(:name).each do |name|
cf_columns << ",NULL AS `#{name}`" cf_columns << ",NULL AS \"#{name}\""
end end
scope = DmsfLink. scope = DmsfLink.
select(%{ select(%{