jprdonnelly/tcommon-studio-se
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

For bug TDI-24222 : DB2 v. 9.7 retrive schemas in pending state

Browse Source 
git-svn-id: http://talendforge.org/svn/tos/trunk@96348 f6f1c999-d317-4740-80b0-e6d1abc6f99e
This commit is contained in:
mwang
2013-01-06 08:47:13 +00:00
parent 8ce9af2fbb
commit 47bbc66fa6
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
org.talend.metadata.managment/src/main/java/org/talend/core/model/metadata/DBConnectionFillerImpl.java
View File

@@ -399,15 +399,20 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl {
catalogName = ""; //$NON-NLS-1$
}
}
// MOD xqliu 2010-03-03 feature 11412
if (!isNullSID(dbConn) && dbConn != null) {
String databaseOnConnWizard = ((DatabaseConnection) dbConn).getSID();
// If the SID on ui is not empty, the catalog name should be same to this SID name.
postFillCatalog(metaConnection, catalogList, filterList,
TalendCWMService.getReadableName(dbConn, databaseOnConnWizard), dbConn);
break;
} else if (isCreateElement(catalogFilter, catalogName)) {
postFillCatalog(metaConnection, catalogList, filterList, catalogName, dbConn);
// Changed by Marvin Wang on Jan. 6, 2012 for bug TDI-24222. I haved discussed with Shen Ze about
// the fix,it is okay for them. What we did is to avoid creating a new catalog when catalogName is
// "null" for DB2.
if (catalogName != null) {
// MOD xqliu 2010-03-03 feature 11412
if (!isNullSID(dbConn) && dbConn != null) {
String databaseOnConnWizard = ((DatabaseConnection) dbConn).getSID();
// If the SID on ui is not empty, the catalog name should be same to this SID name.
postFillCatalog(metaConnection, catalogList, filterList,
TalendCWMService.getReadableName(dbConn, databaseOnConnWizard), dbConn);
break;
} else if (isCreateElement(catalogFilter, catalogName)) {
postFillCatalog(metaConnection, catalogList, filterList, catalogName, dbConn);
}
}
// ~11412
}
@@ -880,7 +885,7 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl {
}
}
} else if (dbJDBCMetadata.getDatabaseProductName() != null
&& dbJDBCMetadata.getDatabaseProductName().equals("DB2/NT")) { //$NON-NLS-1$
&& dbJDBCMetadata.getDatabaseProductName().startsWith("DB2/NT")) { //$NON-NLS-1$
for (String element : tableType) {
if (element.equals("SYNONYM")) { //$NON-NLS-1$
Statement stmt = ExtractMetaDataUtils.conn.createStatement();