diff --git a/sql/151.sql b/sql/151.sql index 90b1791523ddacd1881ca630f51b31079b365d2d..c4a8266d64cecac843ad9ac628cbd7b2d8da7dd9 100755 --- a/sql/151.sql +++ b/sql/151.sql @@ -78,7 +78,7 @@ CREATE TABLE contacts_v2 lastname character varying(255), title character varying(255), function character varying(255), - other_data character varying(255), + other_data text, user_id character varying(255) NOT NULL, entity_id character varying(32) NOT NULL, creation_date timestamp without time zone NOT NULL, diff --git a/sql/160.sql b/sql/160.sql index 7267e60f43a29310693e10e9df4b7d9eedd55900..ad76cd61b9112f851d64ce11e38d5813b3b5ec82 100755 --- a/sql/160.sql +++ b/sql/160.sql @@ -186,6 +186,11 @@ ALTER TABLE sendmail ALTER COLUMN cci_list TYPE text; -- ************************************************************************* -- ALTER TABLE notifications ALTER COLUMN diffusion_properties TYPE text; +-- ************************************************************************* -- +-- CHANGE COLUMNS TYPE FOR CONTACTS_V2 -- +-- ************************************************************************* -- +ALTER TABLE contacts_v2 ALTER COLUMN other_data TYPE text; + -- ************************************************************************* -- -- NOUVEAU STATUS TRANSMISSION -- diff --git a/sql/1706.sql b/sql/1706.sql index d4de46790296deec8b60c540e9baec9e058d0f55..181a003b99551eb7d4220198da7e9677cfd639ff 100755 --- a/sql/1706.sql +++ b/sql/1706.sql @@ -174,6 +174,27 @@ VALUES ('FASTHD_ATTACH', 'FASTHD', 'Fast internal disc bay for attachments', 'N' ALTER TABLE basket_persistent_mode ALTER COLUMN user_id TYPE character varying(128); ALTER TABLE res_mark_as_read ALTER COLUMN user_id TYPE character varying(128); +-- ************************************************************************* -- +-- CHANGE COLUMNS TYPE FOR CONTACTS_V2 -- +-- ************************************************************************* -- +DROP VIEW IF EXISTS view_contacts; + +ALTER TABLE contacts_v2 ALTER COLUMN other_data TYPE text; + +CREATE OR REPLACE VIEW view_contacts AS + SELECT c.contact_id, c.contact_type, c.is_corporate_person, c.society, c.society_short, c.firstname AS contact_firstname +, c.lastname AS contact_lastname, c.title AS contact_title, c.function AS contact_function, c.other_data AS contact_other_data +, c.user_id AS contact_user_id, c.entity_id AS contact_entity_id, c.creation_date, c.update_date, c.enabled AS contact_enabled, ca.id AS ca_id +, ca.contact_purpose_id, ca.departement, ca.firstname, ca.lastname, ca.title, ca.function, ca.occupancy +, ca.address_num, ca.address_street, ca.address_complement, ca.address_town, ca.address_postal_code, ca.address_country +, ca.phone, ca.email, ca.website, ca.salutation_header, ca.salutation_footer, ca.other_data, ca.user_id, ca.entity_id, ca.is_private, ca.enabled +, cp.label as contact_purpose_label, ct.label as contact_type_label + FROM contacts_v2 c + RIGHT JOIN contact_addresses ca ON c.contact_id = ca.contact_id + LEFT JOIN contact_purposes cp ON ca.contact_purpose_id = cp.id + LEFT JOIN contact_types ct ON c.contact_type = ct.id; + + -- EXPORT SEDA DROP TABLE IF EXISTS seda; CREATE TABLE seda diff --git a/sql/structure.sql b/sql/structure.sql index 8760771bac289110d66427c4bf8fcb56c0c11604..ed9b8a8cbffab01537cf3724e649c441dab35151 100755 --- a/sql/structure.sql +++ b/sql/structure.sql @@ -1325,7 +1325,7 @@ CREATE TABLE contacts_v2 lastname character varying(255), title character varying(255), function character varying(255), - other_data character varying(255), + other_data text, user_id character varying(255) NOT NULL, entity_id character varying(32) NOT NULL, creation_date timestamp without time zone NOT NULL,