This is an automated email from the git hooks/post-receive script. New commit to branch feature/lucene in repository wao. See http://git.codelutin.com/wao.git commit bf80c884a6c39493a8058818cb93f8ae2fa8d242 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Dec 22 14:46:26 2014 +0100 fusion de deux migrations dans un même fichier suite à une fusion de branche de fonctionnalité --- ...pecies,_add_laboratories,_add_sclerochronology.sql} | 17 +++++++++++++++++ .../resources/db/migration/V5_0__sclerochronology.sql | 18 ------------------ 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/wao-persistence/src/main/resources/db/migration/V5_0__add_species,_add_laboratories.sql b/wao-persistence/src/main/resources/db/migration/V5_0__add_species,_add_laboratories,_add_sclerochronology.sql similarity index 73% rename from wao-persistence/src/main/resources/db/migration/V5_0__add_species,_add_laboratories.sql rename to wao-persistence/src/main/resources/db/migration/V5_0__add_species,_add_laboratories,_add_sclerochronology.sql index d53308d..96ab55c 100644 --- a/wao-persistence/src/main/resources/db/migration/V5_0__add_species,_add_laboratories.sql +++ b/wao-persistence/src/main/resources/db/migration/V5_0__add_species,_add_laboratories,_add_sclerochronology.sql @@ -57,3 +57,20 @@ alter table SampleRow rename column company to organisation; alter table WaoUser drop constraint fk42d03050f28824af; alter table WaoUser rename column company to organisation; + +-- Ouverture de l'accès au programme sclérochronologie du compte admin +insert into UserProfile values ( + 'fr.ifremer.wao.entities.UserProfile#129111142543000#933200987654321550', + 1, + now(), + (select topiaId from WaoUser where login = 'admin'), + 'SCLEROCHRONOLOGY', + 'ADMIN', + true, + uuid_in(md5(random()::text || now()::text)::cstring) +); + +alter table SampleRow add column species character varying(255) references Species(topiaId); +alter table SampleRow add column sclerochronologySamplingContext character varying(255); +alter table SampleRow add column individualMeasurementStrategy character varying(255); +alter table SampleRow add column sclerochronologySamplingContextInfo text; diff --git a/wao-persistence/src/main/resources/db/migration/V5_0__sclerochronology.sql b/wao-persistence/src/main/resources/db/migration/V5_0__sclerochronology.sql deleted file mode 100644 index fe74d39..0000000 --- a/wao-persistence/src/main/resources/db/migration/V5_0__sclerochronology.sql +++ /dev/null @@ -1,18 +0,0 @@ - - --- Ouverture de l'accès au programme sclérochronologie du compte admin -insert into UserProfile values ( - 'fr.ifremer.wao.entities.UserProfile#129111142543000#933200987654321550', - 1, - now(), - (select topiaId from WaoUser where login = 'admin'), - 'SCLEROCHRONOLOGY', - 'ADMIN', - true, - uuid_in(md5(random()::text || now()::text)::cstring) -); - -alter table SampleRow add column species character varying(255) references Species(topiaId); -alter table SampleRow add column sclerochronologySamplingContext character varying(255); -alter table SampleRow add column individualMeasurementStrategy character varying(255); -alter table SampleRow add column sclerochronologySamplingContextInfo text; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.