lafcadio 0.7.0 → 0.7.1

data/lib/lafcadio/objectStore.rb~

@@ -573,11 +573,23 @@ module Lafcadio
 
 			def get_by_query( query )
 				unless @collections_by_query[query]
-					newObjects = @dbBridge.get_collection_by_query(query)
-					newObjects.each { |dbObj| save dbObj }
-					@collections_by_query[query] = newObjects.collect { |dobj|
-						dobj.pk_id
-					}
+					superset_query, pk_ids =
+						@collections_by_query.find { |other_query, pk_ids|
+							query.implies?( other_query )
+						}
+					if pk_ids
+						@collections_by_query[query] = ( pk_ids.collect { |pk_id|
+							get( query.domain_class, pk_id )
+						} ).select { |dobj| query.object_meets( dobj ) }.collect { |dobj|
+							dobj.pk_id
+						}
+					elsif @collections_by_query.values
+						newObjects = @dbBridge.get_collection_by_query(query)
+						newObjects.each { |dbObj| save dbObj }
+						@collections_by_query[query] = newObjects.collect { |dobj|
+							dobj.pk_id
+						}
+					end
 				end
 				collection = []
 				@collections_by_query[query].each { |pk_id|

data/lib/lafcadio/query.rb

@@ -147,7 +147,8 @@ module Lafcadio
 		
 		def order_clause
 			if @order_by
-				clause = "order by #{ @order_by } "
+				order_by_field = @domain_class.get_field( @order_by )
+				clause = "order by #{ order_by_field.db_field_name } "
 				clause += @order_by_order == ASC ? 'asc' : 'desc'
 				clause
 			end
@@ -234,21 +235,7 @@ module Lafcadio
 				other_cond.is_a?( Condition ) and other_cond.to_sql == to_sql
 			end
 			
-			def get_field
-				a_domain_class = @domain_class
-				field = nil
-				while ( a_domain_class < DomainObject ) && !field
-					field = a_domain_class.get_class_field( @fieldName )
-					a_domain_class = a_domain_class.superclass
-				end
-				if field
-					field
-				else
-					errStr = "Couldn't find field \"#{ @fieldName }\" in " +
-									 "#{ @domain_class } domain class"
-					raise( MissingError, errStr, caller )
-				end
-			end
+			def get_field; @domain_class.get_field( @fieldName ); end
 			
 			def query; Query.new( @domain_class, self ); end
 			

data/lib/lafcadio/query.rb~

@@ -140,6 +140,8 @@ module Lafcadio
 		def limit_clause
 			"limit #{ @limit.begin }, #{ @limit.end - @limit.begin + 1 }" if @limit
 		end
+		
+		def object_meets( dobj ); @condition.object_meets( dobj ); end
 
 		def or( &action ); compound( CompoundCondition::OR, action ); end
 		
@@ -150,6 +152,18 @@ module Lafcadio
 				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
+				else
+					self.condition and self.condition.implies?( other_query.condition )
+				end
+			end
+		end
 
 		def sql_primary_key_field(domain_class)
 			"#{ domain_class.table_name }.#{ domain_class.sql_primary_key_name }"
@@ -207,8 +221,19 @@ module Lafcadio
 				end
 			end
 			
+			def implies?( other_condition )
+				self.eql?( other_condition ) or (
+					other_condition.respond_to?( :implied_by? ) and 
+							other_condition.implied_by?( self )
+				)
+			end
+			
 			def db_field_name; get_field.db_table_and_field_name; end
 			
+			def eql?( other_cond )
+				other_cond.is_a?( Condition ) and other_cond.to_sql == to_sql
+			end
+			
 			def get_field
 				a_domain_class = @domain_class
 				field = nil
@@ -285,20 +310,38 @@ module Lafcadio
 		class CompoundCondition < Condition #:nodoc:
 			AND = 1
 			OR  = 2
-		
+			
 			def initialize(*conditions)
 				if( [ AND, OR ].index(conditions.last) )
-					@compoundType = conditions.last
+					@compound_type = conditions.last
 					conditions.pop
 				else
-					@compoundType = AND
+					@compound_type = AND
 				end
 				@conditions = conditions
 				@domain_class = conditions[0].domain_class
 			end
+			
+			def implied_by?( other_condition )
+				@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|
+						cond.implies?( other_condition )
+					}
+				) or (
+					@compound_type == OR and @conditions.all? { |cond|
+						cond.implies?( other_condition )
+					}
+				)
+			end
 
 			def object_meets(anObj)
-				if @compoundType == AND
+				if @compound_type == AND
 					@conditions.inject( true ) { |result, cond|
 						result && cond.object_meets( anObj )
 					}
@@ -310,7 +353,7 @@ module Lafcadio
 			end
 
 			def to_sql
-				booleanString = @compoundType == AND ? 'and' : 'or'
+				booleanString = @compound_type == AND ? 'and' : 'or'
 				subSqlStrings = @conditions.collect { |cond| cond.to_sql }
 				"(#{ subSqlStrings.join(" #{ booleanString } ") })"
 			end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.1
 specification_version: 1
 name: lafcadio
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
-date: 2005-01-20
+  version: 0.7.1
+date: 2005-01-27
 summary: Lafcadio is an object-relational mapping layer
 require_paths: 
   - lib
@@ -40,7 +40,9 @@ files:
   - lib/lafcadio/mock.rb
   - lib/lafcadio/mock.rb~
   - lib/lafcadio/objectField.rb
+  - lib/lafcadio/objectField.rb~
   - lib/lafcadio/objectStore.rb
+  - lib/lafcadio/objectStore.rb.~1.64.~
   - lib/lafcadio/objectStore.rb~
   - lib/lafcadio/query.rb
   - lib/lafcadio/query.rb~