updated SQL scripts.

Evolveum · May 6, 2014 · 10b1669 · 10b1669
1 parent 6f7f147
commit 10b1669
Show file tree

Hide file tree

Showing 5 changed files with 210 additions and 185 deletions.
diff --git a/config/sql/midpoint/2.3/h2/h2-2.3.sql b/config/sql/midpoint/2.3/h2/h2-2.3.sql
@@ -332,6 +332,7 @@ CREATE TABLE m_org (
   costCenter       VARCHAR(255),
   displayName_norm VARCHAR(255),
   displayName_orig VARCHAR(255),
+  displayOrder     INTEGER,
   identifier       VARCHAR(255),
   locality_norm    VARCHAR(255),
   locality_orig    VARCHAR(255),
@@ -373,13 +374,13 @@ CREATE TABLE m_reference (
 );
 
 CREATE TABLE m_report (
-  export                   INTEGER,
-  name_norm                VARCHAR(255),
-  name_orig                VARCHAR(255),
-  orientation              INTEGER,
-  parent                   BOOLEAN,
-  useHibernateSession      BOOLEAN,
-  oid                      VARCHAR(36) NOT NULL,
+  export              INTEGER,
+  name_norm           VARCHAR(255),
+  name_orig           VARCHAR(255),
+  orientation         INTEGER,
+  parent              BOOLEAN,
+  useHibernateSession BOOLEAN,
+  oid                 VARCHAR(36) NOT NULL,
   PRIMARY KEY (oid),
   UNIQUE (name_norm)
 );
@@ -495,36 +496,36 @@ CREATE TABLE m_trigger (
 );
 
 CREATE TABLE m_user (
-  additionalName_norm      VARCHAR(255),
-  additionalName_orig      VARCHAR(255),
-  costCenter               VARCHAR(255),
-  emailAddress             VARCHAR(255),
-  employeeNumber           VARCHAR(255),
-  familyName_norm          VARCHAR(255),
-  familyName_orig          VARCHAR(255),
-  fullName_norm            VARCHAR(255),
-  fullName_orig            VARCHAR(255),
-  givenName_norm           VARCHAR(255),
-  givenName_orig           VARCHAR(255),
-  hasPhoto                 BOOLEAN     NOT NULL,
-  honorificPrefix_norm     VARCHAR(255),
-  honorificPrefix_orig     VARCHAR(255),
-  honorificSuffix_norm     VARCHAR(255),
-  honorificSuffix_orig     VARCHAR(255),
-  locale                   VARCHAR(255),
-  locality_norm            VARCHAR(255),
-  locality_orig            VARCHAR(255),
-  name_norm                VARCHAR(255),
-  name_orig                VARCHAR(255),
-  nickName_norm            VARCHAR(255),
-  nickName_orig            VARCHAR(255),
-  preferredLanguage        VARCHAR(255),
-  status                   INTEGER,
-  telephoneNumber          VARCHAR(255),
-  timezone                 VARCHAR(255),
-  title_norm               VARCHAR(255),
-  title_orig               VARCHAR(255),
-  oid                      VARCHAR(36) NOT NULL,
+  additionalName_norm  VARCHAR(255),
+  additionalName_orig  VARCHAR(255),
+  costCenter           VARCHAR(255),
+  emailAddress         VARCHAR(255),
+  employeeNumber       VARCHAR(255),
+  familyName_norm      VARCHAR(255),
+  familyName_orig      VARCHAR(255),
+  fullName_norm        VARCHAR(255),
+  fullName_orig        VARCHAR(255),
+  givenName_norm       VARCHAR(255),
+  givenName_orig       VARCHAR(255),
+  hasPhoto             BOOLEAN     NOT NULL,
+  honorificPrefix_norm VARCHAR(255),
+  honorificPrefix_orig VARCHAR(255),
+  honorificSuffix_norm VARCHAR(255),
+  honorificSuffix_orig VARCHAR(255),
+  locale               VARCHAR(255),
+  locality_norm        VARCHAR(255),
+  locality_orig        VARCHAR(255),
+  name_norm            VARCHAR(255),
+  name_orig            VARCHAR(255),
+  nickName_norm        VARCHAR(255),
+  nickName_orig        VARCHAR(255),
+  preferredLanguage    VARCHAR(255),
+  status               INTEGER,
+  telephoneNumber      VARCHAR(255),
+  timezone             VARCHAR(255),
+  title_norm           VARCHAR(255),
+  title_orig           VARCHAR(255),
+  oid                  VARCHAR(36) NOT NULL,
   PRIMARY KEY (oid),
   UNIQUE (name_norm)
 );
@@ -662,6 +663,8 @@ ADD CONSTRAINT fk_node
 FOREIGN KEY (oid)
 REFERENCES m_object;
 
+CREATE INDEX iObjectTypeClass ON m_object (objectTypeClass);
+
 CREATE INDEX iObjectNameOrig ON m_object (name_orig);
 
 CREATE INDEX iObjectNameNorm ON m_object (name_norm);
@@ -716,6 +719,8 @@ ADD CONSTRAINT fk_object_template
 FOREIGN KEY (oid)
 REFERENCES m_object;
 
+CREATE INDEX iDisplayOrder ON m_org (displayOrder);
+
 ALTER TABLE m_org
 ADD CONSTRAINT fk_org
 FOREIGN KEY (oid)

diff --git a/config/sql/midpoint/2.3/mysql/mysql-2.3.sql b/config/sql/midpoint/2.3/mysql/mysql-2.3.sql
@@ -420,6 +420,7 @@ CREATE TABLE m_org (
   costCenter       VARCHAR(255),
   displayName_norm VARCHAR(255),
   displayName_orig VARCHAR(255),
+  displayOrder     INTEGER,
   identifier       VARCHAR(255),
   locality_norm    VARCHAR(255),
   locality_orig    VARCHAR(255),
@@ -476,13 +477,13 @@ CREATE TABLE m_reference (
   ENGINE =InnoDB;
 
 CREATE TABLE m_report (
-  export                   INTEGER,
-  name_norm                VARCHAR(255),
-  name_orig                VARCHAR(255),
-  orientation              INTEGER,
-  parent                   BIT,
-  useHibernateSession      BIT,
-  oid                      VARCHAR(36) NOT NULL,
+  export              INTEGER,
+  name_norm           VARCHAR(255),
+  name_orig           VARCHAR(255),
+  orientation         INTEGER,
+  parent              BIT,
+  useHibernateSession BIT,
+  oid                 VARCHAR(36) NOT NULL,
   PRIMARY KEY (oid),
   UNIQUE (name_norm)
 )
@@ -628,36 +629,36 @@ CREATE TABLE m_trigger (
   ENGINE =InnoDB;
 
 CREATE TABLE m_user (
-  additionalName_norm      VARCHAR(255),
-  additionalName_orig      VARCHAR(255),
-  costCenter               VARCHAR(255),
-  emailAddress             VARCHAR(255),
-  employeeNumber           VARCHAR(255),
-  familyName_norm          VARCHAR(255),
-  familyName_orig          VARCHAR(255),
-  fullName_norm            VARCHAR(255),
-  fullName_orig            VARCHAR(255),
-  givenName_norm           VARCHAR(255),
-  givenName_orig           VARCHAR(255),
-  hasPhoto                 BIT         NOT NULL,
-  honorificPrefix_norm     VARCHAR(255),
-  honorificPrefix_orig     VARCHAR(255),
-  honorificSuffix_norm     VARCHAR(255),
-  honorificSuffix_orig     VARCHAR(255),
-  locale                   VARCHAR(255),
-  locality_norm            VARCHAR(255),
-  locality_orig            VARCHAR(255),
-  name_norm                VARCHAR(255),
-  name_orig                VARCHAR(255),
-  nickName_norm            VARCHAR(255),
-  nickName_orig            VARCHAR(255),
-  preferredLanguage        VARCHAR(255),
-  status                   INTEGER,
-  telephoneNumber          VARCHAR(255),
-  timezone                 VARCHAR(255),
-  title_norm               VARCHAR(255),
-  title_orig               VARCHAR(255),
-  oid                      VARCHAR(36) NOT NULL,
+  additionalName_norm  VARCHAR(255),
+  additionalName_orig  VARCHAR(255),
+  costCenter           VARCHAR(255),
+  emailAddress         VARCHAR(255),
+  employeeNumber       VARCHAR(255),
+  familyName_norm      VARCHAR(255),
+  familyName_orig      VARCHAR(255),
+  fullName_norm        VARCHAR(255),
+  fullName_orig        VARCHAR(255),
+  givenName_norm       VARCHAR(255),
+  givenName_orig       VARCHAR(255),
+  hasPhoto             BIT         NOT NULL,
+  honorificPrefix_norm VARCHAR(255),
+  honorificPrefix_orig VARCHAR(255),
+  honorificSuffix_norm VARCHAR(255),
+  honorificSuffix_orig VARCHAR(255),
+  locale               VARCHAR(255),
+  locality_norm        VARCHAR(255),
+  locality_orig        VARCHAR(255),
+  name_norm            VARCHAR(255),
+  name_orig            VARCHAR(255),
+  nickName_norm        VARCHAR(255),
+  nickName_orig        VARCHAR(255),
+  preferredLanguage    VARCHAR(255),
+  status               INTEGER,
+  telephoneNumber      VARCHAR(255),
+  timezone             VARCHAR(255),
+  title_norm           VARCHAR(255),
+  title_orig           VARCHAR(255),
+  oid                  VARCHAR(36) NOT NULL,
   PRIMARY KEY (oid),
   UNIQUE (name_norm)
 )
@@ -829,6 +830,8 @@ ADD CONSTRAINT fk_node
 FOREIGN KEY (oid)
 REFERENCES m_object (oid);
 
+CREATE INDEX iObjectTypeClass ON m_object (objectTypeClass);
+
 CREATE INDEX iObjectNameOrig ON m_object (name_orig);
 
 CREATE INDEX iObjectNameNorm ON m_object (name_norm);
@@ -889,6 +892,8 @@ ADD CONSTRAINT fk_object_template
 FOREIGN KEY (oid)
 REFERENCES m_object (oid);
 
+CREATE INDEX iDisplayOrder ON m_org (displayOrder);
+
 ALTER TABLE m_org
 ADD INDEX fk_org (oid),
 ADD CONSTRAINT fk_org

diff --git a/config/sql/midpoint/2.3/oracle/oracle-2.3.sql b/config/sql/midpoint/2.3/oracle/oracle-2.3.sql
@@ -335,6 +335,7 @@ CREATE TABLE m_org (
   costCenter       VARCHAR2(255 CHAR),
   displayName_norm VARCHAR2(255 CHAR),
   displayName_orig VARCHAR2(255 CHAR),
+  displayOrder     NUMBER(10, 0),
   identifier       VARCHAR2(255 CHAR),
   locality_norm    VARCHAR2(255 CHAR),
   locality_orig    VARCHAR2(255 CHAR),
@@ -376,13 +377,13 @@ CREATE TABLE m_reference (
 ) INITRANS 30;
 
 CREATE TABLE m_report (
-  export                   NUMBER(10, 0),
-  name_norm                VARCHAR2(255 CHAR),
-  name_orig                VARCHAR2(255 CHAR),
-  orientation              NUMBER(10, 0),
-  parent                   NUMBER(1, 0),
-  useHibernateSession      NUMBER(1, 0),
-  oid                      VARCHAR2(36 CHAR) NOT NULL,
+  export              NUMBER(10, 0),
+  name_norm           VARCHAR2(255 CHAR),
+  name_orig           VARCHAR2(255 CHAR),
+  orientation         NUMBER(10, 0),
+  parent              NUMBER(1, 0),
+  useHibernateSession NUMBER(1, 0),
+  oid                 VARCHAR2(36 CHAR) NOT NULL,
   PRIMARY KEY (oid),
   UNIQUE (name_norm)
 ) INITRANS 30;
@@ -498,36 +499,36 @@ CREATE TABLE m_trigger (
 ) INITRANS 30;
 
 CREATE TABLE m_user (
-  additionalName_norm      VARCHAR2(255 CHAR),
-  additionalName_orig      VARCHAR2(255 CHAR),
-  costCenter               VARCHAR2(255 CHAR),
-  emailAddress             VARCHAR2(255 CHAR),
-  employeeNumber           VARCHAR2(255 CHAR),
-  familyName_norm          VARCHAR2(255 CHAR),
-  familyName_orig          VARCHAR2(255 CHAR),
-  fullName_norm            VARCHAR2(255 CHAR),
-  fullName_orig            VARCHAR2(255 CHAR),
-  givenName_norm           VARCHAR2(255 CHAR),
-  givenName_orig           VARCHAR2(255 CHAR),
-  hasPhoto                 NUMBER(1, 0)      NOT NULL,
-  honorificPrefix_norm     VARCHAR2(255 CHAR),
-  honorificPrefix_orig     VARCHAR2(255 CHAR),
-  honorificSuffix_norm     VARCHAR2(255 CHAR),
-  honorificSuffix_orig     VARCHAR2(255 CHAR),
-  locale                   VARCHAR2(255 CHAR),
-  locality_norm            VARCHAR2(255 CHAR),
-  locality_orig            VARCHAR2(255 CHAR),
-  name_norm                VARCHAR2(255 CHAR),
-  name_orig                VARCHAR2(255 CHAR),
-  nickName_norm            VARCHAR2(255 CHAR),
-  nickName_orig            VARCHAR2(255 CHAR),
-  preferredLanguage        VARCHAR2(255 CHAR),
-  status                   NUMBER(10, 0),
-  telephoneNumber          VARCHAR2(255 CHAR),
-  timezone                 VARCHAR2(255 CHAR),
-  title_norm               VARCHAR2(255 CHAR),
-  title_orig               VARCHAR2(255 CHAR),
-  oid                      VARCHAR2(36 CHAR) NOT NULL,
+  additionalName_norm  VARCHAR2(255 CHAR),
+  additionalName_orig  VARCHAR2(255 CHAR),
+  costCenter           VARCHAR2(255 CHAR),
+  emailAddress         VARCHAR2(255 CHAR),
+  employeeNumber       VARCHAR2(255 CHAR),
+  familyName_norm      VARCHAR2(255 CHAR),
+  familyName_orig      VARCHAR2(255 CHAR),
+  fullName_norm        VARCHAR2(255 CHAR),
+  fullName_orig        VARCHAR2(255 CHAR),
+  givenName_norm       VARCHAR2(255 CHAR),
+  givenName_orig       VARCHAR2(255 CHAR),
+  hasPhoto             NUMBER(1, 0)      NOT NULL,
+  honorificPrefix_norm VARCHAR2(255 CHAR),
+  honorificPrefix_orig VARCHAR2(255 CHAR),
+  honorificSuffix_norm VARCHAR2(255 CHAR),
+  honorificSuffix_orig VARCHAR2(255 CHAR),
+  locale               VARCHAR2(255 CHAR),
+  locality_norm        VARCHAR2(255 CHAR),
+  locality_orig        VARCHAR2(255 CHAR),
+  name_norm            VARCHAR2(255 CHAR),
+  name_orig            VARCHAR2(255 CHAR),
+  nickName_norm        VARCHAR2(255 CHAR),
+  nickName_orig        VARCHAR2(255 CHAR),
+  preferredLanguage    VARCHAR2(255 CHAR),
+  status               NUMBER(10, 0),
+  telephoneNumber      VARCHAR2(255 CHAR),
+  timezone             VARCHAR2(255 CHAR),
+  title_norm           VARCHAR2(255 CHAR),
+  title_orig           VARCHAR2(255 CHAR),
+  oid                  VARCHAR2(36 CHAR) NOT NULL,
   PRIMARY KEY (oid),
   UNIQUE (name_norm)
 ) INITRANS 30;
@@ -665,6 +666,8 @@ ADD CONSTRAINT fk_node
 FOREIGN KEY (oid)
 REFERENCES m_object;
 
+CREATE INDEX iObjectTypeClass ON m_object (objectTypeClass) INITRANS 30;
+
 CREATE INDEX iObjectNameOrig ON m_object (name_orig) INITRANS 30;
 
 CREATE INDEX iObjectNameNorm ON m_object (name_norm) INITRANS 30;
@@ -719,6 +722,8 @@ ADD CONSTRAINT fk_object_template
 FOREIGN KEY (oid)
 REFERENCES m_object;
 
+CREATE INDEX iDisplayOrder ON m_org (displayOrder) INITRANS 30;
+
 ALTER TABLE m_org
 ADD CONSTRAINT fk_org
 FOREIGN KEY (oid)