diff --git a/src/main/resources/update/3_8.sql b/src/main/resources/update/3_8.sql deleted file mode 100644 index 546a46d..0000000 --- a/src/main/resources/update/3_8.sql +++ /dev/null @@ -1,22 +0,0 @@ -DROP TABLE IF EXISTS WEB_HOOK_EVENT; - -CREATE TABLE WEB_HOOK_EVENT( - USER_NAME VARCHAR(100) NOT NULL, - REPOSITORY_NAME VARCHAR(100) NOT NULL, - URL VARCHAR(200) NOT NULL, - EVENT VARCHAR(30) NOT NULL -); - -ALTER TABLE WEB_HOOK_EVENT ADD CONSTRAINT IDX_WEB_HOOK_EVENT_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, URL, EVENT); -ALTER TABLE WEB_HOOK_EVENT ADD CONSTRAINT IDX_WEB_HOOK_EVENT_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME, URL) REFERENCES WEB_HOOK (USER_NAME, REPOSITORY_NAME, URL) - ON DELETE CASCADE ON UPDATE CASCADE; - -CREATE TEMPORARY TABLE TMP_EVENTS (EVENT VARCHAR(30)); - -INSERT INTO TMP_EVENTS VALUES ('push'),('issue_comment'),('issues'),('pull_request'); - -INSERT INTO WEB_HOOK_EVENT (USER_NAME, REPOSITORY_NAME, URL, EVENT) - SELECT USER_NAME, REPOSITORY_NAME, URL, EVENT - FROM WEB_HOOK, TMP_EVENTS; - -DROP TABLE TMP_EVENTS; diff --git a/src/main/resources/update/3_9.sql b/src/main/resources/update/3_9.sql new file mode 100644 index 0000000..546a46d --- /dev/null +++ b/src/main/resources/update/3_9.sql @@ -0,0 +1,22 @@ +DROP TABLE IF EXISTS WEB_HOOK_EVENT; + +CREATE TABLE WEB_HOOK_EVENT( + USER_NAME VARCHAR(100) NOT NULL, + REPOSITORY_NAME VARCHAR(100) NOT NULL, + URL VARCHAR(200) NOT NULL, + EVENT VARCHAR(30) NOT NULL +); + +ALTER TABLE WEB_HOOK_EVENT ADD CONSTRAINT IDX_WEB_HOOK_EVENT_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, URL, EVENT); +ALTER TABLE WEB_HOOK_EVENT ADD CONSTRAINT IDX_WEB_HOOK_EVENT_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME, URL) REFERENCES WEB_HOOK (USER_NAME, REPOSITORY_NAME, URL) + ON DELETE CASCADE ON UPDATE CASCADE; + +CREATE TEMPORARY TABLE TMP_EVENTS (EVENT VARCHAR(30)); + +INSERT INTO TMP_EVENTS VALUES ('push'),('issue_comment'),('issues'),('pull_request'); + +INSERT INTO WEB_HOOK_EVENT (USER_NAME, REPOSITORY_NAME, URL, EVENT) + SELECT USER_NAME, REPOSITORY_NAME, URL, EVENT + FROM WEB_HOOK, TMP_EVENTS; + +DROP TABLE TMP_EVENTS; diff --git a/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala b/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala index d487261..77ee78e 100644 --- a/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala +++ b/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala @@ -21,6 +21,7 @@ * The history of versions. A head of this sequence is the current BitBucket version. */ val versions = Seq( + new Version(3, 9), new Version(3, 8), new Version(3, 7) with SystemSettingsService { override def update(conn: Connection, cl: ClassLoader): Unit = {