diff options
Diffstat (limited to 'readyaml.py')
| -rwxr-xr-x | readyaml.py | 64 |
1 files changed, 35 insertions, 29 deletions
diff --git a/readyaml.py b/readyaml.py index 2ef9a3b..15cfcb3 100755 --- a/readyaml.py +++ b/readyaml.py @@ -3,21 +3,20 @@ updates the database with the contents.""" import optparse -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: @@ -25,42 +24,49 @@ 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(): parser = optparse.OptionParser() parser.add_option("-d", "--database", action="store", - default="test.sqlite3", - help="path to the sqlite3 database file") + default="sqlite:///test.sqlite3", + help="location of the database") options, args = parser.parse_args() - db = sqlite3.connect(options.database) - readyaml(db, sys.stdin) + db = sqlalchemy.create_engine(options.database) + enable_sqlite_foreign_keys(db) + with db.begin() as conn: + readyaml(conn, sys.stdin) if __name__ == "__main__": main() |