Skip to content

Add prefix "kc_" to all existing tables #10124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hmlnarik merged 1 commit into from
Feb 11, 2022
Merged

Add prefix "kc_" to all existing tables #10124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...main/java/org/keycloak/models/map/storage/jpa/client/entity/JpaClientAttributeEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.keycloak.models.map.storage.jpa.JpaAttributeEntity;

@Entity
@Table(name = "client_attribute")
@Table(name = "kc_client_attribute")
public class JpaClientAttributeEntity extends JpaAttributeEntity<JpaClientEntity> {

public JpaClientAttributeEntity() {
Expand Down
2 changes: 1 addition & 1 deletion ...-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/entity/JpaClientEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
* therefore marked as non-insertable and non-updatable to instruct hibernate.
*/
@Entity
@Table(name = "client",
@Table(name = "kc_client",
uniqueConstraints = {
@UniqueConstraint(
columnNames = {"realmId", "clientId"}
Expand Down
2 changes: 1 addition & 1 deletion ...org/keycloak/models/map/storage/jpa/clientscope/entity/JpaClientScopeAttributeEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.keycloak.models.map.storage.jpa.JpaAttributeEntity;

@Entity
@Table(name = "client_scope_attribute")
@Table(name = "kc_client_scope_attribute")
public class JpaClientScopeAttributeEntity extends JpaAttributeEntity<JpaClientScopeEntity> {

public JpaClientScopeAttributeEntity() {
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/org/keycloak/models/map/storage/jpa/clientscope/entity/JpaClientScopeEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
* therefore marked as non-insertable and non-updatable to instruct hibernate.
*/
@Entity
@Table(name = "client_scope", uniqueConstraints = {@UniqueConstraint(columnNames = {"realmId", "name"})})
@Table(name = "kc_client_scope", uniqueConstraints = {@UniqueConstraint(columnNames = {"realmId", "name"})})
@TypeDefs({@TypeDef(name = "jsonb", typeClass = JsonbType.class)})
public class JpaClientScopeEntity extends AbstractClientScopeEntity implements JpaRootEntity {

Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/org/keycloak/models/map/storage/jpa/role/entity/JpaRoleAttributeEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.keycloak.models.map.storage.jpa.JpaAttributeEntity;

@Entity
@Table(name = "role_attribute")
@Table(name = "kc_role_attribute")
public class JpaRoleAttributeEntity extends JpaAttributeEntity<JpaRoleEntity> {

public JpaRoleAttributeEntity() {
Expand Down
2 changes: 1 addition & 1 deletion .../map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/entity/JpaRoleEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
* therefore marked as non-insertable and non-updatable to instruct hibernate.
*/
@Entity
@Table(name = "role", uniqueConstraints = {@UniqueConstraint(columnNames = {"realmId", "clientId", "name"})})
@Table(name = "kc_role", uniqueConstraints = {@UniqueConstraint(columnNames = {"realmId", "clientId", "name"})})
@TypeDefs({@TypeDef(name = "jsonb", typeClass = JsonbType.class)})
public class JpaRoleEntity extends AbstractRoleEntity implements JpaRootEntity {

Expand Down
16 changes: 8 additions & 8 deletions model/map-jpa/src/main/resources/META-INF/client-scopes/jpa-client-scopes-changelog-1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ limitations under the License.
<!-- format of id of changeSet: client-scopes-${org.keycloak.models.map.storage.jpa.Constants.SUPPORTED_VERSION_CLIENT_SCOPE} -->
<changeSet author="keycloak" id="client-scopes-1">

<createTable tableName="client_scope">
<createTable tableName="kc_client_scope">
<column name="id" type="UUID">
<constraints primaryKey="true" nullable="false"/>
</column>
Expand All @@ -34,33 +34,33 @@ limitations under the License.
</column>
<column name="metadata" type="json"/>
</createTable>
<ext:addGeneratedColumn tableName="client_scope">
<ext:addGeneratedColumn tableName="kc_client_scope">
<ext:column name="entityversion" type="INTEGER" jsonColumn="metadata" jsonProperty="entityVersion"/>
<ext:column name="realmid" type="VARCHAR(36)" jsonColumn="metadata" jsonProperty="fRealmId"/>
<ext:column name="name" type="VARCHAR(255)" jsonColumn="metadata" jsonProperty="fName"/>
</ext:addGeneratedColumn>
<createIndex tableName="client_scope" indexName="client_scope_entityVersion">
<createIndex tableName="kc_client_scope" indexName="client_scope_entityVersion">
<column name="entityversion"/>
</createIndex>
<createIndex tableName="client_scope" indexName="client_realmId_name" unique="true">
<createIndex tableName="kc_client_scope" indexName="client_realmId_name" unique="true">
<column name="realmid"/>
<column name="name"/>
</createIndex>

<createTable tableName="client_scope_attribute">
<createTable tableName="kc_client_scope_attribute">
<column name="id" type="UUID">
<constraints primaryKey="true" nullable="false"/>
</column>
<column name="fk_root" type="UUID">
<constraints foreignKeyName="client_scope_attr_fk_root_fkey" references="client_scope(id)" deleteCascade="true"/>
<constraints foreignKeyName="client_scope_attr_fk_root_fkey" references="kc_client_scope(id)" deleteCascade="true"/>
</column>
<column name="name" type="VARCHAR(255)"/>
<column name="value" type="text"/>
</createTable>
<createIndex tableName="client_scope_attribute" indexName="client_scope_attr_fk_root">
<createIndex tableName="kc_client_scope_attribute" indexName="client_scope_attr_fk_root">
<column name="fk_root"/>
</createIndex>
<createIndex tableName="client_scope_attribute" indexName="client_scope_attr_name_value">
<createIndex tableName="kc_client_scope_attribute" indexName="client_scope_attr_name_value">
<column name="name"/>
<column name="VALUE(255)" valueComputed="VALUE(255)"/>
</createIndex>
Expand Down
16 changes: 8 additions & 8 deletions model/map-jpa/src/main/resources/META-INF/clients/jpa-clients-changelog-1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ limitations under the License.
<!-- format of id of changeSet: clients-${org.keycloak.models.map.storage.jpa.Constants.SUPPORTED_VERSION_CLIENT} -->
<changeSet author="keycloak" id="clients-1">

<createTable tableName="client">
<createTable tableName="kc_client">
<column name="id" type="UUID">
<constraints primaryKey="true" nullable="false"/>
</column>
Expand All @@ -34,17 +34,17 @@ limitations under the License.
</column>
<column name="metadata" type="json"/>
</createTable>
<ext:addGeneratedColumn tableName="client">
<ext:addGeneratedColumn tableName="kc_client">
<ext:column name="entityversion" type="INTEGER" jsonColumn="metadata" jsonProperty="entityVersion"/>
<ext:column name="realmid" type="VARCHAR(36)" jsonColumn="metadata" jsonProperty="fRealmId"/>
<ext:column name="clientid" type="VARCHAR(255)" jsonColumn="metadata" jsonProperty="fClientId"/>
<ext:column name="protocol" type="VARCHAR(36)" jsonColumn="metadata" jsonProperty="fProtocol"/>
<ext:column name="enabled" type="BOOLEAN" jsonColumn="metadata" jsonProperty="fEnabled"/>
</ext:addGeneratedColumn>
<createIndex tableName="client" indexName="client_entityVersion">
<createIndex tableName="kc_client" indexName="client_entityVersion">
<column name="entityversion"/>
</createIndex>
<createIndex tableName="client" indexName="client_realmId_clientId" unique="true">
<createIndex tableName="kc_client" indexName="client_realmId_clientId" unique="true">
<column name="realmid"/>
<column name="clientid"/>
</createIndex>
Expand All @@ -54,20 +54,20 @@ limitations under the License.
</ext:createJsonIndex>
-->

<createTable tableName="client_attribute">
<createTable tableName="kc_client_attribute">
<column name="id" type="UUID">
<constraints primaryKey="true" nullable="false"/>
</column>
<column name="fk_root" type="UUID">
<constraints foreignKeyName="client_attr_fk_root_fkey" references="client(id)" deleteCascade="true"/>
<constraints foreignKeyName="client_attr_fk_root_fkey" references="kc_client(id)" deleteCascade="true"/>
</column>
<column name="name" type="VARCHAR(255)"/>
<column name="value" type="text"/>
</createTable>
<createIndex tableName="client_attribute" indexName="client_attr_fk_root">
<createIndex tableName="kc_client_attribute" indexName="client_attr_fk_root">
<column name="fk_root"/>
</createIndex>
<createIndex tableName="client_attribute" indexName="client_attr_name_value">
<createIndex tableName="kc_client_attribute" indexName="client_attr_name_value">
<column name="name"/>
<column name="VALUE(255)" valueComputed="VALUE(255)"/>
</createIndex>
Expand Down
16 changes: 8 additions & 8 deletions model/map-jpa/src/main/resources/META-INF/roles/jpa-roles-changelog-1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ limitations under the License.
<!-- format of id of changeSet: roles-${org.keycloak.models.map.storage.jpa.Constants.SUPPORTED_VERSION_ROLE} -->
<changeSet author="keycloak" id="roles-1">

<createTable tableName="role">
<createTable tableName="kc_role">
<column name="id" type="UUID">
<constraints primaryKey="true" nullable="false"/>
</column>
Expand All @@ -34,17 +34,17 @@ limitations under the License.
</column>
<column name="metadata" type="json"/>
</createTable>
<ext:addGeneratedColumn tableName="role">
<ext:addGeneratedColumn tableName="kc_role">
<ext:column name="entityversion" type="INTEGER" jsonColumn="metadata" jsonProperty="entityVersion"/>
<ext:column name="realmid" type="VARCHAR(255)" jsonColumn="metadata" jsonProperty="fRealmId"/>
<ext:column name="name" type="VARCHAR(36)" jsonColumn="metadata" jsonProperty="fName"/>
<ext:column name="clientid" type="VARCHAR(255)" jsonColumn="metadata" jsonProperty="fClientId"/>
<ext:column name="description" type="VARCHAR(255)" jsonColumn="metadata" jsonProperty="fDescription"/>
</ext:addGeneratedColumn>
<createIndex tableName="role" indexName="role_entityVersion">
<createIndex tableName="kc_role" indexName="role_entityVersion">
<column name="entityversion"/>
</createIndex>
<createIndex tableName="role" indexName="role_realmId_clientid_name" unique="true">
<createIndex tableName="kc_role" indexName="role_realmId_clientid_name" unique="true">
<column name="realmid"/>
<column name="clientid"/>
<column name="name"/>
Expand All @@ -56,20 +56,20 @@ limitations under the License.
</ext:createJsonIndex>
-->

<createTable tableName="role_attribute">
<createTable tableName="kc_role_attribute">
<column name="id" type="UUID">
<constraints primaryKey="true" nullable="false"/>
</column>
<column name="fk_root" type="UUID">
<constraints foreignKeyName="role_attr_fk_root_fkey" references="role(id)" deleteCascade="true"/>
<constraints foreignKeyName="role_attr_fk_root_fkey" references="kc_role(id)" deleteCascade="true"/>
</column>
<column name="name" type="VARCHAR(255)"/>
<column name="value" type="text"/>
</createTable>
<createIndex tableName="role_attribute" indexName="role_attr_fk_root">
<createIndex tableName="kc_role_attribute" indexName="role_attr_fk_root">
<column name="fk_root"/>
</createIndex>
<createIndex tableName="role_attribute" indexName="role_attr_name_value">
<createIndex tableName="kc_role_attribute" indexName="role_attr_name_value">
<column name="name"/>
<column name="VALUE(255)" valueComputed="VALUE(255)"/>
</createIndex>
Expand Down