lafcadio 0.9.0 → 0.9.1

data/lib/lafcadio/query.rb

@@ -1,19 +1,46 @@
 # = Overview
 # By passing a block to ObjectStore, you can write complex, ad-hoc queries in
-# Ruby. This involves a few more keystrokes than writing raw SQL, but also makes
-# it easier to change queries at runtime, and these queries can also be fully
-# tested against the MockObjectStore.
-#   big_invoices = object_store.getInvoices { |inv| inv.rate.gt( 50 ) }
-#   # => "select * from invoices where rate > 50"
+# Ruby. This involves a few more keystrokes than writing raw SQL, but also
+# makes it easier to change queries at runtime, and these queries can also be
+# fully tested against the MockObjectStore.
+#   big_invoices = Invoice.get { |inv| inv.rate.gt( 50 ) }
+#   # => runs "select * from invoices where rate > 50"
 # This a full-fledged block, so you can pass in values from the calling context.
 #   date = Date.new( 2004, 1, 1 )
-#   recent_invoices = object_store.getInvoices { |inv| inv.date.gt( date ) }
-#   # => "select * from invoices where date > '2004-01-01'"
+#   recent_invoices = Invoice.get { |inv| inv.date.gt( date ) }
+#   # => runs "select * from invoices where date > '2004-01-01'"
+#
+# = Building and accessing queries
+# To build a query and run it immediately, call DomainObject.get and pass it a
+# block:
+#   hwangs = User.get { |u| u.lname.equals( 'Hwang' ) }
+# You can also call ObjectStore#[ plural domain class ] with a block:
+#   hwangs = ObjectStore.get_object_store.users { |u|
+#     u.lname.equals( 'Hwang' )
+#   }
+# If you want more fine-grained control over a query, first create it with
+# Query.infer and then build it, using ObjectStore#query to run it.
+#   qry = Query.infer( User ) { |u| u.lname.equals( 'Hwang' ) }
+#   qry.to_sql # => "select * from users where users.lname = 'Hwang'"
+#   qry = qry.and { |u| u.fname.equals( 'Francis' ) }
+#   qry.to_sql # => "select * from users where (users.lname = 'Hwang' and
+#                    users.fname = 'Francis')"
+#   qry.limit = 0..5
+#   qry.to_sql # => "select * from users where (users.lname = 'Hwang' and
+#                    users.fname = 'Francis') limit 0, 6"
+# Using Query.infer, you can also set order_by and order_by_order clauses:
+#   qry = Query.infer(
+#     SKU,
+#     :order_by => [ :standardPrice, :salePrice ],
+#     :order_by_order => Query::DESC
+#   ) { |s| s.sku.nil? }
+#   qry.to_sql # => "select * from skus where skus.sku is null order by
+#                    standardPrice, salePrice desc"
 # 
-# = Query operators
+# = Query inference operators
 # You can compare fields either to simple values, or to other fields in the same
 # table.
-#   paid_immediately = object_store.getInvoices { |inv|
+#   paid_immediately = Invoice.get { |inv|
 #     inv.date.equals( inv.paid )
 #   }
 #   # => "select * from invoices where date = paid"
@@ -21,81 +48,121 @@
 # == Numerical comparisons: +lt+, +lte+, +gte+, +gt+
 # +lt+, +lte+, +gte+, and +gt+ stand for "less than", "less than or equal",
 # "greater than or equal", and "greater than", respectively.
-#   tiny_invoices = object_store.getInvoices { |inv| inv.rate.lte( 25 ) }
+#   tiny_invoices = Invoice.get { |inv| inv.rate.lte( 25 ) }
 #   # => "select * from invoices where rate <= 25"
 # These comparators work on fields that contain numbers, dates, and even
 # references to other domain objects.
-#   for_1st_ten_clients = object_store.getInvoices { |inv|
+#   for_1st_ten_clients = Invoice.get { |inv|
 #     inv.client.lte( 10 )
 #   }
 #   # => "select * from invoices where client <= 10"
+#   client10 = Client[10]
+#   for_1st_ten_clients = Invoice.get { |inv|
+#     inv.client.lte( client10 )
+#   }
+#   # => "select * from invoices where client <= 10"
 #
 # == Equality: +equals+
