do the mercurial dance (re-merge what I just merged...)

1 files changed, 18 insertions, 1 deletions

diff --git a/test/sql/test_query.py b/test/sql/test_query.py
index f59b34076..e14f5301e 100644
--- a/test/sql/test_query.py
+++ b/test/sql/test_query.py
@@ -654,7 +654,24 @@ class QueryTest(TestBase):
                 getattr(result, meth),
             )
             trans.rollback()
-            
+    
+    def test_no_inserted_pk_on_non_insert(self):
+        result = testing.db.execute("select * from query_users")
+        assert_raises_message(
+            exc.InvalidRequestError,
+            r"Statement is not an insert\(\) expression construct.",
+            getattr, result, 'inserted_primary_key'
+        )
+    
+    @testing.requires.returning
+    def test_no_inserted_pk_on_returning(self):
+        result = testing.db.execute(users.insert().returning(users.c.user_id, users.c.user_name))
+        assert_raises_message(
+            exc.InvalidRequestError,
+            r"Can't call inserted_primary_key when returning\(\) is used.",
+            getattr, result, 'inserted_primary_key'
+        )
+        
     def test_fetchone_til_end(self):
         result = testing.db.execute("select * from query_users")
         eq_(result.fetchone(), None)