Bug 549445 - Data source explorer showing column names duplicated
Change-Id: I986aa97e389cb812c0c632429a1007cbf56febfe
Signed-off-by: Lakshminarayana Nekkanti <narayana.nekkanti@gmail.com>
diff --git a/features/org.eclipse.datatools.enablement.mysql.feature/feature.xml b/features/org.eclipse.datatools.enablement.mysql.feature/feature.xml
index bfee9c5..e4e1011 100644
--- a/features/org.eclipse.datatools.enablement.mysql.feature/feature.xml
+++ b/features/org.eclipse.datatools.enablement.mysql.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.datatools.enablement.mysql.feature"
label="%featureName"
- version="1.14.102.qualifier"
+ version="1.14.103.qualifier"
provider-name="%providerName"
plugin="org.eclipse.datatools.enablement.finfo"
image="eclipse_update_120.jpg">
diff --git a/features/org.eclipse.datatools.enablement.mysql.feature/pom.xml b/features/org.eclipse.datatools.enablement.mysql.feature/pom.xml
index ff53fbd..7d23bad 100644
--- a/features/org.eclipse.datatools.enablement.mysql.feature/pom.xml
+++ b/features/org.eclipse.datatools.enablement.mysql.feature/pom.xml
@@ -10,4 +10,5 @@
<groupId>org.eclipse.datatools.features</groupId>
<artifactId>org.eclipse.datatools.enablement.mysql.feature</artifactId>
<packaging>eclipse-feature</packaging>
+ <version>1.14.103-SNAPSHOT</version>
</project>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.mysql/META-INF/MANIFEST.MF b/plugins/enablement/org.eclipse.datatools.enablement.mysql/META-INF/MANIFEST.MF
index a3e7e13..7e7b342 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.mysql/META-INF/MANIFEST.MF
+++ b/plugins/enablement/org.eclipse.datatools.enablement.mysql/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.datatools.enablement.mysql; singleton:=true
-Bundle-Version: 1.2.101.qualifier
+Bundle-Version: 1.2.102.qualifier
Bundle-Activator: org.eclipse.datatools.enablement.mysql.MysqlPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.mysql/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.mysql/pom.xml
index 23e62c4..f19518b 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.mysql/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.mysql/pom.xml
@@ -9,6 +9,6 @@
</parent>
<groupId>org.eclipse.datatools.plugins</groupId>
<artifactId>org.eclipse.datatools.enablement.mysql</artifactId>
- <version>1.2.101-SNAPSHOT</version>
+ <version>1.2.102-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.mysql/src/org/eclipse/datatools/enablement/mysql/catalog/loaders/MySqlTableColumnLoader.java b/plugins/enablement/org.eclipse.datatools.enablement.mysql/src/org/eclipse/datatools/enablement/mysql/catalog/loaders/MySqlTableColumnLoader.java
index ea5c0f8..3fc15e7 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.mysql/src/org/eclipse/datatools/enablement/mysql/catalog/loaders/MySqlTableColumnLoader.java
+++ b/plugins/enablement/org.eclipse.datatools.enablement.mysql/src/org/eclipse/datatools/enablement/mysql/catalog/loaders/MySqlTableColumnLoader.java
@@ -20,6 +20,7 @@
import org.eclipse.datatools.enablement.mysql.catalog.MySqlCatalogColumn;
import org.eclipse.datatools.modelbase.dbdefinition.PredefinedDataTypeDefinition;
import org.eclipse.datatools.modelbase.sql.datatypes.PredefinedDataType;
+import org.eclipse.datatools.modelbase.sql.schema.Schema;
import org.eclipse.datatools.modelbase.sql.tables.Column;
import org.eclipse.emf.ecore.EStructuralFeature;
@@ -36,7 +37,9 @@
protected ResultSet createResultSet() throws SQLException {
Connection connection = getCatalogObject().getConnection();
DatabaseMetaData dbm = connection.getMetaData();
- return dbm.getColumns(null, null, this.getTable().getName(), getJDBCFilterPattern());
+ Schema schema = this.getTable().getSchema();
+ String schemaName = schema != null ? schema.getName() : null;
+ return dbm.getColumns(connection.getCatalog(), schemaName, this.getTable().getName(), getJDBCFilterPattern());
}
protected Column processRow(ResultSet rs) throws SQLException {