-#   full_week_invs = object_store.getInvoices { |inv| inv.hours.equals( 40 ) }
+#   full_week_invs = Invoice.get { |inv| inv.hours.equals( 40 ) }
 #   # => "select * from invoices where hours = 40"
 # If you're comparing to a domain object you should pass in the object itself.
-#   client = object_store.getClient( 99 )
-#   invoices = object_store.getInvoices { |inv| inv.client.equals( client ) }
+#   client = Client[99]
+#   invoices = Invoice.get { |inv| inv.client.equals( client ) }
 #   # => "select * from invoices where client = 99"
+# If you're comparing to a boolean value you don't need to use
+# <tt>equals( true )</tt>.
+#   administrators = User.get { |u| u.administrator.equals( true ) }
+#   administrators = User.get { |u| u.administrator } # both forms work
+# Matching for +nil+ can use <tt>nil?</tt>
+#   no_email = User.get { |u| u.email.nil? }
 # 
-# == Inclusion: +in+
-#   first_three_invs = object_store.getInvoices { |inv| inv.pk_id.in( 1, 2, 3 ) }
+# == Inclusion: +in+ and <tt>include?</tt>
+# Any field can be matched via +in+:
+#   first_three_invs = Invoice.get { |inv| inv.pk_id.in( 1, 2, 3 ) }
 #   # => "select * from invoices where pk_id in ( 1, 2, 3 )"
+# A TextListField can be matched via <tt>include?</tt>
+#   aim_users = User.get { |u| u.im_methods.include?( 'aim' ) }
+#   # => "select * from users where user.im_methods like 'aim,%' or
+#         user.im_methods like '%,aim,%' or user.im_methods like '%,aim' or
+#         user.im_methods = 'aim'"
 #
 # == Text comparison: +like+
-#   fname_starts_with_a = object_store.getUsers { |user|
-#     user.fname.like( /^a/ )
-#   }
+#   fname_starts_with_a = User.get { |user| user.fname.like( /^a/ ) }
 #   # => "select * from users where fname like 'a%'"
-#   fname_ends_with_a = object_store.getUsers { |user|
-#     user.fname.like( /a$/ )
-#   }
+#   fname_ends_with_a = User.get { |user| user.fname.like( /a$/ ) }
 #   # => "select * from users where fname like '%a'"
-#   fname_contains_a = object_store.getUsers { |user|
-#     user.fname.like( /a/ )
-#   }
+#   fname_contains_a = User.get { |user| user.fname.like( /a/ ) }
 #   # => "select * from users where fname like '%a%'"
 # Please note that although we're using the Regexp operators here, these aren't
 # full-fledged regexps. Only ^ and $ work for this.
 #
-# == Compound conditions: <tt>Query.And</tt> and <tt>Query.Or</tt>
-#   invoices = object_store.getInvoices { |inv|
-#     Query.And( inv.hours.equals( 40 ), inv.rate.equals( 50 ) )
+# == Compound conditions: <tt>&</tt> and <tt>|</tt>
+#   invoices = Invoice.get { |inv|
+#     inv.hours.equals( 40 ) & inv.rate.equals( 50 )
 #   }
 #   # => "select * from invoices where (hours = 40 and rate = 50)"
-#   client99 = object_store.getClient( 99 )
-#   invoices = object_store.getInvoices { |inv|
-#     Query.Or( inv.hours.equals( 40 ),
-#               inv.rate.equals( 50 ),
-#               inv.client.equals( client99 ) )
+#   client99 = Client[99]
+#   invoices = Invoice.get { |inv|
+#     inv.hours.equals( 40 ) | inv.rate.equals( 50 ) |
+#       inv.client.equals( client99 )
 #   }
 #   # => "select * from invoices where (hours = 40 or rate = 50 or client = 99)"
-# Note that both compound operators can take 2 or more arguments. Also, they can
-# be nested:
+# Note that both compound operators can be nested:
 #   invoices = object_store.getInvoices { |inv|
-#     Query.And( inv.hours.equals( 40 ),
-#                Query.Or( inv.rate.equals( 50 ),
-#                          inv.client.equals( client99 ) ) )
+#     inv.hours.equals( 40 ) &
+#       ( inv.rate.equals( 50 ) | inv.client.equals( client99 ) )
 #   }
 #   # => "select * from invoices where (hours = 40 and 
 #   #     (rate = 50 or client = 99))"
 #
 # == Negation: +not+
