Karavel/fixin.me
0
0
Fork 0
forked from fixin.me/fixin.me
Code Pull Requests Activity

Merging from main master to my repo master. #4

Closed
Karavel wants to merge 53 commits from fixin.me/fixin.me:master into master
pull from: fixin.me/fixin.me:master
merge into: Karavel:master
Conversation 0 Commits 53 Files Changed 50 +14 -12
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7234d60afc - Show all commits

24
app/models/unit.rb
View File

@ -18,20 +18,22 @@ class Unit < ApplicationRecord
scope :defaults_diff, ->{
other_units = Unit.arel_table.alias('other_units')
other_bases_units = Unit.arel_table.alias('other_bases_units')
constraints = other_bases_units[:id].eq(other_units[:base_id])
.and(other_bases_units[:symbol].eq(Arel::Table.new(:bases_units)[:symbol]))
# add 'portable' fields (import on !default == export) to select
with_defaults
.where("NOT EXISTS (?)",
Unit.select(1).from(other_units).joins(
arel_table.create_join(
other_bases_units,
arel_table.create_on(other_bases_units[:id].eq(other_units[:base_id])),
Arel::Nodes::OuterJoin
)
).where(
other_bases_units[:symbol].eq(Arel::Table.new(:bases_units)[:symbol])
.and(other_units[:symbol].eq(arel_table[:symbol]))
.and(other_units[:user_id].not_eq(arel_table[:user_id]))
with_defaults
.joins(
arel_table.create_join(
arel_table.grouping([other_units, other_bases_units]),
arel_table.create_on(constraints),
Arel::Nodes::OuterJoin
).to_sql
)
.where({other_units: {id: nil}})
)
}
scope :ordered, ->{
left_outer_joins(:base)