Skip to content

Fix incorrect primary key column order in policy_mapping_records table by using EclipseLink @PrimaryKey annotation #1403

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
merged 1 commit into from
Apr 21, 2025
Merged

Fix incorrect primary key column order in policy_mapping_records table by using EclipseLink @PrimaryKey annotation #1403

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: 2 additions & 0 deletions extension/persistence/jpa-model/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ plugins {

dependencies {
implementation(project(":polaris-core"))
implementation(libs.eclipselink)

compileOnly(libs.jakarta.validation.api)
compileOnly(libs.jakarta.annotation.api)
compileOnly(libs.jakarta.persistence.api)
Expand Down
10 changes: 10 additions & 0 deletions ...tence/jpa-model/src/main/java/org/apache/polaris/jpa/models/ModelPolicyMappingRecord.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@
*/
package org.apache.polaris.jpa.models;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.Index;
import jakarta.persistence.Table;
import jakarta.persistence.Version;
import org.apache.polaris.core.policy.PolarisPolicyMappingRecord;
import org.eclipse.persistence.annotations.PrimaryKey;

@Entity
@Table(
Expand All @@ -33,6 +35,14 @@
name = "POLICY_MAPPING_RECORDS_BY_POLICY_INDEX",
columnList = "policyCatalogId,policyId,targetCatalogId,targetId")
})
@PrimaryKey(
Copy link
Contributor

@eric-maynard eric-maynard Apr 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dennishuo I think this is the same issue you observed previously, only applied to Policies this time right?

columns = {
@Column(name = "targetCatalogId"),
@Column(name = "targetId"),
@Column(name = "policyTypeCode"),
@Column(name = "policyCatalogId"),
@Column(name = "policyId")
})
public class ModelPolicyMappingRecord {
// id of the catalog where target entity resides
@Id private long targetCatalogId;
Expand Down
1 change: 1 addition & 0 deletions getting-started/assets/eclipselink/persistence.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<class>org.apache.polaris.jpa.models.ModelEntityChangeTracking</class>
<class>org.apache.polaris.jpa.models.ModelEntityDropped</class>
<class>org.apache.polaris.jpa.models.ModelGrantRecord</class>
<class>org.apache.polaris.jpa.models.ModelPolicyMappingRecord</class>
<class>org.apache.polaris.jpa.models.ModelPrincipalSecrets</class>
<class>org.apache.polaris.jpa.models.ModelSequenceId</class>
<shared-cache-mode>NONE</shared-cache-mode>
Expand Down