Skip to content
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.

Sign up for GitHub

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

Jump to bottom

CB-3582 fix package objects duplication #23032

Open
wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

CB-3582 fix package objects duplication #23032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...ns/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OraclePackage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,8 @@ protected JDBCStatement prepareObjectsStatement(@NotNull JDBCSession session, @N
{
JDBCPreparedStatement dbStat = session.prepareStatement(
"SELECT P.*,CASE WHEN A.DATA_TYPE IS NULL THEN 'PROCEDURE' ELSE 'FUNCTION' END as PROCEDURE_TYPE FROM ALL_PROCEDURES P\n" +
"LEFT OUTER JOIN ALL_ARGUMENTS A ON A.OWNER=P.OWNER AND A.PACKAGE_NAME=P.OBJECT_NAME AND A.OBJECT_NAME=P.PROCEDURE_NAME AND A.ARGUMENT_NAME IS NULL AND A.DATA_LEVEL=0\n" +
"LEFT OUTER JOIN ALL_ARGUMENTS A ON A.OWNER=P.OWNER AND A.PACKAGE_NAME=P.OBJECT_NAME AND A.OBJECT_NAME=P.PROCEDURE_NAME" +
" AND A.SUBPROGRAM_ID=P.SUBPROGRAM_ID AND A.ARGUMENT_NAME IS NULL AND A.DATA_LEVEL=0\n" +
"WHERE P.OWNER=? AND P.OBJECT_NAME=?\n" +
"ORDER BY P.PROCEDURE_NAME");
dbStat.setString(1, owner.getSchema().getName());
Expand Down
6 changes: 5 additions & 1 deletion plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/navigator/DBNDatabaseNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,8 +796,12 @@ public boolean isFiltered() {
@NotNull
@Override
public String getNodeId() {
DBSObject object = getObject();
if (object instanceof DBPUniqueObject uniqueObject) {
return uniqueObject.getUniqueName();
}
String nodeId = super.getNodeId();
if (getObject() instanceof DBPObjectWithLongId longObject) {
if (object instanceof DBPObjectWithLongId longObject) {
nodeId += "_" + longObject.getObjectId();
}
return nodeId;
Expand Down