Fixed names of DB objects for certification (m1_a6_c13 -> m_acc_cert)

Evolveum · Jun 18, 2015 · ff0bc23 · ff0bc23
1 parent 0f24ca4
commit ff0bc23
Show file tree

Hide file tree

Showing 25 changed files with 216 additions and 210 deletions.
diff --git a/config/sql/_all/h2-3.2-all.sql b/config/sql/_all/h2-3.2-all.sql
@@ -2,14 +2,14 @@
 -- So, contrary to all the other databases, this file contains only midPoint-related scripts.
 -- If you want to add Quartz and Activiti-related tables, please use files from quartz and activiti directories, respectively.
 
-CREATE TABLE m1_a6_c13_definition (
+CREATE TABLE m_acc_cert_definition (
     name_norm VARCHAR(255),
     name_orig VARCHAR(255),
     oid VARCHAR(36) NOT NULL,
     PRIMARY KEY (oid)
 );
 
-CREATE TABLE m1_a6_certification_campaign (
+CREATE TABLE m_acc_cert_campaign (
     definitionRef_relation VARCHAR(157),
     definitionRef_targetOid VARCHAR(36),
     definitionRef_type INTEGER,
@@ -605,11 +605,11 @@ CREATE TABLE m_value_policy (
   PRIMARY KEY (oid)
 );
 
-ALTER TABLE m1_a6_c13_definition
-    ADD CONSTRAINT uc_a6_c13_definition_name  UNIQUE (name_norm);
+ALTER TABLE m_acc_cert_definition
+    ADD CONSTRAINT uc_acc_cert_definition_name  UNIQUE (name_norm);
 
-ALTER TABLE m1_a6_certification_campaign
-    ADD CONSTRAINT uc_a6_c13_campaign_name  UNIQUE (name_norm);
+ALTER TABLE m_acc_cert_campaign
+    ADD CONSTRAINT uc_acc_cert_campaign_name  UNIQUE (name_norm);
 
 CREATE INDEX iRequestable ON m_abstract_role (requestable);
 
@@ -739,13 +739,13 @@ CREATE INDEX iLocality ON m_user (locality_orig);
 ALTER TABLE m_value_policy
 ADD CONSTRAINT uc_value_policy_name UNIQUE (name_norm);
 
-ALTER TABLE m1_a6_c13_definition
-    ADD CONSTRAINT fk_a6_c13_definition
+ALTER TABLE m_acc_cert_definition
+    ADD CONSTRAINT fk_acc_cert_definition
     FOREIGN KEY (oid)
     REFERENCES m_object;
 
-ALTER TABLE m1_a6_certification_campaign
-    ADD CONSTRAINT fk_a6_c13_campaign
+ALTER TABLE m_acc_cert_campaign
+    ADD CONSTRAINT fk_acc_cert_campaign
     FOREIGN KEY (oid)
     REFERENCES m_object;
 

diff --git a/config/sql/_all/h2-upgrade-3.1.1-3.2.sql b/config/sql/_all/h2-upgrade-3.1.1-3.2.sql
@@ -1,11 +1,11 @@
-CREATE TABLE m1_a6_c13_definition (
+CREATE TABLE m_acc_cert_definition (
     name_norm VARCHAR(255),
     name_orig VARCHAR(255),
     oid VARCHAR(36) NOT NULL,
     PRIMARY KEY (oid)
 );
 
-CREATE TABLE m1_a6_certification_campaign (
+CREATE TABLE m_acc_cert_campaign (
     definitionRef_relation VARCHAR(157),
     definitionRef_targetOid VARCHAR(36),
     definitionRef_type INTEGER,
@@ -15,18 +15,18 @@ CREATE TABLE m1_a6_certification_campaign (
     PRIMARY KEY (oid)
 );
 
-ALTER TABLE m1_a6_c13_definition
-    ADD CONSTRAINT uc_a6_c13_definition_name  UNIQUE (name_norm);
+ALTER TABLE m_acc_cert_definition
+    ADD CONSTRAINT uc_acc_cert_definition_name  UNIQUE (name_norm);
 
-ALTER TABLE m1_a6_certification_campaign
-    ADD CONSTRAINT uc_a6_c13_campaign_name  UNIQUE (name_norm);
+ALTER TABLE m_acc_cert_campaign
+    ADD CONSTRAINT uc_acc_cert_campaign_name  UNIQUE (name_norm);
 
-ALTER TABLE m1_a6_c13_definition
-    ADD CONSTRAINT fk_a6_c13_definition
+ALTER TABLE m_acc_cert_definition
+    ADD CONSTRAINT fk_acc_cert_definition
     FOREIGN KEY (oid)
     REFERENCES m_object;
 
-ALTER TABLE m1_a6_certification_campaign
-    ADD CONSTRAINT fk_a6_c13_campaign
+ALTER TABLE m_acc_cert_campaign
+    ADD CONSTRAINT fk_acc_cert_campaign
     FOREIGN KEY (oid)
     REFERENCES m_object;
diff --git a/config/sql/_all/mysql-3.2-all.sql b/config/sql/_all/mysql-3.2-all.sql
@@ -11,7 +11,7 @@
 
 # remove iAncestor and iDescendant index, they are the same as FK for that fields
 
-CREATE TABLE m1_a6_c13_definition (
+CREATE TABLE m_acc_cert_definition (
     name_norm VARCHAR(255),
     name_orig VARCHAR(255),
     oid VARCHAR(36) NOT NULL,
@@ -21,7 +21,7 @@ CREATE TABLE m1_a6_c13_definition (
   COLLATE utf8_bin
   ENGINE=InnoDB;
 
-CREATE TABLE m1_a6_certification_campaign (
+CREATE TABLE m_acc_cert_campaign (
     definitionRef_relation VARCHAR(157),
     definitionRef_targetOid VARCHAR(36),
     definitionRef_type INTEGER,
@@ -767,11 +767,11 @@ CREATE TABLE m_value_policy (
   COLLATE utf8_bin
   ENGINE = InnoDB;
 
-ALTER TABLE m1_a6_c13_definition
-    ADD CONSTRAINT uc_a6_c13_definition_name  UNIQUE (name_norm);
+ALTER TABLE m_acc_cert_definition
+    ADD CONSTRAINT uc_acc_cert_definition_name  UNIQUE (name_norm);
 
-ALTER TABLE m1_a6_certification_campaign
-    ADD CONSTRAINT uc_a6_c13_campaign_name  UNIQUE (name_norm);
+ALTER TABLE m_acc_cert_campaign
+    ADD CONSTRAINT uc_acc_cert_campaign_name  UNIQUE (name_norm);
 
 CREATE INDEX iRequestable ON m_abstract_role (requestable);
 
@@ -903,13 +903,13 @@ CREATE INDEX iLocality ON m_user (locality_orig);
 ALTER TABLE m_value_policy
 ADD CONSTRAINT uc_value_policy_name UNIQUE (name_norm);
 
-ALTER TABLE m1_a6_c13_definition
-    ADD CONSTRAINT fk_a6_c13_definition
+ALTER TABLE m_acc_cert_definition
+    ADD CONSTRAINT fk_acc_cert_definition
     FOREIGN KEY (oid)
     REFERENCES m_object (oid);
 
-ALTER TABLE m1_a6_certification_campaign
-    ADD CONSTRAINT fk_a6_c13_campaign
+ALTER TABLE m_acc_cert_campaign
+    ADD CONSTRAINT fk_acc_cert_campaign
     FOREIGN KEY (oid)
     REFERENCES m_object (oid);
 

diff --git a/config/sql/_all/mysql-upgrade-3.1.1-3.2.sql b/config/sql/_all/mysql-upgrade-3.1.1-3.2.sql
@@ -1,4 +1,4 @@
-CREATE TABLE m1_a6_c13_definition (
+CREATE TABLE m_acc_cert_definition (
     name_norm VARCHAR(255),
     name_orig VARCHAR(255),
     oid VARCHAR(36) NOT NULL,
@@ -8,7 +8,7 @@ CREATE TABLE m1_a6_c13_definition (
   COLLATE utf8_bin
   ENGINE=InnoDB;
 
-CREATE TABLE m1_a6_certification_campaign (
+CREATE TABLE m_acc_cert_campaign (
     definitionRef_relation VARCHAR(157),
     definitionRef_targetOid VARCHAR(36),
     definitionRef_type INTEGER,
@@ -21,18 +21,18 @@ CREATE TABLE m1_a6_certification_campaign (
   COLLATE utf8_bin
   ENGINE=InnoDB;
 
-ALTER TABLE m1_a6_c13_definition
-    ADD CONSTRAINT uc_a6_c13_definition_name  UNIQUE (name_norm);
+ALTER TABLE m_acc_cert_definition
+    ADD CONSTRAINT uc_acc_cert_definition_name  UNIQUE (name_norm);
 
-ALTER TABLE m1_a6_certification_campaign
-    ADD CONSTRAINT uc_a6_c13_campaign_name  UNIQUE (name_norm);
+ALTER TABLE m_acc_cert_campaign
+    ADD CONSTRAINT uc_acc_cert_campaign_name  UNIQUE (name_norm);
 
-ALTER TABLE m1_a6_c13_definition
-    ADD CONSTRAINT fk_a6_c13_definition
+ALTER TABLE m_acc_cert_definition
+    ADD CONSTRAINT fk_acc_cert_definition
     FOREIGN KEY (oid)
     REFERENCES m_object (oid);
 
-ALTER TABLE m1_a6_certification_campaign
-    ADD CONSTRAINT fk_a6_c13_campaign
+ALTER TABLE m_acc_cert_campaign
+    ADD CONSTRAINT fk_acc_cert_campaign
     FOREIGN KEY (oid)
     REFERENCES m_object (oid);
diff --git a/config/sql/_all/oracle-3.2-all.sql b/config/sql/_all/oracle-3.2-all.sql
@@ -1,14 +1,14 @@
 -- INITRANS added because we use serializable transactions http://docs.oracle.com/cd/B14117_01/appdev.101/b10795/adfns_sq.htm#1025374
 -- replace ");" with ") INITRANS 30;"
 
-CREATE TABLE m1_a6_c13_definition (
+CREATE TABLE m_acc_cert_definition (
     name_norm VARCHAR2(255 CHAR),
     name_orig VARCHAR2(255 CHAR),
     oid VARCHAR2(36 CHAR) NOT NULL,
     PRIMARY KEY (oid)
 ) INITRANS 30;
 
-CREATE TABLE m1_a6_certification_campaign (
+CREATE TABLE m_acc_cert_campaign (
     definitionRef_relation VARCHAR2(157 CHAR),
     definitionRef_targetOid VARCHAR2(36 CHAR),
     definitionRef_type NUMBER(10,0),
@@ -611,11 +611,11 @@ CREATE TABLE m_value_policy (
   PRIMARY KEY (oid)
 ) INITRANS 30;
 
-ALTER TABLE m1_a6_c13_definition
-    ADD CONSTRAINT uc_a6_c13_definition_name  UNIQUE (name_norm) INITRANS 30;
+ALTER TABLE m_acc_cert_definition
+    ADD CONSTRAINT uc_acc_cert_definition_name  UNIQUE (name_norm) INITRANS 30;
 
-ALTER TABLE m1_a6_certification_campaign
-    ADD CONSTRAINT uc_a6_c13_campaign_name  UNIQUE (name_norm) INITRANS 30;
+ALTER TABLE m_acc_cert_campaign
+    ADD CONSTRAINT uc_acc_cert_campaign_name  UNIQUE (name_norm) INITRANS 30;
 
 CREATE INDEX iRequestable ON m_abstract_role (requestable) INITRANS 30;
 
@@ -745,13 +745,13 @@ CREATE INDEX iLocality ON m_user (locality_orig) INITRANS 30;
 ALTER TABLE m_value_policy
 ADD CONSTRAINT uc_value_policy_name UNIQUE (name_norm) INITRANS 30;
 
-ALTER TABLE m1_a6_c13_definition
-    ADD CONSTRAINT fk_a6_c13_definition
+ALTER TABLE m_acc_cert_definition
+    ADD CONSTRAINT fk_acc_cert_definition
     FOREIGN KEY (oid)
     REFERENCES m_object;
 
-ALTER TABLE m1_a6_certification_campaign
-    ADD CONSTRAINT fk_a6_c13_campaign
+ALTER TABLE m_acc_cert_campaign
+    ADD CONSTRAINT fk_acc_cert_campaign
     FOREIGN KEY (oid)
     REFERENCES m_object;
 

diff --git a/config/sql/_all/oracle-upgrade-3.1.1-3.2.sql b/config/sql/_all/oracle-upgrade-3.1.1-3.2.sql
@@ -1,11 +1,11 @@
-CREATE TABLE m1_a6_c13_definition (
+CREATE TABLE m_acc_cert_definition (
     name_norm VARCHAR2(255 CHAR),
     name_orig VARCHAR2(255 CHAR),
     oid VARCHAR2(36 CHAR) NOT NULL,
     PRIMARY KEY (oid)
 ) INITRANS 30;
 
-CREATE TABLE m1_a6_certification_campaign (
+CREATE TABLE m_acc_cert_campaign (
     definitionRef_relation VARCHAR2(157 CHAR),
     definitionRef_targetOid VARCHAR2(36 CHAR),
     definitionRef_type NUMBER(10,0),
@@ -15,18 +15,18 @@ CREATE TABLE m1_a6_certification_campaign (
     PRIMARY KEY (oid)
 ) INITRANS 30;
 
-ALTER TABLE m1_a6_c13_definition
-    ADD CONSTRAINT uc_a6_c13_definition_name  UNIQUE (name_norm) INITRANS 30;
+ALTER TABLE m_acc_cert_definition
+    ADD CONSTRAINT uc_acc_cert_definition_name  UNIQUE (name_norm) INITRANS 30;
 
-ALTER TABLE m1_a6_certification_campaign
-    ADD CONSTRAINT uc_a6_c13_campaign_name  UNIQUE (name_norm) INITRANS 30;
+ALTER TABLE m_acc_cert_campaign
+    ADD CONSTRAINT uc_acc_cert_campaign_name  UNIQUE (name_norm) INITRANS 30;
 
-ALTER TABLE m1_a6_c13_definition
-    ADD CONSTRAINT fk_a6_c13_definition
+ALTER TABLE m_acc_cert_definition
+    ADD CONSTRAINT fk_acc_cert_definition
     FOREIGN KEY (oid)
     REFERENCES m_object;
 
-ALTER TABLE m1_a6_certification_campaign
-    ADD CONSTRAINT fk_a6_c13_campaign
+ALTER TABLE m_acc_cert_campaign
+    ADD CONSTRAINT fk_acc_cert_campaign
     FOREIGN KEY (oid)
     REFERENCES m_object;
diff --git a/config/sql/_all/postgresql-3.2-all.sql b/config/sql/_all/postgresql-3.2-all.sql
@@ -1,11 +1,11 @@
-CREATE TABLE m1_a6_c13_definition (
+CREATE TABLE m_acc_cert_definition (
     name_norm VARCHAR(255),
     name_orig VARCHAR(255),
     oid VARCHAR(36) NOT NULL,
     PRIMARY KEY (oid)
 );
 
-CREATE TABLE m1_a6_certification_campaign (
+CREATE TABLE m_acc_cert_campaign (
     definitionRef_relation VARCHAR(157),
     definitionRef_targetOid VARCHAR(36),
     definitionRef_type int4,
@@ -601,11 +601,11 @@ CREATE TABLE m_value_policy (
   PRIMARY KEY (oid)
 );
 
-ALTER TABLE m1_a6_c13_definition
-    ADD CONSTRAINT uc_a6_c13_definition_name  UNIQUE (name_norm);
+ALTER TABLE m_acc_cert_definition
+    ADD CONSTRAINT uc_acc_cert_definition_name  UNIQUE (name_norm);
 
-ALTER TABLE m1_a6_certification_campaign
-    ADD CONSTRAINT uc_a6_c13_campaign_name  UNIQUE (name_norm);
+ALTER TABLE m_acc_cert_campaign
+    ADD CONSTRAINT uc_acc_cert_campaign_name  UNIQUE (name_norm);
 
 CREATE INDEX iRequestable ON m_abstract_role (requestable);
 
@@ -735,13 +735,13 @@ CREATE INDEX iLocality ON m_user (locality_orig);
 ALTER TABLE m_value_policy
 ADD CONSTRAINT uc_value_policy_name UNIQUE (name_norm);
 
-ALTER TABLE m1_a6_c13_definition
-    ADD CONSTRAINT fk_a6_c13_definition
+ALTER TABLE m_acc_cert_definition
+    ADD CONSTRAINT fk_acc_cert_definition
     FOREIGN KEY (oid)
     REFERENCES m_object;
 
-ALTER TABLE m1_a6_certification_campaign
-    ADD CONSTRAINT fk_a6_c13_campaign
+ALTER TABLE m_acc_cert_campaign
+    ADD CONSTRAINT fk_acc_cert_campaign
     FOREIGN KEY (oid)
     REFERENCES m_object;
 

diff --git a/config/sql/_all/postgresql-upgrade-3.1.1-3.2.sql b/config/sql/_all/postgresql-upgrade-3.1.1-3.2.sql
@@ -1,11 +1,11 @@
-CREATE TABLE m1_a6_c13_definition (
+CREATE TABLE m_acc_cert_definition (
     name_norm VARCHAR(255),
     name_orig VARCHAR(255),
     oid VARCHAR(36) NOT NULL,
     PRIMARY KEY (oid)
 );
 
-CREATE TABLE m1_a6_certification_campaign (
+CREATE TABLE m_acc_cert_campaign (
     definitionRef_relation VARCHAR(157),
     definitionRef_targetOid VARCHAR(36),
     definitionRef_type int4,
@@ -15,18 +15,18 @@ CREATE TABLE m1_a6_certification_campaign (
     PRIMARY KEY (oid)
 );
 
-ALTER TABLE m1_a6_c13_definition
-    ADD CONSTRAINT uc_a6_c13_definition_name  UNIQUE (name_norm);
+ALTER TABLE m_acc_cert_definition
+    ADD CONSTRAINT uc_acc_cert_definition_name  UNIQUE (name_norm);
 
-ALTER TABLE m1_a6_certification_campaign
-    ADD CONSTRAINT uc_a6_c13_campaign_name  UNIQUE (name_norm);
+ALTER TABLE m_acc_cert_campaign
+    ADD CONSTRAINT uc_acc_cert_campaign_name  UNIQUE (name_norm);
 
-ALTER TABLE m1_a6_c13_definition
-    ADD CONSTRAINT fk_a6_c13_definition
+ALTER TABLE m_acc_cert_definition
+    ADD CONSTRAINT fk_acc_cert_definition
     FOREIGN KEY (oid)
     REFERENCES m_object;
 
-ALTER TABLE m1_a6_certification_campaign
-    ADD CONSTRAINT fk_a6_c13_campaign
+ALTER TABLE m_acc_cert_campaign
+    ADD CONSTRAINT fk_acc_cert_campaign
     FOREIGN KEY (oid)
     REFERENCES m_object;