Revert "Bug 549445 - Data source explorer showing column names duplicated"
This reverts commit 49c4b29a100811abb5ecf773d9dc08e4d20ec6de.
Reason for revert: compilation fails after this change - https://ci.eclipse.org/datatools/job/org.eclipse.datatools_master/124/console
[ERROR] Failed to execute goal org.eclipse.tycho:tycho-compiler-plugin:2.2.0:compile (default-compile) on project org.eclipse.datatools.enablement.oda.xml.tests: Compilation failure: Compilation failure:
[ERROR] /home/jenkins/agent/workspace/org.eclipse.datatools_master/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/util/ui/SchemaPopulationUtilTest.java:[29]
[ERROR] new sun.security.action.GetPropertyAction("line.separator"));
[ERROR] ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
[ERROR] sun.security.action.GetPropertyAction cannot be resolved to a type
[ERROR] /home/jenkins/agent/workspace/org.eclipse.datatools_master/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/util/SaxParserTest.java:[40]
[ERROR] static String lineSeparator = (String) java.security.AccessController.doPrivileged( new sun.security.action.GetPropertyAction( "line.separator" ) );
[ERROR] ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
[ERROR] sun.security.action.GetPropertyAction cannot be resolved to a type
[ERROR] 2 problems (2 errors)
[ERROR] -> [Help 1]
Change-Id: Idadd68e3be5a24674c5a21ee90bf360f44be8dea
diff --git a/features/org.eclipse.datatools.enablement.mysql.feature/feature.xml b/features/org.eclipse.datatools.enablement.mysql.feature/feature.xml
index e4e1011..bfee9c5 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.103.qualifier"
+ version="1.14.102.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 7d23bad..ff53fbd 100644
--- a/features/org.eclipse.datatools.enablement.mysql.feature/pom.xml
+++ b/features/org.eclipse.datatools.enablement.mysql.feature/pom.xml
@@ -10,5 +10,4 @@
<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 7e7b342..a3e7e13 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.102.qualifier
+Bundle-Version: 1.2.101.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 f19518b..23e62c4 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.102-SNAPSHOT</version>
+ <version>1.2.101-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 3fc15e7..ea5c0f8 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,7 +20,6 @@
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;
@@ -37,9 +36,7 @@
protected ResultSet createResultSet() throws SQLException {
Connection connection = getCatalogObject().getConnection();
DatabaseMetaData dbm = connection.getMetaData();
- Schema schema = this.getTable().getSchema();
- String schemaName = schema != null ? schema.getName() : null;
- return dbm.getColumns(connection.getCatalog(), schemaName, this.getTable().getName(), getJDBCFilterPattern());
+ return dbm.getColumns(null, null, this.getTable().getName(), getJDBCFilterPattern());
}
protected Column processRow(ResultSet rs) throws SQLException {