-#   invoices = object_store.getInvoices { |inv| inv.rate.equals( 50 ).not }
+#   invoices = Invoice.get { |inv| inv.rate.equals( 50 ).not }
 #   # => "select * from invoices where rate != 50"
+# This can be used directly against boolean and nil comparisons, too.
+#   not_administrators = User.get { |u| u.administrator.not }
+#   # => "select * from users where administrator != 1"
+#   has_email = User.get { |u| u.email.nil?.not }
+#   # => "select * from users where email is not null"
+#
+# = Query caching via subset matching
+# Lafcadio caches every query, and optimizes based on a simple subset
+# calculation. For example, if you run these statements:
+#   User.get { |u| u.lname.equals( 'Smith' ) }
+#   User.get { |u| u.lname.equals( 'Smith' ) & u.fname.like( /John/ ) }
+#   User.get { |u| u.lname.equals( 'Smith' ) & u.email.like( /hotmail/ ) }
+# Lafcadio can tell that the 2nd and 3rd queries are subsets of the first. So
+# these three statements will result in one database call, for the first 
+# statement: The 2nd and 3rd statements will be handled entirely in Ruby. The 
+# result is less database calls with no extra work for the programmer.
 
 require 'delegate'
 
 module Lafcadio
 	class Query
-		def self.And( *conditions ); CompoundCondition.new( *conditions ); end
+		def self.And( *conditions ) #:nodoc:
+			CompoundCondition.new( *conditions )
+		end
 		
+		# Infers a query from a block. The first required argument is the domain 
+		# class. Other optional arguments should be passed in hash form:
+		# [:order_by] An array of fields to order the results by.
+		# [:order_by_order] Possible values are Query::ASC or Query::DESC. Defaults
+		#                   to Query::DESC.
+		#   qry = Query.infer( User ) { |u| u.lname.equals( 'Hwang' ) }
+		#   qry.to_sql # => "select * from users where users.lname = 'Hwang'"
+		#   qry = Query.infer(
+		#     SKU,
+		#     :order_by => [ :standardPrice, :salePrice ],
+		#     :order_by_order => Query::DESC
+		#   ) { |s| s.sku.nil? }
+		#   qry.to_sql # => "select * from skus where skus.sku is null order by
+		#                    standardPrice, salePrice desc"
 		def self.infer( *args, &action )
 			inferrer = Query::Inferrer.new( *args ) { |obj| action.call( obj ) }
 			inferrer.execute
 		end
 		
-		def self.Or( *conditions )
+		def self.Or( *conditions ) #:nodoc:
 			conditions << CompoundCondition::OR
 			CompoundCondition.new( *conditions)
 		end
@@ -103,27 +170,34 @@ module Lafcadio
 		ASC		= 1
 		DESC 	= 2
 
-		attr_reader :domain_class, :condition
-		attr_accessor :order_by, :order_by_order, :limit
+		attr_reader :domain_class, :condition, :limit
+		attr_accessor :order_by, :order_by_order
 
-		def initialize(domain_class, pk_id_or_condition = nil, opts = {} )
+		def initialize(domain_class, pk_id_or_condition = nil, opts = {} ) #:nodoc:
 			@domain_class, @opts = domain_class, opts
 			( @condition, @order_by, @limit ) = [ nil, nil, nil ]
 			if pk_id_or_condition
-				if pk_id_or_condition.class <= Condition
+				if pk_id_or_condition.is_a?( Condition )
 					@condition = pk_id_or_condition
 				else
 					@condition = Query::Equals.new(
-						'pk_id', pk_id_or_condition, domain_class
+						:pk_id, pk_id_or_condition, domain_class
 					)
 				end
 			end
 			@order_by_order = ASC
 		end
 		
+		# Returns a new query representing the condition of the current query and
+		# the new inferred query.
+		#   qry = Query.infer( User ) { |u| u.lname.equals( 'Hwang' ) }
+		#   qry.to_sql # => "select * from users where users.lname = 'Hwang'"
+		#   qry = qry.and { |u| u.fname.equals( 'Francis' ) }
+		#   qry.to_sql # => "select * from users where (users.lname = 'Hwang' and
+		#                    users.fname = 'Francis')"
 		def and( &action ); compound( CompoundCondition::AND, action ); end
 		
