Changeset 2194
- Timestamp:
- 01/30/06 18:02:11 (3 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/branches/magic-removal/django/db/models/manager.py
r2193 r2194 36 36 Manager.creation_counter += 1 37 37 self.model = None 38 self._use_cache = False 38 39 39 40 def _prepare(self): … … 54 55 return self.get_object(*args, **kwargs) 55 56 57 def all(self): 58 # Returns a caching QuerySet. 59 return QuerySet(self.model) 60 56 61 def add(self, **kwargs): 57 62 kwargs.update(self.core_values) django/branches/magic-removal/django/db/models/query.py
r2191 r2194 64 64 core_filters = {} 65 65 66 # Subclasses need to provide 'self.model' attribute for this class 67 # to be able to function. 68 model = None 69 70 def __init__(self): 66 def __init__(self, model=None): 67 self.model = model 71 68 self._filters = Q(**(self.core_filters)) 72 69 self._order_by = None # Ordering, e.g. ('date', '-name'). If None, use model's ordering. … … 80 77 self._limit = None # LIMIT clause 81 78 self._result_cache = None 79 self._use_cache = True 82 80 83 81 ######################## 84 82 # PYTHON MAGIC METHODS # 85 83 ######################## 84 85 def __repr__(self): 86 return repr(self._get_data()) 86 87 87 88 def __len__(self): … … 314 315 315 316 def _get_data(self): 316 return list(self.iterator()) 317 # if self._result_cache is None: 318 # self._result_cache = list(self.iterator()) 319 # return self._result_cache 317 if self._use_cache: 318 if self._result_cache is None: 319 self._result_cache = list(self.iterator()) 320 return self._result_cache 321 else: 322 return list(self.iterator()) 320 323 321 324 def _get_sql_clause(self, allow_joins):
