From: Tony Mack <tmack@cs.princeton.edu>
Date: Wed, 31 Jan 2007 18:58:09 +0000 (+0000)
Subject: - modify person_key and keys table definitions to ignore deleted keys
X-Git-Tag: pycurl-7_13_1~36
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0ac1d6f4b9747c8d99a4cc1da3da1e15441ff2a1;p=plcapi.git

- modify person_key and keys table definitions to ignore deleted keys
---

diff --git a/tools/plcdb.3-4.conf b/tools/plcdb.3-4.conf
index cd16108e..37f86d79 100644
--- a/tools/plcdb.3-4.conf
+++ b/tools/plcdb.3-4.conf
@@ -22,9 +22,9 @@ address_address_type = 'address_id:addresses.address_id:addresses.address_type_i
 
 key_types = 'key_type:key_types.key_type'
 
-keys = 'key_id:keys.key_id, key_type:keys.key_type, key:keys.key, is_blacklisted:keys.is_blacklisted'
+keys = 'key_id:keys.key_id:person_keys.key_id:person_keys.deleted=false, key_type:keys.key_type, key:keys.key, is_blacklisted:keys.is_blacklisted'
 
-person_key = 'person_id:person_keys.person_id, key_id:person_keys.key_id'
+person_key = 'person_id:person_keys.person_id:person_keys.deleted=false, key_id:person_keys.key_id'
 
 roles = 'role_id:roles.role_id, name:roles.name'