summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2016-05-04 02:30:48 +0300
committerTim Graham <timograham@gmail.com>2016-05-03 19:31:07 -0400
commitfef3f50e319bd691c8fd3313d982b6c07d66445c (patch)
tree3a8ac7f06b192f4df52628d1fca371e92a1f7e87 /django
parent3c6b9f0bbd5e37099c4751cdd2a08db508d66e54 (diff)
[1.9.x] Normalized "an SQL" spelling.
Backport of 575a9a791e62de7550761970dc6797271d956c57 from master
Diffstat (limited to 'django')
-rw-r--r--django/db/backends/base/operations.py4
-rw-r--r--django/db/models/expressions.py2
-rw-r--r--django/db/models/fields/related_descriptors.py4
3 files changed, 5 insertions, 5 deletions
diff --git a/django/db/backends/base/operations.py b/django/db/backends/base/operations.py
index 5d3cddff9d..643c922748 100644
--- a/django/db/backends/base/operations.py
+++ b/django/db/backends/base/operations.py
@@ -262,7 +262,7 @@ class BaseDatabaseOperations(object):
def prepare_sql_script(self, sql):
"""
- Takes a SQL script that may contain multiple lines and returns a list
+ Takes an SQL script that may contain multiple lines and returns a list
of statements to feed to successive cursor.execute() calls.
Since few databases are able to process raw SQL scripts in a single
@@ -374,7 +374,7 @@ class BaseDatabaseOperations(object):
to tables with foreign keys pointing the tables being truncated.
PostgreSQL requires a cascade even if these tables are empty.
"""
- raise NotImplementedError('subclasses of BaseDatabaseOperations must provide a sql_flush() method')
+ raise NotImplementedError('subclasses of BaseDatabaseOperations must provide an sql_flush() method')
def sequence_reset_by_name_sql(self, style, sequences):
"""
diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py
index b5586686a2..f2663752e0 100644
--- a/django/db/models/expressions.py
+++ b/django/db/models/expressions.py
@@ -477,7 +477,7 @@ class F(Combinable):
class Func(Expression):
"""
- A SQL function call.
+ An SQL function call.
"""
function = None
template = '%(function)s(%(expressions)s)'
diff --git a/django/db/models/fields/related_descriptors.py b/django/db/models/fields/related_descriptors.py
index abfa7283ae..5bfac8fc69 100644
--- a/django/db/models/fields/related_descriptors.py
+++ b/django/db/models/fields/related_descriptors.py
@@ -243,7 +243,7 @@ class ForwardManyToOneDescriptor(object):
for lh_field, rh_field in self.field.related_fields:
setattr(instance, lh_field.attname, getattr(value, rh_field.attname))
- # Set the related instance cache used by __get__ to avoid a SQL query
+ # Set the related instance cache used by __get__ to avoid an SQL query
# when accessing the attribute we just set.
setattr(instance, self.cache_name, value)
@@ -416,7 +416,7 @@ class ReverseOneToOneDescriptor(object):
for index, field in enumerate(self.related.field.local_related_fields):
setattr(value, field.attname, related_pk[index])
- # Set the related instance cache used by __get__ to avoid a SQL query
+ # Set the related instance cache used by __get__ to avoid an SQL query
# when accessing the attribute we just set.
setattr(instance, self.cache_name, value)