# 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'
pcu_node = 'pcu_id:pcu_ports.pcu_id, node_id:pcu_ports.node_id, port:pcu_ports.port_number'
-slices = 'slice_id:dslice03_slices.slice_id, site_id:dslice03_slices.site_id, name:dslice03_slices.name, instantiation:dslice03_states.name:dslice03_states.state_id, url:dslice03_slices.url, description:dslice03_slices.description, max_nodes:dslice03_siteinfo.max_slices:dslice03_siteinfo.site_id, creator_person_id:dslice03_slices.creator_person_id, created:dslice03_slices.created, expires:dslice03_slices.expires, deleted:dslice03_slices.is_deleted'
+slices = 'slice_id:dslice03_slices.slice_id, site_id:dslice03_slices.site_id, name:dslice03_slices.name, instantiation:dslice03_states.name:dslice03_states.state_id, url:dslice03_slices.url, description:dslice03_slices.description, max_nodes:dslice03_siteinfo.max_slices:dslice03_siteinfo.site_id, creator_person_id:dslice03_slices.creator_person_id, created:dslice03_slices.created, expires:dslice03_slices.expires, is_deleted:dslice03_slices.is_deleted'
slice_node = 'slice_id:dslice03_slicenode.slice_id, node_id:dslice03_slicenode.node_id'
git://git.onelab.eu / plcapi.git / blobdiff