[dak/master] Change base class of Uid to ORMObject.
Signed-off-by: Torsten Werner <twerner@debian.org>
---
daklib/dbconn.py | 12 ++++++++----
tests/dbtest_fingerprint.py | 2 +-
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 837ce8e..020040c 100755
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -2802,7 +2802,7 @@ __all__.append('get_suite_src_formats')
################################################################################
-class Uid(object):
+class Uid(ORMObject):
def __init__(self, uid = None, name = None):
self.uid = uid
self.name = name
@@ -2819,8 +2819,11 @@ class Uid(object):
# This signals to use the normal comparison operator
return NotImplemented
- def __repr__(self):
- return '<Uid %s (%s)>' % (self.uid, self.name)
+ def properties(self):
+ return ['uid', 'name', 'fingerprint']
+
+ def not_null_constraints(self):
+ return ['uid']
__all__.append('Uid')
@@ -3261,7 +3264,8 @@ class DBConn(object):
mapper(Uid, self.tbl_uid,
properties = dict(uid_id = self.tbl_uid.c.id,
- fingerprint = relation(Fingerprint)))
+ fingerprint = relation(Fingerprint)),
+ extension = validator)
mapper(UploadBlock, self.tbl_upload_blocks,
properties = dict(upload_block_id = self.tbl_upload_blocks.c.id,
diff --git a/tests/dbtest_fingerprint.py b/tests/dbtest_fingerprint.py
index 72e081a..8d57ea0 100755
--- a/tests/dbtest_fingerprint.py
+++ b/tests/dbtest_fingerprint.py
@@ -60,7 +60,7 @@ class FingerprintTestCase(DBDakTestCase):
self.session.rollback()
self.assertRaises(IntegrityError, self.fingerprint_duplicate_fingerprint)
self.session.rollback()
- self.assertRaises(IntegrityError, self.uid_no_uid)
+ self.assertRaises(DBUpdateError, self.uid_no_uid)
self.session.rollback()
self.assertRaises(IntegrityError, self.uid_duplicate_uid)
self.session.rollback()
--
1.5.6.5
Reply to: