fixes for MySQL (these were not merged from trunk)

diff --git a/test/orm/test_naturalpks.py b/test/orm/test_naturalpks.py
index f5d6d97434fa095749e7ff12a1a6b3c1ae587e9a..7217a086b7ef6ed89cc5de8dc3f81c47504cf6a4 100644 (file)
--- a/test/orm/test_naturalpks.py
+++ b/test/orm/test_naturalpks.py
@@ -365,7 +365,7 @@ class ReversePKsTest(_base.MappedTest):
             'user', metadata,
             Column('code', Integer, primary_key=True),
             Column('status', Integer, primary_key=True),
-            Column('username', String, nullable=False),
+            Column('username', String(50), nullable=False),
             )
     
     @classmethod
@@ -384,11 +384,11 @@ class ReversePKsTest(_base.MappedTest):
 
         session = sa.orm.sessionmaker()()
         
-        a_published = User(0, PUBLISHED, u'a')
+        a_published = User(1, PUBLISHED, u'a')
         session.add(a_published)
         session.commit()
 
-        a_editable = User(0, EDITABLE, u'a')
+        a_editable = User(1, EDITABLE, u'a')
 
         session.add(a_editable)
         session.commit()
@@ -400,16 +400,16 @@ class ReversePKsTest(_base.MappedTest):
         a_editable.status = PUBLISHED
 
         session.commit()
-        assert session.query(User).get([0, PUBLISHED]) is a_editable
-        assert session.query(User).get([0, ARCHIVED]) is a_published
+        assert session.query(User).get([1, PUBLISHED]) is a_editable
+        assert session.query(User).get([1, ARCHIVED]) is a_published
 
         a_published.status = PUBLISHED
         a_editable.status = EDITABLE
 
         session.commit()
 
-        assert session.query(User).get([0, PUBLISHED]) is a_published
-        assert session.query(User).get([0, EDITABLE]) is a_editable
+        assert session.query(User).get([1, PUBLISHED]) is a_published
+        assert session.query(User).get([1, EDITABLE]) is a_editable
 
     
 class SelfRefTest(_base.MappedTest):