summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/sql')
-rw-r--r--lib/sqlalchemy/sql/compiler.py1
-rw-r--r--lib/sqlalchemy/sql/sqltypes.py5
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index 4448f7c7b..673e5f89b 100644
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -961,7 +961,6 @@ class SQLCompiler(Compiled):
literal_binds=False,
skip_bind_expression=False,
**kwargs):
-
if not skip_bind_expression and bindparam.type._has_bind_expression:
bind_expression = bindparam.type.bind_expression(bindparam)
return self.process(bind_expression,
diff --git a/lib/sqlalchemy/sql/sqltypes.py b/lib/sqlalchemy/sql/sqltypes.py
index d779caaea..61d906e1c 100644
--- a/lib/sqlalchemy/sql/sqltypes.py
+++ b/lib/sqlalchemy/sql/sqltypes.py
@@ -790,7 +790,7 @@ class _Binary(TypeEngine):
def literal_processor(self, dialect):
def process(value):
- value = value.decode(self.dialect.encoding).replace("'", "''")
+ value = value.decode(dialect.encoding).replace("'", "''")
return "'%s'" % value
return process
@@ -801,6 +801,9 @@ class _Binary(TypeEngine):
# Python 3 - sqlite3 doesn't need the `Binary` conversion
# here, though pg8000 does to indicate "bytea"
def bind_processor(self, dialect):
+ if dialect.dbapi is None:
+ return None
+
DBAPIBinary = dialect.dbapi.Binary
def process(value):