diff --git a/extra/jheidi/loadTableInfoWorker.ajl b/extra/jheidi/loadTableInfoWorker.ajl index aa697aa4..2bcc4759 100644 --- a/extra/jheidi/loadTableInfoWorker.ajl +++ b/extra/jheidi/loadTableInfoWorker.ajl @@ -20,7 +20,7 @@ if ( event == "longRunningTask" || event == "alreadyRunning") { - if ( worker.isDone() ) + if ( worker.isDone() && event=="longRunningTask" ) return; if ( tableName.equals((String)context.get("currentTable")) && @@ -63,10 +63,10 @@ DB.Result tables = db.execute("show full columns from `" + arg("dbName") + "`.`" + arg("tableName") + "`"); - /*try + try { Thread.sleep(5000); - } catch (Exception e) {}*/ + } catch (Exception e) {} publish(tables); diff --git a/extra/jheidi/showTableStatusWorker.ajl b/extra/jheidi/showTableStatusWorker.ajl index 1c27ef68..4ed267a0 100644 --- a/extra/jheidi/showTableStatusWorker.ajl +++ b/extra/jheidi/showTableStatusWorker.ajl @@ -18,11 +18,14 @@ if (event == "longRunningTask" || event == "alreadyRunning" ) { - if ( worker.isDone() ) + if ( worker.isDone() && event == "longRunningTask" ) return; + log.info("currentDB: " + dbName + "=" + context.get("currentDB")); + if ( dbName.equals((String)context.get("currentDB"))) { + log.info("updating banner"); banner.setText("Database " + dbName + ": (loading)"); banner = context.get("/mainTabs/Query/toolbar/banner"); banner.setText("SQL query on database: " + dbName); @@ -51,10 +54,10 @@ DB.Result databases = db.execute("show table status from `" + arg("dbName") + "`"); - /*try + try { Thread.sleep(10000); - } catch (Exception e) {}*/ + } catch (Exception e) {} publish(databases);