fixes: OR...

This commit is contained in:
Denis Knauf 2011-10-06 13:24:17 +02:00
parent 09dfa782a8
commit 863ebca9cd
2 changed files with 13 additions and 8 deletions

View file

@ -79,7 +79,7 @@ class SmqlToAR
end
def build_join orig, pretable, table, prekey, key
" LEFT OUTER 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
def sub_joins table, col, model, query
@ -226,18 +226,21 @@ class SmqlToAR
end
def default() SmqlToAR::And end
def default_new( parent) default.new self, parent, false end
def collect_build_where
collect {|x| x.respond_to?( :build_where) ? x.build_where : x.to_s }
end
end
class And < SubBuilder
def default; SmqlToAR::Or; end
def build_where
join ' AND '
collect_build_where.join ' AND '
end
end
class Or < SubBuilder
def build_where
join ' OR '
collect_build_where.join ' OR '
end
end
end