summaryrefslogtreecommitdiff
path: root/calamus-engine/src/main/resources
diff options
context:
space:
mode:
Diffstat (limited to 'calamus-engine/src/main/resources')
-rw-r--r--calamus-engine/src/main/resources/META-INF/persistence.xml3
-rw-r--r--calamus-engine/src/main/resources/db/public/V001_000__jbpm.sql3
-rw-r--r--calamus-engine/src/main/resources/db/public/V001_001__baseline.sql12
-rw-r--r--calamus-engine/src/main/resources/logback.xml3
4 files changed, 11 insertions, 10 deletions
diff --git a/calamus-engine/src/main/resources/META-INF/persistence.xml b/calamus-engine/src/main/resources/META-INF/persistence.xml
index 5591390..0150ad9 100644
--- a/calamus-engine/src/main/resources/META-INF/persistence.xml
+++ b/calamus-engine/src/main/resources/META-INF/persistence.xml
@@ -20,7 +20,8 @@
<properties>
<property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQL82Dialect"/>
<property name="hibernate.max_fetch_depth" value="3"/>
- <property name="hibernate.hbm2ddl.auto" value="update"/>
+ <property name="hibernate.ejb.naming_strategy" value="org.hibernate.cfg.ImprovedNamingStrategy"/>
+ <!--<property name="hibernate.hbm2ddl.auto" value="update"/>-->
<property name="hibernate.show_sql" value="true"/>
<property name="hibernate.transaction.jta.platform"
value="org.hibernate.service.jta.platform.internal.BitronixJtaPlatform"/>
diff --git a/calamus-engine/src/main/resources/db/public/V001_000__jbpm.sql b/calamus-engine/src/main/resources/db/public/V001_000__jbpm.sql
index 4d2a194..e13e6fb 100644
--- a/calamus-engine/src/main/resources/db/public/V001_000__jbpm.sql
+++ b/calamus-engine/src/main/resources/db/public/V001_000__jbpm.sql
@@ -1,6 +1,3 @@
-DROP SCHEMA public CASCADE;
-CREATE SCHEMA public;
-
CREATE TABLE Attachment (
AttachmentId INT8 NOT NULL,
accessType INT4,
diff --git a/calamus-engine/src/main/resources/db/public/V001_001__baseline.sql b/calamus-engine/src/main/resources/db/public/V001_001__baseline.sql
index 3e39c06..5270d2c 100644
--- a/calamus-engine/src/main/resources/db/public/V001_001__baseline.sql
+++ b/calamus-engine/src/main/resources/db/public/V001_001__baseline.sql
@@ -9,8 +9,8 @@ CREATE TABLE artifact (
version VARCHAR(100) NOT NULL,
classifier VARCHAR(100),
extension VARCHAR(100) NOT NULL,
- git_hash CHAR(40) NOT NULL,
- level VARCHAR(100) NOT NULL
+ level VARCHAR(100) NOT NULL,
+ git_hash CHAR(40)
);
DROP TABLE IF EXISTS process;
@@ -22,16 +22,16 @@ CREATE TABLE process (
DROP TABLE IF EXISTS process_trigger;
CREATE TABLE process_trigger (
- id BIGINT NOT NULL PRIMARY KEY,
- process_id BIGINT NOT NULL REFERENCES process,
- mvel VARCHAR(1000) NOT NULL
+ id BIGINT NOT NULL PRIMARY KEY,
+ process BIGINT NOT NULL REFERENCES process,
+ mvel VARCHAR(1000) NOT NULL
);
INSERT INTO process (id, name, process_id)
VALUES ((SELECT
nextval('calamus_seq')), 'Deploy', 'io.trygvis.calamus.Deploy');
-INSERT INTO process_trigger (id, process_id, mvel)
+INSERT INTO process_trigger (id, process, mvel)
VALUES ((SELECT
nextval('calamus_seq')),
(SELECT
diff --git a/calamus-engine/src/main/resources/logback.xml b/calamus-engine/src/main/resources/logback.xml
index 743dd8b..46502f3 100644
--- a/calamus-engine/src/main/resources/logback.xml
+++ b/calamus-engine/src/main/resources/logback.xml
@@ -7,6 +7,9 @@
</appender>
<logger name="org.hibernate.hql.internal" level="INFO"/>
+ <logger name="com.googlecode.flyway" level="INFO"/>
+ <logger name="org.hibernate.type" level="INFO"/>
+ <logger name="org.hibernate.id" level="INFO"/>
<root level="DEBUG">
<appender-ref ref="CONSOLE"/>