summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-09-10 17:02:31 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2012-09-10 17:02:31 -0400
commitf2622c0c53e761759da89c784c5105d2a38dcab9 (patch)
tree64d4657684c396fcad1d5a44e6bec80b5b327f77 /lib
parentcd8b9dcd37e29b73a3c4b25adc16f1b45371fb7a (diff)
downloadsqlalchemy-f2622c0c53e761759da89c784c5105d2a38dcab9.tar.gz
- [bug] CompileError is raised when VARCHAR with
no length is attempted to be emitted, same way as MySQL. [ticket:2505]
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/dialects/firebird/base.py4
-rw-r--r--lib/sqlalchemy/sql/expression.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/sqlalchemy/dialects/firebird/base.py b/lib/sqlalchemy/dialects/firebird/base.py
index b4b856804..e8e60da2b 100644
--- a/lib/sqlalchemy/dialects/firebird/base.py
+++ b/lib/sqlalchemy/dialects/firebird/base.py
@@ -192,6 +192,10 @@ class FBTypeCompiler(compiler.GenericTypeCompiler):
return self._extend_string(type_, basic)
def visit_VARCHAR(self, type_):
+ if not type_.length:
+ raise exc.CompileError(
+ "VARCHAR requires a length on dialect %s" %
+ self.dialect.name)
basic = super(FBTypeCompiler, self).visit_VARCHAR(type_)
return self._extend_string(type_, basic)
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index a817a2e5b..6b8010601 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -26,6 +26,7 @@ to stay the same in future releases.
"""
+
import itertools
import re
from operator import attrgetter
@@ -553,7 +554,6 @@ def between(ctest, cleft, cright):
ctest = _literal_as_binds(ctest)
return ctest.between(cleft, cright)
-
def case(whens, value=None, else_=None):
"""Produce a ``CASE`` statement.