Ticket #16778: postgis-adapter.patch

django/contrib/gis/db/backends/postgis/adapter.py

@@ -3 +3 @@
 """
 
 from psycopg2 import Binary
-from psycopg2.extensions import ISQLQuote
+from psycopg2.extensions import ISQLQuote, adapt
 
 class PostGISAdapter(object):
     def __init__(self, geom):
@@ -12 +12 @@
         # the adaptor) and the SRID from the geometry.
         self.ewkb = str(geom.ewkb)
         self.srid = geom.srid
+        self._adapter = Binary(self.ewkb)
 
     def __conform__(self, proto):
         # Does the given protocol conform to what Psycopg2 expects?
@@ -26 +27 @@
     def __str__(self):
         return self.getquoted()
 
+    def prepare(self, conn):
+        # Pass the connection to the adapter: this allows escaping the binary
+        # in the style required by the server's standard_conforming_string setting.
+        self._adapter.prepare(conn)
+
     def getquoted(self):
         "Returns a properly quoted string for use in PostgreSQL/PostGIS."
-        # Want to use WKB, so wrap with psycopg2 Binary() to quote properly.
-        return 'ST_GeomFromEWKB(E%s)' % Binary(self.ewkb)
+        # psycopg will figure out whether to use E'\\000' or '\000'
+        return 'ST_GeomFromEWKB(%s)' % adapt(self._adapter)
 
     def prepare_database_save(self, unused):
         return self