From dd9b3312d0a931daf21c10279cef204f04648ef9 Mon Sep 17 00:00:00 2001
From: Shai Berger <shai@platonix.com>
Date: Mon, 14 Jul 2014 19:23:57 +0300
Subject: [PATCH] Fixed name of database connection feature

---
 django/db/backends/__init__.py            | 5 ++---
 django/db/backends/oracle/base.py         | 2 +-
 django/db/models/base.py                  | 2 +-
 tests/invalid_models_tests/test_models.py | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/django/db/backends/__init__.py b/django/db/backends/__init__.py
index a7252cf57d..d3651cda21 100644
--- a/django/db/backends/__init__.py
+++ b/django/db/backends/__init__.py
@@ -520,9 +520,8 @@ class BaseDatabaseFeatures(object):
     # at the end of each save operation?
     supports_forward_references = True
 
-    # Does the backend uses proper method like 'truncate_name'
-    # to auto-truncate column names?
-    truncates_name = False
+    # Does the backend truncate names properly when they are too long?
+    truncates_names = False
 
     # Is there a REAL datatype in addition to floats/doubles?
     has_real_datatype = False
diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py
index 3f596ef425..de28ec21b5 100644
--- a/django/db/backends/oracle/base.py
+++ b/django/db/backends/oracle/base.py
@@ -107,7 +107,7 @@ class DatabaseFeatures(BaseDatabaseFeatures):
     supports_bitwise_or = False
     can_defer_constraint_checks = True
     supports_partially_nullable_unique_constraints = False
-    truncates_name = True
+    truncates_names = True
     has_bulk_insert = True
     supports_tablespaces = True
     supports_sequence_reset = False
diff --git a/django/db/models/base.py b/django/db/models/base.py
index ee7f4fe9c9..0335c48e3a 100644
--- a/django/db/models/base.py
+++ b/django/db/models/base.py
@@ -1479,7 +1479,7 @@ class Model(six.with_metaclass(ModelBase)):
                 continue
             connection = connections[db]
             max_name_length = connection.ops.max_name_length()
-            if max_name_length is None or connection.features.truncates_name:
+            if max_name_length is None or connection.features.truncates_names:
                 continue
             else:
                 if allowed_len is None:
diff --git a/tests/invalid_models_tests/test_models.py b/tests/invalid_models_tests/test_models.py
index 3bfccdb2a9..3c874ad11b 100644
--- a/tests/invalid_models_tests/test_models.py
+++ b/tests/invalid_models_tests/test_models.py
@@ -18,7 +18,7 @@ def get_max_column_name_length():
     for db in settings.DATABASES.keys():
         connection = connections[db]
         max_name_length = connection.ops.max_name_length()
-        if max_name_length is None or connection.features.truncates_name:
+        if max_name_length is None or connection.features.truncates_names:
             continue
         else:
             if allowed_len is None: