From 9bacf6a03f60b50f818df43a0d8f5ab8366a22c5 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Tue, 28 Apr 2020 23:40:28 +0200 Subject: [PATCH 1/6] log everything for utPLSQL only, severe only for others --- sqldev/src/test/resources/logging.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sqldev/src/test/resources/logging.conf b/sqldev/src/test/resources/logging.conf index 636417ce..7cfb270f 100644 --- a/sqldev/src/test/resources/logging.conf +++ b/sqldev/src/test/resources/logging.conf @@ -1,5 +1,5 @@ # logging properties for Oracle SQL Developer and utPLSQL unit test cases -# replace logging.conf in /Applications/SQLDeveloper17.4.0.app/Contents/Resources/sqldeveloper/sqldeveloper/bin +# replace logging.conf in /Applications/SQLDeveloper19.4.0.app/Contents/Resources/sqldeveloper/sqldeveloper/bin #handlers for console (messages pane in SQL Developer) and file ($HOME/sqldeveloper.log) #handlers=java.util.logging.FileHandler, java.util.logging.ConsoleHandler @@ -11,11 +11,11 @@ handlers=java.util.logging.ConsoleHandler .level=SEVERE # Loggers -oracle.level=FINE +#oracle.level=FINE org.utplsql.level=ALL # --- ConsoleHandler --- -java.util.logging.ConsoleHandler.level=FINE +java.util.logging.ConsoleHandler.level=ALL java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS %4$s %3$s: %5$s%n From 6f61de40af86a845d95b028d35ccb2ac1119f74e Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Tue, 28 Apr 2020 23:41:15 +0200 Subject: [PATCH 2/6] use ut3 instead of ut3_latest_release --- .../src/test/java/org/utplsql/sqldev/test/dal/DalTest.xtend | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sqldev/src/test/java/org/utplsql/sqldev/test/dal/DalTest.xtend b/sqldev/src/test/java/org/utplsql/sqldev/test/dal/DalTest.xtend index 63e84b60..2a8d5444 100644 --- a/sqldev/src/test/java/org/utplsql/sqldev/test/dal/DalTest.xtend +++ b/sqldev/src/test/java/org/utplsql/sqldev/test/dal/DalTest.xtend @@ -31,7 +31,7 @@ class DalTest extends AbstractJdbcTest { @BeforeClass @AfterClass def static void setupAndTeardown() { - sysJdbcTemplate.execute("CREATE OR REPLACE PUBLIC SYNONYM ut FOR ut3_latest_release.ut") + sysJdbcTemplate.execute("CREATE OR REPLACE PUBLIC SYNONYM ut FOR ut3.ut") try { jdbcTemplate.execute("DROP PACKAGE junit_utplsql_test_pkg") } catch (BadSqlGrammarException e) { @@ -83,7 +83,7 @@ class DalTest extends AbstractJdbcTest { val dao = new UtplsqlDao(dataSource.connection) Assert.assertEquals(null, dao.utplsqlSchema) setupAndTeardown - Assert.assertEquals("UT3_LATEST_RELEASE", dao.utplsqlSchema) + Assert.assertEquals("UT3", dao.utplsqlSchema) } @Test @@ -491,7 +491,7 @@ class DalTest extends AbstractJdbcTest { val actual = dao.includes('SCOTT', 'junit_utplsql_test_pkg') Assert.assertTrue(actual.findFirst[it == "SCOTT.JUNIT_UTPLSQL_TEST_PKG"] !== null) Assert.assertTrue(actual.findFirst[it == "SCOTT.JUNIT_F"] !== null) - Assert.assertTrue(actual.findFirst[it == "UT3_LATEST_RELEASE.UT_EXPECTATION"] !== null) + Assert.assertTrue(actual.findFirst[it == "UT3.UT_EXPECTATION"] !== null) } @Test From cc4426cf47e8f28730935fb3eaed62e588b9c6ac Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Tue, 28 Apr 2020 23:41:52 +0200 Subject: [PATCH 3/6] add additional log entries for #99 --- .../sqldev/menu/UtplsqlController.xtend | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/menu/UtplsqlController.xtend b/sqldev/src/main/java/org/utplsql/sqldev/menu/UtplsqlController.xtend index 21e59b58..d8dc08ea 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/menu/UtplsqlController.xtend +++ b/sqldev/src/main/java/org/utplsql/sqldev/menu/UtplsqlController.xtend @@ -59,15 +59,22 @@ class UtplsqlController implements Controller { public static final IdeAction UTPLSQL_GENERATE_ACTION = IdeAction.get(UtplsqlController.UTPLSQL_GENERATE_CMD_ID) override handleEvent(IdeAction action, Context context) { - if (action.commandId === UTPLSQL_TEST_CMD_ID) { - runTest(context) - return true - } else if (action.commandId === UTPLSQL_COVERAGE_CMD_ID) { - codeCoverage(context) - return true - } else if (action.commandId === UTPLSQL_GENERATE_CMD_ID) { - generateTest(context) - return true + try { + if (action.commandId === UTPLSQL_TEST_CMD_ID) { + logger.finer("handle utplsql.test") + runTest(context) + return true + } else if (action.commandId === UTPLSQL_COVERAGE_CMD_ID) { + logger.finer("handle utplsql.coverage") + codeCoverage(context) + return true + } else if (action.commandId === UTPLSQL_GENERATE_CMD_ID) { + logger.finer("handle utplsql.generate") + generateTest(context) + return true + } + } catch (Exception e) { + logger.severe("Failed to handle event due to exception " + e?.message) } return false } @@ -376,14 +383,22 @@ class UtplsqlController implements Controller { reporter.showParameterWindow } } else if (view instanceof DBNavigatorWindow) { + logger.finer("Code coverage from DB navigator") val url=context.URL if (url !== null) { + logger.finer('''url: «url»''') val connectionName = url.connectionName logger.fine('''connectionName: «connectionName»''') val pathList=context.pathList.dedupPathList + logger.finer('''pathList: «pathList»''') val includeObjectList = dependencies(context, connectionName) + logger.finer('''includeObjectList: «includeObjectList»''') val reporter = new CodeCoverageReporter(pathList, includeObjectList, connectionName) + logger.finer("showing code coverage dialog") reporter.showParameterWindow + logger.finer("code coverage dialog shown") + } else { + logger.warning('''url: null''') } } } From a2801860b9a6d41498156cd2db8937452d745a89 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Wed, 29 Apr 2020 20:56:47 +0200 Subject: [PATCH 4/6] Log time with milliseconds --- sqldev/src/test/resources/logging.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqldev/src/test/resources/logging.conf b/sqldev/src/test/resources/logging.conf index 7cfb270f..957e74fc 100644 --- a/sqldev/src/test/resources/logging.conf +++ b/sqldev/src/test/resources/logging.conf @@ -17,7 +17,7 @@ org.utplsql.level=ALL # --- ConsoleHandler --- java.util.logging.ConsoleHandler.level=ALL java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter -java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS %4$s %3$s: %5$s%n +java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$s %3$s: %5$s%n # --- FileHandler --- java.util.logging.FileHandler.level=ALL From 0b53032a22f7deece48d6ee57f782bde11d8bc3f Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Wed, 29 Apr 2020 20:57:13 +0200 Subject: [PATCH 5/6] remove duplicate url logging --- .../main/java/org/utplsql/sqldev/menu/UtplsqlController.xtend | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/menu/UtplsqlController.xtend b/sqldev/src/main/java/org/utplsql/sqldev/menu/UtplsqlController.xtend index d8dc08ea..28eadd5d 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/menu/UtplsqlController.xtend +++ b/sqldev/src/main/java/org/utplsql/sqldev/menu/UtplsqlController.xtend @@ -386,7 +386,6 @@ class UtplsqlController implements Controller { logger.finer("Code coverage from DB navigator") val url=context.URL if (url !== null) { - logger.finer('''url: «url»''') val connectionName = url.connectionName logger.fine('''connectionName: «connectionName»''') val pathList=context.pathList.dedupPathList @@ -398,7 +397,7 @@ class UtplsqlController implements Controller { reporter.showParameterWindow logger.finer("code coverage dialog shown") } else { - logger.warning('''url: null''') + logger.warning('''url is null''') } } } From f6fbba0a7651187454a735189c0c97af1230e695 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Wed, 29 Apr 2020 20:58:03 +0200 Subject: [PATCH 6/6] Check all dba_objects used in the data access layer to fix #99 --- .../main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend b/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend index e03c5851..7070a25f 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend +++ b/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend @@ -121,9 +121,17 @@ class UtplsqlDao { if (cachedDbaViewAccessible === null) { try { val sql = ''' - SELECT 1 + SELECT 1 AS dummy FROM dba_objects WHERE 1=2 + UNION ALL + SELECT 1 + FROM dba_synonyms + WHERE 1=2 + UNION ALL + SELECT 1 + FROM dba_dependencies + WHERE 1=2 ''' jdbcTemplate.execute(sql) cachedDbaViewAccessible = true