Skip to content

Commit abe0f6f

Browse files
Nexus6v2mr-anton-t
andauthored
dbeaver/pro#7975 removed vks from api and logic (#4098)
* dbeaver/pro#7975 removed vks from api and logic * dbeaver/pro#7975 revert api changes * dbeaver/pro#7975 revert api changes * dbeaver/pro#7975 revert api changes --------- Co-authored-by: mr-anton-t <42037741+mr-anton-t@users.noreply.github.com>
1 parent 0b2b851 commit abe0f6f

File tree

3 files changed

+3
-12
lines changed

3 files changed

+3
-12
lines changed

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryDataReceiver.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import org.jkiss.dbeaver.model.sql.DBQuotaException;
3535
import org.jkiss.dbeaver.model.struct.DBSDataContainer;
3636
import org.jkiss.dbeaver.model.struct.DBSEntity;
37-
import org.jkiss.dbeaver.model.struct.DBSEntityConstraintType;
3837
import org.jkiss.utils.CommonUtils;
3938

4039
import java.lang.reflect.Method;
@@ -190,15 +189,11 @@ public void fetchEnd(@NotNull DBCSession session, @NotNull DBCResultSet resultSe
190189
DBDRowIdentifier rowIdentifier = resultsInfo.getDefaultRowIdentifier();
191190
if (rowIdentifier == null) {
192191
webResultSet.setRowIdentifierState(WebSQLResultSetRowIdentifierState.METADATA_NOT_FOUND);
193-
} else if (rowIdentifier.getUniqueKey().getConstraintType().equals(DBSEntityConstraintType.VIRTUAL_KEY)) {
194-
webResultSet.setRowIdentifierState(WebSQLResultSetRowIdentifierState.VIRTUAL_KEY);
195192
} else if (!rowIdentifier.isIncomplete() && rowIdentifier.isValidIdentifier()) {
196193
webResultSet.setHasRowIdentifier(true);
197194
webResultSet.setRowIdentifierState(WebSQLResultSetRowIdentifierState.PRIMARY_KEY);
198195
List<WebSQLResultSetRowIdentifierAttribute> attributes = rowIdentifier.getAttributes().stream()
199-
.map(a -> new WebSQLResultSetRowIdentifierAttribute(
200-
a.getName(), a.getOrdinalPosition(), a.getLabel(), a.getDescription()
201-
))
196+
.map(a -> new WebSQLResultSetRowIdentifierAttribute(a.getName(), a.getOrdinalPosition()))
202197
.toList();
203198
String constraintTypeName = rowIdentifier.getUniqueKey().getConstraintType().getName();
204199
webResultSet.setRowIdentifier(

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLResultSetRowIdentifier.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ public List<WebSQLResultSetRowIdentifierAttribute> getAttributes() {
4848
public enum WebSQLResultSetRowIdentifierState {
4949
METADATA_NOT_FOUND,
5050
NONE,
51-
PRIMARY_KEY,
52-
VIRTUAL_KEY
51+
PRIMARY_KEY
5352
}
5453

5554
}

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLResultSetRowIdentifierAttribute.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.cloudbeaver.service.sql;
22

33
import org.jkiss.code.NotNull;
4-
import org.jkiss.code.Nullable;
54

65
public class WebSQLResultSetRowIdentifierAttribute {
76

@@ -11,9 +10,7 @@ public class WebSQLResultSetRowIdentifierAttribute {
1110

1211
public WebSQLResultSetRowIdentifierAttribute(
1312
@NotNull String name,
14-
int ordinalPosition,
15-
@NotNull String label,
16-
@Nullable String description
13+
int ordinalPosition
1714
) {
1815
this.name = name;
1916
this.ordinalPosition = ordinalPosition;

0 commit comments

Comments
 (0)