From 16770ffad8e65429543e8c32b8614a9b592d7dc0 Mon Sep 17 00:00:00 2001
From: Garth <244253+xgp@users.noreply.github.com>
Date: Fri, 29 Mar 2024 18:52:57 +0100
Subject: [PATCH] updated organization table name to not conflict. fixes #28246

Signed-off-by: Garth <244253+xgp@users.noreply.github.com>
---
 .../keycloak/models/jpa/entities/OrganizationEntity.java  | 2 +-
 .../src/main/resources/META-INF/jpa-changelog-25.0.0.xml  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/OrganizationEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/OrganizationEntity.java
index f7870aac6b..ebf7d03cc3 100644
--- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/OrganizationEntity.java
+++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/OrganizationEntity.java
@@ -26,7 +26,7 @@ import jakarta.persistence.NamedQueries;
 import jakarta.persistence.NamedQuery;
 import jakarta.persistence.Table;
 
-@Table(name="ORGANIZATION")
+@Table(name="ORG")
 @Entity
 @NamedQueries({
         @NamedQuery(name="getByRealm", query="select o from OrganizationEntity o where o.realmId = :realmId")
diff --git a/model/jpa/src/main/resources/META-INF/jpa-changelog-25.0.0.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-25.0.0.xml
index 816cb1c1ba..e486b83636 100644
--- a/model/jpa/src/main/resources/META-INF/jpa-changelog-25.0.0.xml
+++ b/model/jpa/src/main/resources/META-INF/jpa-changelog-25.0.0.xml
@@ -75,7 +75,7 @@
     </changeSet>
 
     <changeSet author="keycloak" id="25.0.0-org">
-        <createTable tableName="ORGANIZATION">
+        <createTable tableName="ORG">
             <column name="ID" type="VARCHAR(255)">
                 <constraints nullable="false"/>
             </column>
@@ -90,9 +90,9 @@
             </column>
         </createTable>
 
-        <addPrimaryKey columnNames="ID" tableName="ORGANIZATION"/>
-        <addUniqueConstraint tableName="ORGANIZATION" columnNames="REALM_ID, NAME" constraintName="UK_ORG_NAME"/>
-        <addUniqueConstraint tableName="ORGANIZATION" columnNames="GROUP_ID" constraintName="UK_ORG_GROUP"/>
+        <addPrimaryKey columnNames="ID" tableName="ORG"/>
+        <addUniqueConstraint tableName="ORG" columnNames="REALM_ID, NAME" constraintName="UK_ORG_NAME"/>
+        <addUniqueConstraint tableName="ORG" columnNames="GROUP_ID" constraintName="UK_ORG_GROUP"/>
     </changeSet>
 
     <changeSet author="keycloak" id="unique-consentuser">