diff options
Diffstat (limited to 'django/db/models/sql')
| -rw-r--r-- | django/db/models/sql/compiler.py | 2 | ||||
| -rw-r--r-- | django/db/models/sql/datastructures.py | 2 | ||||
| -rw-r--r-- | django/db/models/sql/expressions.py | 4 | ||||
| -rw-r--r-- | django/db/models/sql/query.py | 8 | ||||
| -rw-r--r-- | django/db/models/sql/where.py | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py index 9351169357..09b1f7d4d8 100644 --- a/django/db/models/sql/compiler.py +++ b/django/db/models/sql/compiler.py @@ -1132,7 +1132,7 @@ class SQLDateTimeCompiler(SQLCompiler): datetime = self.resolve_columns(row, fields)[offset] elif needs_string_cast: datetime = typecast_timestamp(str(datetime)) - # Datetimes are artifically returned in UTC on databases that + # Datetimes are artificially returned in UTC on databases that # don't support time zone. Restore the zone used in the query. if settings.USE_TZ: if datetime is None: diff --git a/django/db/models/sql/datastructures.py b/django/db/models/sql/datastructures.py index 634edf2477..f47e25208c 100644 --- a/django/db/models/sql/datastructures.py +++ b/django/db/models/sql/datastructures.py @@ -1,5 +1,5 @@ """ -Useful auxilliary data structures for query construction. Not useful outside +Useful auxiliary data structures for query construction. Not useful outside the SQL domain. """ diff --git a/django/db/models/sql/expressions.py b/django/db/models/sql/expressions.py index e31eaa8a2f..70646cfc61 100644 --- a/django/db/models/sql/expressions.py +++ b/django/db/models/sql/expressions.py @@ -40,7 +40,7 @@ class SQLEvaluator(object): return self.expression.evaluate(self, qn, connection) ##################################################### - # Vistor methods for initial expression preparation # + # Visitor methods for initial expression preparation # ##################################################### def prepare_node(self, node, query, allow_joins): @@ -72,7 +72,7 @@ class SQLEvaluator(object): [f.name for f in self.opts.fields])) ################################################## - # Vistor methods for final expression evaluation # + # Visitor methods for final expression evaluation # ################################################## def evaluate_node(self, node, qn, connection): diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 28003611ff..92bfdb1881 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -199,7 +199,7 @@ class Query(object): def sql_with_params(self): """ Returns the query as an SQL string and the parameters that will be - subsituted into the query. + substituted into the query. """ return self.get_compiler(DEFAULT_DB_ALIAS).as_sql() @@ -675,7 +675,7 @@ class Query(object): alias = '%s%d' % (self.alias_prefix, len(self.alias_map) + 1) current.append(alias) else: - # The first occurence of a table uses the table name directly. + # The first occurrence of a table uses the table name directly. alias = table_name self.table_map[alias] = [alias] self.alias_refcount[alias] = 1 @@ -1242,7 +1242,7 @@ class Query(object): """ having_parts = [] for c in q_object.children[:]: - # When constucting the having nodes we need to take care to + # When constructing the having nodes we need to take care to # preserve the negation status from the upper parts of the tree if isinstance(c, Node): # For each negated child, flip the in_negated flag. @@ -1802,7 +1802,7 @@ class Query(object): """ If any fields are marked to be deferred, returns a dictionary mapping models to a set of names in those fields that will be loaded. If a - model is not in the returned dictionary, none of it's fields are + model is not in the returned dictionary, none of its fields are deferred. If no fields are marked for deferral, returns an empty dictionary. diff --git a/django/db/models/sql/where.py b/django/db/models/sql/where.py index 0fedb771b7..f65e593a3a 100644 --- a/django/db/models/sql/where.py +++ b/django/db/models/sql/where.py @@ -66,7 +66,7 @@ class WhereNode(tree.Node): # emptiness and transform any non-empty values correctly. value = list(value) - # The "value_annotation" parameter is used to pass auxilliary information + # The "value_annotation" parameter is used to pass auxiliary information # about the value(s) to the query construction. Specifically, datetime # and empty values need special handling. Other types could be used # here in the future (using Python types is suggested for consistency). |