From a1d3f13f0a694e079be196bb2eb4ee6b67799f45 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Wed, 21 Apr 2010 13:21:16 +0900
Subject: [PATCH] update for sqlalchemy 0.6

---
 anki/db.py   | 21 +++++++++++++++++++++
 anki/deck.py |  5 ++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/anki/db.py b/anki/db.py
index 74f85dd90..fd3c052aa 100644
--- a/anki/db.py
+++ b/anki/db.py
@@ -65,6 +65,27 @@ class SessionHelper(object):
             self._lockDB()
         self._seen = True
 
+    def save(self, obj):
+        # compat
+        if sqlalchemy.__version__.startswith("0.4."):
+            self._session.save(obj)
+        else:
+            self._session.add(obj)
+
+    def clear(self):
+        # compat
+        if sqlalchemy.__version__.startswith("0.4."):
+            self._session.clear()
+        else:
+            self._session.expunge_all()
+
+    def update(self, obj):
+        # compat
+        if sqlalchemy.__version__.startswith("0.4."):
+            self._session.update(obj)
+        else:
+            self._session.add(obj)
+
     def execute(self, *a, **ka):
         x = self._session.execute(*a, **ka)
         runHook("dbFinished")
diff --git a/anki/deck.py b/anki/deck.py
index 8e8980556..cc0835fd4 100644
--- a/anki/deck.py
+++ b/anki/deck.py
@@ -2841,7 +2841,10 @@ class DeckStorage(object):
     def _init(s):
         "Add a new deck to the database. Return saved deck."
         deck = Deck()
-        s.save(deck)
+        if sqlalchemy.__version__.startswith("0.4."):
+            s.save(deck)
+        else:
+            s.add(deck)
         s.flush()
         return deck
     _init = staticmethod(_init)