Merge branch 'master' into sqlalchemy

In the mean time, the master branch evolved quite a bit and the schema
changed again (eqclass added to function table). The main reason for the
merge is to resolve the large amounts of conflicts once, so development
of the sqlalchemy branch can continue and still benefit from changes in
the master branch such as schema compatibility, adapting the indent
level in web app due to the use of contextlib.closing which resembles
sqlalchemy's "with db.begin() as conn:".

Conflicts:
	autoimport.py
	dedup/utils.py
	readyaml.py
	update_sharing.py
	webapp.py

1 files changed, 6 insertions, 0 deletions

diff --git a/dedup/utils.py b/dedup/utils.py
index 6864ad3..fd30378 100644
--- a/dedup/utils.py
+++ b/dedup/utils.py
@@ -1,3 +1,4 @@
+from debian.debian_support import version_compare
 import sqlalchemy.event
 
 def fetchiter(cursor):
@@ -12,3 +13,8 @@ def enable_sqlite_foreign_keys(engine):
     def pragma_foreign_keys(connection, _):
         connection.execute("PRAGMA foreign_keys=ON;")
 
+def sqlite_add_version_compare(engine):
+    @sqlalchemy.event.listens_for(engine, "connect")
+    def add_version_compare(connection, _):
+        connection.create_collation("debian_version", version_compare)
+        connection.create_function("debian_version_compare", 2, version_compare)