Skip to content

Commit

Permalink
0001843: Oracle dialect has static "sym" prefix on objects
Browse files Browse the repository at this point in the history
  • Loading branch information
@erilong
erilong committed Jul 29, 2014
1 parent 089134c commit e5c63be
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions symmetric-client/src/main/java/org/jumpmind/symmetric/db/oracle/OracleSymmetricDialect.java
View file
Expand Up @@ -72,7 +72,7 @@ public OracleSymmetricDialect(IParameterService parameterService, IDatabasePlatf
protected void buildSqlReplacementTokens() {
super.buildSqlReplacementTokens();
if (parameterService.is(ParameterConstants.DBDIALECT_ORACLE_USE_HINTS, true)) {
sqlReplacementTokens.put("selectDataUsingGapsSqlHint", "/*+ index(d SYM_IDX_D_CHANNEL_ID) */");
sqlReplacementTokens.put("selectDataUsingGapsSqlHint", "/*+ index(d " + parameterService.getTablePrefix() + "_IDX_D_CHANNEL_ID) */");
}
}

Expand Down Expand Up @@ -252,11 +252,11 @@ public boolean supportsTransactionId() {
public String getSequenceName(SequenceIdentifier identifier) {
switch (identifier) {
case REQUEST:
return "SEQ_SYM_EXTRACT_EST_REQUEST_ID";
return "SEQ_" + parameterService.getTablePrefix() + "_EXTRACT_EST_REQUEST_ID";
case DATA:
return "SEQ_SYM_DATA_DATA_ID";
return "SEQ_" + parameterService.getTablePrefix() + "_DATA_DATA_ID";
case TRIGGER_HIST:
return "SEQ_SYM_TRIGGER_RIGGER_HIST_ID";
return "SEQ_" + parameterService.getTablePrefix() + "_TRIGGER_RIGGER_HIST_ID";
}
return null;
}
Expand Down
8 changes: 4 additions & 4 deletions symmetric-client/src/main/java/org/jumpmind/symmetric/db/oracle/OracleTriggerTemplate.java
View file
Expand Up @@ -40,7 +40,7 @@ public OracleTriggerTemplate(ISymmetricDialect symmetricDialect) {
timeColumnTemplate = "decode($(tableAlias).\"$(columnName)\", null, '', concat(concat('\"',to_char($(tableAlias).\"$(columnName)\", 'YYYY-MM-DD HH24:MI:SS','NLS_CALENDAR=''GREGORIAN''')),'\"'))" ;
dateColumnTemplate = "decode($(tableAlias).\"$(columnName)\", null, '', concat(concat('\"',to_char($(tableAlias).\"$(columnName)\", 'YYYY-MM-DD HH24:MI:SS','NLS_CALENDAR=''GREGORIAN''')),'\"'))" ;
clobColumnTemplate = "decode(dbms_lob.getlength($(tableAlias).\"$(columnName)\"), null, to_clob(''), '\"'||replace(replace($(tableAlias).\"$(columnName)\",'\\','\\\\'),'\"','\\\"')||'\"')" ;
blobColumnTemplate = "decode(dbms_lob.getlength($(tableAlias).\"$(columnName)\"), null, to_clob(''), '\"'||sym_blob2clob($(tableAlias).\"$(columnName)\")||'\"')" ;
blobColumnTemplate = "decode(dbms_lob.getlength($(tableAlias).\"$(columnName)\"), null, to_clob(''), '\"'||$(prefixName)_blob2clob($(tableAlias).\"$(columnName)\")||'\"')" ;
booleanColumnTemplate = "decode($(tableAlias).\"$(columnName)\", null, '', '\"'||cast($(tableAlias).\"$(columnName)\" as number("+symmetricDialect.getTemplateNumberPrecisionSpec()+"))||'\"')" ;
triggerConcatCharacter = "||" ;
newTriggerValue = ":new" ;
Expand All @@ -64,7 +64,7 @@ public OracleTriggerTemplate(ISymmetricDialect symmetricDialect) {
" $(oracleToClob)$(columns), \n" +
" $(channelExpression), \n" +
" $(txIdExpression), \n" +
" sym_pkg.disable_node_id, \n" +
" $(prefixName)_pkg.disable_node_id, \n" +
" $(externalSelect), \n" +
" CURRENT_TIMESTAMP \n" +
" ); \n" +
Expand Down Expand Up @@ -94,7 +94,7 @@ public OracleTriggerTemplate(ISymmetricDialect symmetricDialect) {
" var_old_data, \n" +
" $(channelExpression), \n" +
" $(txIdExpression), \n" +
" sym_pkg.disable_node_id, \n" +
" $(prefixName)_pkg.disable_node_id, \n" +
" $(externalSelect), \n" +
" CURRENT_TIMESTAMP \n" +
" ); \n" +
Expand All @@ -118,7 +118,7 @@ public OracleTriggerTemplate(ISymmetricDialect symmetricDialect) {
" $(oracleToClob)$(oldColumns), \n" +
" $(channelExpression), \n" +
" $(txIdExpression), \n" +
" sym_pkg.disable_node_id, \n" +
" $(prefixName)_pkg.disable_node_id, \n" +
" $(externalSelect), \n" +
" CURRENT_TIMESTAMP \n" +
" ); \n" +
Expand Down

0 comments on commit e5c63be

Please sign in to comment.