BZ342411 - checking in MySQLCatalogTable & catalog loader tweak for
MySQL table fix in master - updating map file
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e660fd9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+bin/
diff --git a/plugins/org.eclipse.datatools.enablement.mysql.dbdefinition/.cvsignore b/plugins/org.eclipse.datatools.enablement.mysql.dbdefinition/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.enablement.mysql.dbdefinition/.cvsignore
rename to plugins/org.eclipse.datatools.enablement.mysql.dbdefinition/.gitignore
diff --git a/plugins/org.eclipse.datatools.enablement.mysql.ui/.cvsignore b/plugins/org.eclipse.datatools.enablement.mysql.ui/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.enablement.mysql.ui/.cvsignore
rename to plugins/org.eclipse.datatools.enablement.mysql.ui/.gitignore
diff --git a/plugins/org.eclipse.datatools.enablement.mysql/.cvsignore b/plugins/org.eclipse.datatools.enablement.mysql/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.enablement.mysql/.cvsignore
rename to plugins/org.eclipse.datatools.enablement.mysql/.gitignore
diff --git a/plugins/org.eclipse.datatools.enablement.mysql/src/org/eclipse/datatools/enablement/mysql/catalog/MySqlCatalogTable.java b/plugins/org.eclipse.datatools.enablement.mysql/src/org/eclipse/datatools/enablement/mysql/catalog/MySqlCatalogTable.java
index 317a0da..af761f8 100644
--- a/plugins/org.eclipse.datatools.enablement.mysql/src/org/eclipse/datatools/enablement/mysql/catalog/MySqlCatalogTable.java
+++ b/plugins/org.eclipse.datatools.enablement.mysql/src/org/eclipse/datatools/enablement/mysql/catalog/MySqlCatalogTable.java
@@ -85,4 +85,8 @@
public Database getCatalogDatabase() {
return this.getSchema().getDatabase();
}
+
+ protected void loadSupertable() {
+ supertableLoaded = Boolean.FALSE;
+ }
}
diff --git a/plugins/org.eclipse.datatools.enablement.mysql/src/org/eclipse/datatools/enablement/mysql/catalog/loaders/MySqlTableColumnLoader.java b/plugins/org.eclipse.datatools.enablement.mysql/src/org/eclipse/datatools/enablement/mysql/catalog/loaders/MySqlTableColumnLoader.java
index 17d8b35..3536096 100644
--- a/plugins/org.eclipse.datatools.enablement.mysql/src/org/eclipse/datatools/enablement/mysql/catalog/loaders/MySqlTableColumnLoader.java
+++ b/plugins/org.eclipse.datatools.enablement.mysql/src/org/eclipse/datatools/enablement/mysql/catalog/loaders/MySqlTableColumnLoader.java
@@ -16,7 +16,6 @@
import java.sql.SQLException;
import org.eclipse.datatools.connectivity.sqm.core.definition.DatabaseDefinition;
-import org.eclipse.datatools.connectivity.sqm.core.rte.jdbc.JDBCColumn;
import org.eclipse.datatools.connectivity.sqm.loader.JDBCTableColumnLoader;
import org.eclipse.datatools.enablement.mysql.catalog.MySqlCatalogColumn;
import org.eclipse.datatools.modelbase.dbdefinition.PredefinedDataTypeDefinition;
@@ -41,7 +40,7 @@
}
protected Column processRow(ResultSet rs) throws SQLException {
- Column column = new JDBCColumn();
+ Column column = new MySqlCatalogColumn();
final String columnName = rs.getString(4);
column.setName(columnName);
diff --git a/releng/org.eclipse.datatools.enablement.mysql.releng/maps/enablement-mysql-plugins.map b/releng/org.eclipse.datatools.enablement.mysql.releng/maps/enablement-mysql-plugins.map
index 47d36c1..cf26af5 100644
--- a/releng/org.eclipse.datatools.enablement.mysql.releng/maps/enablement-mysql-plugins.map
+++ b/releng/org.eclipse.datatools.enablement.mysql.releng/maps/enablement-mysql-plugins.map
@@ -1,3 +1,3 @@
plugin@org.eclipse.datatools.enablement.mysql.dbdefinition=GIT,tag=v200906161800,repo=git://git.eclipse.org/gitroot/datatools/org.eclipse.datatools.enablement.mysql.git,path=plugins/org.eclipse.datatools.enablement.mysql.dbdefinition
plugin@org.eclipse.datatools.enablement.mysql.ui=GIT,tag=v200906020900,repo=git://git.eclipse.org/gitroot/datatools/org.eclipse.datatools.enablement.mysql.git,path=plugins/org.eclipse.datatools.enablement.mysql.ui
-plugin@org.eclipse.datatools.enablement.mysql=GIT,tag=v201002041100,repo=git://git.eclipse.org/gitroot/datatools/org.eclipse.datatools.enablement.mysql.git,path=plugins/org.eclipse.datatools.enablement.mysql
+plugin@org.eclipse.datatools.enablement.mysql=GIT,tag=v201109022323,repo=git://git.eclipse.org/gitroot/datatools/org.eclipse.datatools.enablement.mysql.git,path=plugins/org.eclipse.datatools.enablement.mysql