-		def collect( coll )
+		def collect( coll ) #:nodoc:
 			if @opts[:group_functions] == [:count]
 				[ result_row( [coll.size] ) ]
 			else
@@ -131,55 +205,89 @@ module Lafcadio
 			end
 		end
 			
-		def compound( comp_type, action )
+		def compound( comp_type, action ) #:nodoc:
 			rquery = Query.infer( @domain_class ) { |dobj| action.call( dobj ) }
-			comp_cond = Query::CompoundCondition.new( @condition, rquery.condition,
-			                                          comp_type )
-			comp_cond.query
+			q = Query::CompoundCondition.new(
+				@condition, rquery.condition, comp_type
+			).query
+			[ :order_by, :order_by_order, :limit ].each do |attr|
+				q.send( attr.to_s + '=', self.send( attr ) )
+			end
+			q
 		end
 		
-		def eql?( other ); other.class <= Query && other.to_sql == to_sql; end
+		def dobj_satisfies?( dobj ) #:nodoc:
+			@condition.nil? or @condition.dobj_satisfies?( dobj )
+		end
 
-		def fields; @opts[:group_functions] == [:count] ? 'count(*)' : '*'; end
+		def eql?( other ) #:nodoc:
+			other.is_a?( Query ) && other.to_sql == to_sql
+		end
+
+		def fields #:nodoc:
+			@opts[:group_functions] == [:count] ? 'count(*)' : '*'
+		end
 
-		def hash; to_sql.hash; end
+		def hash #:nodoc:
+			to_sql.hash
+		end
 		
-		def limit_clause
+		def implies?( other_query ) #:nodoc:
+			if other_query == self
+				true
+			elsif @domain_class == other_query.domain_class
+				if other_query.condition.nil? and !self.condition.nil?
+					true
+				else
+					self.condition and self.condition.implies?( other_query.condition )
+				end
+			end
+		end
+		
+		def limit=( limit )
+			@limit = limit.is_a?( Fixnum ) ? 0..limit-1 : limit
+		end
+		
+		def limit_clause #:nodoc:
 			"limit #{ @limit.begin }, #{ @limit.end - @limit.begin + 1 }" if @limit
 		end
 		
-		def object_meets( dobj ); @condition.object_meets( dobj ); end
-
+		# Returns a new query representing the condition of the current query and
+		# the new inferred query.
+		#   qry = Query.infer( User ) { |u| u.lname.equals( 'Hwang' ) }
+		#   qry.to_sql # => "select * from users where users.lname = 'Hwang'"
+		#   qry = qry.or { |u| u.fname.equals( 'Francis' ) }
+		#   qry.to_sql # => "select * from users where (users.lname = 'Hwang' or
+		#                    users.fname = 'Francis')"
 		def or( &action ); compound( CompoundCondition::OR, action ); end
 		
-		def order_clause
+		def order_clause #:nodoc:
 			if @order_by
-				if @order_by.is_a? Array
-					field_str = @order_by.map { |f_name|
-						@domain_class.get_field( f_name.to_s ).db_field_name
-					}.join( ', ' )
-				else
-					field_str = @domain_class.get_field( @order_by ).db_field_name
-				end
+				field_str = @order_by.map { |f_name|
+					@domain_class.field( f_name.to_s ).db_field_name
+				}.join( ', ' )
 				clause = "order by #{ field_str } "
 				clause += @order_by_order == ASC ? 'asc' : 'desc'
 				clause
 			end
 		end
 		
-		def implies?( other_query )
-			if other_query == self
-				true
-			elsif @domain_class == other_query.domain_class
-				if other_query.condition.nil? and !self.condition.nil?
-					true
+		def order_and_limit_collection( objects )
+			objects = objects.sort_by { |dobj|
+				if order_by.nil?
+					dobj.pk_id
+				elsif order_by.is_a?( Array )
+					order_by.map { |field_name| dobj.send( field_name ) }
 				else
-					self.condition and self.condition.implies?( other_query.condition )
+					dobj.send order_by
 				end
-			end
+			}
+			objects.reverse! if order_by_order == Query::DESC
+			objects = objects[limit] if limit
+			objects
 		end
 		
-		def result_row( row )
+		def result_row( row ) #:nodoc:
 			if @opts[:group_functions] == [:count]
 				{ :count => row.first }
 			else
