diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 54302e978..01314585c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -40,7 +40,6 @@ jobs:
MSSQL_SA_PASSWORD: "veryStrong123"
ports:
- 1433:1433
-
steps:
- uses: actions/checkout@v4
- name: Set up JDK 21
@@ -49,9 +48,31 @@ jobs:
java-version: '21'
distribution: 'temurin'
cache: maven
- - name: Run Tests with MSSQL
+ - name: Run tests with MSSQL
run: mvn test -pl core -am -Dspring.profiles.active=mssql
+ test-postgres:
+ runs-on: ubuntu-latest
+ needs: build
+ services:
+ postgres:
+ image: postgres
+ options: --name pg-container
+ env:
+ POSTGRES_USER: sa
+ POSTGRES_PASSWORD: veryStrong123
+ ports:
+ - 5432:5432
+ steps:
+ - uses: actions/checkout@v4
+ - name: Set up JDK 21
+ uses: actions/setup-java@v4
+ with:
+ java-version: '21'
+ distribution: 'temurin'
+ cache: maven
+ - name: Run tests with postgres
+ run: mvn test -pl core -am -Dspring.profiles.active=postgres
java-doc:
runs-on: ubuntu-latest
@@ -84,7 +105,7 @@ jobs:
maven-deploy:
runs-on: ubuntu-latest
- needs: [build, test-mssql]
+ needs: [build, test-mssql, test-postgres]
if: ${{ github.ref == 'refs/heads/main' }}
steps:
- uses: actions/checkout@v4
diff --git a/RUN_AND_BUILD.md b/RUN_AND_BUILD.md
index ff42b5597..23c0b6a05 100644
--- a/RUN_AND_BUILD.md
+++ b/RUN_AND_BUILD.md
@@ -1,7 +1,7 @@
mvn versions:display-dependency-updates
-mvn versions:set -DnewVersion=1.2.0 -DgenerateBackupPoms=false
-mvn versions:set -DnewVersion=1.2.1-SNAPSHOT -DgenerateBackupPoms=false
+mvn versions:set -DnewVersion=1.2.1 -DgenerateBackupPoms=false
+mvn versions:set -DnewVersion=1.2.2-SNAPSHOT -DgenerateBackupPoms=false
-docker run -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=veryStrong123" -p 1433:1433 -d mcr.microsoft.com/mssql/server:2022-latest
+docker run --name pg-container -e POSTGRES_USER=sa -e POSTGRES_PASSWORD=veryStrong123 -p 5432:5432 -d postgres
docker run --cap-add SYS_PTRACE -e 'ACCEPT_EULA=Y' -e 'MSSQL_SA_PASSWORD=veryStrong123' -p 1433:1433 --name azuresqledge -d mcr.microsoft.com/azure-sql-edge
diff --git a/core/pom.xml b/core/pom.xml
index b5f432b93..fc9fd2187 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -6,7 +6,7 @@
org.sterl.spring
spring-persistent-tasks-root
- 1.2.1-SNAPSHOT
+ 1.2.2-SNAPSHOT
../pom.xml
@@ -84,6 +84,11 @@
mssql-jdbc
test
+
+ org.postgresql
+ postgresql
+ test
+
diff --git a/core/src/main/java/org/sterl/spring/persistent_tasks/shared/model/TriggerData.java b/core/src/main/java/org/sterl/spring/persistent_tasks/shared/model/TriggerData.java
index c4a182db8..1d3bfc607 100644
--- a/core/src/main/java/org/sterl/spring/persistent_tasks/shared/model/TriggerData.java
+++ b/core/src/main/java/org/sterl/spring/persistent_tasks/shared/model/TriggerData.java
@@ -79,6 +79,7 @@ public void updateRunningDuration() {
private Long runningDurationInMs;
@Lob
+ @Column(name = "state")
private byte[] state;
@Column(length = 512)
diff --git a/core/src/test/java/org/sterl/spring/persistent_tasks/AbstractSpringTest.java b/core/src/test/java/org/sterl/spring/persistent_tasks/AbstractSpringTest.java
index b67a6b76a..ccf810d8a 100644
--- a/core/src/test/java/org/sterl/spring/persistent_tasks/AbstractSpringTest.java
+++ b/core/src/test/java/org/sterl/spring/persistent_tasks/AbstractSpringTest.java
@@ -15,6 +15,7 @@
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Component;
+import org.springframework.test.context.ActiveProfiles;
import org.springframework.transaction.support.TransactionTemplate;
import org.sterl.spring.persistent_tasks.api.SpringBeanTask;
import org.sterl.spring.persistent_tasks.api.TaskId;
@@ -33,7 +34,7 @@
import uk.co.jemos.podam.api.PodamFactory;
import uk.co.jemos.podam.api.PodamFactoryImpl;
-//@ActiveProfiles("mssql")
+//@ActiveProfiles("postgres") // postgres mssql
@SpringBootTest(classes = SampleApp.class, webEnvironment = WebEnvironment.RANDOM_PORT)
public class AbstractSpringTest {
diff --git a/core/src/test/resources/application-postgres.yml b/core/src/test/resources/application-postgres.yml
new file mode 100644
index 000000000..6cdd7fdc8
--- /dev/null
+++ b/core/src/test/resources/application-postgres.yml
@@ -0,0 +1,11 @@
+spring:
+ datasource:
+ username: sa
+ password: veryStrong123
+ url: jdbc:postgresql://localhost:5432/postgres
+ driver-class-name: org.postgresql.Driver
+ hikari:
+ maximum-pool-size: 100
+ jpa:
+ hibernate:
+ ddl-auto: none
\ No newline at end of file
diff --git a/db/pom.xml b/db/pom.xml
index ce961d6af..8082322c2 100644
--- a/db/pom.xml
+++ b/db/pom.xml
@@ -6,7 +6,7 @@
org.sterl.spring
spring-persistent-tasks-root
- 1.2.1-SNAPSHOT
+ 1.2.2-SNAPSHOT
../pom.xml
diff --git a/db/src/main/resources/spring-persistent-tasks/db/pt-changelog-v1.xml b/db/src/main/resources/spring-persistent-tasks/db/pt-changelog-v1.xml
index 98a4360ad..f1ab91ea1 100644
--- a/db/src/main/resources/spring-persistent-tasks/db/pt-changelog-v1.xml
+++ b/db/src/main/resources/spring-persistent-tasks/db/pt-changelog-v1.xml
@@ -14,7 +14,7 @@
-
+
diff --git a/example/pom.xml b/example/pom.xml
index 6273fe343..482ecb536 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -6,7 +6,7 @@
org.sterl.spring
spring-persistent-tasks-root
- 1.2.1-SNAPSHOT
+ 1.2.2-SNAPSHOT
../pom.xml
diff --git a/pom.xml b/pom.xml
index 26ed96eb3..aa245564d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
org.sterl.spring
spring-persistent-tasks-root
- 1.2.1-SNAPSHOT
+ 1.2.2-SNAPSHOT
pom
2024
diff --git a/ui/pom.xml b/ui/pom.xml
index c9a35bdf4..5b533a38f 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -6,7 +6,7 @@
org.sterl.spring
spring-persistent-tasks-root
- 1.2.1-SNAPSHOT
+ 1.2.2-SNAPSHOT
../pom.xml