From db5bbcb93aba5b078482dca22f41be203d7407cb Mon Sep 17 00:00:00 2001
From: Denis Knauf <Denis.Knauf@gmail.com>
Date: Tue, 27 Sep 2011 16:35:49 +0200
Subject: [PATCH 01/12] AR-through-reflections in query_builder;
 SmqlToAR.models returns the reflections-graph; limit, offset, sub-query "()"
 (not sub-conditions). unstable 0.3

---
 .gitignore                        |  1 +
 Rakefile                          |  1 +
 VERSION                           |  2 +-
 lib/smql_to_ar.rb                 | 48 +++++++++++++--
 lib/smql_to_ar/condition_types.rb | 99 ++++++++++++++++++++++++-------
 lib/smql_to_ar/query_builder.rb   | 79 +++++++++++++++++-------
 6 files changed, 180 insertions(+), 50 deletions(-)

diff --git a/.gitignore b/.gitignore
index 73633ee..1b861d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 pkg/**
+.*.swp
 smql.gemspec
diff --git a/Rakefile b/Rakefile
index 4245ce4..c9ac2a2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,6 +15,7 @@ begin
 		gem.add_dependency 'activerecord'
 		gem.add_dependency 'activesupport'
 		gem.add_dependency 'json'
+		gem.add_dependency 'methodphitamine'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
diff --git a/VERSION b/VERSION
index 4e379d2..bcab45a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.0.2
+0.0.3
diff --git a/lib/smql_to_ar.rb b/lib/smql_to_ar.rb
index 63e1a10..9e53dcf 100644
--- a/lib/smql_to_ar.rb
+++ b/lib/smql_to_ar.rb
@@ -15,6 +15,18 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 class SmqlToAR
+	module Assertion
+		def raise_unless cond, exception = nil, *args
+			cond, exception, *args = yield. cond, exception, *args  if block_given?
+			raise exception || Exception, *args  unless cond
+		end
+
+		def raise_if cond, exception = nil, *args
+			cond, exception, *args = yield. cond, exception, *args  if block_given?
+			raise exception || Exception, *args  if cond
+		end
+	end
+
 	include ActiveSupport::Benchmarkable
 	############################################################################r
 	# Exceptions
@@ -77,12 +89,18 @@ class SmqlToAR
 		end
  	end
 
-	class OnlyOrderOnBaseError < SMQLError
+	class RootOnlyFunctionError < SMQLError
 		def initialize path
 			super :path => path
 		end
 	end
 
+	class ConColumnError < SMQLError
+		def initialize expected, got
+			super :expected => expected, :got => got
+		end
+	end
+
 	class BuilderError < Exception; end
 
 	#############################################################################
@@ -103,7 +121,7 @@ class SmqlToAR
 		def initialize model, *col
 			@model = model
 			@last_model = nil
-			*@path, @col = Array.wrap( col).collect {|s| s.to_s.split /[.\/]/ }.flatten.collect &:to_sym
+			*@path, @col = Array.wrap( col).collect( &it.to_s.split( /[.\/]/)).flatten.collect( &:to_sym)
 		end
 
 		def last_model
@@ -146,6 +164,8 @@ class SmqlToAR
 				exe.call pp, model
 			end
 	 	end
+		def length() @path.length+1  end
+		def size()   @path.size+1  end
 		def to_a()   @path+[@col]  end
 		def to_s()   to_a.join '.'  end
 		def to_sym() to_s.to_sym  end
@@ -153,6 +173,7 @@ class SmqlToAR
 		def inspect()  "#<Column: #{model} #{to_s}>"  end
 		def relation()  SmqlToAR.model_of last_model, @col  end
 		def allowed?()  ! self.protected?  end
+		def child?()  @path.empty? and !!relation  end
 	end
 
 	attr_reader :model, :query, :conditions, :builder, :order
@@ -179,6 +200,23 @@ class SmqlToAR
 		#p model: @model, query: @query
 	end
 
+	def self.models models
+		models = Array.wrap models
+		r = Hash.new {|h,k| h[k] = {} }
+		while model = models.tap( &:uniq!).pop
+			refls = model.respond_to?( :reflections) && model.reflections
+			refls && refls.each do |name, refl|
+				r[model.name][name] = case refl
+					when ActiveRecord::Reflection::ThroughReflection then {:macro => refl.macro, :model => refl.klass.name, :through => refl.through_reflection.name}
+					when ActiveRecord::Reflection::AssociationReflection then {:macro => refl.macro, :model => refl.klass.name}
+					else raise "Ups: #{refl.class}"
+					end
+				models.push refl.klass  unless r.keys.include? refl.klass.name
+			end
+		end
+		r
+	end
+
 	def parse
 		benchmark 'SMQL parse' do
 			@conditions = ConditionTypes.try_parse @model, @query
@@ -187,11 +225,11 @@ class SmqlToAR
 		self
 	end
 
-	def build
+	def build prefix = nil, base_table = nil
 		benchmark 'SMQL build query' do
-			@builder = QueryBuilder.new @model
+			@builder = QueryBuilder.new @model, prefix, base_table
 			table = @builder.base_table
-			@conditions.each {|condition| condition.build builder, table }
+			@conditions.each &it.build( builder, table)
 		end
 		#p builder: @builder
 		self
diff --git a/lib/smql_to_ar/condition_types.rb b/lib/smql_to_ar/condition_types.rb
index 23ec136..6f831b7 100644
--- a/lib/smql_to_ar/condition_types.rb
+++ b/lib/smql_to_ar/condition_types.rb
@@ -25,6 +25,8 @@ class SmqlToAR
 	# Nimmt eine Klasse ein Objekt an,  so soll diese Klasse instanziert werden.
 	# Alles weitere siehe Condition.
 	module ConditionTypes
+		extend SmqlToAR::Assertion
+
 		class <<self
 			# Ex: 'givenname|surname|nick' => [:givenname, :surname, :nick]
 			def split_keys k
@@ -40,13 +42,13 @@ class SmqlToAR
 					next  if :Condition == c
 					c = const_get c
 					next  if Condition === c
-					raise UnexpectedColOpError.new( model, colop, val)  unless colop =~ /^(?:\d*:)?(.*?)(\W*)$/
+					raise_unless colop =~ /^(?:\d*:)?(.*?)(\W*)$/, UnexpectedColOpError.new( model, colop, val)
 					col, op = $1, $2
 					col = split_keys( col).collect {|c| Column.new model, c }
 					r = c.try_parse model, col, op, val
 					break  if r
 				end
-				raise UnexpectedError.new( model, colop, val)  unless r
+				raise_unless r, UnexpectedError.new( model, colop, val)
 				r
 			end
 
@@ -72,6 +74,8 @@ class SmqlToAR
 		end
 
 		class Condition
+			include SmqlToAR::Assertion
+			extend SmqlToAR::Assertion
 			attr_reader :value, :cols
 			Operator = nil
 			Expected = []
@@ -81,7 +85,7 @@ class SmqlToAR
 			# Passt das Object,  die Klasse instanzieren.
 			def self.try_parse model, cols, op, val
 				#p :self => name, :try_parse => op, :cols => cols, :with => self::Operator, :value => val, :expected => self::Expected, :model => model.name
-				new model, cols, val  if self::Operator === op and self::Expected.any? {|i| i === val }
+				new model, cols, val  if self::Operator === op and self::Expected.any?( &it === val)
 			end
 
 			def initialize model, cols, val
@@ -103,14 +107,14 @@ class SmqlToAR
 			# Gibt es eine Spalte diesen Namens?
 			# Oder:  Gibt es eine Relation diesen Namens?  (Hier nicht der Fall)
 			def verify_column col
-				raise NonExistingColumnError.new( %w[Column], col)  unless col.exist_in?
+				raise_unless col.exist_in?, NonExistingColumnError.new( %w[Column], col)
 			end
 
 			# Modelle koennen Spalten/Relationen verbieten mit Model#smql_protected.
 			# Dieses muss ein Object mit #include?( name_als_string) zurueckliefern,
 			# welches true fuer verboten und false fuer, erlaubt steht.
 			def verify_allowed col
-				raise ProtectedColumnError.new( col)  if col.protected?
+				raise_if col.protected?, ProtectedColumnError.new( col)
 			end
 
 			# Erstelle alle noetigen Klauseln. builder nimmt diese entgegen,
@@ -196,31 +200,64 @@ class SmqlToAR
 				super( *pars)
 				cols = {}
 				@cols.each do |col|
-					col_model = SmqlToAR.model_of col.last_model, col.col
-					#p col_model: col_model.to_s, value: @value
+					col_model = col.relation
 					cols[col] = [col_model] + ConditionTypes.try_parse( col_model, @value)
 				end
 				@cols = cols
 			end
 
 			def verify_column col
-				refl = SmqlToAR.model_of col.last_model, col.col
-				#p refl: refl, model: @model.name, col: col, :reflections => @model.reflections.keys
-				raise NonExistingRelationError.new( %w[Relation], col)  unless refl
+				raise_unless col.relation, NonExistingRelationError.new( %w[Relation], col)
 			end
 
 			def build builder, table
 				@cols.each do |col, sub|
 					t = table + col.path + [col.col]
-					#p sub: sub
-					p col: col, joins: col.joins
 					col.joins.each {|j, m| builder.join table+j, m }
-					builder.join t, SmqlToAR.model_of( col.last_model, col.col)
-					sub[1..-1].each {|one| one.build builder, t }
+					builder.join t, sub[0]
+					sub[1..-1].each &it.build( builder, t)
 				end
 				self
 			end
 		end
+
+		# Takes to Queries.
+		# First Query will be a Subquery, second a regular query.
+		# Example:
+		#   Person.smql 'sub.articles:' => [{'limit:' => 1, 'order:': 'updated_at desc'}, {'content~' => 'some text'}]
+		# Person must have as last Article (compared by updated_at) owned by Person a Artive which has 'some text' in content.
+		# The last Article needn't to have 'some text' has content,  the subquery takes it anyway.
+		# But the second query compares to it and never to any other Article,  because these are filtered by first query.
+		# The difference to
+		#   Person.smql :articles => {'content~' => 'some text', 'limit:' => 1, 'order:': 'updated_at desc'}
+		# is,  second is not allowed (limit and order must be in root) and this means something like
+		#   "Person must have the Article owned by Person which has 'some text' in content.
+		#   limit and order has no function in this query and this article needn't to be the last."
+		class SubEqualJoin < EqualJoin
+			Operator = '()'
+			Expected = [lambda {|x| x.kind_of?( Array) and (1..2).include?( x.length) and x.all?( &it.kind_of?( Hash))}]
+
+			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 }
+			end
+
+			def verify_column col
+				raise_unless col.child?, ConColumnError.new( [:Column], col)
+			end
+
+			def build builder, table
+				@cols.each do |col, sub|
+					t = table+col.to_a
+					p t: t, sub: sub
+					builder.sub_join t, col, *sub[0..1]
+					sub[2..-1].each &it.build( builder, t)
+				end
+				self
+			end
+		end
+
 		Equal = simple_condition Condition, '=', "%s = %s", [Array, String, Numeric]
 		Equal2 = simple_condition Equal, '', "%s = %s", [String, Numeric]
 		GreaterThan = simple_condition Condition, '>', "%s > %s", [Array, Numeric]
@@ -236,7 +273,7 @@ class SmqlToAR
 			Expected = [nil]
 
 			def verify_column col
-				raise NonExistingSelectableError.new( col)  unless col.exist_in? or SmqlToAR.model_of( col.last_model, col.col)
+				raise_unless col.exist_in? || SmqlToAR.model_of( col.last_model, col.col), NonExistingSelectableError.new( col)
 			end
 
 			def build builder, table
@@ -258,13 +295,14 @@ class SmqlToAR
 			Expected = [String, Array, Hash, Numeric, nil]
 
 			class Function
+				include SmqlToAR::Assertion
 				Name = nil
 				Expected = []
 				attr_reader :model, :func, :args
 
 				def self.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? {|e| e === args }
+					self.new model, func, args  if self::Name === func and self::Expected.any?( &it === args)
 				end
 
 				def initialize model, func, args
@@ -277,22 +315,19 @@ class SmqlToAR
 				Expected = [String, Array, Hash, nil]
 
 				def initialize model, func, args
-					SmqlToAR.logger.info( {args: args}.inspect)
 					args = case args
 						when String then [args]
 						when Array, Hash then args.to_a
 						when nil then nil
 						else raise 'Oops'
 						end
-					SmqlToAR.logger.info( {args: args}.inspect)
 					args.andand.collect! do |o|
 						o = Array.wrap o
 						col = Column.new model, o.first
 						o = 'desc' == o.last.to_s.downcase ? :DESC : :ASC
-						raise NonExistingColumnError.new( [:Column], col)  unless col.exist_in?
+						raise_unless col.exist_in?, NonExistingColumnError.new( [:Column], col)
 						[col, o]
 					end
-					SmqlToAR.logger.info( {args: args}.inspect)
 					super model, func, args
 				end
 
@@ -302,12 +337,32 @@ class SmqlToAR
 						col, o = o
 						col.joins builder, table
 						t = table + col.path
-						raise OnlyOrderOnBaseError.new( t)  unless 1 == t.length
+						raise_unless 1 == t.length, RootOnlyFunctionError.new( t)
 						builder.order t, col.col, o
 					end
 				end
 			end
 
+			class Limit < Function
+				Name = :limit
+				Expected = [Fixnum]
+
+				def build builder, table
+					raise_unless 1 == table.length, RootOnlyFunctionError.new( table)
+					builder.limit @args
+				end
+			end
+
+			class Offset < Function
+				Name = :offset
+				Expected = [Fixnum]
+
+				def build builder, table
+					raise_unless 1 == table.length, RootOnlyFunctionError.new( table)
+					builder.offset @args
+				end
+			end
+
 			def self.new model, col, val
 				SmqlToAR.logger.info( { function: col.first.to_sym }.inspect)
 				r = nil
@@ -315,9 +370,7 @@ class SmqlToAR
 					next  if [:Function, :Where, :Expected, :Operator].include? c
 					c = const_get c
 					next  if Function === c or not c.respond_to?( :try_parse)
-					SmqlToAR.logger.info( {f: c}.inspect)
 					r = c.try_parse model, col.first.to_sym, val
-					SmqlToAR.logger.info( {r: r}.inspect)
 					break  if r
 				end
 				r
diff --git a/lib/smql_to_ar/query_builder.rb b/lib/smql_to_ar/query_builder.rb
index 9f6c63e..ab98f8b 100644
--- a/lib/smql_to_ar/query_builder.rb
+++ b/lib/smql_to_ar/query_builder.rb
@@ -22,23 +22,24 @@ class SmqlToAR
 		class Vid
 			attr_reader :vid
 			def initialize( vid)  @vid = vid  end
-			def to_s() ":c#{@vid}" end
-			def to_sym() "c#{@vid}".to_sym end
+			def to_s() ":smql_c#{@vid}" end
+			def to_sym() "smql_c#{@vid}".to_sym end
 			alias sym to_sym
 			def to_i()  @vid  end
 		end
 
-		attr_reader :table_alias, :model, :table_model, :base_table, :_where, :_select, :_wobs, :_joins
+		attr_reader :table_alias, :model, :table_model, :base_table, :_where, :_select, :_wobs, :_joins, :prefix, :_vid
 		attr_accessor :logger
 
-		def initialize model
+		def initialize model, prefix = nil, base_table
+			@prefix = "smql"
 			@logger = SmqlToAR.logger
 			@table_alias = Hash.new do |h, k|
 				k = Array.wrap k
-				h[k] = "smql,#{k.join(',')}"
+				h[k] = "#{@prefix},#{k.join(',')}"
 			end
 			@_vid, @_where, @_wobs, @model, @quoter = 0, [], {}, model, model.connection
-			@base_table = [model.table_name.to_sym]
+			@base_table = base_table.blank? ? [model.table_name.to_sym] : Array.wrap( base_table)
 			@table_alias[ @base_table] = @base_table.first
 			t = quote_table_name @table_alias[ @base_table]
 			@_select, @_joins, @_joined, @_includes, @_order = ["DISTINCT #{t}.*"], "", [], [], []
@@ -74,32 +75,57 @@ class SmqlToAR
 		end
 
 		def build_join orig, pretable, table, prekey, key
-			" JOIN #{quote_table_name orig.to_sym} AS #{quote_table_name table} ON #{column pretable, prekey} = #{column table, key} "
+			" JOIN #{orig} AS #{quote_table_name table} ON #{column pretable, prekey} = #{column table, key} "
 		end
 
-		def join table, model
-			return self  if @_joined.include? table # Already joined
-			pretable = table[0...-1]
+		def sub_join table, col, model, query
+			pp [:sub_join, table, col. model, query]
+			prefix, base_table = "#{@prefix}_sub", col.col
+			join_ table, model, "(#{query.build( prefix, base_table).tap{|q| p :sub_join => q }.ar.to_sql})"
+		end
+
+		def join_ table, model, query, pretable = nil
+			pp [:join_, table, model, query]
+			pretable ||= table[0...-1]
 			@table_model[ table] = model
 			premodel = @table_model[ pretable]
 			t = @table_alias[ table]
 			pt = quote_table_name @table_alias[ table[ 0...-1]]
+			pp premodel: premodel, table: table
 			refl = premodel.reflections[table.last]
-			case refl.macro
-			when :has_many
-				@_joins += build_join model.table_name, pretable, t, premodel.primary_key, refl.primary_key_name
-			when :belongs_to
-				@_joins += build_join model.table_name, pretable, t, refl.primary_key_name, premodel.primary_key
-			when :has_and_belongs_to_many
-				jointable = [','] + table
-				@_joins += build_join refl.options[:join_table], pretable, @table_alias[jointable], premodel.primary_key, refl.primary_key_name
-				@_joins += build_join model.table_name, jointable, t, refl.association_foreign_key, refl.association_primary_key
-			else raise BuilderError, "Unkown reflection macro: #{refl.macro.inspect}"
+			case refl
+			when ActiveRecord::Reflection::ThroughReflection
+				through = refl.through_reflection
+				pp refl: refl
+				throughtable = table[0...-1]+[through.name.to_sym]
+				srctable = throughtable+[refl.source_reflection.name]
+				@table_model[ srctable] = model
+				@table_alias[ table] = @table_alias[ srctable]
+				join_ throughtable, through.klass, quote_table_name( through.table_name)
+				join_ srctable, refl.klass, query, throughtable
+			when ActiveRecord::Reflection::AssociationReflection
+				case refl.macro
+				when :has_many
+					@_joins += build_join query, pretable, t, premodel.primary_key, refl.primary_key_name
+				when :belongs_to
+					@_joins += build_join query, pretable, t, refl.primary_key_name, premodel.primary_key
+				when :has_and_belongs_to_many
+					jointable = [','] + table
+					@_joins += build_join refl.options[:join_table], pretable, @table_alias[jointable], premodel.primary_key, refl.primary_key_name
+					@_joins += build_join query, jointable, t, refl.association_foreign_key, refl.association_primary_key
+				else raise BuilderError, "Unkown reflection macro: #{refl.macro.inspect}"
+				end
+			else raise BuilderError, "Unkown reflection type: #{refl.class.name}"
 			end
-			@_joined.push table
 			self
 		end
 
+		def join table, model
+			return self  if @_joined.include? table # Already joined
+			join_ table, model, quote_table_name( model.table_name)
+			@_joined.push table
+		end
+
 		def includes table
 			@_includes.push table
 			self
@@ -114,6 +140,14 @@ class SmqlToAR
 			@_order.push "#{column table, col} #{:DESC == o ? :DESC : :ASC}"
 		end
 
+		def limit count
+			@_limit = count
+		end
+
+		def offset count
+			@_offset = count
+		end
+
 		class Dummy
 			def method_missing m, *a, &e
 				#p :dummy => m, :pars => a, :block => e
@@ -138,6 +172,9 @@ class SmqlToAR
 				where( where_str, @_wobs).
 				order( @_order.join( ', ')).
 				includes( incls)
+			@model = @model.limit @_limit  if @_limit
+			@model = @model.offset @_offset  if @_offset
+			@model
 		end
 
 		def fix_calculate

From 93fd3eeda4b8aab4725bd63197bcb47df59e6a5e Mon Sep 17 00:00:00 2001
From: Denis Knauf <Denis.Knauf@gmail.com>
Date: Tue, 27 Sep 2011 16:51:18 +0200
Subject: [PATCH 02/12] pretty_print removed

---
 lib/smql_to_ar/condition_types.rb | 1 -
 lib/smql_to_ar/query_builder.rb   | 6 +-----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/lib/smql_to_ar/condition_types.rb b/lib/smql_to_ar/condition_types.rb
index 6f831b7..045e1a2 100644
--- a/lib/smql_to_ar/condition_types.rb
+++ b/lib/smql_to_ar/condition_types.rb
@@ -250,7 +250,6 @@ class SmqlToAR
 			def build builder, table
 				@cols.each do |col, sub|
 					t = table+col.to_a
-					p t: t, sub: sub
 					builder.sub_join t, col, *sub[0..1]
 					sub[2..-1].each &it.build( builder, t)
 				end
diff --git a/lib/smql_to_ar/query_builder.rb b/lib/smql_to_ar/query_builder.rb
index ab98f8b..a8978bd 100644
--- a/lib/smql_to_ar/query_builder.rb
+++ b/lib/smql_to_ar/query_builder.rb
@@ -79,24 +79,20 @@ class SmqlToAR
 		end
 
 		def sub_join table, col, model, query
-			pp [:sub_join, table, col. model, query]
 			prefix, base_table = "#{@prefix}_sub", col.col
-			join_ table, model, "(#{query.build( prefix, base_table).tap{|q| p :sub_join => q }.ar.to_sql})"
+			join_ table, model, "(#{query.build( prefix, base_table).ar.to_sql})"
 		end
 
 		def join_ table, model, query, pretable = nil
-			pp [:join_, table, model, query]
 			pretable ||= table[0...-1]
 			@table_model[ table] = model
 			premodel = @table_model[ pretable]
 			t = @table_alias[ table]
 			pt = quote_table_name @table_alias[ table[ 0...-1]]
-			pp premodel: premodel, table: table
 			refl = premodel.reflections[table.last]
 			case refl
 			when ActiveRecord::Reflection::ThroughReflection
 				through = refl.through_reflection
-				pp refl: refl
 				throughtable = table[0...-1]+[through.name.to_sym]
 				srctable = throughtable+[refl.source_reflection.name]
 				@table_model[ srctable] = model

From 2fdc45d1d5fd6971ba25979fb4f6854a4ad8ca46 Mon Sep 17 00:00:00 2001
From: Denis Knauf <Denis.Knauf@gmail.com>
Date: Wed, 5 Oct 2011 13:25:56 +0200
Subject: [PATCH 03/12] "self" and or =============

This lines mean the same:

	User.smql :self => {:id => 1}
	User.smql :id => 1
	User.smql 'self.id' => 1
	User.smql 'self.self.self.self.id' => 1

self is like a reflection to itself.

Very userful if you need the new disjunction:

	User.smql :self => [{:surname => 'Mueller', :givenname => 'Michael'}, {:givenname => 'Horst', :surname => 'Schlemmer'}], :firm => {:name => 'Hotel an der Elbe'}

SmqlToAR::Column
----------------

Rejects every `self`,  so it is really like no self,
but you use `'self'` as like as a simple reflection.
You can ask,  if it is self via Column#self?

SmqlToAR::QueryBuilder
======================

joins:  The old `#join`. Renames because SmqlToAR::And and SmqlToAR::Or which has Array#join,
        so we cannot delegate `#join` to the QueryBuilder.

`#where`
--------

Now only one argument!  Needed for SmqlToAR::And and SmqlToAR::Or.

`#build` will generates LEFT OUTER JOINS now.  Needed for disjunctions.
The most queries will work like before.
Problems:

	User.smql :articles => {}

Before it will return all users with articles,  now it will return also users without articles.
If you want to have only all users with articles,  you ask:

	User.smql :articles => {:id => true}

Will fail if id IS NULL,  but this should not happen. ;)

`SmqlToAR::And` and `SmqlToAR::Or`
==================================

`SmqlToAR::QueryBuilder`-proxies.  QueryBuilder let them build where-clauses.
And will will produce a conjunction and  Or a disjunction of course.
They delegates all QueryBuilder-methods to QueryBuilder.
Only `#where` will stored local and `#build` will do it partial.

They have the same superclass: `SmqlToAR::SubBuilder`.

The small changes
=================

* `SmqlToAR.reload_library`:  Reloads SmqlToAR-lib.  Useful while development.
* `SmqlToAR::ConditionTypes#conditions`:  Return all Conditions.  `#try_parse` uses it.
* Some classes have a new `#inspect`.
* `SmqlToAR::ConditionTypes#Exists` / `NotExists`:
  `{:id => true}` / `{:id => false}`:
  This object has setted an id or not?  `#id` must exists as column of course!
	Uses `IS NOT NULL` and `IS NULL`.
---
 lib/smql_to_ar.rb                 |  38 ++++++---
 lib/smql_to_ar/condition_types.rb |  91 +++++++++++++++------
 lib/smql_to_ar/query_builder.rb   | 128 +++++++++++++++++++++---------
 3 files changed, 184 insertions(+), 73 deletions(-)

diff --git a/lib/smql_to_ar.rb b/lib/smql_to_ar.rb
index 9e53dcf..34226e9 100644
--- a/lib/smql_to_ar.rb
+++ b/lib/smql_to_ar.rb
@@ -107,7 +107,9 @@ class SmqlToAR
 
 	# Model der Relation `rel` von `model`
 	def self.model_of model, rel
-		model.reflections[ rel.to_sym].andand.klass
+		rel = rel.to_sym
+		r = model.reflections[ rel].andand.klass
+		r.nil? && :self == rel ? model : r
 	end
 
 	# Eine Spalte in einer Tabelle, relativ zu `Column#model`.
@@ -121,7 +123,7 @@ class SmqlToAR
 		def initialize model, *col
 			@model = model
 			@last_model = nil
-			*@path, @col = Array.wrap( col).collect( &it.to_s.split( /[.\/]/)).flatten.collect( &:to_sym)
+			*@path, @col = *Array.wrap( col).collect( &it.to_s.split( /[.\/]/)).flatten.collect( &:to_sym).reject( &it==:self)
 		end
 
 		def last_model
@@ -131,9 +133,12 @@ class SmqlToAR
 		def each
 			model = @model
 			@path.each do |rel|
-				model = SmqlToAR.model_of model, rel
-				return false  unless model
-				yield rel, model
+				rel = rel.to_sym
+				unless :self == rel
+					model = SmqlToAR.model_of model, rel
+					return false  unless model
+					yield rel, model
+				end
 			end
 			model
 		end
@@ -158,20 +163,21 @@ class SmqlToAR
 		def joins builder = nil, table = nil, &exe
 			pp = []
 			table = Array.wrap table
-			exe ||= builder ? lambda {|j, m| builder.join table+j, m} : Array.method( :[])
+			exe ||= builder ? lambda {|j, m| builder.joins table+j, m} : Array.method( :[])
 			collect do |rel, model|
 				pp.push rel
 				exe.call pp, model
 			end
 	 	end
-		def length() @path.length+1  end
-		def size()   @path.size+1  end
-		def to_a()   @path+[@col]  end
+		def self?()  !@col  end
+		def length() @path.length+(self.self? ? 0 : 1)  end
+		def size()   @path.size+(self.self? ? 0 : 1)  end
+		def to_a()   @path+(self.self? ? [] : [@col])  end
 		def to_s()   to_a.join '.'  end
 		def to_sym() to_s.to_sym  end
 		def to_json()  to_s  end
 		def inspect()  "#<Column: #{model} #{to_s}>"  end
-		def relation()  SmqlToAR.model_of last_model, @col  end
+		def relation()  self.self? ? model : SmqlToAR.model_of( last_model, @col)  end
 		def allowed?()  ! self.protected?  end
 		def child?()  @path.empty? and !!relation  end
 	end
@@ -225,9 +231,9 @@ class SmqlToAR
 		self
 	end
 
-	def build prefix = nil, base_table = nil
+	def build prefix = nil
 		benchmark 'SMQL build query' do
-			@builder = QueryBuilder.new @model, prefix, base_table
+			@builder = QueryBuilder.new @model, prefix
 			table = @builder.base_table
 			@conditions.each &it.build( builder, table)
 		end
@@ -252,4 +258,12 @@ class SmqlToAR
 	def self.to_ar *params
 		new( *params).to_ar
 	end
+
+	def self.reload_library
+		lib_dir = File.dirname __FILE__
+		fj = lambda {|*a| File.join lib_dir, *a }
+		load fj.call( 'smql_to_ar.rb')
+		load fj.call( 'smql_to_ar', 'condition_types.rb')
+		load fj.call( 'smql_to_ar', 'query_builder.rb')
+	end
 end
diff --git a/lib/smql_to_ar/condition_types.rb b/lib/smql_to_ar/condition_types.rb
index 045e1a2..6061e62 100644
--- a/lib/smql_to_ar/condition_types.rb
+++ b/lib/smql_to_ar/condition_types.rb
@@ -33,15 +33,29 @@ class SmqlToAR
 				k.split( '|').collect &:to_sym
 			end
 
+			def conditions &e
+				unless block_given?
+					r = Enumerator.new( self, :conditions)
+					s = self
+					r.define_singleton_method :[] do |k|
+						s.conditions.select {|c| c::Operator === k }
+					end
+					return r
+				end
+				constants.each do |c|
+					next  if :Condition == c
+					c = const_get c
+					next  if Condition === c
+					yield c
+				end
+			end
+
 			# Eine Regel parsen.
 			# Ex: Person, "givenname=", "Peter"
 			def try_parse_it model, colop, val
 				r = nil
 				#p :try_parse => { :model => model, :colop => colop, :value => val }
-				constants.each do |c|
-					next  if :Condition == c
-					c = const_get c
-					next  if Condition === c
+				conditions.each do |c|
 					raise_unless colop =~ /^(?:\d*:)?(.*?)(\W*)$/, UnexpectedColOpError.new( model, colop, val)
 					col, op = $1, $2
 					col = split_keys( col).collect {|c| Column.new model, c }
@@ -81,11 +95,17 @@ class SmqlToAR
 			Expected = []
 			Where = nil
 
-			# Versuche das Objekt zu erkennen.  Operator und Expected muessen passen.
-			# Passt das Object,  die Klasse instanzieren.
-			def self.try_parse model, cols, op, val
-				#p :self => name, :try_parse => op, :cols => cols, :with => self::Operator, :value => val, :expected => self::Expected, :model => model.name
-				new model, cols, val  if self::Operator === op and self::Expected.any?( &it === val)
+			class <<self
+				# Versuche das Objekt zu erkennen.  Operator und Expected muessen passen.
+				# Passt das Object,  die Klasse instanzieren.
+				def try_parse model, cols, op, val
+					#p :self => name, :try_parse => op, :cols => cols, :with => self::Operator, :value => val, :expected => self::Expected, :model => model.name
+					new model, cols, val  if self::Operator === op and self::Expected.any?( &it === val)
+				end
+
+				def inspect
+					"#{self.name}(:operator=>#{self::Operator.inspect}, :expected=>#{self::Expected.inspect}, :where=>#{self::Where.inspect})"
+				end
 			end
 
 			def initialize model, cols, val
@@ -97,6 +117,10 @@ class SmqlToAR
 				verify
 			end
 
+			def inspect
+				"#<#{self.class.name}:0x#{(self.object_id<<1).to_s 16} model: #{self.class.name}, cols: #{@cols.inspect}, value: #{@value.inspect}>"
+			end
+
 			def verify
 				@cols.each do |col|
 					verify_column col
@@ -118,8 +142,8 @@ class SmqlToAR
 			end
 
 			# Erstelle alle noetigen Klauseln. builder nimmt diese entgegen,
-			# wobei builder.join, builder.select, builder.where und builder.wobs von interesse sind.
-			# mehrere Schluessel bedeuten, dass die Values _alle_ zutreffen muessen, wobei die Schluessel geodert werden.
+			# wobei builder.joins, builder.select, builder.where und builder.wobs von interesse sind.
+			# mehrere Schluessel bedeuten, dass die Values _alle_ zutreffen muessen, wobei die Schluessel geODERt werden.
 			# Ex:
 			# 1) {"givenname=", "Peter"} #=> givenname = 'Peter'
 			# 2) {"givenname=", ["Peter", "Hans"]} #=> ( givenname = 'Peter' OR givenname = 'Hans' )
@@ -132,11 +156,11 @@ class SmqlToAR
 					@cols.each do |col|
 						col.joins builder, table
 						col = builder.column table+col.path, col.col
-						builder.where *values.keys.collect {|vid| self.class::Where % [ col, vid.to_s ] }
+						builder.where values.keys.collect {|vid| self.class::Where % [ col, vid.to_s ] }
 					end
 				else
 					values.keys.each do |vid|
-						builder.where *@cols.collect {|col|
+						builder.where @cols.collect {|col|
 								col.joins builder, table
 								col = builder.column table+col.path, col.col
 								self.class::Where % [ col, vid.to_s ]
@@ -189,19 +213,26 @@ class SmqlToAR
 
 		In = simple_condition NotIn, '|=', '%s IN (%s)', [Array]
 		In2 = simple_condition In, '', nil, [Array]
-		NotEqual = simple_condition Condition, /\!=|<>/, "%s <> %s", [Array, String, Numeric]
+		NotEqual = simple_condition Condition, '!=', "%s <> %s", [Array, String, Numeric]
+		NotEqual2 = simple_condition Condition, '<>', "%s <> %s", [Array, String, Numeric]
 		GreaterThanOrEqual = simple_condition Condition, '>=', "%s >= %s", [Array, Numeric]
 		LesserThanOrEqual = simple_condition Condition, '<=', "%s <= %s", [Array, Numeric]
+
+		# Examples:
+		# { 'articles=>' => { id: 1 } }
+		# { 'articles=>' => [ { id: 1 }, { id: 2 } ] }
 		class EqualJoin <Condition
-			Operator = '='
-			Expected = [Hash]
+			Operator = '=>'
+			Expected = [Hash, lambda {|x| x.kind_of?( Array) and x.all?( &it.kind_of?( Hash))}]
 
 			def initialize *pars
 				super( *pars)
+				@value = Array.wrap @value
 				cols = {}
+				p self: self, cols: @cols
 				@cols.each do |col|
 					col_model = col.relation
-					cols[col] = [col_model] + ConditionTypes.try_parse( col_model, @value)
+					cols[col] = [col_model] + @value.collect {|val| ConditionTypes.try_parse( col_model, val) }
 				end
 				@cols = cols
 			end
@@ -212,11 +243,14 @@ class SmqlToAR
 
 			def build builder, table
 				@cols.each do |col, sub|
+					model, *sub = sub
 					t = table + col.path + [col.col]
-					col.joins.each {|j, m| builder.join table+j, m }
-					builder.join t, sub[0]
-					sub[1..-1].each &it.build( builder, t)
+					col.joins.each {|j, m| builder.joins table+j, m }
+					builder.joins t, model
+					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
@@ -250,7 +284,7 @@ class SmqlToAR
 			def build builder, table
 				@cols.each do |col, sub|
 					t = table+col.to_a
-					builder.sub_join t, col, *sub[0..1]
+					builder.sub_joins t, col, *sub[0..1]
 					sub[2..-1].each &it.build( builder, t)
 				end
 				self
@@ -263,8 +297,9 @@ class SmqlToAR
 		LesserThan = simple_condition Condition, '<', "%s < %s", [Array, Numeric]
 		NotIlike = simple_condition Condition, '!~', "%s NOT ILIKE %s", [Array, String]
 		Ilike = simple_condition Condition, '~', "%s ILIKE %s", [Array, String]
+		Exists = simple_condition Condition, '', '%s IS NOT NULL', [true]
+		NotExists = simple_condition Condition, '', '%s IS NULL', [false]
 
-		####### No Operator #######
 		Join = simple_condition EqualJoin, '', nil, [Hash]
 		InRange2 = simple_condition InRange, '', nil, [Range]
 		class Select < Condition
@@ -299,9 +334,15 @@ class SmqlToAR
 				Expected = []
 				attr_reader :model, :func, :args
 
-				def self.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)
+				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
+
+					def inspect
+						"#{self.name}(:name=>#{self::Name}, :expected=>#{self::Expected})"
+					end
 				end
 
 				def initialize model, func, args
diff --git a/lib/smql_to_ar/query_builder.rb b/lib/smql_to_ar/query_builder.rb
index a8978bd..56ae0c0 100644
--- a/lib/smql_to_ar/query_builder.rb
+++ b/lib/smql_to_ar/query_builder.rb
@@ -29,30 +29,34 @@ class SmqlToAR
 		end
 
 		attr_reader :table_alias, :model, :table_model, :base_table, :_where, :_select, :_wobs, :_joins, :prefix, :_vid
-		attr_accessor :logger
+		attr_accessor :logger, :limit, :offset
 
-		def initialize model, prefix = nil, base_table
+		def initialize model, prefix = nil
 			@prefix = "smql"
 			@logger = SmqlToAR.logger
 			@table_alias = Hash.new do |h, k|
-				k = Array.wrap k
-				h[k] = "#{@prefix},#{k.join(',')}"
+				j = Array.wrap( k).compact
+				h[k] = h.key?(j) ? h[j] : "#{@prefix},#{j.join(',')}"
 			end
-			@_vid, @_where, @_wobs, @model, @quoter = 0, [], {}, model, model.connection
-			@base_table = base_table.blank? ? [model.table_name.to_sym] : Array.wrap( base_table)
+			@_vid, @_where, @_wobs, @model, @quoter = 0, SmqlToAR::And[], {}, model, model.connection
+			@base_table = [model.table_name.to_sym]
 			@table_alias[ @base_table] = @base_table.first
 			t = quote_table_name @table_alias[ @base_table]
-			@_select, @_joins, @_joined, @_includes, @_order = ["DISTINCT #{t}.*"], "", [], [], []
+			@_select, @_joins, @_joined, @_includes, @_order = ["DISTINCT #{t}.*"], "", [@base_table], [], []
 			@table_model = {@base_table => @model}
 		end
 
 		def vid()  Vid.new( @_vid+=1)  end
 
+		def inspect
+			"#<#{self.class.name}:#{"0x%x"% (self.object_id<<1)}|#{@prefix}:#{@base_table}:#{@model} vid=#{@_vid} where=#{@_where} wobs=#{@_wobs} select=#{@_select} aliases=#{@_table_alias}>"
+		end
+
 		# Jede via where uebergebene Condition wird geodert und alle zusammen werden geundet.
 		# "Konjunktive Normalform".  Allerdings duerfen Conditions auch Komplexe Abfragen enthalten.
-		# Ex: builder.where( 'a = a', 'b = c').where( 'c = d', 'e = e').where( 'x = y').where( '( m = n AND o = p )', 'f = g')
+		# Ex: builder.where( ['a = a', 'b = c']).where( ['c = d', 'e = e']).where( 'x = y').where( ['( m = n AND o = p )', 'f = g'])
 		#        #=> WHERE ( a = a OR b = c ) AND ( c = d OR e = e ) AND x = y ( ( m = n AND o = p ) OR f = g )
-		def where *cond
+		def where cond
 			@_where.push cond
 			self
 		end
@@ -75,12 +79,12 @@ class SmqlToAR
 		end
 
 		def build_join orig, pretable, table, prekey, key
-			" JOIN #{orig} AS #{quote_table_name table} ON #{column pretable, prekey} = #{column table, key} "
+			" LEFT OUTER JOIN #{orig} AS #{quote_table_name table} ON #{column pretable, prekey} = #{column table, key} "
 		end
 
-		def sub_join table, col, model, query
-			prefix, base_table = "#{@prefix}_sub", col.col
-			join_ table, model, "(#{query.build( prefix, base_table).ar.to_sql})"
+		def sub_joins table, col, model, query
+			prefix, base_table = "#{@prefix}_sub", col.relation.table_name
+			join_ table, model, "(#{query.build( prefix).ar.to_sql})"
 		end
 
 		def join_ table, model, query, pretable = nil
@@ -116,7 +120,8 @@ class SmqlToAR
 			self
 		end
 
-		def join table, model
+		def joins table, model
+			table = table.flatten.compact
 			return self  if @_joined.include? table # Already joined
 			join_ table, model, quote_table_name( model.table_name)
 			@_joined.push table
@@ -136,40 +141,22 @@ class SmqlToAR
 			@_order.push "#{column table, col} #{:DESC == o ? :DESC : :ASC}"
 		end
 
-		def limit count
-			@_limit = count
-		end
-
-		def offset count
-			@_offset = count
-		end
-
-		class Dummy
-			def method_missing m, *a, &e
-				#p :dummy => m, :pars => a, :block => e
-				self
-			end
-		end
-
 		def build_ar
-			where_str = @_where.collect do |w|
-				w = Array.wrap w
-				1 == w.length ? w.first : "( #{w.join( ' OR ')} )"
-			end.join ' AND '
+			where_str = @_where.type_correction!.optimize!.tap {|x| p x }.build_where
 			incls = {}
 			@_includes.each do |inc|
 				b = incls
 				inc[1..-1].collect {|rel| b = b[rel] ||= {} }
 			end
-			@logger.debug incls: incls, joins: @_joins
+			@logger.info where: where_str, wobs: @_wobs
 			@model = @model.
 				select( @_select.join( ', ')).
 				joins( @_joins).
 				where( where_str, @_wobs).
 				order( @_order.join( ', ')).
 				includes( incls)
-			@model = @model.limit @_limit  if @_limit
-			@model = @model.offset @_offset  if @_offset
+			@model = @model.limit @limit  if @limit
+			@model = @model.offset @offset  if @offset
 			@model
 		end
 
@@ -189,4 +176,73 @@ class SmqlToAR
 			@model
 		end
 	end
+
+	class SubBuilder < Array
+		attr_reader :parent, :_where
+		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
+
+		def new parent, tmp = false
+			super parent, tmp
+			#return parent  if self.class == parent.class
+			#super parent
+		end
+
+		alias where push
+
+		def type_correction!
+			collect! do |sub|
+				if sub.kind_of? Array
+					sub = default[ *sub]  unless sub.respond_to?( :type_correction!)
+					sub.type_correction!
+				end
+				sub
+			end
+			self
+		end
+
+		def optimize!
+			p optimize: self
+			ext = []
+			collect! do |sub|
+				sub = sub.optimize!  if sub.kind_of? Array
+				if self.class == sub.class
+					ext.push *sub
+					nil
+				elsif sub.blank?
+					nil
+				else
+					sub
+				end
+			end.compact!
+			p optimized: self
+			p ext: ext
+			push *ext
+			self
+		end
+
+		def inspect
+			"#{self.class.name.sub( /.*::/, '')}[ #{collect(&:inspect).join ', '}]"
+		end
+		def default()  SmqlToAR::And  end
+		def default_new( parent)  default.new self, parent, false  end
+	end
+
+	class And < SubBuilder
+		def default; SmqlToAR::Or; end
+		def build_where
+			join ' AND '
+		end
+	end
+
+	class Or < SubBuilder
+		def build_where
+			join ' OR '
+		end
+	end
 end

From 75c314159baa7780187827217b99e83fd7d32da3 Mon Sep 17 00:00:00 2001
From: Denis Knauf <Denis.Knauf@gmail.com>
Date: Wed, 5 Oct 2011 14:06:50 +0200
Subject: [PATCH 04/12] v0.0.4

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index bcab45a..81340c7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.0.3
+0.0.4

From 09dfa782a833b5a76ad092602eff64fb21e79ab5 Mon Sep 17 00:00:00 2001
From: Denis Knauf <Denis.Knauf@gmail.com>
Date: Wed, 5 Oct 2011 14:53:34 +0200
Subject: [PATCH 05/12] debugging-output removed

---
 lib/smql_to_ar/condition_types.rb | 4 ----
 lib/smql_to_ar/query_builder.rb   | 7 +------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/lib/smql_to_ar/condition_types.rb b/lib/smql_to_ar/condition_types.rb
index 6061e62..1ab5b0f 100644
--- a/lib/smql_to_ar/condition_types.rb
+++ b/lib/smql_to_ar/condition_types.rb
@@ -229,7 +229,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 +249,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
@@ -336,7 +334,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
 
@@ -404,7 +401,6 @@ class SmqlToAR
 			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
diff --git a/lib/smql_to_ar/query_builder.rb b/lib/smql_to_ar/query_builder.rb
index 56ae0c0..9123fb3 100644
--- a/lib/smql_to_ar/query_builder.rb
+++ b/lib/smql_to_ar/query_builder.rb
@@ -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

From 863ebca9cd02a292f6f646e23bf51d37716aa12a Mon Sep 17 00:00:00 2001
From: Denis Knauf <Denis.Knauf@gmail.com>
Date: Thu, 6 Oct 2011 13:24:17 +0200
Subject: [PATCH 06/12] fixes: OR...

---
 lib/smql_to_ar/condition_types.rb | 12 +++++++-----
 lib/smql_to_ar/query_builder.rb   |  9 ++++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/lib/smql_to_ar/condition_types.rb b/lib/smql_to_ar/condition_types.rb
index 1ab5b0f..117f629 100644
--- a/lib/smql_to_ar/condition_types.rb
+++ b/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
@@ -272,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
@@ -283,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
@@ -386,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
 
@@ -396,7 +398,7 @@ 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
 
diff --git a/lib/smql_to_ar/query_builder.rb b/lib/smql_to_ar/query_builder.rb
index 9123fb3..e38eb82 100644
--- a/lib/smql_to_ar/query_builder.rb
+++ b/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
@@ -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

From cc49fdefe91b654f07b20a735f591bb854b83dda Mon Sep 17 00:00:00 2001
From: Denis Knauf <Denis.Knauf@gmail.com>
Date: Thu, 6 Oct 2011 13:24:44 +0200
Subject: [PATCH 07/12] v0.0.4.1

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 81340c7..1eb4fbd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.0.4
+0.0.4.1

From 11466211acafc263a48ad25a730e22c65669a39a Mon Sep 17 00:00:00 2001
From: Denis Knauf <Denis.Knauf@gmail.com>
Date: Thu, 6 Oct 2011 13:27:41 +0200
Subject: [PATCH 08/12] group and having clause init

---
 lib/smql_to_ar.rb                 |  6 ++++
 lib/smql_to_ar/condition_types.rb | 59 ++++++++++++++++++++++++++++++-
 lib/smql_to_ar/query_builder.rb   |  9 +++++
 3 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/lib/smql_to_ar.rb b/lib/smql_to_ar.rb
index 34226e9..2f18ab5 100644
--- a/lib/smql_to_ar.rb
+++ b/lib/smql_to_ar.rb
@@ -101,6 +101,12 @@ class SmqlToAR
 		end
 	end
 
+	class UnknownHavingMethod < SMQLError
+		def initialize expected, got
+			super :expected => expected, :got => got
+		end
+	end
+
 	class BuilderError < Exception; end
 
 	#############################################################################
diff --git a/lib/smql_to_ar/condition_types.rb b/lib/smql_to_ar/condition_types.rb
index 117f629..0ef2a69 100644
--- a/lib/smql_to_ar/condition_types.rb
+++ b/lib/smql_to_ar/condition_types.rb
@@ -382,13 +382,70 @@ class SmqlToAR
 				end
 			end
 
+			class GroupBy < Function
+				Name = :group
+				Excepted = [String, Array]
+
+				def initialize model, func, args
+					super model, func, args.collect( &Columnt.method( :new))
+				end
+
+				def build builder, table
+					return  if @args.blank?
+					@args.each do |col|
+						t = Column.new *(table + col.to_a)
+						raise_unless 1 == t.length, RootOnlyFunctionError.new( t)
+						builder.group t
+					end
+				end
+			end
+
+			class Having < Function
+				Name = :having
+				Excepted = [Array]
+
+				def initialize model, func, args
+					args = Hash[ *args.collect do |col, meth|
+							col = Column.new col
+							case meth.to_sym
+							when :max, :min
+							else raise UnknownHavingMethod.new( [:max, :min], meth)
+							end
+							[col, meth]
+						end]
+					super model, func, args
+				end
+
+				def build builder, table
+					return  if @args.blank?
+					@args.each do |col, meth|
+						t = Column.new *(table + col.to_a)
+						raise_unless 1 == t.length, RootOnlyFunctionError.new( t)
+						builder.having meth => t
+					end
+				end
+			end
+
+			class Max < Having
+				Name = :max
+				Expected = [String]
+
+				def initialize model, func, args
+					super model, :having, Hash[ *args.collect {|col| [col, func] } ]
+				end
+			end
+
+			class Min < Max
+				Name = :min
+			end
+
 			class Limit < Function
 				Name = :limit
 				Expected = [Fixnum]
 
 				def build builder, table
 					raise_unless 1 == table.length, RootOnlyFunctionError.new( table)
-					builder.limit = Array.wrap(@args).first.to_i
+					builder.limit = Array.wrap( @args).first.to_i
 				end
 			end
 
diff --git a/lib/smql_to_ar/query_builder.rb b/lib/smql_to_ar/query_builder.rb
index e38eb82..17fbc75 100644
--- a/lib/smql_to_ar/query_builder.rb
+++ b/lib/smql_to_ar/query_builder.rb
@@ -43,6 +43,7 @@ class SmqlToAR
 			@table_alias[ @base_table] = @base_table.first
 			t = quote_table_name @table_alias[ @base_table]
 			@_select, @_joins, @_joined, @_includes, @_order = ["DISTINCT #{t}.*"], "", [@base_table], [], []
+			@_group, @_having = {}, {}
 			@table_model = {@base_table => @model}
 		end
 
@@ -66,6 +67,14 @@ class SmqlToAR
 			self
 		end
 
+		def group col
+			@_group.push col
+		end
+
+		def having h
+			@_having.update h
+		end
+
 		def quote_column_name name
 			@quoter.quote_column_name( name).gsub /"\."/, ','
 		end

From d5aa6052ec08b49ad4f0232e847c61737a8269f8 Mon Sep 17 00:00:00 2001
From: Denis Knauf <Denis.Knauf@gmail.com>
Date: Thu, 6 Oct 2011 15:28:40 +0200
Subject: [PATCH 09/12] lesser debug

---
 lib/smql_to_ar/condition_types.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/smql_to_ar/condition_types.rb b/lib/smql_to_ar/condition_types.rb
index 0ef2a69..87927ba 100644
--- a/lib/smql_to_ar/condition_types.rb
+++ b/lib/smql_to_ar/condition_types.rb
@@ -248,7 +248,7 @@ class SmqlToAR
 					col.joins.each {|j, m| builder.joins table+j, m }
 					builder.joins t, model
 					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
 				self
 			end

From f3bcdd4b2561cd868c4a61069a3a3a93398668ee Mon Sep 17 00:00:00 2001
From: Denis Knauf <Denis.Knauf@gmail.com>
Date: Tue, 25 Oct 2011 16:31:18 +0200
Subject: [PATCH 10/12] has_one-reflection (like has_many), group & having.
 subqueries deactivated

---
 lib/smql_to_ar.rb                 |  6 ---
 lib/smql_to_ar/condition_types.rb | 67 +++----------------------------
 lib/smql_to_ar/query_builder.rb   | 11 +----
 3 files changed, 7 insertions(+), 77 deletions(-)

diff --git a/lib/smql_to_ar.rb b/lib/smql_to_ar.rb
index 2f18ab5..34226e9 100644
--- a/lib/smql_to_ar.rb
+++ b/lib/smql_to_ar.rb
@@ -101,12 +101,6 @@ class SmqlToAR
 		end
 	end
 
-	class UnknownHavingMethod < SMQLError
-		def initialize expected, got
-			super :expected => expected, :got => got
-		end
-	end
-
 	class BuilderError < Exception; end
 
 	#############################################################################
diff --git a/lib/smql_to_ar/condition_types.rb b/lib/smql_to_ar/condition_types.rb
index 87927ba..c7f0530 100644
--- a/lib/smql_to_ar/condition_types.rb
+++ b/lib/smql_to_ar/condition_types.rb
@@ -248,7 +248,7 @@ class SmqlToAR
 					col.joins.each {|j, m| builder.joins table+j, m }
 					builder.joins t, model
 					b2 = 1 == sub.length ? builder : Or.new( builder)
-					sub.each {|i| i.collect( &it.build( And.new( b2), t)) }
+					sub.each {|i| i.collect( &it.build( And.new( b2), t)); p 'or' => b2 }
 				end
 				self
 			end
@@ -266,6 +266,7 @@ class SmqlToAR
 		# is,  second is not allowed (limit and order must be in root) and this means something like
 		#   "Person must have the Article owned by Person which has 'some text' in content.
 		#   limit and order has no function in this query and this article needn't to be the last."
+=begin
 		class SubEqualJoin < EqualJoin
 			Operator = '()'
 			Expected = [lambda {|x| x.kind_of?( Array) and (1..2).include?( x.length) and x.all?( &it.kind_of?( Hash))}]
@@ -290,6 +291,7 @@ class SmqlToAR
 				self
 			end
 		end
+=end
 
 		Equal = simple_condition Condition, '=', "%s = %s", [Array, String, Numeric]
 		Equal2 = simple_condition Equal, '', "%s = %s", [String, Numeric]
@@ -297,8 +299,8 @@ class SmqlToAR
 		LesserThan = simple_condition Condition, '<', "%s < %s", [Array, Numeric]
 		NotIlike = simple_condition Condition, '!~', "%s NOT ILIKE %s", [Array, String]
 		Ilike = simple_condition Condition, '~', "%s ILIKE %s", [Array, String]
-		Exists = simple_condition Condition, '', '%s IS NOT NULL', [true]
-		NotExists = simple_condition Condition, '', '%s IS NULL', [false]
+		Exists = simple_condition Condition, '', '%s IS NOT NULL', [TrueClass]
+		NotExists = simple_condition Condition, '', '%s IS NULL', [FalseClass]
 
 		Join = simple_condition EqualJoin, '', nil, [Hash]
 		InRange2 = simple_condition InRange, '', nil, [Range]
@@ -382,70 +384,13 @@ class SmqlToAR
 				end
 			end
 
-			class GroupBy < Function
-				Name = :group
-				Excepted = [String, Array]
-
-				def initialize model, func, args
-					super model, func, args.collect( &Columnt.method( :new))
-				end
-
-				def build builder, table
-					return  if @args.blank?
-					@args.each do |col|
-						t = Column.new *(table + col.to_a)
-						raise_unless 1 == t.length, RootOnlyFunctionError.new( t)
-						builder.group t
-					end
-				end
-			end
-
-			class Having < Function
-				Name = :having
-				Excepted = [Array]
-
-				def initialize model, func, args
-					args = Hash[ *args.collect do |col, meth|
-							col = Column.new col
-							case meth.to_sym
-							when :max, :min
-							else raise UnknownHavingMethod.new( [:max, :min], meth)
-							end
-							[col, meth]
-						end]
-					super model, func, args
-				end
-
-				def build builder, table
-					return  if @args.blank?
-					@args.each do |col, meth|
-						t = Column.new *(table + col.to_a)
-						raise_unless 1 == t.length, RootOnlyFunctionError.new( t)
-						builder.having meth => t
-					end
-				end
-			end
-
-			class Max < Having
-				Name = :max
-				Expected = [String]
-
-				def initialize model, func, args
-					super model, :having, Hash[ *args.collect {|col| [col, func] } ]
-				end
-			end
-
-			class Min < Max
-				Name = :min
-			end
-
 			class Limit < Function
 				Name = :limit
 				Expected = [Fixnum]
 
 				def build builder, table
 					raise_unless 1 == table.length, RootOnlyFunctionError.new( table)
-					builder.limit = Array.wrap( @args).first.to_i
+					builder.limit = Array.wrap(@args).first.to_i
 				end
 			end
 
diff --git a/lib/smql_to_ar/query_builder.rb b/lib/smql_to_ar/query_builder.rb
index 17fbc75..0e8d4c2 100644
--- a/lib/smql_to_ar/query_builder.rb
+++ b/lib/smql_to_ar/query_builder.rb
@@ -43,7 +43,6 @@ class SmqlToAR
 			@table_alias[ @base_table] = @base_table.first
 			t = quote_table_name @table_alias[ @base_table]
 			@_select, @_joins, @_joined, @_includes, @_order = ["DISTINCT #{t}.*"], "", [@base_table], [], []
-			@_group, @_having = {}, {}
 			@table_model = {@base_table => @model}
 		end
 
@@ -67,14 +66,6 @@ class SmqlToAR
 			self
 		end
 
-		def group col
-			@_group.push col
-		end
-
-		def having h
-			@_having.update h
-		end
-
 		def quote_column_name name
 			@quoter.quote_column_name( name).gsub /"\."/, ','
 		end
@@ -114,7 +105,7 @@ class SmqlToAR
 				join_ srctable, refl.klass, query, throughtable
 			when ActiveRecord::Reflection::AssociationReflection
 				case refl.macro
-				when :has_many
+				when :has_many, :has_one
 					@_joins += build_join query, pretable, t, premodel.primary_key, refl.primary_key_name
 				when :belongs_to
 					@_joins += build_join query, pretable, t, refl.primary_key_name, premodel.primary_key

From f9ee0754f14c00e3e8e1adbdd17d642cd3b8a64a Mon Sep 17 00:00:00 2001
From: Denis Knauf <Denis.Knauf@gmail.com>
Date: Thu, 27 Oct 2011 14:26:53 +0200
Subject: [PATCH 11/12] Version 0.0.4.2

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 1eb4fbd..1668587 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.0.4.1
+0.0.4.2

From 3b60648ee79b965a12c7435944e7e16ec1974669 Mon Sep 17 00:00:00 2001
From: Denis Knauf <Denis.Knauf@gmail.com>
Date: Thu, 27 Oct 2011 15:22:49 +0200
Subject: [PATCH 12/12] Version 0.0.4.3

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 1668587..2ec68a9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.0.4.2
+0.0.4.3