提交 99895f7e 编写于 作者: S Serge Rider

PG: data type operation detection fix

Former-commit-id: 7cb83268
上级 ba2f7060
......@@ -40,6 +40,7 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSDataType;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.model.struct.DBSTypedObject;
import org.jkiss.utils.CommonUtils;
import java.sql.ResultSet;
......@@ -287,8 +288,9 @@ public class DB2DataType extends DB2Object<DBSObject> implements DBSDataType, DB
}
}
@NotNull
@Override
public DBCLogicalOperator[] getSupportedOperators()
public DBCLogicalOperator[] getSupportedOperators(DBSTypedObject attribute)
{
return DBUtils.getDefaultOperators(this);
}
......
......@@ -34,6 +34,7 @@ import org.jkiss.dbeaver.model.meta.Property;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSDataType;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.model.struct.DBSTypedObject;
import java.sql.ResultSet;
import java.sql.Types;
......@@ -201,8 +202,9 @@ public class ExasolDataType extends ExasolObject<DBSObject> implements DBSDataTy
}
}
@NotNull
@Override
public DBCLogicalOperator[] getSupportedOperators() {
public DBCLogicalOperator[] getSupportedOperators(DBSTypedObject attribute) {
return DBUtils.getDefaultOperators(this);
}
......
......@@ -348,8 +348,9 @@ public class OracleDataType extends OracleObject<DBSObject>
return typeDesc == null ? 0 : typeDesc.maxScale;
}
@NotNull
@Override
public DBCLogicalOperator[] getSupportedOperators() {
public DBCLogicalOperator[] getSupportedOperators(DBSTypedObject attribute) {
return DBUtils.getDefaultOperators(this);
}
......
......@@ -387,7 +387,7 @@ public class PostgreDataType extends JDBCDataType<PostgreSchema> implements Post
@NotNull
@Override
public DBCLogicalOperator[] getSupportedOperators() {
public DBCLogicalOperator[] getSupportedOperators(DBSTypedObject attribute) {
if (dataKind == DBPDataKind.STRING) {
if (typeCategory == PostgreTypeCategory.S) {
return new DBCLogicalOperator[]{
......@@ -407,7 +407,7 @@ public class PostgreDataType extends JDBCDataType<PostgreSchema> implements Post
};
}
}
return super.getSupportedOperators();
return super.getSupportedOperators(attribute);
}
@Override
......
......@@ -1148,7 +1148,7 @@ public final class DBUtils {
if (attribute instanceof DBSTypedObjectEx) {
DBSDataType dataType = ((DBSTypedObjectEx) attribute).getDataType();
if (dataType != null) {
return dataType.getSupportedOperators();
return dataType.getSupportedOperators(attribute);
}
}
return getDefaultOperators(attribute);
......
......@@ -174,9 +174,10 @@ public class JDBCDataType<OWNER extends DBSObject> implements DBSDataType
return maxScale;
}
@NotNull
@Override
public DBCLogicalOperator[] getSupportedOperators() {
return DBUtils.getDefaultOperators(this);
public DBCLogicalOperator[] getSupportedOperators(DBSTypedObject attribute) {
return DBUtils.getDefaultOperators(attribute);
}
public String toString()
......
......@@ -26,6 +26,7 @@ import org.jkiss.dbeaver.model.exec.DBCLogicalOperator;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSDataType;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.model.struct.DBSTypedObject;
/**
* AbstractAttribute
......@@ -89,7 +90,7 @@ public abstract class AbstractDataType<DS extends DBPDataSource> implements DBSD
@NotNull
@Override
public DBCLogicalOperator[] getSupportedOperators() {
public DBCLogicalOperator[] getSupportedOperators(DBSTypedObject attribute) {
return DBUtils.getDefaultOperators(this);
}
......
......@@ -45,5 +45,5 @@ public interface DBSDataType extends DBSObject, DBSTypedObject
int getMaxScale();
@NotNull
DBCLogicalOperator[] getSupportedOperators();
DBCLogicalOperator[] getSupportedOperators(DBSTypedObject attribute);
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册