Permalink
Browse files

Added a regression test for r14781. Also fixed a bug where connection…

….vendor was effectively always 'unknown', causing all vendor-specific tests to be skipped.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14783 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent cbf9d6e commit 5475da1c32efacab3d740bc599f19f2f33be6d2c @ikelly ikelly committed Dec 3, 2010
Showing with 10 additions and 1 deletion.
  1. +1 −1 django/db/backends/__init__.py
  2. +9 −0 tests/regressiontests/backends/tests.py
@@ -11,6 +11,7 @@ class BaseDatabaseWrapper(local):
Represents a database connection.
"""
ops = None
+ vendor = 'unknown'
def __init__(self, settings_dict, alias=DEFAULT_DB_ALIAS):
# `settings_dict` should be a dictionary containing keys such as
@@ -20,7 +21,6 @@ def __init__(self, settings_dict, alias=DEFAULT_DB_ALIAS):
self.queries = []
self.settings_dict = settings_dict
self.alias = alias
- self.vendor = 'unknown'
self.use_debug_cursor = None
def __eq__(self, other):
@@ -47,6 +47,15 @@ def test_long_string(self):
self.assertEqual(long_str, row[0].read())
c.execute('DROP TABLE ltext')
+ @unittest.skipUnless(connection.vendor == 'oracle',
+ "No need to check Oracle connection semantics")
+ def test_client_encoding(self):
+ # If the backend is Oracle, test that the client encoding is set
+ # correctly. This was broken under Cygwin prior to r14781.
+ c = connection.cursor() # Ensure the connection is initialized.
+ self.assertEqual(connection.connection.encoding, "UTF-8")
+ self.assertEqual(connection.connection.nencoding, "UTF-8")
+
class DateQuotingTest(TestCase):
def test_django_date_trunc(self):

0 comments on commit 5475da1

Please sign in to comment.