@@ -187,11 +295,11 @@ module Lafcadio
 			end
 		end
 
-		def sql_primary_key_field(domain_class)
+		def sql_primary_key_field(domain_class) #:nodoc:
 			"#{ domain_class.table_name }.#{ domain_class.sql_primary_key_name }"
 		end
 
-		def tables
+		def tables #:nodoc:
 			concrete_classes = domain_class.self_and_concrete_superclasses.reverse
 			table_names = concrete_classes.collect { |domain_class|
 				domain_class.table_name
@@ -207,7 +315,7 @@ module Lafcadio
 			clauses.join ' '
 		end
 
-		def where_clause
+		def where_clause #:nodoc:
 			concrete_classes = domain_class.self_and_concrete_superclasses.reverse
 			where_clauses = []
 			concrete_classes.each_with_index { |domain_class, i|
@@ -219,7 +327,7 @@ module Lafcadio
 					where_clauses << @condition.to_sql if @condition
 				end
 			}
-			where_clauses.size > 0 ? 'where ' + where_clauses.join( ' and ' ) : nil
+			!where_clauses.empty? ? 'where ' + where_clauses.join( ' and ' ) : nil
 		end
 
 		class Condition #:nodoc:
@@ -230,16 +338,13 @@ module Lafcadio
 			attr_reader :domain_class
 
 			def initialize(fieldName, searchTerm, domain_class)
-				@fieldName = fieldName
-				@searchTerm = searchTerm
-				unless @searchTerm.class <= self.class.search_term_type
+				@fieldName, @searchTerm, @domain_class =
+						fieldName, searchTerm, domain_class
+				unless @searchTerm.is_a?( self.class.search_term_type )
 					raise "Incorrect searchTerm type #{ searchTerm.class }"
 				end
-				@domain_class = domain_class
-				if @domain_class
-					unless @domain_class <= DomainObject
-						raise "Incorrect object type #{ @domain_class.to_s }"
-					end
+				if @domain_class and !( @domain_class < DomainObject )
+					raise "Incorrect object type #{ @domain_class.to_s }"
 				end
 			end
 			
@@ -254,22 +359,28 @@ module Lafcadio
 				)
 			end
 			
-			def db_field_name; get_field.db_table_and_field_name; end
+			def db_field_name; field.db_column; end
 			
 			def eql?( other_cond )
 				other_cond.is_a?( Condition ) and other_cond.to_sql == to_sql
 			end
 			
-			def get_field; @domain_class.get_field( @fieldName ); end
-			
-			def query; Query.new( @domain_class, self ); end
-			
-			def not
-				Query::Not.new( self )
+			def field
+				f = @domain_class.field @fieldName.to_s
+				f or raise(
+					MissingError,
+					"Couldn't find field \"#{ @fieldName }\" in " + @domain_class.name +
+							" domain class",
+					caller
+				)
 			end
+			
+			def not; Query::Not.new( self ); end
 
 			def primary_key_field?; 'pk_id' == @fieldName; end
 			
+			def query; Query.new( @domain_class, self ); end
+			
 			def to_condition; self; end
 		end
 
@@ -298,17 +409,7 @@ module Lafcadio
 				@compareType = compareType
 			end
 
-			def to_sql
-				if ( get_field.kind_of?( DomainObjectField ) &&
-				     !@searchTerm.respond_to?( :pk_id ) )
-					search_val = @searchTerm.to_s
-				else
-					search_val = get_field.value_for_sql( @searchTerm ).to_s
-				end
-				"#{ db_field_name } #{ @@comparators[@compareType] } " + search_val
-			end
-
-			def object_meets(anObj)
+			def dobj_satisfies?(anObj)
 				value = anObj.send @fieldName
 				value = value.pk_id if value.class <= DomainObject
 				if value
@@ -317,6 +418,16 @@ module Lafcadio
 					false
 				end
 			end
+
+			def to_sql
+				if ( field.kind_of?( DomainObjectField ) &&
+				     !@searchTerm.respond_to?( :pk_id ) )
+					search_val = @searchTerm.to_s
+				else
+					search_val = field.value_for_sql( @searchTerm ).to_s
+				end
+				"#{ db_field_name } #{ @@comparators[@compareType] } #{ search_val }"
+			end
 		end
 
 		class CompoundCondition < Condition #:nodoc:
