From 751f19ec1107c9059ae4834e4b757741ebee6cbd Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Sat, 3 Aug 2013 22:14:40 +0200
Subject: convert remaining code to sqlalchemy

No explicit "import sqlite3" left. It's still a bit rough around the
corners, particularly since sqlalchemy's support for executemany is
totally broken.
---
 readyaml.py | 60 +++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 33 insertions(+), 27 deletions(-)

(limited to 'readyaml.py')

diff --git a/readyaml.py b/readyaml.py
index 21b1ca1..835967d 100755
--- a/readyaml.py
+++ b/readyaml.py
@@ -2,21 +2,20 @@
 """This tool reads a yaml file as generated by importpkg.py on stdin and
 updates the database with the contents."""
 
-import sqlite3
 import sys
 
 from debian.debian_support import version_compare
+import sqlalchemy
 import yaml
 
-def readyaml(db, stream):
-    cur = db.cursor()
-    cur.execute("PRAGMA foreign_keys = ON;")
+from dedup.utils import enable_sqlite_foreign_keys
+
+def readyaml(conn, stream):
     gen = yaml.safe_load_all(stream)
     metadata = next(gen)
     package = metadata["package"]
-    cur.execute("SELECT id, version FROM package WHERE name = ?;",
-                    (package,))
-    row = cur.fetchone()
+    row = conn.execute(sqlalchemy.text("SELECT id, version FROM package WHERE name = :name;"),
+                       name=package).fetchone()
     if row:
         pid, version = row
         if version_compare(version, metadata["version"]) > 0:
@@ -24,37 +23,44 @@ def readyaml(db, stream):
     else:
         pid = None
 
-    cur.execute("BEGIN;")
-    cur.execute("SELECT name, id FROM function;")
+    cur = conn.execute("SELECT name, id FROM function;")
     funcmapping = dict(cur.fetchall())
     if pid is not None:
-        cur.execute("DELETE FROM content WHERE pid = ?;", (pid,))
-        cur.execute("DELETE FROM dependency WHERE pid = ?;", (pid,))
-        cur.execute("UPDATE package SET version = ?, architecture = ?, source = ? WHERE id = ?;",
-                    (metadata["version"], metadata["architecture"], metadata["source"], pid))
+        conn.execute(sqlalchemy.text("DELETE FROM content WHERE pid = :pid;"),
+                     pid=pid)
+        conn.execute(sqlalchemy.text("DELETE FROM dependency WHERE pid = :pid;"),
+                     pid=pid)
+        conn.execute(sqlalchemy.text("UPDATE package SET version = :version, architecture = :architecture, source = :source WHERE id = :pid;"),
+                     version=metadata["version"],
+                     architecture=metadata["architecture"],
+                     source=metadata["source"], pid=pid)
     else:
-        cur.execute("INSERT INTO package (name, version, architecture, source) VALUES (?, ?, ?, ?);",
-                    (package, metadata["version"], metadata["architecture"],
-                     metadata["source"]))
-        pid = cur.lastrowid
-    cur.executemany("INSERT INTO dependency (pid, required) VALUES (?, ?);",
-                    ((pid, dep) for dep in metadata["depends"]))
+        pid = conn.execute(sqlalchemy.text("INSERT INTO package (name, version, architecture, source) VALUES (:name, :version, :architecture, :source);"),
+                           name=package, version=metadata["version"],
+                           architecture=metadata["architecture"],
+                           source=metadata["source"]).lastrowid
+    if metadata["depends"]:
+        conn.execute(sqlalchemy.text("INSERT INTO dependency (pid, required) VALUES (:pid, :required);"),
+                     [dict(pid=pid, required=dep)
+                      for dep in metadata["depends"]])
     for entry in gen:
         if entry == "commit":
-            db.commit()
             return
 
-        cur.execute("INSERT INTO content (pid, filename, size) VALUES (?, ?, ?);",
-                    (pid, entry["name"], entry["size"]))
+        cur = conn.execute(sqlalchemy.text("INSERT INTO content (pid, filename, size) VALUES (:pid, :filename, :size);"),
+                           pid=pid, filename=entry["name"], size=entry["size"])
         cid = cur.lastrowid
-        cur.executemany("INSERT INTO hash (cid, fid, hash) VALUES (?, ?, ?);",
-                        ((cid, funcmapping[func], hexhash)
-                         for func, hexhash in entry["hashes"].items()))
+        if entry["hashes"]:
+            conn.execute(sqlalchemy.text("INSERT INTO hash (cid, fid, hash) VALUES (:cid, :fid, :hash);"),
+                         [dict(cid=cid, fid=funcmapping[func], hash=hexhash)
+                          for func, hexhash in entry["hashes"].items()])
     raise ValueError("missing commit block")
 
 def main():
-    db = sqlite3.connect("test.sqlite3")
-    readyaml(db, sys.stdin)
+    db = sqlalchemy.create_engine("sqlite:///test.sqlite3")
+    enable_sqlite_foreign_keys(db)
+    with db.begin() as conn:
+        readyaml(conn, sys.stdin)
 
 if __name__ == "__main__":
     main()
-- 
cgit v1.2.3