X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tools%2Fplcdb.3-4.conf;h=37f86d7947a100faee6b71a43bb8d3b68351c284;hb=6cef2160bb0ebce6506db05612b90b484541258c;hp=fa16866de4a14daf58128ee297b01f9abc02338d;hpb=fcc284695ea36850ee7b69de22a9f49988fc27bc;p=plcapi.git

diff --git a/tools/plcdb.3-4.conf b/tools/plcdb.3-4.conf
index fa16866..37f86d7 100644
--- a/tools/plcdb.3-4.conf
+++ b/tools/plcdb.3-4.conf
@@ -1,28 +1,30 @@
 # configuration file that describes the differences
 
-# new_table_name = (field:old_table.field[:required_join_table.join_using:...]), ...
+# new_table_name = field:old_table.field[:required_join_table.join_using:...], ...
 
 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, max_slices:dslice03_siteinfo.max_slices:dslice03_siteinfo.site_id, 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'
 
-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'