@@ -324,7 +435,7 @@ module Lafcadio
 			OR  = 2
 			
 			def initialize( *args )
-				if( [ AND, OR ].index( args.last) )
+				if( [ AND, OR ].include?( args.last ) )
 					@compound_type = args.last
 					args.pop
 				else
@@ -336,6 +447,18 @@ module Lafcadio
 				@domain_class = @conditions[0].domain_class
 			end
 
+			def dobj_satisfies?(anObj)
+				if @compound_type == AND
+					@conditions.inject( true ) { |result, cond|
+						result && cond.dobj_satisfies?( anObj )
+					}
+				else
+					@conditions.inject( false ) { |result, cond|
+						result || cond.dobj_satisfies?( anObj )
+					}
+				end
+			end
+
 			def implied_by?( other_condition )
 				@compound_type == OR && @conditions.any? { |cond|
 					cond.implies?( other_condition )
@@ -345,27 +468,15 @@ module Lafcadio
 			def implies?( other_condition )
 				super( other_condition ) or (
 					@compound_type == AND and @conditions.any? { |cond|
-						cond.implies?( other_condition )
+						cond.implies? other_condition
 					}
 				) or (
 					@compound_type == OR and @conditions.all? { |cond|
-						cond.implies?( other_condition )
+						cond.implies? other_condition
 					}
 				)
 			end
 
-			def object_meets(anObj)
-				if @compound_type == AND
-					@conditions.inject( true ) { |result, cond|
-						result && cond.object_meets( anObj )
-					}
-				else
-					@conditions.inject( false ) { |result, cond|
-						result || cond.object_meets( anObj )
-					}
-				end
-			end
-
 			def to_sql
 				booleanString = @compound_type == AND ? 'and' : 'or'
 				subSqlStrings = @conditions.collect { |cond| cond.to_sql }
@@ -386,10 +497,9 @@ module Lafcadio
 						
 						def method_missing( methId, *args )
 							fieldName = methId.id2name
-							begin
-								classField = self.domain_class.get_field( fieldName )
+							if ( classField = self.domain_class.field( fieldName ) )
 								ObjectFieldImpostor.new( self, classField )
-							rescue MissingError
+							else
 								super( methId, *args )
 							end
 						end
@@ -410,10 +520,18 @@ module Lafcadio
 		end
 		
 		class Equals < Condition #:nodoc:
+			def dobj_satisfies?(anObj)
+				if @searchTerm.is_a?( ObjectField )
+					compare_value = anObj.send @searchTerm.name
+				else
+					compare_value = @searchTerm
+				end
+				compare_value == anObj.send( @fieldName )
+			end
+
 			def r_val_string
-				field = get_field
-				if @searchTerm.class <= ObjectField
-					@searchTerm.db_table_and_field_name
+				if @searchTerm.is_a?( ObjectField )
+					@searchTerm.db_column
 				else
 					begin
 						field.value_for_sql( @searchTerm ).to_s
@@ -428,38 +546,22 @@ module Lafcadio
 				end
 			end
 
-			def object_meets(anObj)
-				if @searchTerm.class <= ObjectField
-					compare_value = anObj.send( @searchTerm.name )
-				else
-					compare_value = @searchTerm
-				end
-				compare_value == anObj.send( @fieldName )
-			end
-
 			def to_sql
 				sql = "#{ db_field_name } "
-				unless @searchTerm.nil?
-					sql += "= " + r_val_string
-				else
-					sql += "is null"
-				end
+				sql += ( !@searchTerm.nil? ? "= #{ r_val_string }" : "is null" )
 				sql
 			end
 		end
 
 		class In < Condition #:nodoc:
-			def self.search_term_type
-				Array
-			end
+			def self.search_term_type; Array; end
 
-			def object_meets(anObj)
-				value = anObj.send @fieldName
-				@searchTerm.index(value) != nil
+			def dobj_satisfies?(anObj)
+				@searchTerm.include?( anObj.send( @fieldName ) )
 			end
 
 			def to_sql
-				if get_field.is_a?( StringField )
+				if field.is_a?( StringField )
 					quoted = @searchTerm.map do |str| "'#{ str }'"; end
 					end_clause = quoted.join ', '
 				else
@@ -469,14 +571,17 @@ module Lafcadio
 			end
 		end
 		
-		class Include < CompoundCondition
+		class Include < CompoundCondition #:nodoc:
 			def initialize( field_name, search_term, domain_class )
-				begin_cond = Like.new( field_name, search_term + ',', domain_class,
-				                       Like::POST_ONLY )
-				mid_cond = Like.new( field_name, ',' + search_term + ',',
-				                     domain_class )
-				end_cond = Like.new( field_name, ',' + search_term, domain_class,
-				                     Like::PRE_ONLY )
+				begin_cond = Like.new(
+					field_name, search_term + ',', domain_class, Like::POST_ONLY
+				)
+				mid_cond = Like.new(
+					field_name, ',' + search_term + ',', domain_class
+				)
+				end_cond = Like.new(
+					field_name, ',' + search_term, domain_class, Like::PRE_ONLY
+				)
 				only_cond = Equals.new( field_name, search_term, domain_class )
 				super( begin_cond, mid_cond, end_cond, only_cond, OR )
 			end
@@ -488,16 +593,18 @@ module Lafcadio
 				unless args.size == 1
 					h = args.last
 					@order_by = h[:order_by]
-					@order_by_order = h[:order_by_order]
+					@order_by_order = ( h[:order_by_order] or ASC )
+					@limit = h[:limit]
 				end
 			end
 			
 			def execute
-				impostor = DomainObjectImpostor.impostor( @domain_class )
+				impostor = DomainObjectImpostor.impostor @domain_class
 				condition = @action.call( impostor ).to_condition
 				query = Query.new( @domain_class, condition )
 				query.order_by = @order_by
 				query.order_by_order = @order_by_order
+				query.limit = @limit
 				query
 			end
 		end
@@ -508,12 +615,40 @@ module Lafcadio
 			POST_ONLY			= 3
 
 			def initialize(
-					fieldName, searchTerm, domain_class, matchType = PRE_AND_POST)
+				fieldName, searchTerm, domain_class, matchType = PRE_AND_POST
+			)
+				if searchTerm.is_a? Regexp
+					searchTerm = process_regexp searchTerm
+				else
+					@matchType = matchType
+				end
 				super fieldName, searchTerm, domain_class
