From 3a629bc51174ea08ce604c844d1043e052d997c2 Mon Sep 17 00:00:00 2001 From: nrousseau Date: Tue, 18 Dec 2012 11:02:25 +0000 Subject: [PATCH] TDI-24224 : only found this problem for only one project, not for previous version... (even till 4.0.1...) git-svn-id: http://talendforge.org/svn/tos/trunk@95586 f6f1c999-d317-4740-80b0-e6d1abc6f99e --- .../RepositoryToComponentProperty.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/designerproperties/RepositoryToComponentProperty.java b/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/designerproperties/RepositoryToComponentProperty.java index d3abc5ae5f..b18d1947ec 100644 --- a/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/designerproperties/RepositoryToComponentProperty.java +++ b/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/designerproperties/RepositoryToComponentProperty.java @@ -911,17 +911,22 @@ public class RepositoryToComponentProperty { if (value.equals("DB_VERSION")) { //$NON-NLS-1$ String dbVersionString = connection.getDbVersionString(); - if (EDatabaseConnTemplate.ACCESS.getDBDisplayName().equals(databaseType) - || EDatabaseConnTemplate.MYSQL.getDBDisplayName().equals(databaseType)) { + if (EDatabaseConnTemplate.ACCESS.getDBDisplayName().equals(databaseType)) { // @Deprecated: see bug 7262 this bug is Deprecated return dbVersionString; + } else if (EDatabaseConnTemplate.MYSQL.getDBDisplayName().equals(databaseType)) { + if (dbVersionString != null) { + return dbVersionString.toUpperCase(); + } } else { String driverValue = EDatabaseVersion4Drivers.getDriversStr(databaseType, dbVersionString); if (EDatabaseConnTemplate.ORACLE_OCI.getDBDisplayName().equals(databaseType) || EDatabaseConnTemplate.ORACLE_RAC.getDBDisplayName().equals(databaseType) || EDatabaseConnTemplate.ORACLEFORSID.getDBDisplayName().equals(databaseType) || EDatabaseConnTemplate.ORACLESN.getDBDisplayName().equals(databaseType)) { - driverValue = dbVersionString; + if (dbVersionString != null) { + driverValue = dbVersionString.toUpperCase(); + } } if (isContextMode(connection, dbVersionString)) { return dbVersionString;