Skip to content

D
dbeaver

suliangchun / dbeaver
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
D
dbeaver

体验新版 GitCode，发现更多精彩内容 >>

提交 0e533f62 编写于 作者: S Serge Rider
浏览文件
操作

#6286 Generic driver: procedure type detect fix

上级 c1f58878
隐藏空白更改
内联 并排
Showing with 74 addition and 63 deletion
plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/meta/GenericMetaModel.java
浏览文件 @ 0e533f62
......@@ -226,76 +226,16 @@ public class GenericMetaModel {
GenericDataSource dataSource = container.getDataSource();
GenericMetaObject procObject = dataSource.getMetaObject(GenericConstants.OBJECT_PROCEDURE);
try (JDBCSession session = DBUtils.openMetaSession(monitor, container, "Load procedures")) {
// Read procedures
JDBCResultSet dbResult = session.getMetaData().getProcedures(
container.getCatalog() == null ? null : container.getCatalog().getName(),
container.getSchema() == null ? null : JDBCUtils.escapeWildCards(session, container.getSchema().getName()),
dataSource.getAllObjectsPattern());
try {
while (dbResult.next()) {
if (monitor.isCanceled()) {
break;
}
String procedureCatalog = GenericUtils.safeGetStringTrimmed(procObject, dbResult, JDBCConstants.PROCEDURE_CAT);
String procedureName = GenericUtils.safeGetStringTrimmed(procObject, dbResult, JDBCConstants.PROCEDURE_NAME);
String specificName = GenericUtils.safeGetStringTrimmed(procObject, dbResult, JDBCConstants.SPECIFIC_NAME);
int procTypeNum = GenericUtils.safeGetInt(procObject, dbResult, JDBCConstants.PROCEDURE_TYPE);
String remarks = GenericUtils.safeGetString(procObject, dbResult, JDBCConstants.REMARKS);
DBSProcedureType procedureType;
switch (procTypeNum) {
case DatabaseMetaData.procedureNoResult: procedureType = DBSProcedureType.PROCEDURE; break;
case DatabaseMetaData.procedureReturnsResult: procedureType = DBSProcedureType.FUNCTION; break;
case DatabaseMetaData.procedureResultUnknown: procedureType = DBSProcedureType.PROCEDURE; break;
default: procedureType = DBSProcedureType.UNKNOWN; break;
}
if (CommonUtils.isEmpty(specificName)) {
specificName = procedureName;
}
procedureName = GenericUtils.normalizeProcedureName(procedureName);
GenericPackage procedurePackage = null;
// FIXME: remove as a silly workaround
String packageName = getPackageName(dataSource, procedureCatalog, procedureName, specificName);
if (packageName != null) {
if (!CommonUtils.isEmpty(packageName)) {
if (packageMap == null) {
packageMap = new TreeMap<>();
}
procedurePackage = packageMap.get(packageName);
if (procedurePackage == null) {
procedurePackage = new GenericPackage(container, packageName, true);
packageMap.put(packageName, procedurePackage);
container.addPackage(procedurePackage);
}
}
}
final GenericProcedure procedure = createProcedureImpl(
procedurePackage != null ? procedurePackage : container,
procedureName,
specificName,
remarks,
procedureType,
null);
if (procedurePackage != null) {
procedurePackage.addProcedure(procedure);
} else {
container.addProcedure(procedure);
}
}
}
finally {
dbResult.close();
}
boolean supportsFunctions = false;
try {
// Try to read functions (note: this function appeared only in Java 1.6 so it maybe not implemented by many drivers)
// Read procedures
dbResult = session.getMetaData().getFunctions(
JDBCResultSet dbResult = session.getMetaData().getFunctions(
container.getCatalog() == null ? null : container.getCatalog().getName(),
container.getSchema() == null ? null : JDBCUtils.escapeWildCards(session, container.getSchema().getName()),
dataSource.getAllObjectsPattern());
try {
supportsFunctions = true;
while (dbResult.next()) {
if (monitor.isCanceled()) {
break;
......@@ -344,6 +284,77 @@ public class GenericMetaModel {
log.debug("Can't read generic functions", e);
}
{
// Read procedures
JDBCResultSet dbResult = session.getMetaData().getProcedures(
container.getCatalog() == null ? null : container.getCatalog().getName(),
container.getSchema() == null ? null : JDBCUtils.escapeWildCards(session, container.getSchema().getName()),
dataSource.getAllObjectsPattern());
try {
while (dbResult.next()) {
if (monitor.isCanceled()) {
break;
}
String procedureCatalog = GenericUtils.safeGetStringTrimmed(procObject, dbResult, JDBCConstants.PROCEDURE_CAT);
String procedureName = GenericUtils.safeGetStringTrimmed(procObject, dbResult, JDBCConstants.PROCEDURE_NAME);
String specificName = GenericUtils.safeGetStringTrimmed(procObject, dbResult, JDBCConstants.SPECIFIC_NAME);
int procTypeNum = GenericUtils.safeGetInt(procObject, dbResult, JDBCConstants.PROCEDURE_TYPE);
String remarks = GenericUtils.safeGetString(procObject, dbResult, JDBCConstants.REMARKS);
DBSProcedureType procedureType;
switch (procTypeNum) {
case DatabaseMetaData.procedureNoResult:
procedureType = DBSProcedureType.PROCEDURE;
break;
case DatabaseMetaData.procedureReturnsResult:
procedureType = supportsFunctions ? DBSProcedureType.PROCEDURE : DBSProcedureType.FUNCTION;
break;
case DatabaseMetaData.procedureResultUnknown:
procedureType = DBSProcedureType.PROCEDURE;
break;
default:
procedureType = DBSProcedureType.UNKNOWN;
break;
}
if (CommonUtils.isEmpty(specificName)) {
specificName = procedureName;
}
procedureName = GenericUtils.normalizeProcedureName(procedureName);
GenericPackage procedurePackage = null;
// FIXME: remove as a silly workaround
String packageName = getPackageName(dataSource, procedureCatalog, procedureName, specificName);
if (packageName != null) {
if (!CommonUtils.isEmpty(packageName)) {
if (packageMap == null) {
packageMap = new TreeMap<>();
}
procedurePackage = packageMap.get(packageName);
if (procedurePackage == null) {
procedurePackage = new GenericPackage(container, packageName, true);
packageMap.put(packageName, procedurePackage);
container.addPackage(procedurePackage);
}
}
}
final GenericProcedure procedure = createProcedureImpl(
procedurePackage != null ? procedurePackage : container,
procedureName,
specificName,
remarks,
procedureType,
null);
if (procedurePackage != null) {
procedurePackage.addProcedure(procedure);
} else {
container.addProcedure(procedure);
}
}
} finally {
dbResult.close();
}
}
} catch (SQLException e) {
throw new DBException(e, dataSource);
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或