sqlalchemy api changes

diff --git a/debian/changelog b/debian/changelog
index 81a2af0..97770de 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-images (0.0.4~glasgall2) precise; urgency=low
+
+  * SQLAlchemy API updates
+
+ -- Adam Glasgall <glasgall@mit.edu>  Thu, 06 Jun 2013 22:23:38 -0400
+
 invirt-images (0.0.4~glasgall1) precise; urgency=low
 
   * Rebuild for precise

diff --git a/invirt-images b/invirt-images
index 2175ead..ea208a5 100755 (executable)
--- a/invirt-images
+++ b/invirt-images
@@ -191,7 +191,8 @@ def main():
     global verbosity
     
     database.connect()
-    
+    database.session.begin()
+
     usage = """%prog [options] --add [--cdrom] cdrom_id description mirror_id uri_suffix
        %prog [options] --add --mirror mirror_id uri_prefix
 
@@ -243,8 +244,8 @@ def main():
             attrs = dict(zip(('cdrom_id', 'description', 'mirror_id', 'uri_suffix'),
                              args))
             cdrom = database.CDROM(**attrs)
-            database.session.save(cdrom)
-            database.session.flush()
+            database.session.add(cdrom)
+            database.session.commit()
             
             load_image(cdrom)
         
@@ -252,8 +253,8 @@ def main():
             attrs = dict(zip(('mirror_id', 'uri_prefix'),
                              args))
             mirror = database.Mirror(**attrs)
-            database.session.save(mirror)
-            database.session.flush()
+            database.session.add(mirror)
+            database.session.commit()
     elif options.action == 'update':
         if len(args) > 0:
             images = [database.CDROM.query().get(arg) for arg in args]