smql 0.0.4 → 0.0.4.1

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.4.1

data/lib/smql_to_ar/condition_types.rb

@@ -159,12 +159,13 @@ class SmqlToAR
 						builder.where values.keys.collect {|vid| self.class::Where % [ col, vid.to_s ] }
 					end
 				else
+					b2 = SmqlToAR::And.new builder
 					values.keys.each do |vid|
-						builder.where @cols.collect {|col|
+						b2.where SmqlToAR::Or[ *@cols.collect {|col|
 								col.joins builder, table
 								col = builder.column table+col.path, col.col
 								self.class::Where % [ col, vid.to_s ]
-							}
+							}]
 					end
 				end
 				self
@@ -229,7 +230,6 @@ class SmqlToAR
 				super( *pars)
 				@value = Array.wrap @value
 				cols = {}
-				p self: self, cols: @cols
 				@cols.each do |col|
 					col_model = col.relation
 					cols[col] = [col_model] + @value.collect {|val| ConditionTypes.try_parse( col_model, val) }
@@ -250,7 +250,6 @@ class SmqlToAR
 					b2 = 1 == sub.length ? builder : Or.new( builder)
 					sub.each {|i| i.collect( &it.build( And.new( b2), t)); p 'or' => b2 }
 				end
-				ap '=>' => builder
 				self
 			end
 		end
@@ -274,7 +273,7 @@ class SmqlToAR
 			def initialize model, cols, val
 				super model, cols, val[1]
 				# sub: model, subquery, sub(condition)
-				@cols.each {|col, sub| sub[ 1...1] = SmqlToAR.new( col.relation, val[0]).parse }
+				@cols.each {|col, sub| sub[ 1..-1] = SmqlToAR.new( col.relation, val[0]).parse, *sub[-1] }
 			end
 
 			def verify_column col
@@ -285,6 +284,7 @@ class SmqlToAR
 				@cols.each do |col, sub|
 					t = table+col.to_a
 					builder.sub_joins t, col, *sub[0..1]
+					#ap sub: sub[2..-1]
 					sub[2..-1].each &it.build( builder, t)
 				end
 				self
@@ -336,7 +336,6 @@ class SmqlToAR
 
 				class <<self
 					def try_parse model, func, args
-						SmqlToAR.logger.info( { try_parse: [func,args]}.inspect)
 						self.new model, func, args  if self::Name === func and self::Expected.any?( &it === args)
 					end
 
@@ -389,7 +388,7 @@ class SmqlToAR
 
 				def build builder, table
 					raise_unless 1 == table.length, RootOnlyFunctionError.new( table)
-					builder.limit @args
+					builder.limit = Array.wrap(@args).first.to_i
 				end
 			end
 
@@ -399,12 +398,11 @@ class SmqlToAR
 
 				def build builder, table
 					raise_unless 1 == table.length, RootOnlyFunctionError.new( table)
-					builder.offset @args
+					builder.offset = Array.wrap(@args).first.to_i
 				end
 			end
 
 			def self.new model, col, val
-				SmqlToAR.logger.info( { function: col.first.to_sym }.inspect)
 				r = nil
 				constants.each do |c|
 					next  if [:Function, :Where, :Expected, :Operator].include? c

data/lib/smql_to_ar/query_builder.rb

@@ -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
@@ -142,13 +142,12 @@ class SmqlToAR
 		end
 
 		def build_ar
-			where_str = @_where.type_correction!.optimize!.tap {|x| p x }.build_where
+			where_str = @_where.type_correction!.optimize!.build_where
 			incls = {}
 			@_includes.each do |inc|
 				b = incls
 				inc[1..-1].collect {|rel| b = b[rel] ||= {} }
 			end
-			@logger.info where: where_str, wobs: @_wobs
 			@model = @model.
 				select( @_select.join( ', ')).
 				joins( @_joins).
@@ -182,7 +181,6 @@ class SmqlToAR
 		delegate :wobs, :joins, :includes, :sub_joins, :vid, :quote_column_name, :quoter, :quote_table_name, :column, :to => :parent
 
 		def initialize parent, tmp = false
-			p init: self, parent: parent
 			@parent = parent
 			@parent.where self  unless @parend.nil? && tmp
 		end
@@ -207,7 +205,6 @@ class SmqlToAR
 		end
 
 		def optimize!
-			p optimize: self
 			ext = []
 			collect! do |sub|
 				sub = sub.optimize!  if sub.kind_of? Array
@@ -220,8 +217,6 @@ class SmqlToAR
 					sub
 				end
 			end.compact!
-			p optimized: self
-			p ext: ext
 			push *ext
 			self
 		end
@@ -231,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

metadata

@@ -6,7 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - 4
-  version: 0.0.4
+  - 1
+  version: 0.0.4.1
 platform: ruby
 authors: 
 - Denis Knauf
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-05 00:00:00 +02:00
+date: 2011-10-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency