lafcadio 0.9.2 → 0.9.3

data/lib/lafcadio/query.rb

@@ -32,7 +32,7 @@
 #   qry = Query.infer(
 #     SKU,
 #     :order_by => [ :standardPrice, :salePrice ],
-#     :order_by_order => Query::DESC
+#     :order_by_order => :desc
 #   ) { |s| s.sku.nil? }
 #   qry.to_sql # => "select * from skus where skus.sku is null order by
 #                    standardPrice, salePrice desc"
@@ -93,8 +93,10 @@
 #   # => "select * from users where fname like '%a'"
 #   fname_contains_a = User.get { |user| user.fname.like( /a/ ) }
 #   # => "select * from users where fname like '%a%'"
+#   james_or_jones = User.get { |user| user.lname.like( /J..es/ ) }
+#   # => "select * from users where lname like 'J__es'"
 # Please note that although we're using the Regexp operators here, these aren't
-# full-fledged regexps. Only ^ and $ work for this.
+# full-fledged regexps. Only ^, $, and . work for this.
 #
 # == Compound conditions: <tt>&</tt> and <tt>|</tt>
 #   invoices = Invoice.get { |inv|
@@ -146,14 +148,13 @@ module Lafcadio
 		# 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.
+		# [:order_by_order] Possible values are :asc or :desc. Defaults to :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
+		#     :order_by_order => :desc
 		#   ) { |s| s.sku.nil? }
 		#   qry.to_sql # => "select * from skus where skus.sku is null order by
 		#                    standardPrice, salePrice desc"
@@ -163,29 +164,25 @@ module Lafcadio
 		end
 		
 		def self.Or( *conditions ) #:nodoc:
-			conditions << CompoundCondition::OR
+			conditions << :or
 			CompoundCondition.new( *conditions)
 		end
 
-		ASC		= 1
-		DESC 	= 2
+		attr_reader :domain_class, :condition, :include, :limit, :order_by
+		attr_accessor :order_by_order
 
-		attr_reader :domain_class, :condition, :limit
-		attr_accessor :order_by, :order_by_order
-
-		def initialize(domain_class, pk_id_or_condition = nil, opts = {} ) #:nodoc:
+		def initialize(domain_class, 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.is_a?( Condition )
-					@condition = pk_id_or_condition
-				else
-					@condition = Query::Equals.new(
-						:pk_id, pk_id_or_condition, domain_class
-					)
-				end
+			if ( cond = opts[:condition] )
+				@condition = cond
+			elsif ( pk_id = opts[:pk_id] )
+				@condition = Query::Equals.new( :pk_id, pk_id, domain_class )
 			end
-			@order_by_order = ASC
+			if ( @include = opts[:include] )
+				@include = [ @include ] unless @include.is_a?( Array )
+			end
+			@order_by_order = :asc
 		end
 		
 		# Returns a new query representing the condition of the current query and
@@ -195,7 +192,7 @@ module Lafcadio
 		#   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 and( &action ); compound( :and, action ); end
 		
 		def collect( coll ) #:nodoc:
 			if @opts[:group_functions] == [:count]
@@ -248,10 +245,21 @@ module Lafcadio
 			@limit = limit.is_a?( Fixnum ) ? 0..limit-1 : limit
 		end
 		
-		def limit_clause #:nodoc:
-			"limit #{ @limit.begin }, #{ @limit.end - @limit.begin + 1 }" if @limit
+		def limit_clause( db ) #:nodoc:
+			if @limit
+				case db
+				when 'Mysql'
+					"limit #{ @limit.begin }, #{ @limit.end - @limit.begin + 1 }"
+				when 'Pg'
+					limit_clause = "limit #{ @limit.end - @limit.begin + 1 }"
+					limit_clause += " offset #{ @limit.begin }" if @limit.begin > 0
+					limit_clause
+				end
+			end
 		end
 		
+		def one_pk_id?; @condition and @condition.one_pk_id?; 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' ) }
@@ -259,7 +267,11 @@ module Lafcadio
 		#   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 or( &action ); compound( :or, action ); end
+		
+		def order_by=( ob )
+			@order_by = ( ob.is_a?( Array ) ? ob.map { |f| f.to_s } : ob.to_s ) if ob
+		end
 		
 		def order_clause #:nodoc:
 			if @order_by
@@ -267,7 +279,7 @@ module Lafcadio
 					@domain_class.field( f_name.to_s ).db_field_name
 				}.join( ', ' )
 				clause = "order by #{ field_str } "
