Compare commits

...

2 Commits

Author SHA1 Message Date
Emmanuel GALLOIS
8ba144c5a1 feat(TDI-50821): bump component-runtime to 1.38.13 (#9516)
Co-authored-by: jzhao-talend <jzhao@talend.com>
2024-01-24 16:30:46 +08:00
Jane Ding
d6ccf6d000 fix(TUP-41316):tELTOracleMap generates incorrect column names when (#9437)
spaces present
https://jira.talendforge.org/browse/TUP-41316
2024-01-19 09:56:49 +08:00
3 changed files with 20 additions and 2 deletions

View File

@@ -14,6 +14,7 @@ package org.talend.designer.dbmap.language.oracle;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -413,7 +414,13 @@ public class OracleGenerationManager extends DbGenerationManager {
}
if (map.size() > 0) {
List<String> list = map.get(expression);
Collections.sort(list);
Collections.sort(list, new Comparator<String>() {
@Override
public int compare(String o1, String o2) {
return o1.length() - o2.length();
}
});
String specialColumn = list.get(list.size() - 1);
if (expression.contains(specialColumn)) {
int begin = expression.indexOf(specialColumn);

View File

@@ -14,7 +14,7 @@
<description>Studio integration of the Talend Component Kit framework.</description>
<properties>
<component-runtime.version>1.38.12</component-runtime.version>
<component-runtime.version>1.38.13</component-runtime.version>
<commons-lang3.version>3.11</commons-lang3.version>
<mockito.version>2.23.0</mockito.version>
<oro.version>2.0.8</oro.version>

View File

@@ -132,6 +132,17 @@ public class OracleGenerationManagerTest extends DbGenerationManagerTestHelper {
//
}
@Test
public void testAddQuoteForSpecialChar_Order6() throws Exception {
when(conn.getMetadataTable()).thenReturn(createMetadataTable(new String[] { "Employee ID", "Worker Type",
"Contingent Worker Type", "Termination Date", "Future Termination Date" }));
checkValue("A.Employee ID", "A.\\\"Employee ID\\\"");
checkValue("A.Worker Type", "A.\\\"Worker Type\\\"");
checkValue("A.Contingent Worker Type", "A.\\\"Contingent Worker Type\\\"");
checkValue("A.Termination Date", "A.\\\"Termination Date\\\"");
checkValue("A.Future Termination Date", "A.\\\"Future Termination Date\\\"");
}
public void testEscape() throws Exception {
checkValue("A.\\\"id\\\"", "A.\\\"id\\\"");