Merge remote-tracking branch 'origin/devel' into devel

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ViewerColumnController.java

@@ -126,6 +126,11 @@ public class ViewerColumnController<COLUMN, ELEMENT> {
     public void addColumn(String name, String description, int style, boolean defaultVisible, boolean required, IColumnTextProvider<ELEMENT> labelProvider, EditingSupport editingSupport)
     {
         addColumn(name, description, style, defaultVisible, required, false, null, new ColumnLabelProvider() {
+            @Override
+            public String getText(Object element) {
+                return labelProvider.getText((ELEMENT) element);
+            }
+
             @Override
             public void update(ViewerCell cell) {
                 if (cell.getColumnIndex() == 0) {

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/search/data/SearchDataResultsPage.java

@@ -16,6 +16,7 @@
  */
 package org.jkiss.dbeaver.ui.search.data;
 
+import org.eclipse.search.ui.ISearchResult;
 import org.eclipse.swt.widgets.Composite;
 import org.jkiss.dbeaver.model.DBPNamedObject;
 import org.jkiss.dbeaver.model.navigator.DBNDatabaseNode;
@@ -42,6 +43,12 @@ public class SearchDataResultsPage extends AbstractSearchResultsPage<SearchDataO
         return object.getNode();
     }
 
+    @Override
+    public void setInput(ISearchResult search, Object uiState) {
+        foundObjects.clear();
+        super.setInput(search, uiState);
+    }
+
     @Override
     public void populateObjects(Collection<SearchDataObject> objects) {
         foundObjects.addAll(objects);
@@ -49,7 +56,7 @@ public class SearchDataResultsPage extends AbstractSearchResultsPage<SearchDataO
     }
 
     private class DataSearchResultsControl extends SearchResultsControl {
-        public DataSearchResultsControl(Composite resultsGroup)
+        DataSearchResultsControl(Composite resultsGroup)
         {
             super(resultsGroup);
 

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

@@ -405,6 +405,31 @@ meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.cardinality.name=Car
 meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.cardinality.description=Estimate by the query optimization approach of the number of rows accessed by the operation
 meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.bytes.name=Bytes
 meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.bytes.description=Estimate by the query optimization approach of the number of bytes accessed by the operation
+meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.partitionStart.name=Partition Start
+meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.partitionStart.description=Start partition of a range of accessed partitions
+meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.partitionStop.name=Partition Stop
+meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.partitionStop.description=Stop partition of a range of accessed partitions
+meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.partitionId.name=Partition ID
+meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.partitionId.description=Step that has computed the pair of values of the PARTITION_START and PARTITION_STOP columns
+meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.distribution.name=Distribution
+meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.distribution.description=Method used to distribute rows from producer query servers to consumer query servers
+meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.cpuCost.name=CPU Cost
+meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.cpuCost.description=CPU cost of the operation as estimated by the query optimizer's approach.\nThe value of this column is proportional to the number of machine cycles required for the operation.\nFor statements that use the rule-based approach, this column is NULL.
+meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.ioCost.name=IO Cost
+meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.ioCost.description=	I/O cost of the operation as estimated by the query optimizer's approach.\nThe value of this column is proportional to the number of data blocks read by the operation.\nFor statements that use the rule-based approach, this column is NULL.
+meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.tempSpace.name=Temp Space
+meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.tempSpace.description=Temporary space (in bytes) used by the operation as estimated by the query optimizer's approach.\nFor statements that use the rule-based approach, or for operations that do not use any temporary space, this column is NULL.
+meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.accessPredicates.name=Access Predicates
+meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.accessPredicates.description=Predicates used to locate rows in an access structure.\nFor example, start or stop predicates for an index range scan.
+meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.filterPredicates.name=Filter Predicates
+meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.filterPredicates.description=Predicates used to filter rows before producing them
+meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.projection.name=Projection
+meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.projection.description=Expressions produced by the operation
+meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.time.name=Elapsed Time
+meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.time.description=Elapsed time (in seconds) of the operation as estimated by query optimization.\nFor statements that use the rule-based approach, this column is NULL.
+meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.qblockName.name=Query Block
+meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.qblockName.description=Name of the query block (either system-generated or defined by the user with the QB_NAME hint)
+
 meta.org.jkiss.dbeaver.ext.oracle.model.session.OracleServerSession.sid.name=SID
 meta.org.jkiss.dbeaver.ext.oracle.model.session.OracleServerSession.sid.description=Session identifier
 meta.org.jkiss.dbeaver.ext.oracle.model.session.OracleServerSession.user.name=User

plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/plan/OraclePlanNode.java

@@ -241,6 +241,66 @@ public class OraclePlanNode implements DBCPlanNode {
         return bytes;
     }
 
+    @Property(order = 20)
+    public String getPartitionStart() {
+        return partitionStart;
+    }
+
+    @Property(order = 21)
+    public String getPartitionStop() {
+        return partitionStop;
+    }
+
+    @Property(order = 22)
+    public long getPartitionId() {
+        return partitionId;
+    }
+
+    @Property(order = 23)
+    public String getDistribution() {
+        return distribution;
+    }
+
+    @Property(order = 24)
+    public long getCpuCost() {
+        return cpuCost;
+    }
+
+    @Property(order = 25)
+    public long getIoCost() {
+        return ioCost;
+    }
+
+    @Property(order = 26)
+    public long getTempSpace() {
+        return tempSpace;
+    }
+
+    @Property(order = 27)
+    public String getAccessPredicates() {
+        return accessPredicates;
+    }
+
+    @Property(order = 28)
+    public String getFilterPredicates() {
+        return filterPredicates;
+    }
+
+    @Property(order = 29)
+    public String getProjection() {
+        return projection;
+    }
+
+    @Property(order = 30)
+    public long getTime() {
+        return time;
+    }
+
+    @Property(order = 31)
+    public String getQblockName() {
+        return qblockName;
+    }
+
     @Override
     public String toString()
     {

plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDataSource.java

@@ -460,7 +460,7 @@ public class PostgreDataSource extends JDBCDataSource implements DBSObjectSelect
                 }
             }
         } catch (Exception e) {
-            throw new DBException("Error eading templkate databases", e);
+            throw new DBException("Error reading template databases", e);
         }
     }
 
@@ -502,7 +502,7 @@ public class PostgreDataSource extends JDBCDataSource implements DBSObjectSelect
             DBSObjectFilter catalogFilters = owner.getContainer().getObjectFilter(PostgreDatabase.class, null, false);
             if (showNDD) {
                 if (catalogFilters != null) {
-                    JDBCUtils.appendFilterClause(catalogQuery, catalogFilters, "datname", true);
+                    JDBCUtils.appendFilterClause(catalogQuery, catalogFilters, "datname", false);
                 }
                 catalogQuery.append("\nORDER BY db.datname");
             }