#9858 naming fixed, into German localized

plugins/org.jkiss.dbeaver.ext.oracle.ui/src/org/jkiss/dbeaver/ext/oracle/ui/internal/OracleUIMessages.properties

@@ -80,11 +80,11 @@ edit_create_checkbox_content_group_show_description = Always shows DBA-related m
 edit_create_checkbox_content_group_use = Always use DBA_* views
 edit_create_checkbox_content_group_use_description = Use DBA_* views instead of ALL_* views wherever it is possible
 edit_create_checkbox_content_group_use_sys_schema = Use SYS schema prefix
-edit_create_checkbox_content_group_use_sys_schema_description = Use SYS schema prefix in all metadataa queries. Otherwise use view names without explicit schema.
+edit_create_checkbox_content_group_use_sys_schema_description = Use SYS schema prefix in all metadata queries. Otherwise use view names without explicit schema.
 edit_create_checkbox_content_group_use_simple_constraints = Simple constraint reading query
 edit_create_checkbox_content_group_use_simple_constraints_description = Use simple metadata queries. May work slower but it is more stable for all Oracle versions.
-edit_create_checkbox_content_group_use_another_table_query = Use another table metadata query
-edit_create_checkbox_content_group_use_another_table_query_description = Use another table metadata query. It helps in some cases speed up reading of table data
+edit_create_checkbox_content_group_use_another_table_query = Use UNION for table metadata reading
+edit_create_checkbox_content_group_use_another_table_query_description = Use legacy table metadata query. With UNION instead JOIN. It helps in some cases speed up reading of table data.
 dialog_controlgroup_performance = Performance
 edit_create_checkbox_group_use_rule = Use RULE hint for system catalog queries
 edit_create_checkbox_adds_rule_tool_tip_text = Adds RULE hint for some system catalog queries (like columns and constraints reading).\nIt significantly increases performance on some Oracle databases (and decreases on others).

plugins/org.jkiss.dbeaver.ext.oracle.ui/src/org/jkiss/dbeaver/ext/oracle/ui/internal/OracleUIMessages_de.properties

@@ -46,6 +46,19 @@ dialog_connection_user_name = Benutzername
 
 dialog_connection_ver = v.
 
+edit_create_checkbox_hide_empty_schemas = Leere Schemas ausblenden
+edit_create_checkbox_hide_empty_schemas_tool_tip_text = \u00DCberpr\u00FCfen Sie das Vorhandensein von Objekten im Schema und zeigen Sie keine leeren Schemas im Baum an.\nStandardm\u00E4\u00DFig aktiviert, kann jedoch Leistungsprobleme bei Datenbanken mit sehr vielen Objekten verursachen.
+edit_create_checkbox_content_group_show = Zeigen Sie immer DBA-Objekte an
+edit_create_checkbox_content_group_show_description = Zeigt immer DBA-bezogene Metadatenobjekte im Baum an, auch wenn der Benutzer keine DBA-Rolle hat.
+edit_create_checkbox_content_group_use = Verwenden Sie immer DBA_ * Ansichten
+edit_create_checkbox_content_group_use_description = Verwenden Sie DBA_ * -Ansichten anstelle von ALL_ * -Ansichten, wo immer dies m\u00F6glich ist
+edit_create_checkbox_content_group_use_sys_schema = Verwenden Sie das SYS-Schema-Pr\u00E4fix
+edit_create_checkbox_content_group_use_sys_schema_description = Verwenden Sie das SYS-Schema-Pr\u00E4fix in allen Metadatenabfragen. Verwenden Sie andernfalls Ansichtsnamen ohne explizites Schema.
+edit_create_checkbox_content_group_use_simple_constraints = Einfache Abfrage zum Lesen von Einschr\u00E4nkungen
+edit_create_checkbox_content_group_use_simple_constraints_description = Verwenden Sie einfache Metadatenabfragen. Funktioniert m\u00F6glicherweise langsamer, ist jedoch f\u00FCr alle Oracle-Versionen stabiler.
+edit_create_checkbox_content_group_use_another_table_query = Verwenden Sie UNION zum Lesen von Tabellenmetadaten
+edit_create_checkbox_content_group_use_another_table_query_description = Verwenden Sie die Metadatenabfrage f\u00FCr Legacy-Tabellen. Mit UNION stattdessen beitreten. In einigen F\u00E4llen hilft es, das Lesen von Tabellendaten zu beschleunigen.
+
 edit_oracle_constraint_manager_dialog_title = Einschr\u00E4nkung erstellen
 
 edit_oracle_data_type_manager_dialog_title = Paket

