Commit 204e00c0 authored by Claude Paroz's avatar Claude Paroz
Browse files

Fixed #26140 -- Suppressed MySQL warning when inserting binary content 

Thanks Tim Graham for the review.
parent cacc7e85

django/db/backends/base/operations.py

+7 −0
Original line number Diff line number Diff line
@@ -578,6 +578,13 @@ class BaseDatabaseOperations(object): 
    def combine_duration_expression(self, connector, sub_expressions):

        return self.combine_expression(connector, sub_expressions)



    def binary_placeholder_sql(self, value):

        """

        Some backends require special syntax to insert binary content (MySQL

        for example uses '_binary %s').

        """

        return '%s'



    def modify_insert_params(self, placeholder, params):

        """Allow modification of insert parameters. Needed for Oracle Spatial

        backend due to #10888.

django/db/backends/mysql/operations.py

+3 −0
Original line number Diff line number Diff line
@@ -212,6 +212,9 @@ class DatabaseOperations(BaseDatabaseOperations): 
            value = uuid.UUID(value)

        return value



    def binary_placeholder_sql(self, value):

        return '_binary %s' if value is not None else '%s'



    def subtract_temporals(self, internal_type, lhs, rhs):

        lhs_sql, lhs_params = lhs

        rhs_sql, rhs_params = rhs

django/db/models/fields/__init__.py

+3 −0
Original line number Diff line number Diff line
@@ -2371,6 +2371,9 @@ class BinaryField(Field): 
    def get_internal_type(self):

        return "BinaryField"



    def get_placeholder(self, value, compiler, connection):

        return connection.ops.binary_placeholder_sql(value)



    def get_default(self):

        if self.has_default() and not callable(self.default):

            return self.default