full mapper test suite works with postgres

1 files changed, 65 insertions, 6 deletions

diff --git a/test/tables.py b/test/tables.py
index a5e8bdbee..1dee54236 100644
--- a/test/tables.py
+++ b/test/tables.py
@@ -9,9 +9,7 @@ import testbase
 __ALL__ = ['db', 'users', 'addresses', 'orders', 'orderitems', 'keywords', 'itemkeywords']
 
 ECHO = testbase.echo
-DATA = True
-#CREATE = False
-CREATE = True
+
 DBTYPE = 'sqlite_memory'
 #DBTYPE = 'postgres'
 #DBTYPE = 'sqlite_file'
@@ -62,15 +60,76 @@ itemkeywords = Table('itemkeywords', db,
     Column('keyword_id', INT, ForeignKey("keywords"))
 )
 
-if CREATE:
+def create():
     users.create()
     addresses.create()
     orders.create()
     orderitems.create()
     keywords.create()
     itemkeywords.create()
-
-
+    
+def drop():
+    itemkeywords.drop()
+    keywords.drop()
+    orderitems.drop()
+    orders.drop()
+    addresses.drop()
+    users.drop()
+
+def data():
+    itemkeywords.delete().execute()
+    keywords.delete().execute()
+    orderitems.delete().execute()
+    orders.delete().execute()
+    addresses.delete().execute()
+    users.delete().execute()
+    users.insert().execute(
+        dict(user_id = 7, user_name = 'jack'),
+        dict(user_id = 8, user_name = 'ed'),
+        dict(user_id = 9, user_name = 'fred')
+    )
+    addresses.insert().execute(
+        dict(address_id = 1, user_id = 7, email_address = "jack@bean.com"),
+        dict(address_id = 2, user_id = 8, email_address = "ed@wood.com"),
+        dict(address_id = 3, user_id = 8, email_address = "ed@lala.com")
+    )
+    orders.insert().execute(
+        dict(order_id = 1, user_id = 7, description = 'order 1', isopen=0),
+        dict(order_id = 2, user_id = 9, description = 'order 2', isopen=0),
+        dict(order_id = 3, user_id = 7, description = 'order 3', isopen=1),
+        dict(order_id = 4, user_id = 9, description = 'order 4', isopen=1),
+        dict(order_id = 5, user_id = 7, description = 'order 5', isopen=0)
+    )
+    orderitems.insert().execute(
+        dict(item_id=1, order_id=2, item_name='item 1'),
+        dict(item_id=3, order_id=3, item_name='item 3'),
+        dict(item_id=2, order_id=2, item_name='item 2'),
+        dict(item_id=5, order_id=3, item_name='item 5'),
+        dict(item_id=4, order_id=3, item_name='item 4')
+    )
+    keywords.insert().execute(
+        dict(keyword_id=1, name='blue'),
+        dict(keyword_id=2, name='red'),
+        dict(keyword_id=3, name='green'),
+        dict(keyword_id=4, name='big'),
+        dict(keyword_id=5, name='small'),
+        dict(keyword_id=6, name='round'),
+        dict(keyword_id=7, name='square')
+    )
+    itemkeywords.insert().execute(
+        dict(keyword_id=2, item_id=1),
+        dict(keyword_id=2, item_id=2),
+        dict(keyword_id=4, item_id=1),
+        dict(keyword_id=6, item_id=1),
+        dict(keyword_id=7, item_id=2),
+        dict(keyword_id=6, item_id=3),
+        dict(keyword_id=3, item_id=3),
+        dict(keyword_id=5, item_id=2),
+        dict(keyword_id=4, item_id=3)
+    )
+
+    db.commit()
+    
 class User(object):
     def __init__(self):
         self.user_id = None