-				@matchType = matchType
 			end
 			
-			def get_regexp
+			def dobj_satisfies?(anObj)
+				value = anObj.send @fieldName
+				value = value.pk_id.to_s if value.respond_to?( :pk_id )
+				if value.is_a?( Array )
+					value.include? @searchTerm
+				else
+					!regexp.match( value ).nil?
+				end
+			end
+			
+			def process_regexp( searchTerm )
+				if searchTerm.source =~ /^\^(.*)/
+					@matchType = Query::Like::POST_ONLY
+					$1
+				elsif searchTerm.source =~ /(.*)\$$/
+					@matchType = Query::Like::PRE_ONLY
+					$1
+				else
+					@matchType = Query::Like::PRE_AND_POST
+					searchTerm.source
+				end
+			end
+
+			def regexp
 				if @matchType == PRE_AND_POST
 					Regexp.new( @searchTerm, Regexp::IGNORECASE )
 				elsif @matchType == PRE_ONLY
@@ -523,18 +658,6 @@ module Lafcadio
 				end
 			end
 
-			def object_meets(anObj)
-				value = anObj.send @fieldName
-				if value.class <= DomainObject || value.class == DomainObjectProxy
-					value = value.pk_id.to_s
-				end
-				if value.class <= Array
-					(value.index(@searchTerm) != nil)
-				else
-					get_regexp.match(value) != nil
-				end
-			end
-
 			def to_sql
 				withWildcards = @searchTerm
 				if @matchType == PRE_AND_POST
@@ -558,14 +681,14 @@ module Lafcadio
 		
 			def collect( coll )
 				max = coll.inject( nil ) { |max, d_obj|
-					a_value = d_obj.send( @field_name )
+					a_value = d_obj.send @field_name
 					( max.nil? || a_value > max ) ? a_value : max
 				}
 				[ result_row( [max] ) ]
 			end
 		
 			def fields
-				"max(#{ @domain_class.get_field( @field_name ).db_field_name })"
+				"max(#{ @domain_class.field( @field_name ).db_field_name })"
 			end
 			
 			def result_row( row ); { :max => row.first }; end
