Skip to content

Commit

Permalink
[1.5.x] Fixed Oracle failure for "%" in table name
Browse files Browse the repository at this point in the history
Backpatch of 2249bd2
  • Loading branch information
akaariai committed Oct 27, 2012
1 parent c902623 commit 18357bf
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 4 deletions.
4 changes: 4 additions & 0 deletions django/db/backends/oracle/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,10 @@ def quote_name(self, name):
if not name.startswith('"') and not name.endswith('"'):
name = '"%s"' % util.truncate_name(name.upper(),
self.max_name_length())
# Oracle puts the query text into a (query % args) construct, so % signs
# in names need to be escaped. The '%%' will be collapsed back to '%' at
# that stage so we aren't really making the name longer here.
name = name.replace('%','%%')
return name.upper()

def random_function_sql(self):
Expand Down
8 changes: 8 additions & 0 deletions tests/regressiontests/backends/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@

class OracleChecks(unittest.TestCase):

@unittest.skipUnless(connection.vendor == 'oracle',
"No need to check Oracle quote_name semantics")
def test_quote_name(self):
# Check that '%' chars are escaped for query execution.
name = '"SOME%NAME"'
quoted_name = connection.ops.quote_name(name)
self.assertEquals(quoted_name % (), name)

@unittest.skipUnless(connection.vendor == 'oracle',
"No need to check Oracle cursor semantics")
def test_dbms_session(self):
Expand Down
11 changes: 7 additions & 4 deletions tests/regressiontests/inspectdb/tests.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from __future__ import unicode_literals

from django.core.management import call_command
from django.db import connection
from django.test import TestCase, skipUnlessDBFeature
from django.utils.six import StringIO

Expand Down Expand Up @@ -60,14 +61,16 @@ def test_digits_column_name_introspection(self):
self.assertIn("number_45extra = models.CharField", output)

def test_special_column_name_introspection(self):
"""Introspection of column names containing special characters,
unsuitable for Python identifiers
"""
Introspection of column names containing special characters,
unsuitable for Python identifiers
"""
out = StringIO()
call_command('inspectdb', stdout=out)
output = out.getvalue()
base_name = 'Field' if connection.vendor != 'oracle' else 'field'
self.assertIn("field = models.IntegerField()", output)
self.assertIn("field_field = models.IntegerField(db_column='Field_')", output)
self.assertIn("field_field_0 = models.IntegerField(db_column='Field__')", output)
self.assertIn("field_field = models.IntegerField(db_column='%s_')" % base_name, output)
self.assertIn("field_field_0 = models.IntegerField(db_column='%s__')" % base_name, output)
self.assertIn("field_field_1 = models.IntegerField(db_column='__field')", output)
self.assertIn("prc_x = models.IntegerField(db_column='prc(%) x')", output)

0 comments on commit 18357bf

Please sign in to comment.