# HG changeset patch # User Augusto Mauch # Date 1477585117 -7200 # Thu Oct 27 18:18:37 2016 +0200 # Node ID 846ddd8a000b1775e2682ac5b10774244329bc69 # Parent fa1155a3635ec5852cc715dc6692bab611647026 Fixes issue 34224: SymmetricDS triggers can be disabled programatically The class SymmetricDSTriggerHandler enables/reenables the SymmetricDS in a similar way the TriggerHandler class does the same with the standard Openbravo triggers. A column called EM_Strsync_Symds_Trg_Disabled has been added to ad_session_status, the SymmetricDSTriggerHandler trigger adds a record with that column set to 'TRUE' to soft disable the triggers. The SymmetricDS triggers are now appended by a check that calls the function STRSYNC_ISTRIGGERENABLED, it will soft disable the trigger if it returns true. This fix depends on the fix of this issue [1] to be compatible with the TriggerHandler. Without this change, calling TriggerHandler.enable will result in the SymmetricDS triggers being enabled to. In the future the SymmetricDSTriggerHandler might be updated to use a temporary table instead of ad_session_status. This way it can be ensured that the insertions done to the table are not accidentally commited in the database. [1] https://issues.openbravo.com/view.php?id=34323 diff --git a/src-db/database/model/functions/STRSYNC_ISTRIGGERENABLED.xml b/src-db/database/model/functions/STRSYNC_ISTRIGGERENABLED.xml new file mode 100644 --- /dev/null +++ b/src-db/database/model/functions/STRSYNC_ISTRIGGERENABLED.xml @@ -0,0 +1,37 @@ + + + + . + *************************************************************************/ + v_aux CHAR; +BEGIN + SELECT CASE WHEN EXISTS(SELECT 1 + FROM ad_session_status + WHERE em_strsync_symds_trg_disabled = 'Y') + THEN 'N' + ELSE 'Y' + END + INTO v_aux; + RETURN v_aux; +EXCEPTION +WHEN OTHERS THEN + RETURN 'Y'; +END STRSYNC_ISTRIGGERENABLED +]]> + + diff --git a/src-db/database/model/modifiedTables/AD_SESSION_STATUS.xml b/src-db/database/model/modifiedTables/AD_SESSION_STATUS.xml new file mode 100644 --- /dev/null +++ b/src-db/database/model/modifiedTables/AD_SESSION_STATUS.xml @@ -0,0 +1,9 @@ + + + + + + + +

+ diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml +++ b/src-db/database/sourcedata/AD_COLUMN.xml @@ -564,6 +564,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/org/openbravo/replication/symmetricds/SymmetricDSConfiguration_data.xsql b/src/org/openbravo/replication/symmetricds/SymmetricDSConfiguration_data.xsql --- a/src/org/openbravo/replication/symmetricds/SymmetricDSConfiguration_data.xsql +++ b/src/org/openbravo/replication/symmetricds/SymmetricDSConfiguration_data.xsql @@ -219,8 +219,14 @@ @@ -232,6 +238,9 @@ + + + diff --git a/src/org/openbravo/replication/symmetricds/SymmetricDsTablePopulator.java b/src/org/openbravo/replication/symmetricds/SymmetricDsTablePopulator.java --- a/src/org/openbravo/replication/symmetricds/SymmetricDsTablePopulator.java +++ b/src/org/openbravo/replication/symmetricds/SymmetricDsTablePopulator.java @@ -245,7 +245,8 @@ fromStringBooleanToNumericString(synchronizedTable.synchUpdates), fromStringBooleanToNumericString(synchronizedTable.synchInserts), fromStringBooleanToNumericString(synchronizedTable.synchDeletes), updateTriggerName, - insertTriggerName, deleteTriggerName, excludedPropertiesNames, syncOnIncomingBatch); + insertTriggerName, deleteTriggerName, "STRSYNC_ISTRIGGERENABLED()='Y'", + excludedPropertiesNames, syncOnIncomingBatch); if ("Y".equals(synchronizedTable.synchUpdates)) { System.out.println(" Adding metadata for trigger " + updateTriggerName); diff --git a/src/org/openbravo/replication/symmetricds/util/SymmetricDSTriggerHandler.java b/src/org/openbravo/replication/symmetricds/util/SymmetricDSTriggerHandler.java new file mode 100644 --- /dev/null +++ b/src/org/openbravo/replication/symmetricds/util/SymmetricDSTriggerHandler.java @@ -0,0 +1,121 @@ +/* + ************************************************************************* + * Openbravo DB Synchronization module + * Copyright (C) 2016 Openbravo SLU + * + * The content of this file is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + ************************************************************************ + */ + +package org.openbravo.replication.symmetricds.util; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; + +import org.apache.log4j.Logger; +import org.openbravo.base.exception.OBException; +import org.openbravo.base.provider.OBProvider; +import org.openbravo.base.util.Check; +import org.openbravo.dal.service.OBDal; + +/** + * Supports disabling and again enabling of the triggers SymmetricDS places on the Openbravo tables. + * + * The user of this class should call disable() after beginning the transaction and enable at the + * end, before committing. + * + */ + +public class SymmetricDSTriggerHandler { + private static final Logger log = Logger.getLogger(SymmetricDSTriggerHandler.class); + + private static SymmetricDSTriggerHandler instance; + + public static SymmetricDSTriggerHandler getInstance() { + if (instance == null) { + instance = OBProvider.getInstance().get(SymmetricDSTriggerHandler.class); + } + return instance; + } + + private ThreadLocal sessionStatus = new ThreadLocal(); + + /** + * Disabled all triggers in the database. This is done by creating an ADSessionStatus object and + * storing it in the AD_SESSION_STATUS table. Note: this method will also call + * {@link OBDal#flush() OBDal.flush()}. + */ + public void disable() { + log.debug("Disabling SymmetricDS triggers"); + Check.isNull(sessionStatus.get(), "There is already a ADSessionStatus present in this thread, " + + "call enable before calling disable again"); + Connection con = OBDal.getInstance().getConnection(); + PreparedStatement ps = null; + try { + ps = con + .prepareStatement("INSERT INTO AD_SESSION_STATUS(ad_session_status_id, ad_client_id, ad_org_id, createdby, updatedby, isimporting, em_strsync_symds_trg_disabled) VALUES (get_uuid(), '0', '0', '0', '0', 'N', 'Y')"); + ps.executeUpdate(); + sessionStatus.set(Boolean.TRUE); + } catch (Exception e) { + throw new OBException("Couldn't disable triggers: ", e); + } finally { + try { + ps.close(); + } catch (SQLException e) { + } + } + } + + /** + * @return true if the database triggers are disabled, false in other cases. + */ + public boolean isDisabled() { + return sessionStatus.get() != null; + } + + /** + * Clears the SessionStatus from the threadlocal, must be done in case of rollback + */ + public void clear() { + sessionStatus.set(null); + } + + /** + * Enables triggers in the database. It does this by removing the ADSessionStatus from the + * database. + */ + public void enable() { + log.debug("Enabling triggers"); + Check.isNotNull(sessionStatus.get(), "SessionStatus not set, call disable " + + "before calling this method"); + + Connection con = OBDal.getInstance().getConnection(); + PreparedStatement ps = null; + try { + ps = con + .prepareStatement("DELETE FROM ad_session_status WHERE em_strsync_symds_trg_disabled = 'Y'"); + ps.executeUpdate(); + } catch (Exception e) { + throw new OBException("Couldn't disable triggers: ", e); + } finally { + // always clear the threadlocal + clear(); + try { + ps.close(); + } catch (SQLException e) { + } + } + } +} \ No newline at end of file