Author: dgeraskov Date: 2011-01-18 08:29:40 -0500 (Tue, 18 Jan 2011) New Revision: 28351 Modified: branches/jbosstools-3.2.0.CR1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java branches/jbosstools-3.2.0.CR1/hibernatetools/plugins/org.hibernate.eclipse/lib/tools/hibernate-tools.jar Log: https://issues.jboss.org/browse/JBIDE-6396 Fixed and moved to hibernate-tools 3.4.0.CR1 Modified: branches/jbosstools-3.2.0.CR1/hibernatetools/plugins/org.hibernate.eclipse/lib/tools/hibernate-tools.jar =================================================================== (Binary files differ) Modified: branches/jbosstools-3.2.0.CR1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java =================================================================== --- branches/jbosstools-3.2.0.CR1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java 2011-01-18 13:29:25 UTC (rev 28350) +++ branches/jbosstools-3.2.0.CR1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java 2011-01-18 13:29:40 UTC (rev 28351) @@ -56,11 +56,9 @@ @SuppressWarnings("unchecked") public synchronized Object[] getChildren(Object o, final IProgressMonitor monitor) { LazyDatabaseSchema dbs = getLazyDatabaseSchema( o ); - final DefaultDatabaseCollector db = new DefaultDatabaseCollector(); - ConsoleConfiguration consoleConfiguration = dbs.getConsoleConfiguration(); try{ - readDatabaseSchema(monitor, db, consoleConfiguration, dbs.getReverseEngineeringStrategy()); + DefaultDatabaseCollector db = readDatabaseSchema(monitor, consoleConfiguration, dbs.getReverseEngineeringStrategy()); List<TableContainer> result = new ArrayList<TableContainer>(); @@ -101,30 +99,30 @@ return getLazyDatabaseSchema(o).getConsoleConfiguration(); } - protected void readDatabaseSchema(final IProgressMonitor monitor, final DefaultDatabaseCollector db, ConsoleConfiguration consoleConfiguration, final ReverseEngineeringStrategy strategy) { + protected DefaultDatabaseCollector readDatabaseSchema(final IProgressMonitor monitor, ConsoleConfiguration consoleConfiguration, final ReverseEngineeringStrategy strategy) { final Configuration configuration = consoleConfiguration.buildWith(null, false); + return (DefaultDatabaseCollector) consoleConfiguration.execute(new ExecutionContext.Command() { - consoleConfiguration.execute(new ExecutionContext.Command() { - public Object execute() { + DefaultDatabaseCollector db = null; Settings settings = configuration.buildSettings(); ConnectionProvider connectionProvider = null; try { connectionProvider = settings.getConnectionProvider(); JDBCReader reader = JDBCReaderFactory.newJDBCReader(configuration.getProperties(), settings, strategy); + db = new DefaultDatabaseCollector(reader.getMetaDataDialect()); reader.readDatabaseSchema(db, settings.getDefaultCatalogName(), settings.getDefaultSchemaName(), new ProgressListenerMonitor(monitor)); + return db; } catch(HibernateException he) { HibernateConsolePlugin.getDefault().logErrorMessage(HibernateConsoleMessages.LazyDatabaseSchemaWorkbenchAdapter_problem_while_reading_database_schema, he); - return new Object[] { HibernateConsoleMessages.LazyDatabaseSchemaWorkbenchAdapter_schema_not_available}; } finally { if (connectionProvider!=null) { connectionProvider.close(); } } - - return null; + return null; } }); }