From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 11 Jan 2009 23:37:19 +0000 (+0000)
Subject: NotSupportedError is a DBAPI wrapper which takes four args and is expected to origina... 
X-Git-Tag: rel_0_5_1~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc46b9eb5bd1496c06a1a459ee07ce33fc3b7b52;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

NotSupportedError is a DBAPI wrapper which takes four args and is expected to originate from the DBAPI layer.
Moved those error throws to CompileError/InvalidRequestError.
---

diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py
index 11b1027c25..7d23c5b273 100644
--- a/lib/sqlalchemy/databases/mssql.py
+++ b/lib/sqlalchemy/databases/mssql.py
@@ -1585,7 +1585,7 @@ class MSSQLCompiler(compiler.DefaultCompiler):
                               [self.process(x) for x in insert_stmt._prefixes])
 
             if not colparams and not self.dialect.supports_default_values and not self.dialect.supports_empty_insert:
-                raise exc.NotSupportedError(
+                raise exc.CompileError(
                     "The version of %s you are using does not support empty inserts." % self.dialect.name)
             elif not colparams and self.dialect.supports_default_values:
                 return (insert + " INTO %s DEFAULT VALUES" % (
diff --git a/lib/sqlalchemy/databases/sybase.py b/lib/sqlalchemy/databases/sybase.py
index 3cc97e9c45..6007315f26 100644
--- a/lib/sqlalchemy/databases/sybase.py
+++ b/lib/sqlalchemy/databases/sybase.py
@@ -160,11 +160,11 @@ class SybaseTypeError(sqltypes.TypeEngine):
 
     def bind_processor(self, dialect):
         def process(value):
-            raise exc.NotSupportedError("Data type not supported", [value])
+            raise exc.InvalidRequestError("Data type not supported", [value])
         return process
 
     def get_col_spec(self):
-        raise exc.NotSupportedError("Data type not supported")
+        raise exc.CompileError("Data type not supported")
 
 class SybaseNumeric(sqltypes.Numeric):
     def get_col_spec(self):
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index b286398bfc..7f7fb4ef0f 100644
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -599,7 +599,7 @@ class DefaultCompiler(engine.Compiled):
                           [self.process(x) for x in insert_stmt._prefixes])
 
         if not colparams and not self.dialect.supports_default_values and not self.dialect.supports_empty_insert:
-            raise exc.NotSupportedError(
+            raise exc.CompileError(
                 "The version of %s you are using does not support empty inserts." % self.dialect.name)
         elif not colparams and self.dialect.supports_default_values:
             return (insert + " INTO %s DEFAULT VALUES" % (