plugins/org.jkiss.dbeaver.ext.oracle.ui/src/org/jkiss/dbeaver/ext/oracle/ui/internal/OracleUIMessages_ru.properties

@@ -100,5 +100,5 @@ edit_create_checkbox_content_group_use_sys_schema = \u0418\u0441\u043F\u043E\u04
 edit_create_checkbox_content_group_use_sys_schema_description = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0441\u0445\u0435\u043C\u0443 SYS \u0432 \u0437\u0430\u043F\u0440\u043E\u0441\u0430\u0445 \u043C\u0435\u0442\u0430\u0434\u0430\u043D\u043D\u044B\u0445
 edit_create_checkbox_group_use_metadata_optimizer = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u043E\u043F\u0442\u0438\u043C\u0438\u0437\u0430\u0442\u043E\u0440 \u0437\u0430\u043F\u0440\u043E\u0441\u043E\u0432 \u043A \u043C\u0435\u0442\u0430\u0434\u0430\u043D\u043D\u044B\u043C
 edit_create_checkbox_group_use_metadata_optimizer_tip = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0435 \u043E\u043F\u0442\u0438\u043C\u0438\u0437\u0430\u0442\u043E\u0440\u0430 \u0437\u0430\u043F\u0440\u043E\u0441\u043E\u0432 \u043A \u043C\u0435\u0442\u0430\u0434\u0430\u043D\u043D\u044B\u043C.\n\u041C\u043E\u0436\u0435\u0442 \u0437\u043D\u0430\u0447\u0438\u0442\u0435\u043B\u044C\u043D\u043E \u043F\u043E\u0432\u044B\u0441\u0438\u0442\u044C \u043F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u044C \u0447\u0442\u0435\u043D\u0438\u044F \u043C\u0435\u0442\u0430\u0434\u0430\u043D\u043D\u044B\u0445 \u0432 \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0445 \u0441\u0438\u0441\u0442\u0435\u043C\u0430\u0445.
