[Rt-commit] rt branch, 5.0/merge-configurations-schema-changes, created. rt-5.0.0beta1-1-g73b5ed1e20

[? sunnavy]

The branch, 5.0/merge-configurations-schema-changes has been created
        at  73b5ed1e20afc2252960ed74710540cd7c3b0c46 (commit)

- Log -----------------------------------------------------------------
commit 73b5ed1e20afc2252960ed74710540cd7c3b0c46
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Jun 10 03:33:02 2020 +0800

    Merge schema changes for Configurations table to avoid confusion
    
    Since these changes will be included in the same version(5.0.0), there
    is no need to do the "change, revert, fix" thing, and we can do it right
    from the beginning.

diff --git a/etc/upgrade/4.5.1/schema.Oracle b/etc/upgrade/4.5.1/schema.Oracle
index d275ae92bf..f487c74757 100644
--- a/etc/upgrade/4.5.1/schema.Oracle
+++ b/etc/upgrade/4.5.1/schema.Oracle
@@ -1,7 +1,7 @@
 CREATE SEQUENCE Configurations_seq;
 CREATE TABLE Configurations (
     id              NUMBER(11,0)    CONSTRAINT Configurations_key PRIMARY KEY,
-    Name            VARCHAR2(255) CONSTRAINT Configurations_Name_Unique unique  NOT NULL,
+    Name            VARCHAR2(255) NOT NULL,
     Content         CLOB,
     ContentType     VARCHAR2(80),
     Disabled        NUMBER(11,0) DEFAULT 0 NOT NULL,
@@ -11,5 +11,5 @@ CREATE TABLE Configurations (
     LastUpdated     DATE
 );
 
-CREATE UNIQUE INDEX Configurations1 ON Configurations (LOWER(Name));
+CREATE INDEX Configurations1 ON Configurations (LOWER(Name), Disabled);
 CREATE INDEX Configurations2 ON Configurations (Disabled);
diff --git a/etc/upgrade/4.5.1/schema.Pg b/etc/upgrade/4.5.1/schema.Pg
index eecba576b2..2ff8de0a52 100644
--- a/etc/upgrade/4.5.1/schema.Pg
+++ b/etc/upgrade/4.5.1/schema.Pg
@@ -12,5 +12,5 @@ CREATE TABLE Configurations (
     PRIMARY KEY (id)
 );
 
-CREATE UNIQUE INDEX Configurations1 ON Configurations (LOWER(Name));
+CREATE INDEX Configurations1 ON Configurations (LOWER(Name), Disabled);
 CREATE INDEX Configurations2 ON Configurations (Disabled);
diff --git a/etc/upgrade/4.5.1/schema.SQLite b/etc/upgrade/4.5.1/schema.SQLite
index a8f280d334..25106a6363 100644
--- a/etc/upgrade/4.5.1/schema.SQLite
+++ b/etc/upgrade/4.5.1/schema.SQLite
@@ -10,6 +10,5 @@ CREATE TABLE Configurations (
     LastUpdated       timestamp                DEFAULT NULL
 );
 
-CREATE UNIQUE INDEX Configurations1 ON Configurations (Name);
+CREATE INDEX Configurations1 ON Configurations (Name, Disabled);
 CREATE INDEX Configurations2 ON Configurations (Disabled);
-
diff --git a/etc/upgrade/4.5.1/schema.mysql b/etc/upgrade/4.5.1/schema.mysql
index 80eda81134..db356b87de 100644
--- a/etc/upgrade/4.5.1/schema.mysql
+++ b/etc/upgrade/4.5.1/schema.mysql
@@ -11,5 +11,5 @@ CREATE TABLE Configurations (
     PRIMARY KEY (id)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-CREATE UNIQUE INDEX Configurations1 ON Configurations (Name);
+CREATE INDEX Configurations1 ON Configurations (Name, Disabled);
 CREATE INDEX Configurations2 ON Configurations (Disabled);
diff --git a/etc/upgrade/4.5.3/schema.Oracle b/etc/upgrade/4.5.3/schema.Oracle
index c4e069a4a7..2f61d6a0a5 100644
--- a/etc/upgrade/4.5.3/schema.Oracle
+++ b/etc/upgrade/4.5.3/schema.Oracle
@@ -1,5 +1,2 @@
 -- Add transaction support for new config in database feature
 ALTER TABLE Transactions MODIFY Field VARCHAR2(255);
-
-DROP INDEX Configurations1;
-CREATE INDEX Configurations1 ON Configurations (LOWER(Name), Disabled);
diff --git a/etc/upgrade/4.5.3/schema.Pg b/etc/upgrade/4.5.3/schema.Pg
index 3df15eacad..8f9580a91b 100644
--- a/etc/upgrade/4.5.3/schema.Pg
+++ b/etc/upgrade/4.5.3/schema.Pg
@@ -1,5 +1,2 @@
 -- Add transaction support for new config in database feature
 ALTER TABLE Transactions ALTER COLUMN Field TYPE varchar(255);
-
-DROP INDEX IF EXISTS Configurations1;
-CREATE INDEX Configurations1 ON Configurations (LOWER(Name), Disabled);
diff --git a/etc/upgrade/4.5.3/schema.SQLite b/etc/upgrade/4.5.3/schema.SQLite
deleted file mode 100644
index 88d1ca8dc6..0000000000
--- a/etc/upgrade/4.5.3/schema.SQLite
+++ /dev/null
@@ -1,2 +0,0 @@
-DROP INDEX IF EXISTS Configurations1;
-CREATE INDEX Configurations1 ON Configurations (Name, Disabled);
diff --git a/etc/upgrade/4.5.3/schema.mysql b/etc/upgrade/4.5.3/schema.mysql
index 8c3134f25d..74f7976522 100644
--- a/etc/upgrade/4.5.3/schema.mysql
+++ b/etc/upgrade/4.5.3/schema.mysql
@@ -1,5 +1,2 @@
 -- Add transaction support for new config in database feature
 ALTER TABLE Transactions MODIFY Field VARCHAR(255) CHARACTER SET ascii DEFAULT NULL;
-
-DROP INDEX Configurations1 ON Configurations;
-CREATE INDEX Configurations1 ON Configurations (Name, Disabled);
diff --git a/etc/upgrade/4.5.8/schema.Oracle b/etc/upgrade/4.5.8/schema.Oracle
deleted file mode 100644
index 0f7e6e4133..0000000000
--- a/etc/upgrade/4.5.8/schema.Oracle
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE Configurations DROP CONSTRAINT Configurations_Name_Unique;

-----------------------------------------------------------------------