- fix ddl's

apache · Sep 20, 2024 · 76a4933 · 76a4933
1 parent 6c2196e
commit 76a4933
Show file tree

Hide file tree

Showing 8 changed files with 133 additions and 8 deletions.
diff --git a/data-index/data-index-storage/data-index-storage-jpa/.gitignore b/data-index/data-index-storage/data-index-storage-jpa/.gitignore
@@ -0,0 +1 @@
+/src/main/resources/db/data-index/postgresql/*
diff --git a/data-index/data-index-storage/data-index-storage-jpa/pom.xml b/data-index/data-index-storage/data-index-storage-jpa/pom.xml
@@ -33,6 +33,10 @@
   <name>Kogito Apps :: Data Index Storage JPA compatible DBs</name>
 
   <properties>
+    <path.to.postgresql.storage>../data-index-storage-postgresql</path.to.postgresql.storage>
+    <path.to.script.folder>src/main/resources/db/</path.to.script.folder>
+    <path.to.migration.scripts.from>${path.to.postgresql.storage}/${path.to.script.folder}/data-index/postgresql</path.to.migration.scripts.from>
+    <path.to.migration.scripts.to>${path.to.script.folder}/data-index/postgresql</path.to.migration.scripts.to>
     <java.module.name>org.kie.kogito.index.jpa</java.module.name>
   </properties>
 
@@ -115,6 +119,31 @@
           </execution>
         </executions>
       </plugin>
+      <!--  The cleanest way would be to use the maven-dependency-plugin to unpack and copy scripts from the built artifact `kie-addons-persistence-jdbc` but there's a limitation to using this only in the `package` phase whereas we need that into the `generate-sources` phase. See also https://issues.apache.org/jira/browse/MDEP-98 -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-resource-one</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${path.to.migration.scripts.to}</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${path.to.migration.scripts.from}</directory>
+                  <includes>
+                    <include>*.sql</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

diff --git a/jobs-service/jobs-service-storage-jpa/.gitignore b/jobs-service/jobs-service-storage-jpa/.gitignore
@@ -0,0 +1 @@
+/src/main/resources/db/jobs-service/postgresql/*
diff --git a/jobs-service/jobs-service-storage-jpa/pom.xml b/jobs-service/jobs-service-storage-jpa/pom.xml
@@ -142,6 +142,9 @@
                             <resources>
                                 <resource>
                                     <directory>${path.to.migration.scripts.from}</directory>
+                                    <includes>
+                                        <include>*.sql</include>
+                                    </includes>
                                 </resource>
                             </resources>
                         </configuration>

diff --git a/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml b/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml
@@ -36,23 +36,64 @@
         </dependencySet>
     </dependencySets>
     <fileSets>
+        <!-- Persistence Commons -->
         <fileSet>
-            <directory>${project.root.dir}/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration</directory>
+            <directory>${project.root.dir}/persistence-commons/persistence-commons-jpa/src/main/resources/db/persistence-commons/ansi</directory>
+            <outputDirectory>h2/persistence-commons</outputDirectory>
+            <includes>
+                <include>*.sql</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.root.dir}/persistence-commons/persistence-commons-postgresql/src/main/resources/db/persistence-commons/postgresql</directory>
+            <outputDirectory>postgresql/persistence-commons</outputDirectory>
+            <includes>
+                <include>*.sql</include>
+            </includes>
+        </fileSet>
+
+        <!-- Data Index -->
+        <fileSet>
+            <directory>${project.root.dir}/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/data-index/ansi</directory>
+            <outputDirectory>h2/data-index</outputDirectory>
+            <includes>
+                <include>*.sql</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.root.dir}/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/data-index/postgresql</directory>
             <outputDirectory>postgresql/data-index</outputDirectory>
             <includes>
                 <include>*.sql</include>
             </includes>
         </fileSet>
+
+        <!-- Data Audit -->
+        <fileSet>
+            <directory>${project.root.dir}/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/db/data-audit/h2</directory>
+            <outputDirectory>h2/data-audit</outputDirectory>
+            <includes>
+                <include>*.sql</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.root.dir}/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/db/data-audit/postgresql</directory>
+            <outputDirectory>postgresql/data-audit</outputDirectory>
+            <includes>
+                <include>*.sql</include>
+            </includes>
+        </fileSet>
+
+        <!-- Job Service -->
         <fileSet>
-            <directory>${project.root.dir}/data-index/data-index-storage/data-index-storage-oracle/src/main/resources/db/migration</directory>
-            <outputDirectory>oracle/data-index</outputDirectory>
+            <directory>${project.root.dir}/jobs-service/jobs-service-storage-jpa/src/main/resources/db/jobs-service/ansi</directory>
+            <outputDirectory>h2/jobs-service</outputDirectory>
             <includes>
                 <include>*.sql</include>
             </includes>
         </fileSet>
-        <!-- Job Service DDLs - Flyway scripts -->
         <fileSet>
-            <directory>${project.root.dir}/jobs-service/jobs-service-postgresql-common/src/main/resources/db/jobs-service</directory>
+            <directory>${project.root.dir}/jobs-service/jobs-service-postgresql-common/src/main/resources/db/jobs-service/postgresql</directory>
             <outputDirectory>postgresql/jobs-service</outputDirectory>
             <includes>
                 <include>*.sql</include>

diff --git a/persistence-commons/kogito-ddl/src/assembly/productized-multi-repo-zip.xml b/persistence-commons/kogito-ddl/src/assembly/productized-multi-repo-zip.xml
@@ -36,16 +36,36 @@
         </dependencySet>
     </dependencySets>
     <fileSets>
+        <!-- Persistence Commons -->
         <fileSet>
-            <directory>${project.root.dir}/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration</directory>
+            <directory>${project.root.dir}/persistence-commons/persistence-commons-postgresql/src/main/resources/db/persistence-commons/postgresql</directory>
+            <outputDirectory>postgresql/persistence-commons</outputDirectory>
+            <includes>
+                <include>*.sql</include>
+            </includes>
+        </fileSet>
+
+        <!-- Data Index -->
+        <fileSet>
+            <directory>${project.root.dir}/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/data-index/postgresql</directory>
             <outputDirectory>postgresql/data-index</outputDirectory>
             <includes>
                 <include>*.sql</include>
             </includes>
         </fileSet>
-        <!-- Job Service DDLs - Flyway scripts -->
+
+        <!-- Data Audit -->
+        <fileSet>
+            <directory>${project.root.dir}/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/db/data-audit/postgresql</directory>
+            <outputDirectory>postgresql/data-audit</outputDirectory>
+            <includes>
+                <include>*.sql</include>
+            </includes>
+        </fileSet>
+
+        <!-- Job Service -->
         <fileSet>
-            <directory>${project.root.dir}/jobs-service/jobs-service-postgresql-common/src/main/resources/db/jobs-service</directory>
+            <directory>${project.root.dir}/jobs-service/jobs-service-postgresql-common/src/main/resources/db/jobs-service/postgresql</directory>
             <outputDirectory>postgresql/jobs-service</outputDirectory>
             <includes>
                 <include>*.sql</include>

diff --git a/persistence-commons/persistence-commons-jpa/.gitignore b/persistence-commons/persistence-commons-jpa/.gitignore
@@ -0,0 +1 @@
+/src/main/resources/db/persistence-commons/postgresql/*
diff --git a/persistence-commons/persistence-commons-jpa/pom.xml b/persistence-commons/persistence-commons-jpa/pom.xml
@@ -33,6 +33,10 @@
   <name>Kogito Apps :: Persistence Commons JPA</name>
 
   <properties>
+    <path.to.postgresql.storage>../persistence-commons-postgresql</path.to.postgresql.storage>
+    <path.to.script.folder>src/main/resources/db/</path.to.script.folder>
+    <path.to.migration.scripts.from>${path.to.postgresql.storage}/${path.to.script.folder}/persistence-commons/postgresql</path.to.migration.scripts.from>
+    <path.to.migration.scripts.to>${path.to.script.folder}/persistence-commons/postgresql</path.to.migration.scripts.to>
     <java.module.name>org.kie.kogito.persistence.jpa</java.module.name>
   </properties>
 
@@ -61,6 +65,31 @@
           </execution>
         </executions>
       </plugin>
+      <!--  The cleanest way would be to use the maven-dependency-plugin to unpack and copy scripts from the built artifact `kie-addons-persistence-jdbc` but there's a limitation to using this only in the `package` phase whereas we need that into the `generate-sources` phase. See also https://issues.apache.org/jira/browse/MDEP-98 -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-resource-one</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${path.to.migration.scripts.to}</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${path.to.migration.scripts.from}</directory>
+                  <includes>
+                    <include>*.sql</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>