Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint

Evolveum · Mar 3, 2014 · f3050f1 · f3050f1
2 parents 133fb3a + beefb4b
commit f3050f1
Show file tree

Hide file tree

Showing 65 changed files with 1,947 additions and 654 deletions.
diff --git a/config/sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql b/config/sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql
@@ -4,12 +4,27 @@ ALTER TABLE m_sync_situation_description ADD fullFlag BOOLEAN;
 ALTER TABLE m_shadow ADD fullSynchronizationTimestamp TIMESTAMP;
 ALTER TABLE m_task ADD expectedTotal BIGINT;
 ALTER TABLE m_assignment ADD disableReason VARCHAR(255);
+ALTER TABLE m_assignment ADD tenantRef_description CLOB;
+ALTER TABLE m_assignment ADD tenantRef_filter CLOB;
+ALTER TABLE m_assignment ADD tenantRef_relationLocalPart VARCHAR(100);
+ALTER TABLE m_assignment ADD tenantRef_relationNamespace VARCHAR(255);
+ALTER TABLE m_assignment ADD tenantRef_targetOid VARCHAR(36);
+ALTER TABLE m_assignment ADD tenantRef_type INTEGER;
 ALTER TABLE m_focus ADD disableReason VARCHAR(255);
 ALTER TABLE m_shadow ADD disableReason VARCHAR(255);
 ALTER TABLE m_audit_delta ADD context CLOB;
 ALTER TABLE m_audit_delta ADD returns CLOB;
 ALTER TABLE m_operation_result ADD context CLOB;
 ALTER TABLE m_operation_result ADD returns CLOB;
