Compare commits

...

4 Commits

2 changed files with 47 additions and 17 deletions

View File

@@ -234,26 +234,30 @@ final java.util.Map<String, String> registry_metadata_<%=cid%> = new java.util.H
}
} else {
value = ElementParameterParser.getStringElementParameterValue(p);
// fix MEMO Types: behave now as TEXT_AREA
if (p.getFieldType().toString().startsWith("MEMO")){
value = value.replace("\n", " ").replace("\r", " ");
}
if (org.talend.core.model.utils.ContextParameterUtils.isDynamic(value)) {
value = "String.valueOf(" + value + ")";
}
else {
if (org.talend.core.model.utils.TalendTextUtils.isEnclosed(value)) {
value = org.talend.core.model.utils.TalendTextUtils.removeQuotes(value);
if(cid.contains("JDBC") && p.getFieldType() == EParameterFieldType.MEMO_SQL && value.contains("+")) {
value = org.talend.core.model.utils.NodeUtil.replaceCRLFInMEMO_SQL(value);
} else {
// fix MEMO Types: behave now as TEXT_AREA
if (p.getFieldType().toString().startsWith("MEMO")){
value = value.replace("\n", " ").replace("\r", " ");
}
Object sourceName = p.getTaggedValue("org.talend.sdk.component.source");
boolean isTacokit = "tacokit".equalsIgnoreCase(String.valueOf(sourceName));
if(isTacokit) {
value = org.talend.core.model.utils.TalendTextUtils.addQuotes(org.talend.core.utils.TalendQuoteUtils.checkAndAddBackslashes(value));
if (org.talend.core.model.utils.ContextParameterUtils.isDynamic(value)) {
value = "String.valueOf(" + value + ")";
} else {
value = org.talend.core.model.utils.TalendTextUtils.addQuotes(value);
if (org.talend.core.model.utils.TalendTextUtils.isEnclosed(value)) {
value = org.talend.core.model.utils.TalendTextUtils.removeQuotes(value);
}
Object sourceName = p.getTaggedValue("org.talend.sdk.component.source");
boolean isTacokit = "tacokit".equalsIgnoreCase(String.valueOf(sourceName));
if(isTacokit) {
value = org.talend.core.model.utils.TalendTextUtils.addQuotes(org.talend.core.utils.TalendQuoteUtils.checkAndAddBackslashes(value));
} else {
value = org.talend.core.model.utils.TalendTextUtils.addQuotes(value);
}
}
}
}
if (value != null) {

View File

@@ -77,6 +77,32 @@ if (params != null && !params.isEmpty()) {
}
}
}
} else if(cid.contains("JDBC") && p.getFieldType() == EParameterFieldType.MEMO_SQL) {
if (!p.isShow(params)) {
continue;
}
final String key = p.getName();
String value = ElementParameterParser.getStringElementParameterValue(p);
if (value.contains("+")) {
value = org.talend.core.model.utils.NodeUtil.replaceCRLFInMEMO_SQL(value);
} else {
value = value.replace("\n", " ").replace("\r", " ");
if (org.talend.core.model.utils.ContextParameterUtils.isDynamic(value)) {
value = "String.valueOf(" + value + ")";
} else {
if (org.talend.core.model.utils.TalendTextUtils.isEnclosed(value)) {
value = org.talend.core.model.utils.TalendTextUtils.removeQuotes(value);
}
value = org.talend.core.model.utils.TalendTextUtils.addQuotes(value);
}
}
if(value != null) {
configurationToChange.put(key, value);
}
}
}
}