deac/smql
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

optimizer optimized (AND[Or["abc"]] -> "abc"). ()-bugfix in where-clause.

Browse source
This commit is contained in:
Denis Knauf 2012-01-18 13:34:26 +01:00
parent ce81d21bd8
commit 08d1610987
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
0.0.5.2
0.0.5.3

17
lib/smql_to_ar/query_builder.rb
View file

@ -248,12 +248,14 @@ class SmqlToAR
def optimize!
ext = []
collect! do |sub|
sub = sub.optimize! if sub.kind_of? Array
sub = sub.optimize! if sub.kind_of? SubBuilder
if self.class == sub.class
ext.push *sub
nil
elsif sub.blank?
nil
elsif 1 == sub.size
sub.first
else
sub
end
@ -267,21 +269,22 @@ 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 }
def collect_build_where indent = nil
indent = (indent||0) + 1
collect {|x| "(#{x.respond_to?( :build_where) ? x.build_where( indent) : x.to_s})" }
end
end
class And < SubBuilder
def default; SmqlToAR::Or; end
def build_where
collect_build_where.join ' AND '
def build_where indent = nil
collect_build_where( indent).join " AND\n"+"\t"*(indent||0)
end
end
class Or < SubBuilder
def build_where
collect_build_where.join ' OR '
def build_where indent = nil
collect_build_where( indent).join " OR\n"+"\t"*(indent||0)
end
end
end