From ab1461e0eaa38a5f2881efa744aa2d2e08685d20 Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Mon, 28 Aug 2023 12:10:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=81=E7=94=A8=E5=88=9B=E5=BB=BA=E5=A4=96?= =?UTF-8?q?=E9=94=AEsql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lihongjie/coal/config/MyPostgreSQLDialect.java | 11 +++++++++++ .../cn/lihongjie/coal/entity/PermissionEntity.java | 6 ++++-- .../java/cn/lihongjie/coal/entity/ResourceEntity.java | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/main/java/cn/lihongjie/coal/config/MyPostgreSQLDialect.java b/src/main/java/cn/lihongjie/coal/config/MyPostgreSQLDialect.java index 9cd847c1..dbe03bc4 100644 --- a/src/main/java/cn/lihongjie/coal/config/MyPostgreSQLDialect.java +++ b/src/main/java/cn/lihongjie/coal/config/MyPostgreSQLDialect.java @@ -12,4 +12,15 @@ public class MyPostgreSQLDialect extends PostgreSQLDialect { } return super.columnType(sqlTypeCode); } + + + @Override + public String getAddForeignKeyConstraintString(String constraintName, String[] foreignKey, String referencedTable, String[] primaryKey, boolean referencesPrimaryKey) { + return " DROP CONSTRAINT IF EXISTS notexist "; + } + + @Override + public String getAddForeignKeyConstraintString(String constraintName, String foreignKeyDefinition) { + return " DROP CONSTRAINT IF EXISTS notexist "; + } } diff --git a/src/main/java/cn/lihongjie/coal/entity/PermissionEntity.java b/src/main/java/cn/lihongjie/coal/entity/PermissionEntity.java index 6bd9929a..efd98f9d 100644 --- a/src/main/java/cn/lihongjie/coal/entity/PermissionEntity.java +++ b/src/main/java/cn/lihongjie/coal/entity/PermissionEntity.java @@ -1,8 +1,8 @@ package cn.lihongjie.coal.entity; import cn.lihongjie.coal.entity.base.CommonEntity; -import com.fasterxml.jackson.annotation.JsonManagedReference; import jakarta.persistence.Entity; +import jakarta.persistence.JoinTable; import jakarta.persistence.ManyToMany; import lombok.Data; import org.hibernate.annotations.Comment; @@ -15,7 +15,9 @@ import java.util.List; public class PermissionEntity extends CommonEntity { - @ManyToMany(mappedBy = "permissions") + @ManyToMany() + @JoinTable(foreignKey = @jakarta.persistence.ForeignKey(name = "none" , value = jakarta.persistence.ConstraintMode.NO_CONSTRAINT), + inverseForeignKey = @jakarta.persistence.ForeignKey(name = "none" , value = jakarta.persistence.ConstraintMode.NO_CONSTRAINT)) private List resources; diff --git a/src/main/java/cn/lihongjie/coal/entity/ResourceEntity.java b/src/main/java/cn/lihongjie/coal/entity/ResourceEntity.java index 3ba0e0ab..c119a92c 100644 --- a/src/main/java/cn/lihongjie/coal/entity/ResourceEntity.java +++ b/src/main/java/cn/lihongjie/coal/entity/ResourceEntity.java @@ -17,7 +17,7 @@ import java.util.List; @Slf4j public class ResourceEntity extends CommonEntity { - @ManyToMany + @ManyToMany(mappedBy = "resources") private List permissions;