-				clause += @order_by_order == ASC ? 'asc' : 'desc'
+				clause += @order_by_order == :asc ? 'asc' : 'desc'
 				clause
 			end
 		end
@@ -282,7 +294,7 @@ module Lafcadio
 					dobj.send order_by
 				end
 			}
-			objects.reverse! if order_by_order == Query::DESC
+			objects.reverse! if order_by_order == :desc
 			objects = objects[limit] if limit
 			objects
 		end
@@ -301,32 +313,38 @@ module Lafcadio
 
 		def tables #:nodoc:
 			concrete_classes = domain_class.self_and_concrete_superclasses.reverse
-			table_names = concrete_classes.collect { |domain_class|
-				domain_class.table_name
-			}
-			table_names.join( ', ' )
+			sql = ''
+			dclass = nil
+			until concrete_classes.empty?
+				prev_dclass = dclass
+				dclass = concrete_classes.shift
+				if sql == ''
+					sql = dclass.table_name
+				else
+					sql += " inner join #{ dclass.table_name } on #{ sql_primary_key_field( prev_dclass ) } = #{ sql_primary_key_field( dclass ) }"
+				end
+			end
+			if @include
+				@include.each do |include_sym|
+					field = dclass.field include_sym
+					included_dclass = field.linked_type
+					sql += " left outer join #{ included_dclass.table_name } on #{ dclass.table_name }.#{ field.db_field_name } = #{ sql_primary_key_field( included_dclass ) }"
+				end
+			end
+			sql
 		end
 
-		def to_sql
+		def to_sql( db = 'Mysql' )
 			clauses = [ "select #{ fields }", "from #{ tables }" ]
 			clauses << where_clause if where_clause
 			clauses << order_clause if order_clause
-			clauses << limit_clause if limit_clause
+			clauses << limit_clause( db ) if limit_clause( db )
 			clauses.join ' '
 		end
 
 		def where_clause #:nodoc:
-			concrete_classes = domain_class.self_and_concrete_superclasses.reverse
 			where_clauses = []
-			concrete_classes.each_with_index { |domain_class, i|
-				if i < concrete_classes.size - 1
-					join_clause = sql_primary_key_field( domain_class ) + ' = ' +
-					              sql_primary_key_field( concrete_classes[i+1] )
-					where_clauses << join_clause
-				else
-					where_clauses << @condition.to_sql if @condition
-				end
-			}
+			where_clauses << @condition.to_sql if @condition
 			!where_clauses.empty? ? 'where ' + where_clauses.join( ' and ' ) : nil
 		end
 
@@ -376,32 +394,24 @@ module Lafcadio
 			end
 			
 			def not; Query::Not.new( self ); end
+			
+			def one_pk_id?; self.is_a?( Equals ) and primary_key_field?; end
 
 			def primary_key_field?; 'pk_id' == @fieldName; end
 			
-			def query; Query.new( @domain_class, self ); end
+			def query; Query.new( @domain_class, :condition => self ); end
 			
 			def to_condition; self; end
 		end
 
 		class Compare < Condition #:nodoc:
-			LESS_THAN							= 1
-			LESS_THAN_OR_EQUAL		= 2
-			GREATER_THAN_OR_EQUAL = 3
-			GREATER_THAN					= 4
-
-			@@comparators = {
-				LESS_THAN => '<',
-				LESS_THAN_OR_EQUAL => '<=',
-				GREATER_THAN_OR_EQUAL => '>=',
-				GREATER_THAN => '>'
-			}
+			@@comparators = { :lt => '<', :lte => '<=', :gte => '>=', :gt => '>' }
 
 			@@mockComparators = {
-				LESS_THAN => Proc.new { |d1, d2| d1 < d2 },
-				LESS_THAN_OR_EQUAL => Proc.new { |d1, d2| d1 <= d2 },
-				GREATER_THAN_OR_EQUAL => Proc.new { |d1, d2| d1 >= d2 },
-				GREATER_THAN => Proc.new { |d1, d2| d1 > d2 }
+				:lt => Proc.new { |d1, d2| d1 < d2 },
+				:lte => Proc.new { |d1, d2| d1 <= d2 },
+				:gte => Proc.new { |d1, d2| d1 >= d2 },
+				:gt => Proc.new { |d1, d2| d1 > d2 }
 			}
 
 			def initialize(fieldName, searchTerm, domain_class, compareType)
