From 28de16f2f22baf6ba504bf280e614e9e1daf6647 Mon Sep 17 00:00:00 2001 From: Viliam Repan Date: Wed, 23 May 2018 15:47:47 +0200 Subject: [PATCH] configuration bugfix for sql server, upgrade scripts improvements --- config/sql/_all/sqlserver-upgrade-3.7-3.8.sql | 3 ++- .../java/com/evolveum/midpoint/repo/sql/DataSourceFactory.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/sql/_all/sqlserver-upgrade-3.7-3.8.sql b/config/sql/_all/sqlserver-upgrade-3.7-3.8.sql index 88211f2bb6c..f5a4e784b84 100644 --- a/config/sql/_all/sqlserver-upgrade-3.7-3.8.sql +++ b/config/sql/_all/sqlserver-upgrade-3.7-3.8.sql @@ -167,7 +167,6 @@ ALTER TABLE m_audit_item ADD CONSTRAINT fk_audit_item FOREIGN KEY (record_id) RE ALTER TABLE m_audit_prop_value ADD CONSTRAINT fk_audit_prop_value FOREIGN KEY (record_id) REFERENCES m_audit_event; ALTER TABLE m_audit_ref_value ADD CONSTRAINT fk_audit_ref_value FOREIGN KEY (record_id) REFERENCES m_audit_event; --- TODO fix -- ALTER TABLE m_audit_item ALTER COLUMN changedItemPath NVARCHAR(255) COLLATE database_default NOT NULL; ALTER TABLE m_audit_delta ADD deltaBlob VARBINARY(MAX); @@ -1232,3 +1231,5 @@ ALTER TABLE m_user ADD CONSTRAINT fk_user FOREIGN KEY (oid) REFERENCES m_focus; ALTER TABLE m_value_policy ADD CONSTRAINT fk_value_policy FOREIGN KEY (oid) REFERENCES m_object; + +GO; diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/DataSourceFactory.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/DataSourceFactory.java index 0ff0641174c..fbea5b74827 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/DataSourceFactory.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/DataSourceFactory.java @@ -95,7 +95,7 @@ private HikariConfig createConfig() { // config.setAutoCommit(false); TransactionIsolation ti = configuration.getTransactionIsolation(); - if (ti != null) { + if (ti != null && TransactionIsolation.SNAPSHOT != ti) { config.setTransactionIsolation("TRANSACTION_" + ti.name()); }