p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #23889 -- Added more usage of quote_name_unless_alias() to avoid deprecation warnings.

This commit is contained in:
Collin Anderson 2014-11-21 11:38:02 -05:00 committed by Tim Graham
parent c7087bc777
commit d4ea4eea79
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/db/backends/mysql/compiler.py
View File

@ -2,7 +2,8 @@ from django.db.models.sql import compiler
class SQLCompiler(compiler.SQLCompiler): class SQLCompiler(compiler.SQLCompiler):
def as_subquery_condition(self, alias, columns, qn): def as_subquery_condition(self, alias, columns, compiler):
qn = compiler.quote_name_unless_alias
qn2 = self.connection.ops.quote_name qn2 = self.connection.ops.quote_name
sql, params = self.as_sql() sql, params = self.as_sql()
return '(%s) IN (%s)' % (', '.join('%s.%s' % (qn(alias), qn2(column)) for column in columns), sql), params return '(%s) IN (%s)' % (', '.join('%s.%s' % (qn(alias), qn2(column)) for column in columns), sql), params

2
django/db/models/expressions.py
View File

@ -521,7 +521,7 @@ class Ref(ExpressionNode):
return self return self
def as_sql(self, compiler, connection): def as_sql(self, compiler, connection):
return "%s" % compiler(self.refs), [] return "%s" % compiler.quote_name_unless_alias(self.refs), []
def get_group_by_cols(self): def get_group_by_cols(self):
return [(None, self.refs)] return [(None, self.refs)]