@@ -431,15 +441,12 @@ module Lafcadio
 		end
 
 		class CompoundCondition < Condition #:nodoc:
-			AND = 1
-			OR  = 2
-			
 			def initialize( *args )
-				if( [ AND, OR ].include?( args.last ) )
+				if( [ :and, :or ].include?( args.last ) )
 					@compound_type = args.last
 					args.pop
 				else
-					@compound_type = AND
+					@compound_type = :and
 				end
 				@conditions = args.map { |arg|
 					arg.respond_to?( :to_condition ) ? arg.to_condition : arg
@@ -448,7 +455,7 @@ module Lafcadio
 			end
 
 			def dobj_satisfies?(anObj)
-				if @compound_type == AND
+				if @compound_type == :and
 					@conditions.inject( true ) { |result, cond|
 						result && cond.dobj_satisfies?( anObj )
 					}
@@ -460,25 +467,25 @@ module Lafcadio
 			end
 
 			def implied_by?( other_condition )
-				@compound_type == OR && @conditions.any? { |cond|
+				@compound_type == :or && @conditions.any? { |cond|
 					cond.implies?( other_condition )
 				}
 			end
 			
 			def implies?( other_condition )
 				super( other_condition ) or (
-					@compound_type == AND and @conditions.any? { |cond|
+					@compound_type == :and and @conditions.any? { |cond|
 						cond.implies? other_condition
 					}
 				) or (
-					@compound_type == OR and @conditions.all? { |cond|
+					@compound_type == :or and @conditions.all? { |cond|
 						cond.implies? other_condition
 					}
 				)
 			end
 
 			def to_sql
-				booleanString = @compound_type == AND ? 'and' : 'or'
+				booleanString = @compound_type == :and ? 'and' : 'or'
 				subSqlStrings = @conditions.collect { |cond| cond.to_sql }
 				"(#{ subSqlStrings.join(" #{ booleanString } ") })"
 			end
@@ -500,7 +507,10 @@ module Lafcadio
 							if ( classField = self.domain_class.field( fieldName ) )
 								ObjectFieldImpostor.new( self, classField )
 							else
-								super( methId, *args )
+								msg = "undefined method `" + fieldName +
+								      "' for #<DomainObjectImpostor::" +
+								      '#{ domain_class.name }' + ">"
+								raise( NoMethodError, msg )
 							end
 						end
 						
@@ -574,16 +584,16 @@ module Lafcadio
 		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
+					field_name, search_term + ',', domain_class, :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
+					field_name, ',' + search_term, domain_class, :pre_only
 				)
 				only_cond = Equals.new( field_name, search_term, domain_class )
-				super( begin_cond, mid_cond, end_cond, only_cond, OR )
+				super( begin_cond, mid_cond, end_cond, only_cond, :or )
 			end
 		end
 
@@ -593,7 +603,7 @@ module Lafcadio
 				unless args.size == 1
 					h = args.last
 					@order_by = h[:order_by]
-					@order_by_order = ( h[:order_by_order] or ASC )
+					@order_by_order = ( h[:order_by_order] or :asc )
 					@limit = h[:limit]
 				end
 			end
@@ -601,7 +611,7 @@ module Lafcadio
 			def execute
 				impostor = DomainObjectImpostor.impostor @domain_class
 				condition = @action.call( impostor ).to_condition
-				query = Query.new( @domain_class, condition )
+				query = Query.new( @domain_class, :condition => condition )
 				query.order_by = @order_by
 				query.order_by_order = @order_by_order
 				query.limit = @limit
@@ -610,12 +620,8 @@ module Lafcadio
 		end
 		
 		class Like < Condition #:nodoc:
-			PRE_AND_POST	= 1
-			PRE_ONLY			= 2
-			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
@@ -637,36 +643,37 @@ module Lafcadio
 			
 			def process_regexp( searchTerm )
 				if searchTerm.source =~ /^\^(.*)/
-					@matchType = Query::Like::POST_ONLY
+					@matchType = :post_only
 					$1
 				elsif searchTerm.source =~ /(.*)\$$/
-					@matchType = Query::Like::PRE_ONLY
+					@matchType = :pre_only
 					$1
 				else
-					@matchType = Query::Like::PRE_AND_POST
+					@matchType = :pre_and_post
 					searchTerm.source
 				end
 			end
 
 			def regexp
-				if @matchType == PRE_AND_POST
+				if @matchType == :pre_and_post
 					Regexp.new( @searchTerm, Regexp::IGNORECASE )
-				elsif @matchType == PRE_ONLY
+				elsif @matchType == :pre_only
 					Regexp.new( @searchTerm.to_s + "$", Regexp::IGNORECASE )
-				elsif @matchType == POST_ONLY
+				elsif @matchType == :post_only
 					Regexp.new( "^" + @searchTerm, Regexp::IGNORECASE )
 				end
 			end
 
 			def to_sql
-				withWildcards = @searchTerm
-				if @matchType == PRE_AND_POST
+				withWildcards = @searchTerm.clone
+				if @matchType == :pre_and_post
 					withWildcards = "%" + withWildcards + "%"
-				elsif @matchType == PRE_ONLY
+				elsif @matchType == :pre_only
 					withWildcards = "%" + withWildcards
-				elsif @matchType == POST_ONLY
+				elsif @matchType == :post_only
 					withWildcards += "%"
 				end
+				withWildcards.gsub!( /(\\?\.)/ ) { |m| m.size == 1 ? "_" : "." }
 				"#{ db_field_name } like '#{ withWildcards }'"
 			end
 		end
@@ -712,11 +719,7 @@ module Lafcadio
 
 		class ObjectFieldImpostor #:nodoc:
 			def self.comparators
-				{ 
-					'lt' => Compare::LESS_THAN, 'lte' => Compare::LESS_THAN_OR_EQUAL,
-					'gte' => Compare::GREATER_THAN_OR_EQUAL,
-					'gt' => Compare::GREATER_THAN
-				}
+				{ 'lt' => :lt, 'lte' => :lte, 'gte' => :gte, 'gt' => :gt }
 			end
 			
 			attr_reader :class_field

data/lib/lafcadio/query.rb~

@@ -32,7 +32,7 @@
 #   qry = Query.infer(
 #     SKU,
 #     :order_by => [ :standardPrice, :salePrice ],
-#     :order_by_order => Query::DESC
+#     :order_by_order => :desc
 #   ) { |s| s.sku.nil? }
 #   qry.to_sql # => "select * from skus where skus.sku is null order by
 #                    standardPrice, salePrice desc"
@@ -108,7 +108,7 @@
 #   }
 #   # => "select * from invoices where (hours = 40 or rate = 50 or client = 99)"
 # Note that both compound operators can be nested:
-#   invoices = object_store.getInvoices { |inv|
+#   invoices = Invoice.get { |inv|
 #     inv.hours.equals( 40 ) &
 #       ( inv.rate.equals( 50 ) | inv.client.equals( client99 ) )
 #   }
@@ -146,14 +146,13 @@ module Lafcadio
 		# 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.
+		# [:order_by_order] Possible values are :asc or :desc. Defaults to :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
+		#     :order_by_order => :desc
 		#   ) { |s| s.sku.nil? }
 		#   qry.to_sql # => "select * from skus where skus.sku is null order by
 		#                    standardPrice, salePrice desc"
@@ -163,29 +162,25 @@ module Lafcadio
 		end
 		
 		def self.Or( *conditions ) #:nodoc:
-			conditions << CompoundCondition::OR
+			conditions << :or
 			CompoundCondition.new( *conditions)
 		end
 
-		ASC		= 1
-		DESC 	= 2
-
-		attr_reader :domain_class, :condition, :limit
-		attr_accessor :order_by, :order_by_order
+		attr_reader :domain_class, :condition, :include, :limit, :order_by
+		attr_accessor :order_by_order
 
-		def initialize(domain_class, pk_id_or_condition = nil, opts = {} ) #:nodoc:
+		def initialize(domain_class, 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.is_a?( Condition )
-					@condition = pk_id_or_condition
-				else
-					@condition = Query::Equals.new(
-						:pk_id, pk_id_or_condition, domain_class
-					)
-				end
+			if ( cond = opts[:condition] )
+				@condition = cond
+			elsif ( pk_id = opts[:pk_id] )
+				@condition = Query::Equals.new( :pk_id, pk_id, domain_class )
+			end
+			if ( @include = opts[:include] )
+				@include = [ @include ] unless @include.is_a?( Array )
 			end
-			@order_by_order = ASC
+			@order_by_order = :asc
 		end
 		
 		# Returns a new query representing the condition of the current query and
@@ -195,7 +190,7 @@ module Lafcadio
 		#   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 and( &action ); compound( :and, action ); end
 		
 		def collect( coll ) #:nodoc:
 			if @opts[:group_functions] == [:count]
@@ -248,10 +243,21 @@ module Lafcadio
 			@limit = limit.is_a?( Fixnum ) ? 0..limit-1 : limit
 		end
 		
-		def limit_clause #:nodoc:
-			"limit #{ @limit.begin }, #{ @limit.end - @limit.begin + 1 }" if @limit
+		def limit_clause( db ) #:nodoc:
+			if @limit
+				case db
+				when 'Mysql'
+					"limit #{ @limit.begin }, #{ @limit.end - @limit.begin + 1 }"
+				when 'Pg'
+					limit_clause = "limit #{ @limit.end - @limit.begin + 1 }"
+					limit_clause += " offset #{ @limit.begin }" if @limit.begin > 0
+					limit_clause
+				end
+			end
 		end
 		
+		def one_pk_id?; @condition and @condition.one_pk_id?; 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' ) }
@@ -259,7 +265,11 @@ module Lafcadio
 		#   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 or( &action ); compound( :or, action ); end
+		
+		def order_by=( ob )
+			@order_by = ( ob.is_a?( Array ) ? ob.map { |f| f.to_s } : ob.to_s ) if ob
+		end
 		
 		def order_clause #:nodoc:
 			if @order_by
@@ -267,7 +277,7 @@ module Lafcadio
 					@domain_class.field( f_name.to_s ).db_field_name
 				}.join( ', ' )
 				clause = "order by #{ field_str } "
-				clause += @order_by_order == ASC ? 'asc' : 'desc'
+				clause += @order_by_order == :asc ? 'asc' : 'desc'
 				clause
 			end
 		end
@@ -282,7 +292,7 @@ module Lafcadio
 					dobj.send order_by
 				end
 			}
-			objects.reverse! if order_by_order == Query::DESC
+			objects.reverse! if order_by_order == :desc
 			objects = objects[limit] if limit
 			objects
 		end
@@ -301,32 +311,38 @@ module Lafcadio
 
 		def tables #:nodoc:
 			concrete_classes = domain_class.self_and_concrete_superclasses.reverse
-			table_names = concrete_classes.collect { |domain_class|
-				domain_class.table_name
-			}
-			table_names.join( ', ' )
+			sql = ''
+			dclass = nil
+			until concrete_classes.empty?
+				prev_dclass = dclass
+				dclass = concrete_classes.shift
+				if sql == ''
+					sql = dclass.table_name
+				else
+					sql += " inner join #{ dclass.table_name } on #{ sql_primary_key_field( prev_dclass ) } = #{ sql_primary_key_field( dclass ) }"
+				end
+			end
+			if @include
+				@include.each do |include_sym|
+					field = dclass.field include_sym
+					included_dclass = field.linked_type
+					sql += " left outer join #{ included_dclass.table_name } on #{ dclass.table_name }.#{ field.db_field_name } = #{ sql_primary_key_field( included_dclass ) }"
+				end
+			end
+			sql
 		end
 
-		def to_sql
+		def to_sql( db = 'Mysql' )
 			clauses = [ "select #{ fields }", "from #{ tables }" ]
 			clauses << where_clause if where_clause
 			clauses << order_clause if order_clause
-			clauses << limit_clause if limit_clause
+			clauses << limit_clause( db ) if limit_clause( db )
 			clauses.join ' '
 		end
 
 		def where_clause #:nodoc:
-			concrete_classes = domain_class.self_and_concrete_superclasses.reverse
 			where_clauses = []
-			concrete_classes.each_with_index { |domain_class, i|
-				if i < concrete_classes.size - 1
-					join_clause = sql_primary_key_field( domain_class ) + ' = ' +
-					              sql_primary_key_field( concrete_classes[i+1] )
-					where_clauses << join_clause
-				else
-					where_clauses << @condition.to_sql if @condition
-				end
-			}
+			where_clauses << @condition.to_sql if @condition
 			!where_clauses.empty? ? 'where ' + where_clauses.join( ' and ' ) : nil
 		end
 
@@ -376,32 +392,24 @@ module Lafcadio
 			end
 			
 			def not; Query::Not.new( self ); end
+			
+			def one_pk_id?; self.is_a?( Equals ) and primary_key_field?; end
 
 			def primary_key_field?; 'pk_id' == @fieldName; end
 			
-			def query; Query.new( @domain_class, self ); end
+			def query; Query.new( @domain_class, :condition => self ); end
 			
 			def to_condition; self; end
 		end
 
 		class Compare < Condition #:nodoc:
-			LESS_THAN							= 1
-			LESS_THAN_OR_EQUAL		= 2
-			GREATER_THAN_OR_EQUAL = 3
-			GREATER_THAN					= 4
-
-			@@comparators = {
-				LESS_THAN => '<',
-				LESS_THAN_OR_EQUAL => '<=',
-				GREATER_THAN_OR_EQUAL => '>=',
-				GREATER_THAN => '>'
-			}
+			@@comparators = { :lt => '<', :lte => '<=', :gte => '>=', :gt => '>' }
 
 			@@mockComparators = {
-				LESS_THAN => Proc.new { |d1, d2| d1 < d2 },
-				LESS_THAN_OR_EQUAL => Proc.new { |d1, d2| d1 <= d2 },
-				GREATER_THAN_OR_EQUAL => Proc.new { |d1, d2| d1 >= d2 },
-				GREATER_THAN => Proc.new { |d1, d2| d1 > d2 }
+				:lt => Proc.new { |d1, d2| d1 < d2 },
+				:lte => Proc.new { |d1, d2| d1 <= d2 },
+				:gte => Proc.new { |d1, d2| d1 >= d2 },
+				:gt => Proc.new { |d1, d2| d1 > d2 }
 			}
 
 			def initialize(fieldName, searchTerm, domain_class, compareType)
@@ -431,15 +439,12 @@ module Lafcadio
 		end
 
 		class CompoundCondition < Condition #:nodoc:
-			AND = 1
-			OR  = 2
-			
 			def initialize( *args )
-				if( [ AND, OR ].include?( args.last ) )
+				if( [ :and, :or ].include?( args.last ) )
 					@compound_type = args.last
 					args.pop
 				else
-					@compound_type = AND
+					@compound_type = :and
 				end
 				@conditions = args.map { |arg|
 					arg.respond_to?( :to_condition ) ? arg.to_condition : arg
@@ -448,7 +453,7 @@ module Lafcadio
 			end
 
 			def dobj_satisfies?(anObj)
-				if @compound_type == AND
+				if @compound_type == :and
 					@conditions.inject( true ) { |result, cond|
 						result && cond.dobj_satisfies?( anObj )
 					}
@@ -460,25 +465,25 @@ module Lafcadio
 			end
 
 			def implied_by?( other_condition )
-				@compound_type == OR && @conditions.any? { |cond|
+				@compound_type == :or && @conditions.any? { |cond|
 					cond.implies?( other_condition )
 				}
 			end
 			
 			def implies?( other_condition )
 				super( other_condition ) or (
-					@compound_type == AND and @conditions.any? { |cond|
+					@compound_type == :and and @conditions.any? { |cond|
 						cond.implies? other_condition
 					}
 				) or (
-					@compound_type == OR and @conditions.all? { |cond|
+					@compound_type == :or and @conditions.all? { |cond|
 						cond.implies? other_condition
 					}
 				)
 			end
 
 			def to_sql
-				booleanString = @compound_type == AND ? 'and' : 'or'
+				booleanString = @compound_type == :and ? 'and' : 'or'
 				subSqlStrings = @conditions.collect { |cond| cond.to_sql }
 				"(#{ subSqlStrings.join(" #{ booleanString } ") })"
 			end
@@ -500,7 +505,10 @@ module Lafcadio
 							if ( classField = self.domain_class.field( fieldName ) )
 								ObjectFieldImpostor.new( self, classField )
 							else
-								super( methId, *args )
+								msg = "undefined method `" + fieldName +
+								      "' for #<DomainObjectImpostor::" +
+								      '#{ domain_class.name }' + ">"
+								raise( NoMethodError, msg )
 							end
 						end
 						
@@ -574,16 +582,16 @@ module Lafcadio
 		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
+					field_name, search_term + ',', domain_class, :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
+					field_name, ',' + search_term, domain_class, :pre_only
 				)
 				only_cond = Equals.new( field_name, search_term, domain_class )
-				super( begin_cond, mid_cond, end_cond, only_cond, OR )
+				super( begin_cond, mid_cond, end_cond, only_cond, :or )
 			end
 		end
 
@@ -593,7 +601,7 @@ module Lafcadio
 				unless args.size == 1
 					h = args.last
 					@order_by = h[:order_by]
-					@order_by_order = ( h[:order_by_order] or ASC )
+					@order_by_order = ( h[:order_by_order] or :asc )
 					@limit = h[:limit]
 				end
 			end
@@ -601,7 +609,7 @@ module Lafcadio
 			def execute
 				impostor = DomainObjectImpostor.impostor @domain_class
 				condition = @action.call( impostor ).to_condition
-				query = Query.new( @domain_class, condition )
+				query = Query.new( @domain_class, :condition => condition )
 				query.order_by = @order_by
 				query.order_by_order = @order_by_order
 				query.limit = @limit
@@ -610,12 +618,8 @@ module Lafcadio
 		end
 		
 		class Like < Condition #:nodoc:
-			PRE_AND_POST	= 1
-			PRE_ONLY			= 2
-			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
@@ -637,36 +641,37 @@ module Lafcadio
 			
 			def process_regexp( searchTerm )
 				if searchTerm.source =~ /^\^(.*)/
-					@matchType = Query::Like::POST_ONLY
+					@matchType = :post_only
 					$1
 				elsif searchTerm.source =~ /(.*)\$$/
-					@matchType = Query::Like::PRE_ONLY
+					@matchType = :pre_only
 					$1
 				else
-					@matchType = Query::Like::PRE_AND_POST
+					@matchType = :pre_and_post
 					searchTerm.source
 				end
 			end
 
 			def regexp
-				if @matchType == PRE_AND_POST
+				if @matchType == :pre_and_post
 					Regexp.new( @searchTerm, Regexp::IGNORECASE )
-				elsif @matchType == PRE_ONLY
+				elsif @matchType == :pre_only
 					Regexp.new( @searchTerm.to_s + "$", Regexp::IGNORECASE )
-				elsif @matchType == POST_ONLY
+				elsif @matchType == :post_only
 					Regexp.new( "^" + @searchTerm, Regexp::IGNORECASE )
 				end
 			end
 
 			def to_sql
-				withWildcards = @searchTerm
-				if @matchType == PRE_AND_POST
+				withWildcards = @searchTerm.clone
+				if @matchType == :pre_and_post
 					withWildcards = "%" + withWildcards + "%"
-				elsif @matchType == PRE_ONLY
+				elsif @matchType == :pre_only
 					withWildcards = "%" + withWildcards
-				elsif @matchType == POST_ONLY
+				elsif @matchType == :post_only
 					withWildcards += "%"
 				end
+				withWildcards.gsub!( /(\\?\.)/ ) { |m| m.size == 1 ? "_" : "." }
 				"#{ db_field_name } like '#{ withWildcards }'"
 			end
 		end
@@ -712,11 +717,7 @@ module Lafcadio
 
 		class ObjectFieldImpostor #:nodoc:
 			def self.comparators
-				{ 
-					'lt' => Compare::LESS_THAN, 'lte' => Compare::LESS_THAN_OR_EQUAL,
-					'gte' => Compare::GREATER_THAN_OR_EQUAL,
-					'gt' => Compare::GREATER_THAN
-				}
+				{ 'lt' => :lt, 'lte' => :lte, 'gte' => :gte, 'gt' => :gt }
 			end
 			
 			attr_reader :class_field