lib/model_set/query.rb in model_set-1.0.0 vs lib/model_set/query.rb in model_set-1.1.0

@@ -35,31 +35,32 @@
       @limit  = limit  ? limit.to_i  : nil
       @offset = offset ? offset.to_i : nil
       @page   = nil if offset
       clear_limited_cache!
     end
-    
+
     def unlimited!
       @limit  = nil
       @offset = nil
       @page   = nil
       clear_limited_cache!
     end
-    
+
     def clear_limited_cache!
       @ids  = nil
       @size = nil
       self
     end
-     
+
     def clear_cache!
       @count = nil
       clear_limited_cache!
     end
 
-    attr_reader :set_class
-    delegate :id_field, :to => :set_class
+    attr_reader :set_class, :limit, :sort_order
+    delegate :id_field,             :to => :set_class
+    delegate :id_field_with_prefix, :to => :set_class
 
     def model_class
       set_class.query_model_class
     end
 
@@ -69,16 +70,10 @@
 
     def table_name
       model_class.table_name
     end
 
-    def id_field_with_prefix
-      "#{table_name}.#{id_field}"
-    end
-
-    attr_reader :limit, :sort_order
-
     def offset
       if limit
         @offset ||= @page ? (@page - 1) * limit : 0
       end
     end
@@ -95,11 +90,11 @@
 
     def before_query(*args)
       proc = self.class.before_query
       proc.bind(self).call(*args) if proc
     end
-    
+
     def self.before_query(&block)
       if block
         @before_query = block
       else
         @before_query
@@ -130,7 +125,16 @@
       else
         @after_query
       end
     end
 
+    def condition_ops
+      { :not => 'NOT ',
+        :and => ' AND ',
+        :or  => ' OR ' }
+    end
+
+    def transform_condition(condition)
+      [condition]
+    end
   end
 end