Commit 66f5203d authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge branch 'test'

parents 633927c7 fae69365
Loading
Loading
Loading
Loading
+8 −7
Changes for composer.lock: 8 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
    "content-hash": "946a5ea1f43e05305f62da7f28d3b592",
    "content-hash": "279eb09bb0299ba3814065b1dbacaa73",
    "packages": [
        {
            "name": "beberlei/assert",
@@ -817,12 +817,12 @@
            "version": "v2.5.14",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/doctrine2.git",
                "url": "https://github.com/doctrine/orm.git",
                "reference": "810a7baf81462a5ddf10e8baa8cb94b6eec02754"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/810a7baf81462a5ddf10e8baa8cb94b6eec02754",
                "url": "https://api.github.com/repos/doctrine/orm/zipball/810a7baf81462a5ddf10e8baa8cb94b6eec02754",
                "reference": "810a7baf81462a5ddf10e8baa8cb94b6eec02754",
                "shasum": ""
            },
@@ -2094,11 +2094,11 @@
        },
        {
            "name": "unicaen/oracle",
            "version": "1.2.3",
            "version": "1.2.4",
            "source": {
                "type": "git",
                "url": "https://git.unicaen.fr/lib/unicaen/oracle.git",
                "reference": "bc79ca51396e377999225c02f1726a153a2f342c"
                "reference": "52ae94ec5f3b4bb9f3af38676e076491139edecc"
            },
            "require": {
                "doctrine/dbal": "^2.5",
@@ -2118,7 +2118,7 @@
                ]
            },
            "description": "Bibliothèque utile lorsqu'on utilise un base de données Oracle",
            "time": "2018-12-06T10:39:40+00:00"
            "time": "2019-01-09T13:47:48+00:00"
        },
        {
            "name": "webmozart/assert",
@@ -3844,7 +3844,8 @@
    "platform": {
        "ext-fileinfo": "*",
        "ext-json": "*",
        "ext-imagick": "*"
        "ext-imagick": "*",
        "ext-pdo": "*"
    },
    "platform-dev": []
}
+1 −1
Changes for config/application.config.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ $modules = [
    'UnicaenImport',
    'UnicaenFaq',
    'UnicaenLeocarte',
    'Application',
    'Import',
    'Indicateur',
    'Retraitement',
    'Notification',
    'Information',
    'Application',
];
if (php_sapi_name() === 'cli') {
    unset($modules['BjyAuthorize']);

data/SQL/profil.sql

0 → 100644
+28 −0
Changes for data/SQL/profil.sql: 28 added lines, 0 removed lines.
Original line number Diff line number Diff line
rename ROLE_MODELE to PROFIL;
rename ROLE_MODELE_PRIVILEGE to PROFIL_PRIVILEGE;

create sequence PROFIL_ID_SEQ;
--
-- Avance d'une sequence.
--
declare
  maxid integer;
  seqnextval integer;
begin
  select max(PROFIL.id) into maxid from PROFIL;
  LOOP
    select PROFIL_ID_SEQ.nextval into seqnextval from dual;
    EXIT WHEN seqnextval >= maxid;
  END LOOP;
end;

create unique index PROFIL_ROLE_ID_uindex on PROFIL (ROLE_ID);

alter table PROFIL_PRIVILEGE rename column ROLE_ID to PROFIL_ID;
alter table PROFIL_PRIVILEGE add constraint PROFIL_PRIVILEGE_PROFIL_ID_fk foreign key (PROFIL_ID) references PROFIL;

create table PROFIL_TO_ROLE (
	PROFIL_ID integer not null constraint PROFIL_TO_ROLE_PROFIL_ID_fk references PROFIL,
	ROLE_ID integer not null constraint PROFIL_TO_ROLE_ROLE_ID_fk references ROLE,
	constraint PROFIL_TO_ROLE_pk primary key (PROFIL_ID, ROLE_ID)
);
 No newline at end of file
+902 −0

File added.

Preview size limit exceeded, changes collapsed.

+5 −5
Changes for data/db/oracle-data-insert-from-SYGAL_TEST.ROLE_MODELE-into-SYGAL_TEST.sql: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
set define off ;

INSERT INTO SYGAL_TEST.ROLE_MODELE (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (1, 'Unité de recherche', 'UR', 3) ;
INSERT INTO SYGAL_TEST.ROLE_MODELE (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (2, 'École doctorale', 'ED', 2) ;
INSERT INTO SYGAL_TEST.ROLE_MODELE (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (3, 'Administrateur', 'ADMIN', 1) ;
INSERT INTO SYGAL_TEST.ROLE_MODELE (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (4, 'Bureau des doctorats', 'BDD', 1) ;
INSERT INTO SYGAL_TEST.ROLE_MODELE (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (5, 'Bibliothèque universitaire', 'BU', 1) ;
INSERT INTO SYGAL_TEST.PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (1, 'Unité de recherche', 'UR', 3) ;
INSERT INTO SYGAL_TEST.PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (2, 'École doctorale', 'ED', 2) ;
INSERT INTO SYGAL_TEST.PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (3, 'Administrateur', 'ADMIN', 1) ;
INSERT INTO SYGAL_TEST.PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (4, 'Bureau des doctorats', 'BDD', 1) ;
INSERT INTO SYGAL_TEST.PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (5, 'Bibliothèque universitaire', 'BU', 1) ;
Loading