Skip to content

Commit

Permalink
0000712: drop trigger doesn't work on Oracle if the trigger is in a d…
Browse files Browse the repository at this point in the history 
…ifferent schema

0000711: Table inactivation doesn't work properly when using the wildcard feature of sym_trigger
  • Loading branch information
@chenson42
chenson42 committed Jul 13, 2012
1 parent be8df80 commit cddd6b3
Show file tree
Hide file tree
Showing 5 changed files with 109 additions and 53 deletions.
7 changes: 7 additions & 0 deletions ...mmetric-client/src/main/java/org/jumpmind/symmetric/db/oracle/OracleSymmetricDialect.java
View file
Expand Up @@ -208,4 +208,11 @@ protected String getDbSpecificDataHasChangedCondition(Trigger trigger) {
}
}

@Override
protected String getDropTriggerSql(StringBuilder sqlBuffer, String catalogName,
String schemaName, String triggerName, String tableName, TriggerHistory oldHistory) {
return "drop trigger " + triggerName;
}


}
5 changes: 4 additions & 1 deletion ...client/src/main/java/org/jumpmind/symmetric/db/postgresql/PostgreSqlSymmetricDialect.java
View file
Expand Up @@ -110,11 +110,14 @@ public void removeTrigger(StringBuilder sqlBuffer, String catalogName, String sc
final String dropFunction = "drop function " + schemaName + "f" + triggerName + "()";
logSql(dropFunction, sqlBuffer);
if (parameterService.is(ParameterConstants.AUTO_SYNC_TRIGGERS)) {
String sql = null;
try {
sql = dropSql;
platform.getSqlTemplate().update(dropSql);
sql = dropFunction;
platform.getSqlTemplate().update(dropFunction);
} catch (Exception e) {
log.warn("Trigger does not exist");
log.warn("Tried to remove trigger using: {} and failed because: {}", sql, e.getMessage());
}
}
}
Expand Down
11 changes: 8 additions & 3 deletions ...tric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractSymmetricDialect.java
View file
Expand Up @@ -211,17 +211,22 @@ public Set<String> getSqlKeywords() {
}
return sqlKeywords;
}

protected String getDropTriggerSql(StringBuilder sqlBuffer, String catalogName, String schemaName,
String triggerName, String tableName, TriggerHistory oldHistory) {
schemaName = schemaName == null ? "" : (schemaName + ".");
return "drop trigger " + schemaName + triggerName;
}

