Consistent declaration of H2 primary keys

1 files changed, 32 insertions, 38 deletions

diff --git a/server/sonar-db-core/src/main/resources/org/sonar/db/version/schema-h2.ddl b/server/sonar-db-core/src/main/resources/org/sonar/db/version/schema-h2.ddl
index ee63fd3464e..2ebc5a39f71 100644
--- a/server/sonar-db-core/src/main/resources/org/sonar/db/version/schema-h2.ddl
+++ b/server/sonar-db-core/src/main/resources/org/sonar/db/version/schema-h2.ddl
@@ -1,5 +1,5 @@
 CREATE TABLE "ORGANIZATIONS" (
-  "UUID" VARCHAR(40) NOT NULL PRIMARY KEY,
+  "UUID" VARCHAR(40) PRIMARY KEY,
   "KEE" VARCHAR(32) NOT NULL,
   "NAME" VARCHAR(64) NOT NULL,
   "DESCRIPTION" VARCHAR(256),
@@ -15,14 +15,13 @@ CREATE TABLE "ORGANIZATIONS" (
   "CREATED_AT" BIGINT NOT NULL,
   "UPDATED_AT" BIGINT NOT NULL
 );
-CREATE UNIQUE INDEX "PK_ORGANIZATIONS" ON "ORGANIZATIONS" ("UUID");
 CREATE UNIQUE INDEX "ORGANIZATION_KEY" ON "ORGANIZATIONS" ("KEE");
 
 CREATE TABLE "ORGANIZATION_MEMBERS" (
   "ORGANIZATION_UUID" VARCHAR(40) NOT NULL,
-  "USER_ID" INTEGER NOT NULL
+  "USER_ID" INTEGER NOT NULL,
+  PRIMARY KEY ("ORGANIZATION_UUID", "USER_ID")
 );
-CREATE PRIMARY KEY ON "ORGANIZATION_MEMBERS" ("ORGANIZATION_UUID", "USER_ID");
 
 CREATE TABLE "GROUPS_USERS" (
   "USER_ID" INTEGER,
@@ -58,7 +57,7 @@ CREATE UNIQUE INDEX "UNIQ_QPROF_KEY" ON "RULES_PROFILES" ("KEE");
 
 
 CREATE TABLE "ORG_QPROFILES" (
-  "UUID" VARCHAR(255) NOT NULL PRIMARY KEY,
+  "UUID" VARCHAR(255) PRIMARY KEY,
   "ORGANIZATION_UUID" VARCHAR(40) NOT NULL,
   "RULES_PROFILE_UUID" VARCHAR(255) NOT NULL,
   "PARENT_UUID" VARCHAR(255),
@@ -76,9 +75,9 @@ CREATE TABLE "DEFAULT_QPROFILES" (
   "LANGUAGE" VARCHAR(20) NOT NULL,
   "QPROFILE_UUID" VARCHAR(255) NOT NULL,
   "CREATED_AT" BIGINT NOT NULL,
-  "UPDATED_AT" BIGINT NOT NULL
+  "UPDATED_AT" BIGINT NOT NULL,
+  PRIMARY KEY ("ORGANIZATION_UUID", "LANGUAGE")
 );
-CREATE PRIMARY KEY ON "DEFAULT_QPROFILES" ("ORGANIZATION_UUID", "LANGUAGE");
 CREATE UNIQUE INDEX "UNIQ_DEFAULT_QPROFILES_UUID" ON "DEFAULT_QPROFILES" ("QPROFILE_UUID");
 
 
@@ -91,23 +90,21 @@ CREATE UNIQUE INDEX "UNIQ_PROJECT_QPROFILES" ON "PROJECT_QPROFILES" ("PROJECT_UU
 
 
 CREATE TABLE "QPROFILE_EDIT_USERS" (
-  "UUID" VARCHAR(40) NOT NULL PRIMARY KEY,
+  "UUID" VARCHAR(40) PRIMARY KEY,
   "USER_ID" INTEGER NOT NULL,
   "QPROFILE_UUID" VARCHAR(255) NOT NULL,
   "CREATED_AT" BIGINT,
 );
-CREATE UNIQUE INDEX "PK_QPROFILE_EDIT_USERS" ON "QPROFILE_EDIT_USERS" ("UUID");
 CREATE INDEX "QPROFILE_EDIT_USERS_QPROFILE" ON "QPROFILE_EDIT_USERS" ("QPROFILE_UUID");
 CREATE UNIQUE INDEX "QPROFILE_EDIT_USERS_UNIQUE" ON "QPROFILE_EDIT_USERS" ("USER_ID", "QPROFILE_UUID");
 
 
 CREATE TABLE "QPROFILE_EDIT_GROUPS" (
-  "UUID" VARCHAR(40) NOT NULL PRIMARY KEY,
+  "UUID" VARCHAR(40) PRIMARY KEY,
   "GROUP_ID" INTEGER NOT NULL,
   "QPROFILE_UUID" VARCHAR(255) NOT NULL,
   "CREATED_AT" BIGINT,
 );
-CREATE UNIQUE INDEX "PK_QPROFILE_EDIT_GROUPS" ON "QPROFILE_EDIT_GROUPS" ("UUID");
 CREATE INDEX "QPROFILE_EDIT_GROUPS_QPROFILE" ON "QPROFILE_EDIT_GROUPS" ("QPROFILE_UUID");
 CREATE UNIQUE INDEX "QPROFILE_EDIT_GROUPS_UNIQUE" ON "QPROFILE_EDIT_GROUPS" ("GROUP_ID", "QPROFILE_UUID");
 
@@ -163,14 +160,14 @@ CREATE UNIQUE INDEX "UNIQ_GROUP_ROLES" ON "GROUP_ROLES" ("ORGANIZATION_UUID", "G
 
 
 CREATE TABLE "RULE_REPOSITORIES" (
-  "KEE" VARCHAR(200) NOT NULL PRIMARY KEY,
+  "KEE" VARCHAR(200) PRIMARY KEY,
   "LANGUAGE" VARCHAR(20) NOT NULL,
   "NAME" VARCHAR(4000) NOT NULL,
   "CREATED_AT" BIGINT
 );
 
 CREATE TABLE "DEPRECATED_RULE_KEYS" (
-  "UUID"  VARCHAR(40) NOT NULL PRIMARY KEY,
+  "UUID"  VARCHAR(40) PRIMARY KEY,
   "RULE_ID" INTEGER NOT NULL,
   "OLD_REPOSITORY_KEY" VARCHAR(200) NOT NULL,
   "OLD_RULE_KEY" VARCHAR(255) NOT NULL,
@@ -219,7 +216,7 @@ CREATE TABLE "RULES_METADATA" (
   "TAGS" VARCHAR(4000),
   "CREATED_AT" BIGINT NOT NULL,
   "UPDATED_AT" BIGINT NOT NULL,
-  CONSTRAINT PK_RULES_METADATA PRIMARY KEY (RULE_ID,ORGANIZATION_UUID)
+  PRIMARY KEY ("RULE_ID", "ORGANIZATION_UUID")
 );
 
 CREATE TABLE "EVENTS" (
@@ -262,7 +259,7 @@ CREATE TABLE "QUALITY_GATE_CONDITIONS" (
 );
 
 CREATE TABLE "ORG_QUALITY_GATES" (
-  "UUID" VARCHAR(40) NOT NULL PRIMARY KEY,
+  "UUID" VARCHAR(40) PRIMARY KEY,
   "ORGANIZATION_UUID" VARCHAR(40) NOT NULL,
   "QUALITY_GATE_UUID" VARCHAR(40) NOT NULL
 );
@@ -282,7 +279,7 @@ CREATE INDEX "PROPERTIES_KEY" ON "PROPERTIES" ("PROP_KEY");
 
 
 CREATE TABLE "PROJECT_LINKS" (
-  "UUID" VARCHAR(40) NOT NULL,
+  "UUID" VARCHAR(40) PRIMARY KEY,
   "PROJECT_UUID" VARCHAR(50) NOT NULL,
   "LINK_TYPE" VARCHAR(20) NOT NULL,
   "NAME" VARCHAR(128),
@@ -290,7 +287,6 @@ CREATE TABLE "PROJECT_LINKS" (
   "CREATED_AT" BIGINT,
   "UPDATED_AT" BIGINT
 );
-
 CREATE INDEX "PROJECT_LINKS_PROJECT" ON "PROJECT_LINKS" ("PROJECT_UUID");
 
 
@@ -308,7 +304,7 @@ CREATE INDEX "DUPLICATION_ANALYSIS_COMPONENT" ON "DUPLICATIONS_INDEX" ("ANALYSIS
 
 
 CREATE TABLE "LIVE_MEASURES" (
-  "UUID" VARCHAR(40) NOT NULL PRIMARY KEY,
+  "UUID" VARCHAR(40) PRIMARY KEY,
   "PROJECT_UUID" VARCHAR(50) NOT NULL,
   "COMPONENT_UUID" VARCHAR(50) NOT NULL,
   "METRIC_ID" INTEGER NOT NULL,
@@ -347,13 +343,12 @@ CREATE INDEX "MEASURES_ANALYSIS_METRIC" ON "PROJECT_MEASURES" ("ANALYSIS_UUID",
 
 
 CREATE TABLE "INTERNAL_PROPERTIES" (
-  "KEE" VARCHAR(20) NOT NULL PRIMARY KEY,
+  "KEE" VARCHAR(20) PRIMARY KEY,
   "IS_EMPTY" BOOLEAN NOT NULL,
   "TEXT_VALUE" VARCHAR(4000),
   "CLOB_VALUE" CLOB,
   "CREATED_AT" BIGINT
 );
-CREATE UNIQUE INDEX "UNIQ_INTERNAL_PROPERTIES" ON "INTERNAL_PROPERTIES" ("KEE");
 
 
 CREATE TABLE "PROJECTS" (
@@ -600,7 +595,7 @@ CREATE TABLE "PERM_TEMPLATES_GROUPS" (
 
 
 CREATE TABLE "QPROFILE_CHANGES" (
-  "KEE" VARCHAR(40) NOT NULL PRIMARY KEY,
+  "KEE" VARCHAR(40) PRIMARY KEY,
   "RULES_PROFILE_UUID" VARCHAR(255) NOT NULL,
   "CHANGE_TYPE" VARCHAR(20) NOT NULL,
   "CREATED_AT" BIGINT NOT NULL,
@@ -669,14 +664,14 @@ CREATE TABLE "CE_ACTIVITY" (
   "ERROR_STACKTRACE" CLOB,
   "ERROR_TYPE" VARCHAR(20)
 );
-
 CREATE UNIQUE INDEX "CE_ACTIVITY_UUID" ON "CE_ACTIVITY" ("UUID");
 CREATE INDEX "CE_ACTIVITY_COMPONENT_UUID" ON "CE_ACTIVITY" ("COMPONENT_UUID");
 CREATE INDEX "CE_ACTIVITY_ISLASTKEY" ON "CE_ACTIVITY" ("IS_LAST_KEY");
 CREATE INDEX "CE_ACTIVITY_ISLAST_STATUS" ON "CE_ACTIVITY" ("IS_LAST", "STATUS");
 
+
 CREATE TABLE "CE_TASK_CHARACTERISTICS" (
-  "UUID" VARCHAR(40) NOT NULL PRIMARY KEY,
+  "UUID" VARCHAR(40) PRIMARY KEY,
   "TASK_UUID" VARCHAR(40) NOT NULL,
   "KEE" VARCHAR(50) NOT NULL,
   "TEXT_VALUE" VARCHAR(4000)
@@ -685,7 +680,7 @@ CREATE INDEX "CE_TASK_CHARACTERISTICS_TASK_UUID" ON "CE_TASK_CHARACTERISTICS" ("
 
 
 CREATE TABLE "CE_TASK_INPUT" (
-  "TASK_UUID" VARCHAR(40) NOT NULL PRIMARY KEY,
+  "TASK_UUID" VARCHAR(40) PRIMARY KEY,
   "INPUT_DATA" BLOB,
   "CREATED_AT" BIGINT NOT NULL,
   "UPDATED_AT" BIGINT NOT NULL
@@ -693,7 +688,7 @@ CREATE TABLE "CE_TASK_INPUT" (
 
 
 CREATE TABLE "CE_SCANNER_CONTEXT" (
-  "TASK_UUID" VARCHAR(40) NOT NULL PRIMARY KEY,
+  "TASK_UUID" VARCHAR(40) PRIMARY KEY,
   "CONTEXT_DATA" BLOB NOT NULL,
   "CREATED_AT" BIGINT NOT NULL,
   "UPDATED_AT" BIGINT NOT NULL
@@ -712,18 +707,18 @@ CREATE UNIQUE INDEX "USER_TOKENS_LOGIN_NAME" ON "USER_TOKENS" ("LOGIN", "NAME");
 
 
 CREATE TABLE "ES_QUEUE" (
-  "UUID" VARCHAR(40) NOT NULL PRIMARY KEY,
+  "UUID" VARCHAR(40) PRIMARY KEY,
   "DOC_TYPE" VARCHAR(40) NOT NULL,
   "DOC_ID" VARCHAR(4000) NOT NULL,
   "DOC_ID_TYPE" VARCHAR(20),
   "DOC_ROUTING" VARCHAR(4000),
   "CREATED_AT" BIGINT NOT NULL
 );
-CREATE UNIQUE INDEX "PK_ES_QUEUE" ON "ES_QUEUE" ("UUID");
 CREATE INDEX "ES_QUEUE_CREATED_AT" ON "ES_QUEUE" ("CREATED_AT");
 
+
 CREATE TABLE "PLUGINS" (
-  "UUID" VARCHAR(40) NOT NULL PRIMARY KEY,
+  "UUID" VARCHAR(40) PRIMARY KEY,
   "KEE" VARCHAR(200) NOT NULL,
   "BASE_PLUGIN_KEY" VARCHAR(200),
   "FILE_HASH" VARCHAR(200) NOT NULL,
@@ -732,8 +727,9 @@ CREATE TABLE "PLUGINS" (
 );
 CREATE UNIQUE INDEX "PLUGINS_KEY" ON "PLUGINS" ("KEE");
 
+
 CREATE TABLE "PROJECT_BRANCHES" (
-  "UUID" VARCHAR(50) NOT NULL PRIMARY KEY,
+  "UUID" VARCHAR(50) PRIMARY KEY,
   "PROJECT_UUID" VARCHAR(50) NOT NULL,
   "KEE" VARCHAR(255) NOT NULL,
   "KEY_TYPE" VARCHAR(12) NOT NULL,
@@ -743,11 +739,11 @@ CREATE TABLE "PROJECT_BRANCHES" (
   "CREATED_AT" BIGINT NOT NULL,
   "UPDATED_AT" BIGINT NOT NULL
 );
-CREATE UNIQUE INDEX "PK_PROJECT_BRANCHES" ON "PROJECT_BRANCHES" ("UUID");
 CREATE UNIQUE INDEX "PROJECT_BRANCHES_KEE_KEY_TYPE" ON "PROJECT_BRANCHES" ("PROJECT_UUID", "KEE", "KEY_TYPE");
 
+
 CREATE TABLE "ANALYSIS_PROPERTIES" (
-  "UUID" VARCHAR(40) NOT NULL PRIMARY KEY,
+  "UUID" VARCHAR(40) PRIMARY KEY,
   "SNAPSHOT_UUID" VARCHAR(40) NOT NULL,
   "KEE" VARCHAR(512) NOT NULL,
   "TEXT_VALUE" VARCHAR(4000),
@@ -759,7 +755,7 @@ CREATE INDEX "SNAPSHOT_UUID" ON "ANALYSIS_PROPERTIES" ("SNAPSHOT_UUID");
 
 
 CREATE TABLE "WEBHOOKS" (
-  "UUID" VARCHAR(40) NOT NULL PRIMARY KEY,
+  "UUID" VARCHAR(40) PRIMARY KEY,
   "NAME" VARCHAR(100) NOT NULL,
   "URL" VARCHAR(2000) NOT NULL,
   "ORGANIZATION_UUID" VARCHAR(40),
@@ -767,13 +763,12 @@ CREATE TABLE "WEBHOOKS" (
   "CREATED_AT" BIGINT NOT NULL,
   "UPDATED_AT" BIGINT NOT NULL
 );
-CREATE UNIQUE INDEX "PK_WEBHOOKS" ON "WEBHOOKS" ("UUID");
 CREATE INDEX "ORGANIZATION_WEBHOOK" ON "WEBHOOKS" ("ORGANIZATION_UUID");
 CREATE INDEX "PROJECT_WEBHOOK" ON "WEBHOOKS" ("PROJECT_UUID");
 
 
 CREATE TABLE "WEBHOOK_DELIVERIES" (
-  "UUID" VARCHAR(40) NOT NULL PRIMARY KEY,
+  "UUID" VARCHAR(40) PRIMARY KEY,
   "WEBHOOK_UUID" VARCHAR(40) NOT NULL,
   "COMPONENT_UUID" VARCHAR(40) NOT NULL,
   "ANALYSIS_UUID" VARCHAR(40),
@@ -787,19 +782,18 @@ CREATE TABLE "WEBHOOK_DELIVERIES" (
   "ERROR_STACKTRACE" CLOB,
   "CREATED_AT" BIGINT NOT NULL
 );
-CREATE UNIQUE INDEX "PK_WEBHOOK_DELIVERIES" ON "WEBHOOK_DELIVERIES" ("UUID");
 CREATE INDEX "COMPONENT_UUID" ON "WEBHOOK_DELIVERIES" ("COMPONENT_UUID");
 CREATE INDEX "CE_TASK_UUID" ON "WEBHOOK_DELIVERIES" ("CE_TASK_UUID");
 CREATE INDEX "ANALYSIS_UUID" ON "WEBHOOK_DELIVERIES" ("ANALYSIS_UUID");
 
+
 CREATE TABLE "ALM_APP_INSTALLS" (
-  "UUID" VARCHAR(40) NOT NULL PRIMARY KEY,
+  "UUID" VARCHAR(40) PRIMARY KEY,
   "ALM_ID" VARCHAR(40) NOT NULL,
   "OWNER_ID" VARCHAR(4000) NOT NULL,
   "INSTALL_ID" VARCHAR(4000) NOT NULL,
   "CREATED_AT" BIGINT NOT NULL,
-  "UPDATED_AT" BIGINT NOT NULL,
-  CONSTRAINT "PK_ALM_APP_INSTALLS" PRIMARY KEY ("UUID")
+  "UPDATED_AT" BIGINT NOT NULL
 );
 CREATE UNIQUE INDEX "ALM_APP_INSTALLS_OWNER" ON "ALM_APP_INSTALLS" ("ALM_ID", "OWNER_ID");
 CREATE UNIQUE INDEX "ALM_APP_INSTALLS_INSTALL" ON "ALM_APP_INSTALLS" ("ALM_ID", "INSTALL_ID");