#3392 Oracle schema properties update. User reference

nls/bundles/org.jkiss.dbeaver.ext.oracle.nls/OSGI-INF/l10n/bundle_ru.properties

@@ -192,7 +192,8 @@ meta.org.jkiss.dbeaver.ext.oracle.model.OracleRole.name.description=\u0418\u043C
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleRole.authentication.name=\u0418\u0434\u0435\u043D\u0442\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u044F
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleRole.authentication.description=\u041E\u0431\u043E\u0437\u043D\u0430\u0447\u0430\u0435\u0442, \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044F \u043B\u0438 \u043F\u0430\u0440\u043E\u043B\u044C \u0434\u043B\u044F \u0432\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u044F \u0440\u043E\u043B\u0438
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleSchema.name.name=\u0418\u043C\u044F
-meta.org.jkiss.dbeaver.ext.oracle.model.OracleSchema.id.name=\u0418\u0434\u0435\u043D\u0442\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440 \u043F\u043E\u043B\u044C\u0437-\u043B\u044F
+meta.org.jkiss.dbeaver.ext.oracle.model.OracleSchema.id.name=ID
+meta.org.jkiss.dbeaver.ext.oracle.model.OracleSchema.schemaUser.name=\u041F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleSegment.schema.name=\u0421\u0445\u0435\u043C\u0430
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleSegment.segmentType.name=\u0422\u0438\u043F
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleSegment.partitionName.name=\u0420\u0430\u0437\u0434\u0435\u043B

plugins/org.jkiss.dbeaver.ext.oracle/OSGI-INF/l10n/bundle.properties

@@ -242,6 +242,7 @@ meta.org.jkiss.dbeaver.ext.oracle.model.OracleRole.authentication.name=Authentic
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleRole.authentication.description=Indicates if the role requires a password to be enabled
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleSchema.name.name=Name
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleSchema.id.name=User ID
+meta.org.jkiss.dbeaver.ext.oracle.model.OracleSchema.schemaUser.name=Schema user
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleSchema.createTime.name=Create time
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleSchema.createTime.description=Date the user was created
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleSegment.schema.name=Owner

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

@@ -317,6 +317,11 @@ public class OracleDataSource extends JDBCDataSource
         return userCache.getAllObjects(monitor, this);
     }
 
+    @Association
+    public OracleUser getUser(DBRProgressMonitor monitor, String name) throws DBException {
+        return userCache.getObject(monitor, this, name);
+    }
+
     @Association
     public Collection<OracleUserProfile> getProfiles(DBRProgressMonitor monitor) throws DBException {
         return profileCache.getAllObjects(monitor, this);

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

@@ -100,13 +100,13 @@ public class OracleSchema extends OracleGlobalObject implements DBSSchema, DBPRe
         return OracleConstants.USER_PUBLIC.equals(this.name);
     }
 
-    @Property(viewable = false, order = 200)
+    @Property(order = 200)
     public long getId()
     {
         return id;
     }
 
-    @Property(viewable = false, order = 190)
+    @Property(order = 190)
     public Date getCreateTime() {
         return createTime;
     }
@@ -269,12 +269,7 @@ public class OracleSchema extends OracleGlobalObject implements DBSSchema, DBPRe
                 allTableTriggers.addAll(triggers);
             }
         }
-        allTableTriggers.sort(new Comparator<OracleTableTrigger>() {
-            @Override
-            public int compare(OracleTableTrigger o1, OracleTableTrigger o2) {
-                return o1.getName().compareTo(o2.getName());
-            }
-        });
+        allTableTriggers.sort(Comparator.comparing(OracleTrigger::getName));
         return allTableTriggers;
     }
 
@@ -313,17 +308,18 @@ public class OracleSchema extends OracleGlobalObject implements DBSSchema, DBPRe
         return recycleBin.getAllObjects(monitor, this);
     }
 
+    @Property(order = 90)
+    public OracleUser getSchemaUser(DBRProgressMonitor monitor) throws DBException {
+        return getDataSource().getUser(monitor, name);
+    }
+
     @Override
     public Collection<DBSObject> getChildren(@NotNull DBRProgressMonitor monitor)
         throws DBException
     {
         List<DBSObject> children = new ArrayList<>();
-        for (OracleTableBase table : tableCache.getAllObjects(monitor, this)) {
-            children.add(table);
-        }
-        for (OraclePackage pack : packageCache.getAllObjects(monitor, this)) {
-            children.add(pack);
-        }
+        children.addAll(tableCache.getAllObjects(monitor, this));
+        children.addAll(packageCache.getAllObjects(monitor, this));
         return children;
     }
 
@@ -410,7 +406,7 @@ public class OracleSchema extends OracleGlobalObject implements DBSSchema, DBPRe
         TableCache()
         {
             super("TABLE_NAME");
-            setListOrderComparator(DBUtils.<OracleTableBase>nameComparator());
+            setListOrderComparator(DBUtils.nameComparator());
         }
 
         @NotNull
@@ -486,7 +482,7 @@ public class OracleSchema extends OracleGlobalObject implements DBSSchema, DBPRe
 
         @Override
         protected void cacheChildren(OracleTableBase parent, List<OracleTableColumn> oracleTableColumns) {
-            Collections.sort(oracleTableColumns, DBUtils.orderComparator());
+            oracleTableColumns.sort(DBUtils.orderComparator());
             super.cacheChildren(parent, oracleTableColumns);
         }
 

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

@@ -282,11 +282,16 @@ public class OracleUtils {
         throws DBException
     {
         final Object reference = referrer.getLazyReference(propertyId);
-        if (reference instanceof String && monitor != null) {
-            Object object = cache.getObject(
+        if (reference instanceof String) {
+            Object object;
+            if (monitor != null) {
+                object = cache.getObject(
                     monitor,
                     parent,
                     (String) reference);
+            } else {
+                object = cache.getCachedObject((String) reference);
+            }
             if (object != null) {
                 return object;
             } else {