fix: change field size for client

(cherry picked from commit d0b4f90) # Conflicts: # gravitee-am-repository/gravitee-am-repository-jdbc/src/main/resources/liquibase/master.yml # gravitee-am-repository/gravitee-am-repository-tests/src/test/java/io/gravitee/am/repository/management/api/DeviceRepositoryTest.java (cherry picked from commit df1ada0) (cherry picked from commit 34fbb00) # Conflicts: # gravitee-am-repository/gravitee-am-repository-jdbc/src/main/resources/liquibase/changelogs/v4_2_27/4.2.27-change-client-column-size.yml # gravitee-am-repository/gravitee-am-repository-jdbc/src/main/resources/liquibase/changelogs/v4_5_5/4.5.5-scope-approval-index.yml
gravitee-io · Dec 19, 2024 · 478fabd · 478fabd
1 parent df1ada0
commit 478fabd
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/...jdbc/src/main/resources/liquibase/changelogs/v4_2_27/4.2.27-change-client-column-size.yml b/...jdbc/src/main/resources/liquibase/changelogs/v4_2_27/4.2.27-change-client-column-size.yml
@@ -1,9 +1,14 @@
 # Change client column from 64 to 255 characters.
 databaseChangeLog:
   - changeSet:
+<<<<<<< HEAD
       id: 4.2.27-change-client-column-size-scope-approval-new-field # remove index introduced in 4.5.0
       author: GraviteeSource Team
       dbms: mssql
+=======
+      id: 4.2.27-change-client-column-size-scope-approval-remove-index # remove index introduced in 4.5.0
+      author: GraviteeSource Team
+>>>>>>> 34fbb0083 (fix: change field size for client)
       onError: MARK_RAN
       preConditions:
         - onFail: MARK_RAN

diff --git a/.../src/main/resources/liquibase/changelogs/v4_5_0/4.5.0-scope-approval-external-user-id.yml b/.../src/main/resources/liquibase/changelogs/v4_5_0/4.5.0-scope-approval-external-user-id.yml
@@ -44,8 +44,6 @@ databaseChangeLog:
                   name: domain
               - column:
                   name: client_id
-              - column:
-                  name: user_id
               - column:
                   name: user_source
               - column:

diff --git a/...sitory-jdbc/src/main/resources/liquibase/changelogs/v4_5_5/4.5.5-scope-approval-index.yml b/...sitory-jdbc/src/main/resources/liquibase/changelogs/v4_5_5/4.5.5-scope-approval-index.yml
@@ -3,14 +3,24 @@ databaseChangeLog:
   - changeSet:
       id: 4.5.5-scope-approval-index
       author: GraviteeSource Team
+<<<<<<< HEAD
       dbms: mssql
+=======
+      validCheckSum: ANY
+>>>>>>> 34fbb0083 (fix: change field size for client)
       onError: MARK_RAN
       preConditions:
         - onFail: MARK_RAN
         - not:
+<<<<<<< HEAD
           - indexExists:
               tableName: scope_approvals
               indexName: idx_scope_approvals_domain_client_user_id_extid_scope
+=======
+            - indexExists:
+                tableName: scope_approvals
+                indexName: idx_scope_approvals_domain_client_user_id_extid_scope
+>>>>>>> 34fbb0083 (fix: change field size for client)
       changes:
         - createIndex:
             columns:
@@ -19,13 +29,20 @@ databaseChangeLog:
               - column:
                   name: client_id
               - column:
+<<<<<<< HEAD
                   name: user_id
               - column:
+=======
+>>>>>>> 34fbb0083 (fix: change field size for client)
                   name: user_source
               - column:
                   name: user_external_id
               - column:
                   name: scope
             indexName: idx_scope_approvals_domain_client_user_id_extid_scope
             tableName: scope_approvals
+<<<<<<< HEAD
             unique: false
+=======
+            unique: false
+>>>>>>> 34fbb0083 (fix: change field size for client)