debugging removed
This commit is contained in:
parent
69aceef180
commit
63be31734b
3 changed files with 1 additions and 9 deletions
|
@ -107,7 +107,6 @@ class SmqlToAR
|
||||||
|
|
||||||
# Model der Relation `rel` von `model`
|
# Model der Relation `rel` von `model`
|
||||||
def self.model_of model, rel
|
def self.model_of model, rel
|
||||||
p model_of: rel.to_sym, model: model
|
|
||||||
r = model.reflections[ rel.to_sym].andand.klass
|
r = model.reflections[ rel.to_sym].andand.klass
|
||||||
r.nil? && rel === :self ? model : r
|
r.nil? && rel === :self ? model : r
|
||||||
end
|
end
|
||||||
|
@ -165,9 +164,7 @@ class SmqlToAR
|
||||||
|
|
||||||
def each
|
def each
|
||||||
model = @model
|
model = @model
|
||||||
p each: self, path: @path
|
|
||||||
@path.each do |rel|
|
@path.each do |rel|
|
||||||
p rel: rel
|
|
||||||
unless rel === :self
|
unless rel === :self
|
||||||
model = SmqlToAR.model_of model, rel
|
model = SmqlToAR.model_of model, rel
|
||||||
return false unless model
|
return false unless model
|
||||||
|
|
|
@ -58,9 +58,7 @@ class SmqlToAR
|
||||||
conditions.each do |c|
|
conditions.each do |c|
|
||||||
raise_unless colop =~ /^(?:\d*:)?(.*?)((?:\W*(?!\])\W)?)$/, UnexpectedColOpError.new( model, colop, val)
|
raise_unless colop =~ /^(?:\d*:)?(.*?)((?:\W*(?!\])\W)?)$/, UnexpectedColOpError.new( model, colop, val)
|
||||||
col, op = $1, $2
|
col, op = $1, $2
|
||||||
p col: col, op: op
|
|
||||||
col = split_keys( col).collect {|c| Column.new model, c }
|
col = split_keys( col).collect {|c| Column.new model, c }
|
||||||
p col: col
|
|
||||||
r = c.try_parse model, col, op, val
|
r = c.try_parse model, col, op, val
|
||||||
break if r
|
break if r
|
||||||
end
|
end
|
||||||
|
@ -248,10 +246,9 @@ class SmqlToAR
|
||||||
model, *sub = sub
|
model, *sub = sub
|
||||||
t = table + col.path + [col.col]
|
t = table + col.path + [col.col]
|
||||||
col.joins.each {|j, m| builder.joins table+j, m }
|
col.joins.each {|j, m| builder.joins table+j, m }
|
||||||
p build_t: t
|
|
||||||
builder.joins t, model
|
builder.joins t, model
|
||||||
b2 = 1 == sub.length ? builder : Or.new( builder)
|
b2 = 1 == sub.length ? builder : Or.new( builder)
|
||||||
sub.each {|i| i.collect( &it.build( And.new( b2), t)); p 'or' => b2 }
|
sub.each {|i| i.collect( &it.build( And.new( b2), t)) }
|
||||||
end
|
end
|
||||||
self
|
self
|
||||||
end
|
end
|
||||||
|
|
|
@ -90,7 +90,6 @@ class SmqlToAR
|
||||||
end
|
end
|
||||||
|
|
||||||
def build_join orig, pretable, table, prekey, key
|
def build_join orig, pretable, table, prekey, key
|
||||||
p build_join: {orig: orig, pretable: pretable, table: table, prekey: prekey, key: key}, alias: @table_alias
|
|
||||||
" LEFT JOIN #{orig} AS #{quote_table_name table} ON #{column pretable, prekey} = #{column table, key} "
|
" LEFT JOIN #{orig} AS #{quote_table_name table} ON #{column pretable, prekey} = #{column table, key} "
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -105,7 +104,6 @@ class SmqlToAR
|
||||||
premodel = @table_model[ pretable]
|
premodel = @table_model[ pretable]
|
||||||
t = @table_alias[ table]
|
t = @table_alias[ table]
|
||||||
pt = quote_table_name table[ 0...-1]
|
pt = quote_table_name table[ 0...-1]
|
||||||
p table: table
|
|
||||||
refl = premodel.reflections[table.last.to_sym]
|
refl = premodel.reflections[table.last.to_sym]
|
||||||
case refl
|
case refl
|
||||||
when ActiveRecord::Reflection::ThroughReflection
|
when ActiveRecord::Reflection::ThroughReflection
|
||||||
|
|
Loading…
Add table
Reference in a new issue