From 91efc3fe4d04e0f66142cfa8455604a22083d771 Mon Sep 17 00:00:00 2001
From: Pavol Mederly <mederly@evolveum.com>
Date: Tue, 4 Aug 2015 11:14:47 +0200
Subject: [PATCH] Fixed PostgreSQL db scripts (changed definition order only).

---
 config/sql/_all/postgresql-3.2-all.sql        | 42 +++++++++----------
 .../3.2/postgresql/postgresql-3.2.sql         | 42 +++++++++----------
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/config/sql/_all/postgresql-3.2-all.sql b/config/sql/_all/postgresql-3.2-all.sql
index 335369432c6..cf0db1290cd 100644
--- a/config/sql/_all/postgresql-3.2-all.sql
+++ b/config/sql/_all/postgresql-3.2-all.sql
@@ -1,8 +1,8 @@
-CREATE TABLE m_acc_cert_definition (
-    name_norm VARCHAR(255),
-    name_orig VARCHAR(255),
-    oid VARCHAR(36) NOT NULL,
-    PRIMARY KEY (oid)
+CREATE TABLE m_abstract_role (
+  approvalProcess VARCHAR(255),
+  requestable     BOOLEAN,
+  oid             VARCHAR(36) NOT NULL,
+  PRIMARY KEY (oid)
 );
 
 CREATE TABLE m_acc_cert_campaign (
@@ -15,11 +15,11 @@ CREATE TABLE m_acc_cert_campaign (
     PRIMARY KEY (oid)
 );
 
-CREATE TABLE m_abstract_role (
-  approvalProcess VARCHAR(255),
-  requestable     BOOLEAN,
-  oid             VARCHAR(36) NOT NULL,
-  PRIMARY KEY (oid)
+CREATE TABLE m_acc_cert_definition (
+    name_norm VARCHAR(255),
+    name_orig VARCHAR(255),
+    oid VARCHAR(36) NOT NULL,
+    PRIMARY KEY (oid)
 );
 
 CREATE TABLE m_assignment (
@@ -601,13 +601,13 @@ CREATE TABLE m_value_policy (
   PRIMARY KEY (oid)
 );
 
-ALTER TABLE m_acc_cert_definition
-    ADD CONSTRAINT uc_acc_cert_definition_name  UNIQUE (name_norm);
+CREATE INDEX iRequestable ON m_abstract_role (requestable);
 
 ALTER TABLE m_acc_cert_campaign
     ADD CONSTRAINT uc_acc_cert_campaign_name  UNIQUE (name_norm);
 
-CREATE INDEX iRequestable ON m_abstract_role (requestable);
+ALTER TABLE m_acc_cert_definition
+    ADD CONSTRAINT uc_acc_cert_definition_name  UNIQUE (name_norm);
 
 CREATE INDEX iAssignmentAdministrative ON m_assignment (administrativeStatus);
 
@@ -735,20 +735,20 @@ CREATE INDEX iLocality ON m_user (locality_orig);
 ALTER TABLE m_value_policy
 ADD CONSTRAINT uc_value_policy_name UNIQUE (name_norm);
 
-ALTER TABLE m_acc_cert_definition
-    ADD CONSTRAINT fk_acc_cert_definition
-    FOREIGN KEY (oid)
-    REFERENCES m_object;
+ALTER TABLE m_abstract_role
+ADD CONSTRAINT fk_abstract_role
+FOREIGN KEY (oid)
+REFERENCES m_focus;
 
 ALTER TABLE m_acc_cert_campaign
     ADD CONSTRAINT fk_acc_cert_campaign
     FOREIGN KEY (oid)
     REFERENCES m_object;
 
-ALTER TABLE m_abstract_role
-ADD CONSTRAINT fk_abstract_role
-FOREIGN KEY (oid)
-REFERENCES m_focus;
+ALTER TABLE m_acc_cert_definition
+    ADD CONSTRAINT fk_acc_cert_definition
+    FOREIGN KEY (oid)
+    REFERENCES m_object;
 
 ALTER TABLE m_assignment
 ADD CONSTRAINT fk_assignment_owner
diff --git a/config/sql/midpoint/3.2/postgresql/postgresql-3.2.sql b/config/sql/midpoint/3.2/postgresql/postgresql-3.2.sql
index f5fee7c376e..7c61625f18d 100644
--- a/config/sql/midpoint/3.2/postgresql/postgresql-3.2.sql
+++ b/config/sql/midpoint/3.2/postgresql/postgresql-3.2.sql
@@ -1,8 +1,8 @@
-CREATE TABLE m_acc_cert_definition (
-    name_norm VARCHAR(255),
-    name_orig VARCHAR(255),
-    oid VARCHAR(36) NOT NULL,
-    PRIMARY KEY (oid)
+CREATE TABLE m_abstract_role (
+  approvalProcess VARCHAR(255),
+  requestable     BOOLEAN,
+  oid             VARCHAR(36) NOT NULL,
+  PRIMARY KEY (oid)
 );
 
 CREATE TABLE m_acc_cert_campaign (
@@ -15,11 +15,11 @@ CREATE TABLE m_acc_cert_campaign (
     PRIMARY KEY (oid)
 );
 
-CREATE TABLE m_abstract_role (
-  approvalProcess VARCHAR(255),
-  requestable     BOOLEAN,
-  oid             VARCHAR(36) NOT NULL,
-  PRIMARY KEY (oid)
+CREATE TABLE m_acc_cert_definition (
+    name_norm VARCHAR(255),
+    name_orig VARCHAR(255),
+    oid VARCHAR(36) NOT NULL,
+    PRIMARY KEY (oid)
 );
 
 CREATE TABLE m_assignment (
@@ -601,13 +601,13 @@ CREATE TABLE m_value_policy (
   PRIMARY KEY (oid)
 );
 
-ALTER TABLE m_acc_cert_definition
-    ADD CONSTRAINT uc_acc_cert_definition_name  UNIQUE (name_norm);
+CREATE INDEX iRequestable ON m_abstract_role (requestable);
 
 ALTER TABLE m_acc_cert_campaign
     ADD CONSTRAINT uc_acc_cert_campaign_name  UNIQUE (name_norm);
 
-CREATE INDEX iRequestable ON m_abstract_role (requestable);
+ALTER TABLE m_acc_cert_definition
+    ADD CONSTRAINT uc_acc_cert_definition_name  UNIQUE (name_norm);
 
 CREATE INDEX iAssignmentAdministrative ON m_assignment (administrativeStatus);
 
@@ -735,20 +735,20 @@ CREATE INDEX iLocality ON m_user (locality_orig);
 ALTER TABLE m_value_policy
 ADD CONSTRAINT uc_value_policy_name UNIQUE (name_norm);
 
-ALTER TABLE m_acc_cert_definition
-    ADD CONSTRAINT fk_acc_cert_definition
-    FOREIGN KEY (oid)
-    REFERENCES m_object;
+ALTER TABLE m_abstract_role
+ADD CONSTRAINT fk_abstract_role
+FOREIGN KEY (oid)
+REFERENCES m_focus;
 
 ALTER TABLE m_acc_cert_campaign
     ADD CONSTRAINT fk_acc_cert_campaign
     FOREIGN KEY (oid)
     REFERENCES m_object;
 
-ALTER TABLE m_abstract_role
-ADD CONSTRAINT fk_abstract_role
-FOREIGN KEY (oid)
-REFERENCES m_focus;
+ALTER TABLE m_acc_cert_definition
+    ADD CONSTRAINT fk_acc_cert_definition
+    FOREIGN KEY (oid)
+    REFERENCES m_object;
 
 ALTER TABLE m_assignment
 ADD CONSTRAINT fk_assignment_owner