From 42764813b85ab0eafa55f27e1a9c7a21f0928bad Mon Sep 17 00:00:00 2001
From: Matija Obreza <matija.obreza@croptrust.org>
Date: Mon, 18 Dec 2017 19:25:01 +0100
Subject: [PATCH] Update acl_sid table with user#email

- Compatibility with app-blocks:1.3-SNAPSHOT
- swagger downgraded to 2.6.1 due to https://github.com/springfox/springfox/issues/2039
---
 pom.xml                                              |  3 ++-
 src/main/resources/liquibase/liquibase-changeLog.yml | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 466329b55..e0e481edd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,8 @@
 		<jackson.version>2.6.4</jackson.version>
 		<jaxb-api.version>2.2.12</jaxb-api.version>
 		<liquibase.version>3.5.3</liquibase.version>
-		<swagger.version>2.7.0</swagger.version>
+		<!-- TODO Upgrade past 2.7.0 which is buggy -->
+		<swagger.version>2.6.1</swagger.version>
 		
 		<!--Container -->
 		<jetty.version>9.4.5.v20170502</jetty.version>
diff --git a/src/main/resources/liquibase/liquibase-changeLog.yml b/src/main/resources/liquibase/liquibase-changeLog.yml
index 007b0b53f..f08e5a670 100644
--- a/src/main/resources/liquibase/liquibase-changeLog.yml
+++ b/src/main/resources/liquibase/liquibase-changeLog.yml
@@ -1135,3 +1135,15 @@ databaseChangeLog:
         onUpdate:              NO ACTION
         referencedColumnNames: id
         referencedTableName:   acl_sid
+
+# Use user#email as acl_sid#sid
+- changeSet:
+    id:                        1513620354000-1
+    author:                    matijaobreza
+    comment:                   Use user#email as acl_sid#sid
+    changes:
+    - sql:
+        comment: Inner join acl_sid with user on id and update acl_sid#sid with user#email
+        sql: >-
+          update acl_sid inner join user on user.id=acl_sid.id
+            set acl_sid.sid = user.email;
-- 
GitLab