@@ -576,8 +699,8 @@ module Lafcadio
 				@unCondition = unCondition
 			end
 
-			def object_meets(obj)
-				!@unCondition.object_meets(obj)
+			def dobj_satisfies?(obj)
+				!@unCondition.dobj_satisfies?(obj)
 			end
 			
 			def domain_class; @unCondition.domain_class; end
@@ -598,42 +721,40 @@ module Lafcadio
 			
 			attr_reader :class_field
 		
-			def initialize( domainObjectImpostor, class_field_or_name )
+			def initialize( domainObjectImpostor, class_field )
 				@domainObjectImpostor = domainObjectImpostor
-				if class_field_or_name == 'pk_id'
-					@field_name = 'pk_id'
-				else
-					@class_field = class_field_or_name
-					@field_name = class_field_or_name.name
-				end
+				@class_field = class_field
+				@field_name = class_field.name
 			end
 			
+			def &( condition ); Query.And( to_condition, condition ); end
+
+			def |( condition ); Query.Or( to_condition, condition ); end
+			
 			def method_missing( methId, *args )
 				methodName = methId.id2name
-				if !ObjectFieldImpostor.comparators.keys.index( methodName ).nil?
-					register_compare_condition( methodName, *args )
+				if self.class.comparators.keys.include?( methodName )
+					compare_condition( methodName, *args )
 				else
-					super( methId, *args )
+					super
 				end
 			end
 			
-			def |( condition ); Query.Or( to_condition, condition ); end
-			
-			def &( condition ); Query.And( to_condition, condition ); end
-
-			def register_compare_condition( compareStr, searchTerm)
+			def compare_condition( compareStr, searchTerm)
 				compareVal = ObjectFieldImpostor.comparators[compareStr]
-				Compare.new( @field_name, searchTerm,
-				             @domainObjectImpostor.domain_class, compareVal )
+				Compare.new( @field_name, searchTerm, domain_class, compareVal )
 			end
 			
+			def domain_class; @domainObjectImpostor.domain_class; end
+			
 			def equals( searchTerm )
-				Equals.new( @field_name, field_or_field_name( searchTerm ),
-					          @domainObjectImpostor.domain_class )
+				Equals.new(
+					@field_name, field_or_field_name( searchTerm ), domain_class
+				)
 			end
 			
 			def field_or_field_name( search_term )
-				if search_term.class == ObjectFieldImpostor
+				if search_term.is_a? ObjectFieldImpostor
 					search_term.class_field
 				else
 					search_term
@@ -641,9 +762,8 @@ module Lafcadio
 			end
 			
 			def include?( search_term )
-				if @class_field.instance_of?( TextListField )
-					Include.new( @field_name, search_term,
-					             @domainObjectImpostor.domain_class )
+				if @class_field.is_a?( TextListField )
+					Include.new( @field_name, search_term, domain_class )
 				else
 					raise ArgumentError
 				end
@@ -651,18 +771,7 @@ module Lafcadio
 			
 			def like( regexp )
 				if regexp.is_a?( Regexp )
-					if regexp.source =~ /^\^(.*)/
-						searchTerm = $1
-						matchType = Query::Like::POST_ONLY
-					elsif regexp.source =~ /(.*)\$$/
-						searchTerm = $1
-						matchType = Query::Like::PRE_ONLY
-					else
-						searchTerm = regexp.source
-						matchType = Query::Like::PRE_AND_POST
-					end
-					Query::Like.new( @field_name, searchTerm,
-													 @domainObjectImpostor.domain_class, matchType )
+					Query::Like.new( @field_name, regexp, domain_class )
 				else
 					raise(
 						ArgumentError, "#{ @field_name }#like needs to receive a Regexp",
@@ -672,16 +781,14 @@ module Lafcadio
 			end
 			
 			def in( *searchTerms )
-				Query::In.new( @field_name, searchTerms,
-											 @domainObjectImpostor.domain_class )
+				Query::In.new( @field_name, searchTerms, domain_class )
 			end
 			
 			def nil?; equals( nil ); end
 			
 			def to_condition
 				if @class_field.instance_of?( BooleanField )
-					Query::Equals.new( @field_name, true,
-					                   @domainObjectImpostor.domain_class )
+					Query::Equals.new( @field_name, true, domain_class )
 				else
 					raise
 				end