#2403 - table partitioning (Postgres only at this point) is always in…

…cluded + simplify skip logic
ebean-orm · Jan 21, 2022 · 0139ad8 · 0139ad8
1 parent 4f70c09
commit 0139ad8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
@@ -212,7 +212,7 @@ protected void runCreateSql(Connection connection) throws IOException {
     if (extraDdl && jaxbPresent) {
       if (currentModel().isTablePartitioning()) {
         String extraPartitioning = ExtraDdlXmlReader.buildPartitioning(platform);
-        if (extraPartitioning != null && !extraPartitioning.isEmpty()  && useMigrationStoredProcedures) {
+        if (extraPartitioning != null && !extraPartitioning.isEmpty()) {
           runScript(connection, false, extraPartitioning, "builtin-partitioning-ddl");
         }
       }

diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -397,23 +397,20 @@ private void configurePlatforms() {
   private void generateExtraDdl(File migrationDir, DatabasePlatform dbPlatform, boolean tablePartitioning) throws IOException {
     if (dbPlatform != null) {
       if (tablePartitioning && includeBuiltInPartitioning) {
-        generateExtraDdlFor(migrationDir, dbPlatform, ExtraDdlXmlReader.readBuiltinTablePartitioning(), true);
+        generateExtraDdlFor(migrationDir, dbPlatform, ExtraDdlXmlReader.readBuiltinTablePartitioning(), false);
       }
+      // skip built-in migration stored procedures based on isUseMigrationStoredProcedures
       generateExtraDdlFor(migrationDir, dbPlatform, ExtraDdlXmlReader.readBuiltin(), true);
       generateExtraDdlFor(migrationDir, dbPlatform, ExtraDdlXmlReader.read(), false);
     }
   }
 
-  private void generateExtraDdlFor(File migrationDir, DatabasePlatform dbPlatform, ExtraDdl extraDdl, boolean isBuiltin) throws IOException {
+  private void generateExtraDdlFor(File migrationDir, DatabasePlatform dbPlatform, ExtraDdl extraDdl, boolean checkSkip) throws IOException {
     if (extraDdl != null) {
       List<DdlScript> ddlScript = extraDdl.getDdlScript();
       for (DdlScript script : ddlScript) {
         if (!script.isDrop() && matchPlatform(dbPlatform.getPlatform(), script.getPlatforms())) {
-          if (script.isInit()) {
-            if (!isBuiltin || dbPlatform.isUseMigrationStoredProcedures()) {
-              writeExtraDdl(migrationDir, script);
-            }
-          } else {
+          if (!checkSkip || dbPlatform.isUseMigrationStoredProcedures()) {
             writeExtraDdl(migrationDir, script);
           }
         }