-edit_create_checkbox_content_group_use_another_table_query = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0434\u0440\u0443\u0433\u043E\u0439 \u0437\u0430\u043F\u0440\u043E\u0441 \u043F\u043E\u043B\u0443\u0447\u0435\u043D\u0438\u044F \u0442\u0430\u0431\u043B\u0438\u0447\u043D\u044B\u0445 \u0434\u0430\u043D\u043D\u044B\u0445
-edit_create_checkbox_content_group_use_another_table_query_description = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0434\u0440\u0443\u0433\u043E\u0439 \u0437\u0430\u043F\u0440\u043E\u0441 \u043F\u043E\u043B\u0443\u0447\u0435\u043D\u0438\u044F \u0442\u0430\u0431\u043B\u0438\u0447\u043D\u044B\u0445 \u0434\u0430\u043D\u043D\u044B\u0445.\n\u041F\u043E\u043C\u043E\u0433\u0430\u0435\u0442 \u0432 \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0445 \u0441\u043B\u0443\u0447\u0430\u044F\u0445 \u0443\u0441\u043A\u043E\u0440\u0438\u0442\u044C \u0447\u0442\u0435\u043D\u0438\u0435 \u0442\u0430\u0431\u043B\u0438\u0447\u043D\u044B\u0445 \u0434\u0430\u043D\u043D\u044B\u0445
+edit_create_checkbox_content_group_use_another_table_query = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C UNION \u0432 \u0437\u0430\u043F\u0440\u043E\u0441\u0435 \u043F\u043E\u043B\u0443\u0447\u0435\u043D\u0438\u044F \u0442\u0430\u0431\u043B\u0438\u0447\u043D\u044B\u0445 \u0434\u0430\u043D\u043D\u044B\u0445
+edit_create_checkbox_content_group_use_another_table_query_description = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0430\u043B\u044C\u0442\u0435\u0440\u043D\u0430\u0442\u0438\u0432\u043D\u044B\u0439 \u0437\u0430\u043F\u0440\u043E\u0441 \u043F\u043E\u043B\u0443\u0447\u0435\u043D\u0438\u044F \u0442\u0430\u0431\u043B\u0438\u0447\u043D\u044B\u0445 \u0434\u0430\u043D\u043D\u044B\u0445.\n\u0417\u0430\u043F\u0440\u043E\u0441 \u0441\u043E\u0434\u0435\u0440\u0436\u0438\u0442 UNION \u0432\u043C\u0435\u0441\u0442\u043E JOIN. \u041F\u043E\u043C\u043E\u0433\u0430\u0435\u0442 \u0432 \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0445 \u0441\u043B\u0443\u0447\u0430\u044F\u0445 \u0443\u0441\u043A\u043E\u0440\u0438\u0442\u044C \u0447\u0442\u0435\u043D\u0438\u0435 \u0442\u0430\u0431\u043B\u0438\u0447\u043D\u044B\u0445 \u0434\u0430\u043D\u043D\u044B\u0445.

plugins/org.jkiss.dbeaver.ext.oracle.ui/src/org/jkiss/dbeaver/ext/oracle/ui/views/OracleConnectionExtraPage.java

@@ -52,7 +52,7 @@ public class OracleConnectionExtraPage extends ConnectionPageAbstract
     private Button useRuleHint;
     private Button useOptimizerHint;
     private Button useSimpleConstraints;
-    private Button useAnotherTableMetadataQuery;
+    private Button useAlternativeTableMetadataQuery;
 
     public OracleConnectionExtraPage()
     {
@@ -126,8 +126,8 @@ public class OracleConnectionExtraPage extends ConnectionPageAbstract
 
             useSimpleConstraints = UIUtils.createCheckbox(contentGroup, OracleUIMessages.edit_create_checkbox_content_group_use_simple_constraints,  OracleUIMessages.edit_create_checkbox_content_group_use_simple_constraints_description, false, 1);
 
-            useAnotherTableMetadataQuery = UIUtils.createCheckbox(contentGroup, OracleUIMessages.edit_create_checkbox_content_group_use_another_table_query, false);
-            useAnotherTableMetadataQuery.setToolTipText(OracleUIMessages.edit_create_checkbox_content_group_use_another_table_query_description);
+            useAlternativeTableMetadataQuery = UIUtils.createCheckbox(contentGroup, OracleUIMessages.edit_create_checkbox_content_group_use_another_table_query, false);
+            useAlternativeTableMetadataQuery.setToolTipText(OracleUIMessages.edit_create_checkbox_content_group_use_another_table_query_description);
         }
 
         setControl(cfgGroup);
@@ -177,7 +177,7 @@ public class OracleConnectionExtraPage extends ConnectionPageAbstract
         useSimpleConstraints.setSelection(CommonUtils.getBoolean(providerProperties.get(OracleConstants.PROP_METADATA_USE_SIMPLE_CONSTRAINTS), false));
         useRuleHint.setSelection(CommonUtils.getBoolean(providerProperties.get(OracleConstants.PROP_USE_RULE_HINT), false));
         useOptimizerHint.setSelection(CommonUtils.getBoolean(providerProperties.get(OracleConstants.PROP_USE_META_OPTIMIZER), false));