+ALTER TABLE m_object ADD tenantRef_description CLOB;
+ALTER TABLE m_object ADD tenantRef_filter CLOB;
+ALTER TABLE m_object ADD tenantRef_relationLocalPart VARCHAR(100);
+ALTER TABLE m_object ADD tenantRef_relationNamespace VARCHAR(255);
+ALTER TABLE m_object ADD tenantRef_targetOid VARCHAR(36);
+ALTER TABLE m_object ADD tenantRef_type INTEGER;
+ALTER TABLE m_object ADD name_norm VARCHAR(255);
+ALTER TABLE m_object ADD name_orig VARCHAR(255);
+ALTER TABLE m_org ADD tenant BOOLEAN;
 
 CREATE TABLE m_report (
     configuration CLOB,
@@ -69,4 +84,8 @@ ALTER TABLE m_report_output
 
 ALTER TABLE m_assignment ADD orderValue INTEGER;
 
-ALTER TABLE m_user ADD jpegPhoto BLOB;
+ALTER TABLE m_user ADD jpegPhoto BLOB;
+
+CREATE INDEX iObjectNameOrig ON m_object (name_orig);
+
+CREATE INDEX iObjectNameNorm ON m_object (name_norm);
diff --git a/config/sql/midpoint/2.2/mysql/mysql-upgrade-2.2-to-2.3.sql b/config/sql/midpoint/2.2/mysql/mysql-upgrade-2.2-to-2.3.sql
@@ -4,12 +4,27 @@ ALTER TABLE m_sync_situation_description ADD fullFlag BIT;
 ALTER TABLE m_shadow ADD fullSynchronizationTimestamp DATETIME(6);
 ALTER TABLE m_task ADD expectedTotal BIGINT;
 ALTER TABLE m_assignment ADD disableReason VARCHAR(255);
+ALTER TABLE m_assignment ADD tenantRef_description LONGTEXT;
+ALTER TABLE m_assignment ADD tenantRef_filter LONGTEXT;
+ALTER TABLE m_assignment ADD tenantRef_relationLocalPart VARCHAR(100);
+ALTER TABLE m_assignment ADD tenantRef_relationNamespace VARCHAR(255);
+ALTER TABLE m_assignment ADD tenantRef_targetOid VARCHAR(36);
+ALTER TABLE m_assignment ADD tenantRef_type INTEGER;
 ALTER TABLE m_focus ADD disableReason VARCHAR(255);
 ALTER TABLE m_shadow ADD disableReason VARCHAR(255);
 ALTER TABLE m_audit_delta ADD context LONGTEXT;
 ALTER TABLE m_audit_delta ADD returns LONGTEXT;
 ALTER TABLE m_operation_result ADD context LONGTEXT;
 ALTER TABLE m_operation_result ADD returns LONGTEXT;
+ALTER TABLE m_object ADD tenantRef_description LONGTEXT;
+ALTER TABLE m_object ADD tenantRef_filter LONGTEXT;
+ALTER TABLE m_object ADD tenantRef_relationLocalPart VARCHAR(100);
+ALTER TABLE m_object ADD tenantRef_relationNamespace VARCHAR(255);
+ALTER TABLE m_object ADD tenantRef_targetOid VARCHAR(36);
+ALTER TABLE m_object ADD tenantRef_type INTEGER;
+ALTER TABLE m_object ADD name_norm VARCHAR(255);
+ALTER TABLE m_object ADD name_orig VARCHAR(255);
+ALTER TABLE m_org ADD tenant BIT;
 
 CREATE TABLE m_report (
 	configuration LONGTEXT,
@@ -74,4 +89,8 @@ ALTER TABLE m_report_output
 
 ALTER TABLE m_assignment ADD orderValue INTEGER;
 
-ALTER TABLE m_user ADD jpegPhoto LONGBLOB;
+ALTER TABLE m_user ADD jpegPhoto LONGBLOB;
+
+CREATE INDEX iObjectNameOrig ON m_object (name_orig);
+
+CREATE INDEX iObjectNameNorm ON m_object (name_norm);
diff --git a/config/sql/midpoint/2.2/oracle/oracle-upgrade-2.2-to-2.3.sql b/config/sql/midpoint/2.2/oracle/oracle-upgrade-2.2-to-2.3.sql
@@ -4,12 +4,28 @@ ALTER TABLE m_sync_situation_description ADD fullFlag NUMBER(1, 0);
 ALTER TABLE m_shadow ADD fullSynchronizationTimestamp TIMESTAMP;
 ALTER TABLE m_task ADD expectedTotal NUMBER(19, 0);
 ALTER TABLE m_assignment ADD disableReason VARCHAR2(255 CHAR);
+ALTER TABLE m_assignment ADD tenantRef_description CLOB;
+ALTER TABLE m_assignment ADD tenantRef_filter CLOB;
+ALTER TABLE m_assignment ADD tenantRef_relationLocalPart VARCHAR(100 CHAR);
+ALTER TABLE m_assignment ADD tenantRef_relationNamespace VARCHAR(255 CHAR);
+ALTER TABLE m_assignment ADD tenantRef_targetOid VARCHAR(36 CHAR);
+ALTER TABLE m_assignment ADD tenantRef_type NUMBER(10, 0);
 ALTER TABLE m_focus ADD disableReason VARCHAR2(255 CHAR);
 ALTER TABLE m_shadow ADD disableReason VARCHAR2(255 CHAR);
 ALTER TABLE m_audit_delta ADD context CLOB;
 ALTER TABLE m_audit_delta ADD returns CLOB;
 ALTER TABLE m_operation_result ADD context CLOB;
 ALTER TABLE m_operation_result ADD returns CLOB;
+ALTER TABLE m_object ADD tenantRef_description CLOB;
+ALTER TABLE m_object ADD tenantRef_filter CLOB;
+ALTER TABLE m_object ADD tenantRef_relationLocalPart VARCHAR(100 CHAR);
+ALTER TABLE m_object ADD tenantRef_relationNamespace VARCHAR(255 CHAR);
+ALTER TABLE m_object ADD tenantRef_targetOid VARCHAR(36 CHAR);
+ALTER TABLE m_object ADD tenantRef_type NUMBER(10,0);
+ALTER TABLE m_object ADD name_norm VARCHAR(255 CHAR);
+ALTER TABLE m_object ADD name_orig VARCHAR(255 CHAR);
+ALTER TABLE m_org ADD tenant NUMBER(1, 0);
+
 
 CREATE TABLE m_report (
     configuration CLOB,
@@ -68,4 +84,7 @@ ALTER TABLE m_report_output
 
 ALTER TABLE m_assignment ADD orderValue NUMBER(10,0);
 
-ALTER TABLE m_user ADD jpegPhoto BLOB;
+ALTER TABLE m_user ADD jpegPhoto BLOB;
+CREATE INDEX iObjectNameOrig ON m_object (name_orig) INITRANS 30;
+
+CREATE INDEX iObjectNameNorm ON m_object (name_norm) INITRANS 30;
diff --git a/config/sql/midpoint/2.2/postgresql/postgresql-upgrade-2.2-to-2.3.sql b/config/sql/midpoint/2.2/postgresql/postgresql-upgrade-2.2-to-2.3.sql
@@ -1,15 +1,30 @@
 CREATE INDEX iParent ON m_task (parent);
 
-ALTER TABLE m_sync_situation_description ADD COLUMN fullFlag BOOLEAN;
-ALTER TABLE m_shadow ADD COLUMN fullSynchronizationTimestamp TIMESTAMP;
-ALTER TABLE m_task ADD COLUMN expectedTotal INT8;
+ALTER TABLE m_sync_situation_description ADD fullFlag BOOLEAN;
+ALTER TABLE m_shadow ADD fullSynchronizationTimestamp TIMESTAMP;
+ALTER TABLE m_task ADD expectedTotal INT8;
 ALTER TABLE m_assignment ADD disableReason VARCHAR(255);
+ALTER TABLE m_assignment ADD tenantRef_description TEXT;
+ALTER TABLE m_assignment ADD tenantRef_filter TEXT;
+ALTER TABLE m_assignment ADD tenantRef_relationLocalPart VARCHAR(100);
+ALTER TABLE m_assignment ADD tenantRef_relationNamespace VARCHAR(255);
+ALTER TABLE m_assignment ADD tenantRef_targetOid VARCHAR(36);
+ALTER TABLE m_assignment ADD tenantRef_type INT4;
 ALTER TABLE m_focus ADD disableReason VARCHAR(255);
 ALTER TABLE m_shadow ADD disableReason VARCHAR(255);
 ALTER TABLE m_audit_delta ADD context TEXT;
 ALTER TABLE m_audit_delta ADD returns TEXT;
 ALTER TABLE m_operation_result ADD context TEXT;
 ALTER TABLE m_operation_result ADD returns TEXT;
+ALTER TABLE m_object ADD tenantRef_description TEXT;
+ALTER TABLE m_object ADD tenantRef_filter TEXT;
+ALTER TABLE m_object ADD tenantRef_relationLocalPart VARCHAR(100);
+ALTER TABLE m_object ADD tenantRef_relationNamespace VARCHAR(255);
+ALTER TABLE m_object ADD tenantRef_targetOid VARCHAR(36);
+ALTER TABLE m_object ADD tenantRef_type INT4;
+ALTER TABLE m_object ADD name_norm VARCHAR(255);
+ALTER TABLE m_object ADD name_orig VARCHAR(255);
+ALTER TABLE m_org ADD tenant BOOLEAN;
 
 CREATE TABLE m_report (
     configuration TEXT,
@@ -68,4 +83,8 @@ ALTER TABLE m_report_output
 
 ALTER TABLE m_assignment ADD orderValue INT4;
 
-ALTER TABLE m_user ADD jpegPhoto OID;
+ALTER TABLE m_user ADD jpegPhoto OID;
+
+CREATE INDEX iObjectNameOrig ON m_object (name_orig);
+
+CREATE INDEX iObjectNameNorm ON m_object (name_norm);
diff --git a/config/sql/midpoint/2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql b/config/sql/midpoint/2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql
@@ -4,12 +4,28 @@ ALTER TABLE m_sync_situation_description ADD fullFlag BIT;
 ALTER TABLE m_shadow ADD fullSynchronizationTimestamp DATETIME2;
 ALTER TABLE m_task ADD expectedTotal BIGINT;
 ALTER TABLE m_assignment ADD disableReason NVARCHAR(255);
+ALTER TABLE m_assignment ADD tenantRef_description NVARCHAR(MAX);
+ALTER TABLE m_assignment ADD tenantRef_filter NVARCHAR(MAX);
+ALTER TABLE m_assignment ADD tenantRef_relationLocalPart NVARCHAR(100);
+ALTER TABLE m_assignment ADD tenantRef_relationNamespace NVARCHAR(255);
+ALTER TABLE m_assignment ADD tenantRef_targetOid NVARCHAR(36);
+ALTER TABLE m_assignment ADD tenantRef_type INT;
 ALTER TABLE m_focus ADD disableReason NVARCHAR(255);
 ALTER TABLE m_shadow ADD disableReason NVARCHAR(255);
 ALTER TABLE m_audit_delta ADD context NVARCHAR(MAX);
 ALTER TABLE m_audit_delta ADD returns NVARCHAR(MAX);
 ALTER TABLE m_operation_result ADD context NVARCHAR(MAX);
 ALTER TABLE m_operation_result ADD returns NVARCHAR(MAX);
+ALTER TABLE m_object ADD tenantRef_description NVARCHAR(MAX);
+ALTER TABLE m_object ADD tenantRef_filter NVARCHAR(MAX);
+ALTER TABLE m_object ADD tenantRef_relationLocalPart NVARCHAR(100);
+ALTER TABLE m_object ADD tenantRef_relationNamespace NVARCHAR(255);
+ALTER TABLE m_object ADD tenantRef_targetOid NVARCHAR(36);
+ALTER TABLE m_object ADD tenantRef_type INT;
+ALTER TABLE m_object ADD name_norm NVARCHAR(255);
+ALTER TABLE m_object ADD name_orig NVARCHAR(255);
+ALTER TABLE m_org ADD tenant BIT;
+
 
 CREATE TABLE m_report (
 	configuration NVARCHAR(MAX),
@@ -68,4 +84,8 @@ ALTER TABLE m_report_output
 
 ALTER TABLE m_assignment ADD orderValue INT;
 
-ALTER TABLE m_user ADD jpegPhoto VARBINARY(MAX);
+ALTER TABLE m_user ADD jpegPhoto VARBINARY(MAX);
+
+CREATE INDEX iObjectNameOrig ON m_object (name_orig);
+
+CREATE INDEX iObjectNameNorm ON m_object (name_norm);
diff --git a/config/sql/midpoint/2.3/h2/h2-2.3.sql b/config/sql/midpoint/2.3/h2/h2-2.3.sql
@@ -132,6 +132,12 @@
         targetRef_relationNamespace varchar(255),
         targetRef_targetOid varchar(36),
         targetRef_type integer,
+        tenantRef_description clob,
+        tenantRef_filter clob,
+        tenantRef_relationLocalPart varchar(100),
+        tenantRef_relationNamespace varchar(255),
+        tenantRef_targetOid varchar(36),
+        tenantRef_type integer,
         id bigint not null,
         oid varchar(36) not null,
         extId bigint,
@@ -329,6 +335,14 @@
 
     create table m_object (
         description clob,
+        name_norm varchar(255),
+        name_orig varchar(255),
+        tenantRef_description clob,
+        tenantRef_filter clob,
+        tenantRef_relationLocalPart varchar(100),
+        tenantRef_relationNamespace varchar(255),
+        tenantRef_targetOid varchar(36),
+        tenantRef_type integer,
         version bigint not null,
         id bigint not null,
         oid varchar(36) not null,
@@ -376,6 +390,7 @@
         locality_orig varchar(255),
         name_norm varchar(255),
         name_orig varchar(255),
+        tenant boolean,
         id bigint not null,
         oid varchar(36) not null,
         primary key (id, oid),
@@ -418,7 +433,7 @@
         primary key (owner_id, owner_oid, relLocalPart, relNamespace, targetOid)
     );
 
-   create table m_report (
+    create table m_report (
         configuration clob,
         configurationSchema clob,
         dataSource_providerClass varchar(255),
@@ -838,6 +853,10 @@
         foreign key (id, oid) 
         references m_object;
 
+    create index iObjectNameOrig on m_object (name_orig);
+
+    create index iObjectNameNorm on m_object (name_norm);
+
     alter table m_object 
         add constraint fk_object 
         foreign key (id, oid)