public void removeTrigger(StringBuilder sqlBuffer, String catalogName, String schemaName,
String triggerName, String tableName, TriggerHistory oldHistory) {
schemaName = schemaName == null ? "" : (schemaName + ".");
final String sql = "drop trigger " + schemaName + triggerName;
String sql = getDropTriggerSql(sqlBuffer, catalogName, schemaName, triggerName, tableName, oldHistory);
logSql(sql, sqlBuffer);
if (parameterService.is(ParameterConstants.AUTO_SYNC_TRIGGERS)) {
try {
this.platform.getSqlTemplate().update(sql);
} catch (Exception e) {
log.warn("Trigger does not exist");
log.warn("Tried to remove trigger using: {} and failed because: {}", sql, e.getMessage());
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/model/TriggerHistory.java
View file
Expand Up @@ -157,6 +157,10 @@ public int getTableHash() {
public void setTableHash(int tableHash) {
this.tableHash = tableHash;
}

public String getFullyQualifiedSourceTableName() {
return Table.getFullyQualifiedTableName(sourceCatalogName, sourceSchemaName, sourceTableName);
}

public String getSourceTableName() {
return sourceTableName;
Expand Down
135 changes: 86 additions & 49 deletions ...ymmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterService.java
View file
Expand Up @@ -794,12 +794,41 @@ protected Set<String> getTriggerIdsFrom(List<Trigger> triggersThatShouldBeActive

protected void inactivateTriggers(List<Trigger> triggersThatShouldBeActive,
StringBuilder sqlBuffer) {
boolean ignoreCase = this.parameterService
.is(ParameterConstants.DB_METADATA_IGNORE_CASE);
List<TriggerHistory> activeHistories = getActiveTriggerHistories();
Set<String> triggerIdsThatShouldBeActive = getTriggerIdsFrom(triggersThatShouldBeActive);
Map<String, Set<Table>> tablesByTriggerId = new HashMap<String, Set<Table>>();
for (TriggerHistory history : activeHistories) {
if (!triggerIdsThatShouldBeActive.contains(history.getTriggerId())) {
boolean removeTrigger = false;
Set<Table> tables = tablesByTriggerId.get(history.getTriggerId());
Trigger trigger = getTriggerById(history.getTriggerId(), false);
if (tables == null) {
tables = getTablesForTrigger(trigger, triggersThatShouldBeActive);
tablesByTriggerId.put(trigger.getTriggerId(), tables);
}

if (tables == null || trigger == null) {
removeTrigger = true;
} else {
if (!StringUtils.equals(trigger.getSourceCatalogName(),
history.getSourceCatalogName())
|| !StringUtils.equals(trigger.getSourceSchemaName(),
history.getSourceSchemaName())) {
removeTrigger = true;
} else {
if (trigger.isSourceTableNameWildcarded()) {
boolean foundMatch = false;
for (Table table : tables) {
foundMatch |= ignoreCase ? StringUtils.equalsIgnoreCase(table.getName(), history.getSourceTableName()) : StringUtils.equals(table.getName(), history.getSourceTableName());
}
removeTrigger = !foundMatch;
}
}
}

if (removeTrigger) {
log.info("About to remove triggers for inactivated table: {}",
history.getSourceTableName());
history.getFullyQualifiedSourceTableName());
symmetricDialect.removeTrigger(sqlBuffer, history.getSourceCatalogName(),
history.getSourceSchemaName(), history.getNameForInsertTrigger(),
history.getSourceTableName(), history);
Expand Down Expand Up @@ -858,7 +887,7 @@ protected Set<Table> getTablesForTrigger(Trigger trigger, List<Trigger> triggers
if (trigger.isSourceTableNameWildcarded()) {
boolean ignoreCase = this.parameterService
.is(ParameterConstants.DB_METADATA_IGNORE_CASE);

Database database = symmetricDialect.getPlatform().readDatabase(
trigger.getSourceCatalogName(), trigger.getSourceSchemaName(),
new String[] { "TABLE" });
Expand All @@ -868,7 +897,8 @@ protected Set<Table> getTablesForTrigger(Trigger trigger, List<Trigger> triggers
for (String wildcardToken : wildcardTokens) {
for (Table table : tableArray) {
if (FormatUtils.isWildCardMatch(table.getName(), wildcardToken, ignoreCase)
&& !containsExactMatchForSourceTableName(table.getName(), triggers, ignoreCase)
&& !containsExactMatchForSourceTableName(table.getName(), triggers,
ignoreCase)
&& !table.getName().toLowerCase().startsWith(tablePrefix)) {
tables.add(table);
} else {
Expand All @@ -887,7 +917,8 @@ protected Set<Table> getTablesForTrigger(Trigger trigger, List<Trigger> triggers
return tables;
}

private boolean containsExactMatchForSourceTableName(String tableName, List<Trigger> triggers, boolean ignoreCase) {
private boolean containsExactMatchForSourceTableName(String tableName, List<Trigger> triggers,
boolean ignoreCase) {
for (Trigger trigger : triggers) {
if (trigger.getSourceTableName().equals(tableName)) {
return true;
Expand All @@ -903,23 +934,24 @@ protected void updateOrCreateDatabaseTriggers(List<Trigger> triggers, StringBuil

for (Trigger trigger : triggers) {
TriggerHistory newestHistory = null;
try {
TriggerReBuildReason reason = TriggerReBuildReason.NEW_TRIGGERS;

String errorMessage = null;
Channel channel = configurationService.getChannel(trigger.getChannelId());
if (channel == null) {
errorMessage = String
.format("Trigger %s had an unrecognized channel_id of '%s'. Please check to make sure the channel exists. Creating trigger on the '%s' channel",
trigger.getTriggerId(), trigger.getChannelId(),
Constants.CHANNEL_DEFAULT);
log.error(errorMessage);
trigger.setChannelId(Constants.CHANNEL_DEFAULT);
}
TriggerReBuildReason reason = TriggerReBuildReason.NEW_TRIGGERS;

String errorMessage = null;
Channel channel = configurationService.getChannel(trigger.getChannelId());
if (channel == null) {
errorMessage = String
.format("Trigger %s had an unrecognized channel_id of '%s'. Please check to make sure the channel exists. Creating trigger on the '%s' channel",
trigger.getTriggerId(), trigger.getChannelId(),
Constants.CHANNEL_DEFAULT);
log.error(errorMessage);
trigger.setChannelId(Constants.CHANNEL_DEFAULT);
}

Set<Table> tables = getTablesForTrigger(trigger, triggers);
if (tables.size() > 0) {
for (Table table : tables) {
try {

Set<Table> tables = getTablesForTrigger(trigger, triggers);
if (tables.size() > 0) {
for (Table table : tables) {
if (table.getPrimaryKeyColumnCount() == 0) {
table = table.copy();
table.makeAllColumnsPrimaryKeys();
Expand Down Expand Up @@ -986,44 +1018,48 @@ protected void updateOrCreateDatabaseTriggers(List<Trigger> triggers, StringBuil
}
}
}
}

} else {
log.error(
"Could not find any database tables matching '{}' in the datasource that is configured",
trigger.qualifiedSourceTableName());
} catch (Exception ex) {
log.error(
String.format("Failed to create triggers for %s",
trigger.qualifiedSourceTableName()), ex);

if (this.triggerCreationListeners != null) {
for (ITriggerCreationListener l : this.triggerCreationListeners) {
l.tableDoesNotExist(trigger);
if (newestHistory != null) {
// Make sure all the triggers are removed from the
// table
symmetricDialect.removeTrigger(null, trigger.getSourceCatalogName(),
trigger.getSourceSchemaName(),
newestHistory.getNameForInsertTrigger(),
trigger.getSourceTableName(), newestHistory);
symmetricDialect.removeTrigger(null, trigger.getSourceCatalogName(),
trigger.getSourceSchemaName(),
newestHistory.getNameForUpdateTrigger(),
trigger.getSourceTableName(), newestHistory);
symmetricDialect.removeTrigger(null, trigger.getSourceCatalogName(),
trigger.getSourceSchemaName(),
newestHistory.getNameForDeleteTrigger(),
trigger.getSourceTableName(), newestHistory);
}

if (this.triggerCreationListeners != null) {
for (ITriggerCreationListener l : this.triggerCreationListeners) {
l.triggerFailed(trigger, ex);
}
}
}
}
} catch (Exception ex) {

} else {
log.error(
String.format("Failed to create triggers for %s",
trigger.qualifiedSourceTableName()), ex);

if (newestHistory != null) {
// Make sure all the triggers are removed from the table
symmetricDialect.removeTrigger(null, trigger.getSourceCatalogName(),
trigger.getSourceSchemaName(), newestHistory.getNameForInsertTrigger(),
trigger.getSourceTableName(), newestHistory);
symmetricDialect.removeTrigger(null, trigger.getSourceCatalogName(),
trigger.getSourceSchemaName(), newestHistory.getNameForUpdateTrigger(),
trigger.getSourceTableName(), newestHistory);
symmetricDialect.removeTrigger(null, trigger.getSourceCatalogName(),
trigger.getSourceSchemaName(), newestHistory.getNameForDeleteTrigger(),
trigger.getSourceTableName(), newestHistory);
}
"Could not find any database tables matching '{}' in the datasource that is configured",
trigger.qualifiedSourceTableName());

if (this.triggerCreationListeners != null) {
for (ITriggerCreationListener l : this.triggerCreationListeners) {
l.triggerFailed(trigger, ex);
l.tableDoesNotExist(trigger);
}
}
}

}
}

Expand Down Expand Up @@ -1070,7 +1106,8 @@ protected TriggerHistory rebuildTriggerIfNecessary(StringBuilder sqlBuffer,

if ((forceRebuild || !triggerIsActive) && triggerExists) {
symmetricDialect.removeTrigger(sqlBuffer, oldCatalogName, oldSourceSchema,
oldTriggerName, trigger.getSourceTableName(), oldhist);
oldTriggerName, trigger.isSourceTableNameWildcarded() ? table.getName() : trigger
.getSourceTableName(), oldhist);
triggerExists = false;
triggerRemoved = true;
}
Expand Down

0 comments on commit cddd6b3

Please sign in to comment.