X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tools%2Fplcdb.3-4.conf;h=962070388df1d4c6077b6f6e64d51b95c6e83b84;hb=c63e5f873b83934324631c46d90884d005675853;hp=4f1ba259738eb60437d9047587c6b7658e9a2d63;hpb=0a4f3483226d29a842f0846385975d804af1752e;p=plcapi.git

diff --git a/tools/plcdb.3-4.conf b/tools/plcdb.3-4.conf
index 4f1ba25..9620703 100644
--- a/tools/plcdb.3-4.conf
+++ b/tools/plcdb.3-4.conf
@@ -1,12 +1,12 @@
 # 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'
 
@@ -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'
 
@@ -38,11 +38,11 @@ nodegroups = 'nodegroup_id:nodegroups.nodegroup_id, name:nodegroups.name, descri
 
 nodegroup_node = 'nodegroup_id:nodegroup_nodes.nodegroup_id, node_id:nodegroup_nodes.node_id'
 
-conf_files = 'conf_file_id:conf_file.conf_file_id, enabled:conf_file.enabled, source:conf_file.source, dest:conf_file.dest, file_permissions:conf_file.file_permissions, file_owner:conf_file.file_owner, file_group:conf_file.file_group, preinstall_cmd:conf_file.preinstall_cmd, postinstall_cmd:conf_file.postinstall_cmd, error_cmd:conf_file.error_cmd, ignore_cmd_errors:conf_file.ignore_cmd_errors, always_update:conf_file.always_update'
+# conf_files = 'conf_file_id:conf_file.conf_file_id, enabled:conf_file.enabled, source:conf_file.source, dest:conf_file.dest, file_permissions:conf_file.file_permissions, file_owner:conf_file.file_owner, file_group:conf_file.file_group, preinstall_cmd:conf_file.preinstall_cmd, postinstall_cmd:conf_file.postinstall_cmd, error_cmd:conf_file.error_cmd, ignore_cmd_errors:conf_file.ignore_cmd_errors, always_update:conf_file.always_update'
 
-conf_file_node = 'conf_file_id:conf_assoc.conf_file_id, node_id:conf_assoc.node_id'
+# conf_file_node = 'conf_file_id:conf_assoc.conf_file_id, node_id:conf_assoc.node_id'
 
-conf_file_nodegroup = 'conf_file_id:conf_assoc.conf_file_id, nodegroup_id:conf_assoc.nodegroup_id'
+# conf_file_nodegroup = 'conf_file_id:conf_assoc.conf_file_id, nodegroup_id:conf_assoc.nodegroup_id'
 
 nodenetworks = 'nodenetwork_id:nodenetworks.nodenetwork_id, node_id:node_nodenetworks.node_id:node_nodenetworks.nodenetwork_id, is_primary:node_nodenetworks.is_primary:node_nodenetworks.nodenetwork_id, type:nodenetworks.type, method:nodenetworks.method, ip:nodenetworks.ip, mac:nodenetworks.mac, gateway:nodenetworks.gateway, network:nodenetworks.network, broadcast:nodenetworks.broadcast, netmask:nodenetworks.netmask, dns1:nodenetworks.dns1, dns2:nodenetworks.dns2, bwlimit:nodenetworks.bwlimit, hostname:nodenetworks.hostname'