-        useAnotherTableMetadataQuery.setSelection(CommonUtils.getBoolean(providerProperties.get(OracleConstants.PROP_METADATA_USE_ANOTHER_TABLE_QUERY), false));
+        useAlternativeTableMetadataQuery.setSelection(CommonUtils.getBoolean(providerProperties.get(OracleConstants.PROP_METADATA_USE_ALTERNATIVE_TABLE_QUERY), false));
     }
 
     @Override
@@ -230,8 +230,8 @@ public class OracleConnectionExtraPage extends ConnectionPageAbstract
                 OracleConstants.PROP_USE_META_OPTIMIZER,
                 String.valueOf(useOptimizerHint.getSelection()));
             providerProperties.put(
-                    OracleConstants.PROP_METADATA_USE_ANOTHER_TABLE_QUERY,
-                    String.valueOf(useAnotherTableMetadataQuery.getSelection()));
+                    OracleConstants.PROP_METADATA_USE_ALTERNATIVE_TABLE_QUERY,
+                    String.valueOf(useAlternativeTableMetadataQuery.getSelection()));
 
         }
         saveConnectionURL(dataSource.getConnectionConfiguration());

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

@@ -498,12 +498,12 @@ public class OracleSchema extends OracleGlobalObject implements DBSSchema, DBPRe
             String tableOper = "=";
 
             boolean hasAllAllTables = owner.getDataSource().isViewAvailable(session.getProgressMonitor(), null, "ALL_ALL_TABLES");
-            boolean useAnotherQuery = CommonUtils.toBoolean(getDataSource().getContainer().getConnectionConfiguration().getProviderProperty(OracleConstants.PROP_METADATA_USE_ANOTHER_TABLE_QUERY));
+            boolean useAlternativeQuery = CommonUtils.toBoolean(getDataSource().getContainer().getConnectionConfiguration().getProviderProperty(OracleConstants.PROP_METADATA_USE_ALTERNATIVE_TABLE_QUERY));
             String tablesSource = hasAllAllTables ? "ALL_TABLES" : "TABLES";
             String tableTypeColumns = hasAllAllTables ? "t.TABLE_TYPE_OWNER,t.TABLE_TYPE" : "NULL as TABLE_TYPE_OWNER, NULL as TABLE_TYPE";
 
             JDBCPreparedStatement dbStat;
-            if (!useAnotherQuery) {
+            if (!useAlternativeQuery) {
                 dbStat = session.prepareStatement("SELECT " + OracleUtils.getSysCatalogHint(owner.getDataSource()) +
                         " O.*,\n" +
                         tableTypeColumns + ",t.TABLESPACE_NAME,t.PARTITIONED,t.IOT_TYPE,t.IOT_NAME,t.TEMPORARY,t.SECONDARY,t.NESTED,t.NUM_ROWS\n" +
@@ -520,7 +520,7 @@ public class OracleSchema extends OracleGlobalObject implements DBSSchema, DBPRe
                     dbStat.setString(2, object != null ? object.getName() : objectName);
                 return dbStat;
             } else {
-                return getAnotherTableStatement(session, owner, object, objectName, tablesSource, tableTypeColumns);
+                return getAlternativeTableStatement(session, owner, object, objectName, tablesSource, tableTypeColumns);
             }
         }
 
@@ -586,7 +586,7 @@ public class OracleSchema extends OracleGlobalObject implements DBSSchema, DBPRe
         }
 
         @NotNull
-        private JDBCStatement getAnotherTableStatement(@NotNull JDBCSession session, @NotNull OracleSchema owner, @Nullable OracleTableBase object, @Nullable String objectName, String tablesSource, String tableTypeColumns) throws SQLException {
+        private JDBCStatement getAlternativeTableStatement(@NotNull JDBCSession session, @NotNull OracleSchema owner, @Nullable OracleTableBase object, @Nullable String objectName, String tablesSource, String tableTypeColumns) throws SQLException {
             boolean hasName = object == null && objectName != null;
             JDBCPreparedStatement dbStat;
             StringBuilder sql = new StringBuilder();