Skip to content

Bugfix/issue 111 schema browser #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions sqldev/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,13 @@
<scope>system</scope>
<systemPath>${sqldev.basedir}/sqldeveloper/extensions/oracle.sqldeveloper.worksheet.jar</systemPath>
</dependency>
<dependency>
<groupId>oracle</groupId>
<artifactId>oracle.sqldeveloper.schemabrowser</artifactId>
<version>19.3.0</version>
<scope>system</scope>
<systemPath>${sqldev.basedir}/sqldeveloper/extensions/oracle.sqldeveloper.schemabrowser.jar</systemPath>
</dependency>
<dependency>
<groupId>oracle</groupId>
<artifactId>ojdbc8</artifactId>
Expand Down Expand Up @@ -445,6 +452,7 @@
oracle.ide.db,
oracle.ide.runner,
oracle.sqldeveloper,
oracle.sqldeveloper.schemabrowser,
oracle.sqldeveloper.utils,
oracle.sqldeveloper.worksheet,
oracle.uic
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import oracle.dbtools.raptor.navigator.impl.ObjectFolder;
import oracle.dbtools.raptor.navigator.impl.SchemaFolder;
import oracle.dbtools.raptor.navigator.plsql.PlSqlNode;
import oracle.dbtools.raptor.schemabrowser.view.SBWindow;
import oracle.dbtools.raptor.utils.Connections;
import oracle.dbtools.worksheet.editor.Worksheet;
import oracle.ide.Context;
Expand Down Expand Up @@ -135,7 +136,7 @@ public boolean update(final IdeAction action, final Context context) {
action.setEnabled(true);
}
}
} else if (view instanceof DBNavigatorWindow) {
} else if (view instanceof DBNavigatorWindow || view instanceof SBWindow) {
action.setEnabled(true);
// disable action if a node in the selection is not runnable
for (int i = 0; i < context.getSelection().length; i++) {
Expand Down Expand Up @@ -192,7 +193,7 @@ public boolean update(final IdeAction action, final Context context) {
action.setEnabled(true);
}
}
} else if (view instanceof DBNavigatorWindow) {
} else if (view instanceof DBNavigatorWindow || view instanceof SBWindow) {
// multiselection is not supported, use oddgen to generte tests for multiple objects
if (context.getSelection().length == 1) {
final Object element = context.getSelection()[0];
Expand Down Expand Up @@ -367,7 +368,7 @@ public void runTest(final Context context, boolean withDebug) {
worksheet.runTestAsync();
}
}
} else if (view instanceof DBNavigatorWindow) {
} else if (view instanceof DBNavigatorWindow || view instanceof SBWindow) {
final URL url = getURL(context);
if (url != null) {
final String connectionName = URLTools.getConnectionName(url);
Expand Down Expand Up @@ -469,7 +470,7 @@ public void codeCoverage(final Context context) {
final CodeCoverageReporter reporter = new CodeCoverageReporter(getPathList(path), includeObjectList, connectionName);
reporter.showParameterWindow();
}
} else if (view instanceof DBNavigatorWindow) {
} else if (view instanceof DBNavigatorWindow || view instanceof SBWindow) {
logger.finer("Code coverage from DB navigator");
final URL url = getURL(context);
if (url != null) {
Expand Down Expand Up @@ -529,7 +530,7 @@ public void generateTest(final Context context) {
}
}
} else {
if (view instanceof DBNavigatorWindow) {
if (view instanceof DBNavigatorWindow || view instanceof SBWindow) {
final URL url = getURL(context);
if (url != null) {
final String connectionName = URLTools.getConnectionName(url);
Expand Down