summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/compiler.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-05-04 14:59:26 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-05-04 14:59:26 -0400
commit2a99b770ddf144c279ad8b42ad8593b3439cd2de (patch)
tree669f31c9921dc568fe94d73f31cdc5574062fcb6 /lib/sqlalchemy/sql/compiler.py
parent6f82c320b8834761fa9606119a4c2cbc6c3312f1 (diff)
downloadsqlalchemy-2a99b770ddf144c279ad8b42ad8593b3439cd2de.tar.gz
- unicode literals need to just be handled differently if they have utf-8
encoded in them vs. unicode escaping. not worth figuring out how to combine these right now
Diffstat (limited to 'lib/sqlalchemy/sql/compiler.py')
-rw-r--r--lib/sqlalchemy/sql/compiler.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index d51dd625a..c3aea159a 100644
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -1868,11 +1868,11 @@ class DDLCompiler(engine.Compiled):
first_pk = True
except exc.CompileError as ce:
util.raise_from_cause(
- exc.CompileError(util.u("(in table '%s', column '%s'): %s" % (
+ exc.CompileError(util.u("(in table '%s', column '%s'): %s") % (
table.description,
column.name,
ce.args[0]
- ))))
+ )))
const = self.create_table_constraints(table)
if const:
@@ -2344,7 +2344,7 @@ class IdentifierPreparer(object):
lc_value = value.lower()
return (lc_value in self.reserved_words
or value[0] in self.illegal_initial_characters
- or not self.legal_characters.match(str(value))
+ or not self.legal_characters.match(util.text_type(value))
or (lc_value != value))
def quote_schema(self, schema, force):