brought up to date with latest sqlalchemy conventions

diff --git a/bluechips/controllers/spend.py b/bluechips/controllers/spend.py
index fd884536b1d02811ce0977c40bbbe8c9c9956831..1a1c34612091b888df800ebeacfba199fc631da3 100644 (file)
--- a/bluechips/controllers/spend.py
+++ b/bluechips/controllers/spend.py
@@ -42,12 +42,12 @@ class SpendController(BaseController):
         # old one
         if id is None:
             e = model.Expenditure()
+            meta.Session.add(e)
         else:
             e = meta.Session.query(model.Expenditure).get(id)
         
         # Set the fields that were submitted
         update_sar(e, self.form_result)
-        meta.Session.save_or_update(e)
         
         if id is None:
             e.even_split()

diff --git a/bluechips/controllers/transfer.py b/bluechips/controllers/transfer.py
index 68d8b44a4d73ffa2ab32c9292a5d0ac80c7dc431..b4b375ab2de4019a765aae26b301e24bf3d17be5 100644 (file)
--- a/bluechips/controllers/transfer.py
+++ b/bluechips/controllers/transfer.py
@@ -38,11 +38,11 @@ class TransferController(BaseController):
         
         if id is None:
             t = model.Transfer()
+            meta.Session.add(t)
         else:
             t = meta.Session.query(model.Transfer).get(id)
         
         update_sar(t, self.form_result)
-        meta.Session.save_or_update(t)
         meta.Session.commit()
         
         h.flash('Transfer recorded.')

diff --git a/bluechips/model/__init__.py b/bluechips/model/__init__.py
index 4b016eab8223392a79cc32f5a02f669bec2c9b07..ba5404f5ff4277185b5b707ec6d969b61a0e3a3d 100644 (file)
--- a/bluechips/model/__init__.py
+++ b/bluechips/model/__init__.py
@@ -16,7 +16,7 @@ from datetime import datetime
 def init_model(engine):
     """Call me before using any of the tables or classes in the model"""
 
-    sm = orm.sessionmaker(autoflush=True, transactional=True, bind=engine)
+    sm = orm.sessionmaker(autoflush=True, bind=engine)
 
     meta.engine = engine
     meta.Session = orm.scoped_session(sm)

diff --git a/bluechips/model/expenditure.py b/bluechips/model/expenditure.py
index 8d3bbbc67e74e9c8155df70bcf694e5788a629d4..f7e69344dc2cf88bf09cb7f0fa6ea9a81fdc4cb9 100644 (file)
--- a/bluechips/model/expenditure.py
+++ b/bluechips/model/expenditure.py
@@ -84,6 +84,6 @@ class Expenditure(object):
         
         for user, share in amounts_dict.iteritems():
             s = Split(self, user, share)
-            meta.Session.save(s)
+            meta.Session.add(s)
 
 __all__ = ['Expenditure']

diff --git a/bluechips/tests/__init__.py b/bluechips/tests/__init__.py
index cbc0ad459d5eade3873955a405ece11245b539e2..79de0195e99cd1c0acd7427958b35de768fef66c 100644 (file)
--- a/bluechips/tests/__init__.py
+++ b/bluechips/tests/__init__.py
@@ -32,7 +32,7 @@ def setUpPackage():
     SetupCommand('setup-app').run([config['__file__']])
     
     test_user = bluechips.model.User(u'root', u'Charlie Root', False)
-    meta.Session.save(test_user)
+    meta.Session.add(test_user)
     meta.Session.commit()
 
 def tearDownPackage():
@@ -50,7 +50,7 @@ def createUsers(n=None):
         n = random.randint(2, 5)
     for i in xrange(n):
         u = bluechips.model.User(sample_users[i].lower(), resident=True)
-        meta.Session.save(u)
+        meta.Session.add(u)
     meta.Session.commit()
 
 def createExpenditures(n=None):
@@ -60,7 +60,7 @@ def createExpenditures(n=None):
     for i in xrange(n):
         e = bluechips.model.Expenditure(random.choice(users),
                                         Currency(random.randint(1000, 100000)))
-        meta.Session.save(e)
+        meta.Session.add(e)
         e.even_split()
     meta.Session.commit()
 

diff --git a/bluechips/tests/splits/test_fixed.py b/bluechips/tests/splits/test_fixed.py
index 0de37867e549ecd518863ffc4cfe9170c6c6a87b..46fcd842083b17e1d84c0eb84acc24f85859e7a2 100644 (file)
--- a/bluechips/tests/splits/test_fixed.py
+++ b/bluechips/tests/splits/test_fixed.py
@@ -14,7 +14,7 @@ class TestSplitFixed(TestCase):
         
         e = model.Expenditure(meta.Session.query(model.User).first(),
                               Currency("100"))
-        meta.Session.save(e)
+        meta.Session.add(e)
         e.even_split()
         meta.Session.commit()
         
@@ -34,7 +34,7 @@ class TestSplitFixed(TestCase):
         users = meta.Session.query(model.User).all()
         
         e = model.Expenditure(users[0], Currency("100"))
-        meta.Session.save(e)
+        meta.Session.add(e)
         
         split_dict = {users[0]: Decimal("20"),
                       users[1]: Decimal("80")}
@@ -61,7 +61,7 @@ class TestSplitFixed(TestCase):
         users = meta.Session.query(model.User).all()
         
         e = model.Expenditure(users[0], Currency("100.00"))
-        meta.Session.save(e)
+        meta.Session.add(e)
         
         split_dict = {users[0]: Decimal(10),
                       users[1]: Decimal(15)}
@@ -87,7 +87,7 @@ class TestSplitFixed(TestCase):
         users = meta.Session.query(model.User).all()
 
         e = model.Expenditure(users[0], Currency("100.00"))
-        meta.Session.save(e)
+        meta.Session.add(e)
 
         # Force a split that will result in needing to distribute
         # pennies