Commit d4ea4eea authored by Collin Anderson's avatar Collin Anderson Committed by Tim Graham
Browse files

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

parent c7087bc7

django/db/backends/mysql/compiler.py

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ from django.db.models.sql import compiler 




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

        sql, params = self.as_sql()

        return '(%s) IN (%s)' % (', '.join('%s.%s' % (qn(alias), qn2(column)) for column in columns), sql), params

django/db/models/expressions.py

+1 −1
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ class Ref(ExpressionNode): 
        return self



    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):

        return [(None, self.refs)]