From 91255618ddb47553774c620a23479adf88c27b74 Mon Sep 17 00:00:00 2001
From: Eric Siegerman <eric.siegerman@rci.rogers.com>
Date: Thu, 24 Sep 2015 15:25:15 -0400
Subject: Fix sqlalchemy.ext.baked.Result.one_or_none() exception message

Also add a couple of missing tests.
---
 lib/sqlalchemy/ext/baked.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/sqlalchemy/ext/baked.py')

diff --git a/lib/sqlalchemy/ext/baked.py b/lib/sqlalchemy/ext/baked.py
index a933e7eb7..d8c8843f6 100644
--- a/lib/sqlalchemy/ext/baked.py
+++ b/lib/sqlalchemy/ext/baked.py
@@ -301,7 +301,7 @@ class Result(object):
             return None
         else:
             raise orm_exc.MultipleResultsFound(
-                "Multiple rows were found for one()")
+                "Multiple rows were found for one_or_none()")
 
     def all(self):
         """Return all rows.
-- 
cgit v1.2.1