scalar() returns None if no rows

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py
index c3048de29..4ec7cbb7b 100644
--- a/lib/sqlalchemy/sql.py
+++ b/lib/sqlalchemy/sql.py
@@ -293,7 +293,11 @@ class Compiled(ClauseVisitor):
         """executes this compiled object via the execute() method, then 
         returns the first column of the first row.  Useful for executing functions,
         sequences, rowcounts, etc."""
-        return self.execute(*multiparams, **params).fetchone()[0]
+        row = self.execute(*multiparams, **params).fetchone()
+        if row is not None:
+            return row[0]
+        else:
+            return None
         
 class ClauseElement(object):
     """base class for elements of a programmatically constructed SQL expression."""