#2453 Metadata aliases support (DB1 and Oracle)

Former-commit-id: 49d90c13

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetUtils.java

@@ -260,6 +260,9 @@ public class ResultSetUtils
             entityName = DBObjectNameCaseTransformer.transformName(dataSource, entityName);
         }
         DBSObject entityObject = DBUtils.getObjectByPath(monitor, objectContainer, catalogName, schemaName, entityName);
+        if (entityObject instanceof DBSAlias && !(entityObject instanceof DBSEntity)) {
+            entityObject = ((DBSAlias) entityObject).getTargetObject(monitor);
+        }
         if (entityObject == null) {
             return null;
         } else if (entityObject instanceof DBSEntity) {

plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Alias.java

@@ -23,6 +23,7 @@ import org.jkiss.dbeaver.ext.db2.model.dict.DB2AliasType;
 import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils;
 import org.jkiss.dbeaver.model.meta.Property;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
+import org.jkiss.dbeaver.model.struct.DBSAlias;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.utils.CommonUtils;
 
@@ -33,7 +34,7 @@ import java.sql.ResultSet;
  * 
  * @author Denis Forveille
  */
-public class DB2Alias extends DB2SchemaObject {
+public class DB2Alias extends DB2SchemaObject implements DBSAlias {
 
     private DB2AliasType type;
     private DBSObject targetObject;
@@ -95,4 +96,9 @@ public class DB2Alias extends DB2SchemaObject {
         return targetObject;
     }
 
+    @Override
+    public DBSObject getTargetObject(DBRProgressMonitor monitor) throws DBException {
+        return getTargetObject();
+    }
+
 }

plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleSynonym.java

@@ -22,13 +22,15 @@ import org.jkiss.dbeaver.model.impl.DBObjectNameCaseTransformer;
 import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils;
 import org.jkiss.dbeaver.model.meta.Property;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
+import org.jkiss.dbeaver.model.struct.DBSAlias;
+import org.jkiss.dbeaver.model.struct.DBSObject;
 
 import java.sql.ResultSet;
 
 /**
  * Oracle synonym
  */
-public class OracleSynonym extends OracleSchemaObject {
+public class OracleSynonym extends OracleSchemaObject implements DBSAlias {
 
     private String objectOwner;
     private String objectTypeName;
@@ -91,4 +93,12 @@ public class OracleSynonym extends OracleSchemaObject {
         return OracleDBLink.resolveObject(monitor, getSchema(), dbLink);
     }
 
+    @Override
+    public DBSObject getTargetObject(DBRProgressMonitor monitor) throws DBException {
+        Object object = getObject(monitor);
+        if (object instanceof DBSObject) {
+            return (DBSObject) object;
+        }
+        return null;
+    }
 }

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/struct/DBSAlias.java

+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jkiss.dbeaver.model.struct;
+
+import org.eclipse.jgit.annotations.Nullable;
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.DBPObject;
+import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
+
+/**
+ * DBSAlias - refers to some other metadata object
+ */
+public interface DBSAlias extends DBPObject
+{
+
+    /**
+     * Returns target object or null if alias is broken or target object is unavailable.
+     */
+    @Nullable
+    DBSObject getTargetObject(@NotNull DBRProgressMonitor monitor)
+        throws DBException;
+
+}