From ceac2d12b1e8abba9b10f97060dc86c5bdcf6d60 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 16 May 2022 21:48:19 +1200
Subject: [PATCH] #2694 - Postgres DDL - For Postgres table partitioning,
 remove the "suppressPrimaryKeyOnPartition" mode

---
 .../dbmigration/ddlgeneration/platform/BaseTableDdl.java     | 4 +---
 .../dbmigration/ddlgeneration/platform/PlatformDdl.java      | 4 ----
 .../dbmigration/ddlgeneration/platform/PostgresDdl.java      | 5 -----
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
index c4ed12292..b364a27d4 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
@@ -216,9 +216,7 @@ public class BaseTableDdl implements TableDdl {
     writeCompoundUniqueConstraints(apply, createTable);
     if (!pk.isEmpty()) {
       // defined on the columns
-      if (partitionMode == null || !platformDdl.suppressPrimaryKeyOnPartition()) {
-        writePrimaryKeyConstraint(apply, createTable.getPkName(), toColumnNames(pk));
-      }
+      writePrimaryKeyConstraint(apply, createTable.getPkName(), toColumnNames(pk));
     }
     if (platformDdl.isInlineForeignKeys()) {
       writeInlineForeignKeys(apply, createTable);
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
index 9cc23b4ee..4224ec9b9 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
@@ -732,10 +732,6 @@ public class PlatformDdl {
     return createTable;
   }
 
-  public boolean suppressPrimaryKeyOnPartition() {
-    return false;
-  }
-
   public void addTablePartition(DdlBuffer apply, String partitionMode, String partitionColumn) {
     // only supported by postgres initially
   }
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java
index 2e97f5c0f..d17bf1dee 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java
@@ -30,11 +30,6 @@ public class PostgresDdl extends PlatformDdl {
     return "set lock_timeout = " + (lockTimeoutSeconds * 1000);
   }
 
-  @Override
-  public boolean suppressPrimaryKeyOnPartition() {
-    return true;
-  }
-
   @Override
   protected String convertArrayType(String logicalArrayType) {
     return NativeDbArray.logicalToNative(logicalArrayType);