From: Tony Mack <tmack@cs.princeton.edu> Date: Mon, 20 Nov 2006 16:17:26 +0000 (+0000) Subject: - changes to addresses, site_address, address_address_type table config (person_addre... X-Git-Tag: pycurl-7_13_1~276 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0a4f3483226d29a842f0846385975d804af1752e;p=plcapi.git - changes to addresses, site_address, address_address_type table config (person_addresses with type 10001 now considered site_addresses) --- diff --git a/tools/plcdb.3-4.conf b/tools/plcdb.3-4.conf index fa16866d..4f1ba259 100644 --- a/tools/plcdb.3-4.conf +++ b/tools/plcdb.3-4.conf @@ -6,17 +6,19 @@ DB_VERSION_PREVIOUS = '3' DB_VERSION_NEW = '4' -sites = '(site_id:sites.site_id), (login_base:sites.login_base), (name:sites.name), (abbreviated_name:sites.abbreviated_name), (deleted:sites.deleted), (is_public:sites.is_public), (latitude:sites.latitude), (longitude:sites.longitude), (url:sites.url), (date_created:sites.date_created)' +sites = 'site_id:sites.site_id, login_base:sites.login_base, name:sites.name, abbreviated_name:sites.abbreviated_name, deleted:sites.deleted, is_public:sites.is_public, latitude:sites.latitude, longitude:sites.longitude, url:sites.url, date_created:sites.date_created' -persons = '(person_id:persons.person_id), (email:persons.email), (first_name:persons.first_name), (last_name:persons.last_name), (deleted:persons.deleted), (enabled:persons.enabled), (password:persons.password), (verification_key:persons.verification_key), (verification_expires:persons.verification_expires), (title:persons.title), (phone:persons.phone), (url:persons.url), (bio:persons.bio)' +persons = 'person_id:persons.person_id, email:persons.email, first_name:persons.first_name, last_name:persons.last_name, deleted:persons.deleted, enabled:persons.enabled, password:persons.password, verification_key:persons.verification_key, verification_expires:persons.verification_expires, title:persons.title, phone:persons.phone, url:persons.url, bio:persons.bio' person_site = 'person_id:person_site.person_id, site_id:person_site.site_id, is_primary:person_site.is_primary' address_types = 'address_type_id:address_types.address_type_id, name:address_types.name' -addresses = 'address_id:addresses.address_id, line1:addresses.line1, line2:addresses.line2, line3:addresses.line3, city:addresses.city, state:addresses.state, postalcode:addresses.postalcode, country:addresses.country' +addresses = 'address_id:addresses.address_id:addresses.address_type_id=10001, line1:addresses.line1, line2:addresses.line2, line3:addresses.line3, city:addresses.city, state:addresses.state, postalcode:addresses.postalcode, country:addresses.country' -address_address_type = 'address_id:addresses.address_id, address_type_id:addresses.address_type_id' +site_address = 'address_id:addresses.address_id, site_id:person_site.site_id:person_address.address_id:person_site.person_id:addresses.address_type_id=10001' + +address_address_type = 'address_id:addresses.address_id:addresses.address_type_id=10001, address_type_id:addresses.address_type_id' key_types = 'key_type:key_types.key_type'