Ticket #25705: ticket25705.patch

django/db/backends/base/operations.py

@@ -313 +313 @@
         """
         raise NotImplementedError('subclasses of BaseDatabaseOperations may require a quote_name() method')
 
+    def adapt_param(self, param):
+        """
+        Returns adapted version of parameter.
+        """
+        return param
+
     def random_function_sql(self):
         """
         Returns an SQL expression that returns a random value.

django/db/backends/postgresql/operations.py

@@ -1 +1 @@
 from __future__ import unicode_literals
 
+from psycopg2.extensions import adapt
 from psycopg2.extras import Inet
 
 from django.conf import settings
@@ -93 +94 @@
         if name.startswith('"') and name.endswith('"'):
             return name  # Quoting once is enough.
         return '"%s"' % name
+
+    def adapt_param(self, param):
+        return adapt(param).getquoted()
 
     def set_time_zone_sql(self):
         return "SET TIME ZONE %s"

django/db/models/sql/compiler.py

@@ -476 +476 @@
             raise EmptyResultSet
         return nested_sql
 
+    def as_quoted_sql(self):
+        """
+        Returns SQL for this query with adapted parameters to use in string representation.
+        """
+        sql, params = self.as_sql()
+        return sql, tuple(self.connection.ops.adapt_param(param) for param in params)
+
     def get_default_columns(self, start_alias=None, opts=None, from_parent=None):
         """
         Computes the default columns for selecting every field in the base

django/db/models/sql/query.py

@@ -216 +216 @@
         """
         Returns the query as a string of SQL with the parameter values
         substituted in (use sql_with_params() to see the unsubstituted string).
-
-        Parameter values won't necessarily be quoted correctly, since that is
-        done by the database interface at execution time.
         """
         sql, params = self.sql_with_params()
         return sql % params
@@ -228 +225 @@
         Returns the query as an SQL string and the parameters that will be
         substituted into the query.
         """
-        return self.get_compiler(DEFAULT_DB_ALIAS).as_sql()
+        return self.get_compiler(DEFAULT_DB_ALIAS).as_quoted_sql()
 
     def __deepcopy__(self, memo):
         result = self.clone(memo=memo)

tests/postgres_tests/test_ranges.py

@@ -630 +630 @@
             '<input type="text" name="datetimerange_0" value="2006-01-10 07:30:00" />'
             '<input type="text" name="datetimerange_1" value="2006-02-12 09:50:00" />'
         )
+
+
+class TestRepresentation(PostgreSQLTestCase):
+
+    def test_numeric_range(self):
+        self.assertEqual(
+            str(RangesModel.objects.filter(ints__overlap=NumericRange(1, 5)).query),
+            'SELECT "postgres_tests_rangesmodel"."id", "postgres_tests_rangesmodel"."ints", '
+            '"postgres_tests_rangesmodel"."bigints", "postgres_tests_rangesmodel"."floats", '
+            '"postgres_tests_rangesmodel"."timestamps", "postgres_tests_rangesmodel"."dates" '
+            'FROM "postgres_tests_rangesmodel" WHERE "postgres_tests_rangesmodel"."ints" && \'[1,5)\''
+        )