p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

magic-removal: Removed 'where_constraints' parameter to 'class Meta' 

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2115 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-01-23 04:36:08 +00:00
parent c8c7f07190
commit ff474dffab
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/db/models/manager.py
View File

@ -84,9 +84,6 @@ class Manager(object):
where.extend(where2) where.extend(where2)
params.extend(params2) params.extend(params2)
# Add any additional constraints from the "where_constraints" parameter.
where.extend(opts.where_constraints)
# Add additional tables and WHERE clauses based on select_related. # Add additional tables and WHERE clauses based on select_related.
if kwargs.get('select_related') is True: if kwargs.get('select_related') is True:
fill_table_cache(opts, select, tables, where, opts.db_table, [opts.db_table]) fill_table_cache(opts, select, tables, where, opts.db_table, [opts.db_table])

4
django/db/models/options.py
View File

@ -10,8 +10,7 @@ import re
get_verbose_name = lambda class_name: re.sub('([A-Z])', ' \\1', class_name).lower().strip() get_verbose_name = lambda class_name: re.sub('([A-Z])', ' \\1', class_name).lower().strip()
DEFAULT_NAMES = ('verbose_name', 'verbose_name_plural', 'db_table', 'ordering', DEFAULT_NAMES = ('verbose_name', 'verbose_name_plural', 'db_table', 'ordering',
'unique_together', 'where_constraints', 'permissions', 'unique_together', 'permissions', 'get_latest_by', 'order_with_respect_to')
'get_latest_by', 'order_with_respect_to')
class Options: class Options:
def __init__(self, meta): def __init__(self, meta):
@ -21,7 +20,6 @@ class Options:
self.db_table = '' self.db_table = ''
self.ordering = [] self.ordering = []
self.unique_together = [] self.unique_together = []
self.where_constraints = []
self.permissions = [] self.permissions = []
self.object_name, self.app_label = None, None self.object_name, self.app_label = None, None
self.get_latest_by = None self.get_latest_by = None