Skip to content

D
dbeaver

suliangchun / dbeaver
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
D
dbeaver

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

提交 d271ed9f 编写于 作者: S serge-rider
浏览文件
操作

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


Former-commit-id: 4e104303
上级 c05f4c42 1c431745
展开全部 隐藏空白更改
内联 并排
Showing with 354 addition and 261 deletion
plugins/org.jkiss.dbeaver.ext.oracle.ui/src/org/jkiss/dbeaver/ext/oracle/ui/internal/OracleUIMessages.java
浏览文件 @ d271ed9f
......@@ -93,7 +93,7 @@ public class OracleUIMessages extends NLS {
public static String views_oracle_compiler_log_viewer_column_pos;
public static String dialog_connection_oracle_properties;
public static String dialog_connection_oracle_properties_discription;
public static String dialog_connection_oracle_properties_description;
public static String dialog_controlgroup_session_settings;
public static String edit_label_combo_language;
public static String edit_label_combo_language_tool_tip_text;
......@@ -107,13 +107,15 @@ public class OracleUIMessages extends NLS {
public static String edit_create_checkbox_hide_empty_schemas;
public static String edit_create_checkbox_hide_empty_schemas_tool_tip_text;
public static String edit_create_checkbox_content_group_show;
public static String edit_create_checkbox_content_group_show_discription;
public static String edit_create_checkbox_content_group_show_description;
public static String edit_create_checkbox_content_group_use;
public static String edit_create_checkbox_content_group_use_discription;
public static String edit_create_checkbox_content_group_use_description;
public static String edit_create_checkbox_content_group_use_sys_schema;
public static String edit_create_checkbox_content_group_use_simple_constraints;
public static String edit_create_checkbox_content_group_use_sys_schema_description;
public static String edit_create_checkbox_content_group_use_simple_constraints_description;
public static String edit_create_checkbox_content_group_use_another_table_query;
public static String edit_create_checkbox_content_group_use_another_table_query_description;
public static String dialog_controlgroup_performance;
public static String edit_create_checkbox_group_use_rule;
public static String edit_create_checkbox_adds_rule_tool_tip_text;
......@@ -127,7 +129,7 @@ public class OracleUIMessages extends NLS {
public static String pref_page_oracle_label_disable_client_side_parser;
public static String pref_page_oracle_label_if_unchecked_java_classes;
public static String pref_page_oracle_label_plan_table;
public static String pref_page_oracle_legend_executin_plan;
public static String pref_page_oracle_legend_execution_plan;
public static String pref_page_oracle_legend_misc;
}
plugins/org.jkiss.dbeaver.ext.oracle.ui/src/org/jkiss/dbeaver/ext/oracle/ui/internal/OracleUIMessages.properties
浏览文件 @ d271ed9f
......@@ -62,7 +62,7 @@ views_oracle_compiler_log_viewer_column_message=Message
views_oracle_compiler_log_viewer_column_pos=Pos
dialog_connection_oracle_properties = Oracle properties
dialog_connection_oracle_properties_discription = Regional settings and performance
dialog_connection_oracle_properties_description = Regional settings and performance
dialog_controlgroup_session_settings = Session settings
edit_label_combo_language = Language
edit_label_combo_language_tool_tip_text = Session language
......@@ -76,15 +76,17 @@ dialog_controlgroup_content = Content
edit_create_checkbox_hide_empty_schemas = Hide empty schemas
edit_create_checkbox_hide_empty_schemas_tool_tip_text = Check existence of objects within schema and do not show empty schemas in tree.\nEnabled by default but it may cause performance problems on databases with very big number of objects.
edit_create_checkbox_content_group_show = Always show DBA objects
edit_create_checkbox_content_group_show_discription = Always shows DBA-related metadata objects in tree even if user do not has DBA role.
edit_create_checkbox_content_group_show_description = Always shows DBA-related metadata objects in tree even if user do not has DBA role.
edit_create_checkbox_content_group_use = Always use DBA_* views
edit_create_checkbox_content_group_use_discription = Use DBA_* views instead of ALL_* views wherever it is possible
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 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_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).
edit_create_checkbox_group_use_metadata_optimizer = Use metadata queries optimizer
edit_create_checkbox_group_use_metadata_optimizer_tip = Use metadata queries optimizer. May significantly improve metadata reading performance on some systems.
......@@ -96,5 +98,5 @@ pref_page_oracle_label_by_default_plan_table=By default plan table in current or
pref_page_oracle_label_disable_client_side_parser=Disable client-side parser of driver instruction in brackets { }
pref_page_oracle_label_if_unchecked_java_classes=If unchecked Java classes and package bodies will be skipped
pref_page_oracle_label_plan_table=Plan table
pref_page_oracle_legend_executin_plan=Execution plan
pref_page_oracle_legend_execution_plan=Execution plan
pref_page_oracle_legend_misc=Misc
plugins/org.jkiss.dbeaver.ext.oracle.ui/src/org/jkiss/dbeaver/ext/oracle/ui/internal/OracleUIMessages_de.properties
浏览文件 @ d271ed9f
......@@ -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
浏览文件 @ d271ed9f
......@@ -60,22 +60,25 @@ tools_script_execute_wizard_page_settings_page_description=\u041D\u0430\u0441\u0
tools_script_execute_wizard_page_settings_page_name=\u041F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B \u0441\u043A\u0440\u0438\u043F\u0442\u0430
dialog_connection_oracle_properties = \u0421\u0432\u043E\u0439\u0441\u0442\u0432\u0430 Oracle
dialog_connection_oracle_properties_discription = \u0420\u0435\u0433\u0438\u043E\u043D\u0430\u043B\u044C\u043D\u044B\u0435 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B \u0438 \u043F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u044C
dialog_connection_oracle_properties_description = \u0420\u0435\u0433\u0438\u043E\u043D\u0430\u043B\u044C\u043D\u044B\u0435 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B \u0438 \u043F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u044C
dialog_controlgroup_session_settings = \u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0441\u0435\u0441\u0441\u0438\u0438
edit_label_combo_language = \u042F\u0437\u044B\u043A
edit_label_combo_language_tool_tip_text = \u042F\u0437\u044B\u043A \u0441\u0435\u0441\u0441\u0438\u0438
edit_label_combo_territory = \u0422\u0435\u0440\u0440\u0438\u0442\u043E\u0440\u0438\u044F
edit_label_combo_territory_tool_tip_text = \u0422\u0435\u0440\u0440\u0438\u0442\u043E\u0440\u0438\u044F \u0441\u0435\u0441\u0441\u0438\u0438
edit_label_text_date_format = \u0424\u043E\u0440\u043C\u0430\u0442 \u0434\u0430\u0442\u044B NLS
edit_label_text_timestamp_format = NLS \u0424\u043E\u0440\u043C\u0430\u0442 \u043C\u0435\u0442\u043A\u0438 \u0432\u0440\u0435\u043C\u0435\u043D\u0438
edit_label_text_length_format = \u0421\u0435\u043C\u0430\u043D\u0442\u0438\u043A\u0430 \u0434\u043B\u0438\u043D\u044B
edit_label_text_currency_format = \u0421\u0438\u043C\u0432\u043E\u043B \u0432\u0430\u043B\u044E\u0442\u044B
dialog_controlgroup_content = \u041C\u0435\u0442\u0430\u0434\u0430\u043D\u043D\u044B\u0435
edit_create_checkbox_hide_empty_schemas = \u0421\u043A\u0440\u044B\u0442\u044C \u043F\u0443\u0441\u0442\u044B\u0435 \u0441\u0445\u0435\u043C\u044B
edit_create_checkbox_hide_empty_schemas_tool_tip_text = \u041F\u0440\u043E\u0432\u0435\u0440\u044F\u0442\u044C \u043D\u0430\u043B\u0438\u0447\u0438\u0435 \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432 \u0432 \u0441\u0445\u0435\u043C\u0435 \u0438 \u043D\u0435 \u043F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u043F\u0443\u0441\u0442\u044B\u0435 \u0441\u0445\u0435\u043C\u044B \u0432 \u0434\u0435\u0440\u0435\u0432\u0435.\n\u0412\u043A\u043B\u044E\u0447\u0435\u043D\u043E \u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E, \u043D\u043E \u043C\u043E\u0436\u0435\u0442 \u0432\u044B\u0437\u0432\u0430\u0442\u044C \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u044B \u0441 \u043F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u044C\u044E \u0432 \u0431\u0430\u0437\u0430\u0445 \u0434\u0430\u043D\u043D\u044B\u0445 \u0441 \u043E\u0447\u0435\u043D\u044C \u0431\u043E\u043B\u044C\u0448\u0438\u043C \u043A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E\u043C \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432.
edit_create_checkbox_content_group_show = \u0412\u0441\u0435\u0433\u0434\u0430 \u043F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u043E\u0431\u044A\u0435\u043A\u0442\u044B DBA
edit_create_checkbox_content_group_show_discription = \u0412\u0441\u0435\u0433\u0434\u0430 \u043F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u0441\u0432\u044F\u0437\u0430\u043D\u043D\u044B\u0435 \u0441 DBA \u043E\u0431\u044A\u0435\u043A\u0442\u044B \u043C\u0435\u0442\u0430\u0434\u0430\u043D\u043D\u044B\u0445 \u0432 \u0434\u0435\u0440\u0435\u0432\u0435, \u0434\u0430\u0436\u0435 \u0435\u0441\u043B\u0438 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C \u043D\u0435 \u0438\u043C\u0435\u0435\u0442 \u0440\u043E\u043B\u0438 DBA.
edit_create_checkbox_content_group_use = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u043F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043B\u0435\u043D\u0438\u044F DBA_*.
edit_create_checkbox_content_group_use_discription = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u043F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043B\u0435\u043D\u0438\u044F DBA_* \u0432\u043C\u0435\u0441\u0442\u043E ALL_* \u0432\u0435\u0437\u0434\u0435, \u0433\u0434\u0435 \u044D\u0442\u043E \u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E.
edit_create_checkbox_content_group_show_description = \u0412\u0441\u0435\u0433\u0434\u0430 \u043F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u0441\u0432\u044F\u0437\u0430\u043D\u043D\u044B\u0435 \u0441 DBA \u043E\u0431\u044A\u0435\u043A\u0442\u044B \u043C\u0435\u0442\u0430\u0434\u0430\u043D\u043D\u044B\u0445 \u0432 \u0434\u0435\u0440\u0435\u0432\u0435, \u0434\u0430\u0436\u0435 \u0435\u0441\u043B\u0438 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C \u043D\u0435 \u0438\u043C\u0435\u0435\u0442 \u0440\u043E\u043B\u0438 DBA.
edit_create_checkbox_content_group_use = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u043F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043B\u0435\u043D\u0438\u044F DBA_*
edit_create_checkbox_content_group_use_description = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u043F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043B\u0435\u043D\u0438\u044F DBA_* \u0432\u043C\u0435\u0441\u0442\u043E ALL_* \u0432\u0435\u0437\u0434\u0435, \u0433\u0434\u0435 \u044D\u0442\u043E \u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E.
dialog_controlgroup_performance = \u041F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u044C
edit_create_checkbox_group_use_rule = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u043F\u043E\u0434\u0441\u043A\u0430\u0437\u043A\u0443 RULE \u0434\u043B\u044F \u0437\u0430\u043F\u0440\u043E\u0441\u043E\u0432 \u0441\u0438\u0441\u0442\u0435\u043C\u043D\u043E\u0433\u043E \u043A\u0430\u0442\u0430\u043B\u043E\u0433\u0430.
edit_create_checkbox_group_use_rule = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u043F\u043E\u0434\u0441\u043A\u0430\u0437\u043A\u0443 RULE \u0434\u043B\u044F \u0437\u0430\u043F\u0440\u043E\u0441\u043E\u0432 \u0441\u0438\u0441\u0442\u0435\u043C\u043D\u043E\u0433\u043E \u043A\u0430\u0442\u0430\u043B\u043E\u0433\u0430
edit_create_checkbox_adds_rule_tool_tip_text = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u043F\u043E\u0434\u0441\u043A\u0430\u0437\u043A\u0443 RULE \u0434\u043B\u044F \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0445 \u0437\u0430\u043F\u0440\u043E\u0441\u043E\u0432 \u0441\u0438\u0441\u0442\u0435\u043C\u043D\u043E\u0433\u043E \u043A\u0430\u0442\u0430\u043B\u043E\u0433\u0430 (\u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440, \u0447\u0442\u0435\u043D\u0438\u0435 \u041A\u041E\u041B\u041E\u041D\u041E\u041A \u0438 \u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u043D\u0438\u0439).\n\u0417\u043D\u0430\u0447\u0438\u0442\u0435\u043B\u044C\u043D\u043E \u0443\u0432\u0435\u043B\u0438\u0447\u0438\u0432\u0430\u0435\u0442 \u043F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u044C \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0445 \u0431\u0430\u0437 \u0434\u0430\u043D\u043D\u044B\u0445 Oracle (\u0438 \u0443\u043C\u0435\u043D\u044C\u0448\u0430\u0435\u0442 \u043F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u044C \u0434\u0440\u0443\u0433\u0438\u0445).
pref_page_oracle_checkbox_disable_escape_processing=\u041E\u0442\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u043F\u0440\u0435\u043F\u0430\u0440\u0441\u0435\u0440 SQL \u0441\u043A\u0440\u0438\u043F\u0442\u043E\u0432
......@@ -86,13 +89,16 @@ pref_page_oracle_label_by_default_plan_table=\u041F\u043E \u0443\u043C\u043E\u04
pref_page_oracle_label_disable_client_side_parser=\u041E\u0442\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u043A\u043B\u0438\u0435\u043D\u0442\u0441\u043A\u0438\u0439 \u043F\u0430\u0440\u0441\u0435\u0440 \u0438\u043D\u0441\u0442\u0440\u0443\u043A\u0446\u0438\u0439 \u0434\u0440\u0430\u0439\u0432\u0435\u0440\u0430 \u0432 \u0441\u043A\u043E\u0431\u043A\u0430\u0445 { }
pref_page_oracle_label_if_unchecked_java_classes=\u0415\u0441\u043B\u0438 \u0444\u043B\u0430\u0436\u043E\u043A \u0441\u043D\u044F\u0442, \u043A\u043B\u0430\u0441\u0441\u044B Java \u0438 \u0442\u0435\u043B\u0430 \u043F\u0430\u043A\u0435\u0442\u043E\u0432 \u0431\u0443\u0434\u0443\u0442 \u043F\u0440\u043E\u043F\u0443\u0449\u0435\u043D\u044B
pref_page_oracle_label_plan_table=\u0422\u0430\u0431\u043B\u0438\u0446\u0430 \u0445\u0440\u0430\u043D\u0435\u043D\u0438\u044F \u043F\u043B\u0430\u043D\u0430 \u0438\u0441\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F
pref_page_oracle_legend_executin_plan=\u041F\u043B\u0430\u043D \u0438\u0441\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F
pref_page_oracle_legend_execution_plan=\u041F\u043B\u0430\u043D \u0438\u0441\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F
pref_page_oracle_legend_misc=\u0420\u0430\u0437\u043D\u043E\u0435
config_import_wizard_page_sql_developer_label_installation_not_found=\u0423\u0441\u0442\u0430\u043D\u043E\u0432\u043A\u0430 SQL Developer \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D\u0430
edit_create_checkbox_content_group_use_simple_constraints = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u043F\u0440\u043E\u0441\u0442\u043E\u0439 \u0437\u0430\u043F\u0440\u043E\u0441 \u0434\u043B\u044F \u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u043D\u0438\u0439
edit_create_checkbox_content_group_use_simple_constraints_description = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u043F\u0440\u043E\u0441\u0442\u043E\u0439 \u0437\u0430\u043F\u0440\u043E\u0441 \u0434\u043B\u044F \u043F\u043E\u043B\u0443\u0447\u0435\u043D\u0438\u044F \u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u043D\u0438\u0439. \u041C\u043E\u0436\u0435\u0442 \u0440\u0430\u0431\u043E\u0442\u0430\u0442\u044C \u043C\u0435\u0434\u043B\u0435\u043D\u043D\u043E, \u043D\u043E \u0441\u0442\u0430\u0431\u0438\u043B\u044C\u043D\u0435\u0435.
edit_create_checkbox_content_group_use_sys_schema = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0441\u0445\u0435\u043C\u0443 SYS \u0434\u043B\u044F \u0437\u0430\u043F\u0440\u043E\u0441\u043E\u0432
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 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
浏览文件 @ d271ed9f
......@@ -52,11 +52,12 @@ public class OracleConnectionExtraPage extends ConnectionPageAbstract
private Button useRuleHint;
private Button useOptimizerHint;
private Button useSimpleConstraints;
private Button useAlternativeTableMetadataQuery;
public OracleConnectionExtraPage()
{
setTitle(OracleUIMessages.dialog_connection_oracle_properties);
setDescription(OracleUIMessages.dialog_connection_oracle_properties_discription);
setDescription(OracleUIMessages.dialog_connection_oracle_properties_description);
}
@Override
......@@ -109,8 +110,8 @@ public class OracleConnectionExtraPage extends ConnectionPageAbstract
hideEmptySchemasCheckbox.setToolTipText(
OracleUIMessages.edit_create_checkbox_hide_empty_schemas_tool_tip_text);
showDBAAlwaysCheckbox = UIUtils.createCheckbox(contentGroup, OracleUIMessages.edit_create_checkbox_content_group_show, OracleUIMessages.edit_create_checkbox_content_group_show_discription, false, 1);
useDBAViewsCheckbox = UIUtils.createCheckbox(contentGroup, OracleUIMessages.edit_create_checkbox_content_group_use, OracleUIMessages.edit_create_checkbox_content_group_use_discription, false, 1);
showDBAAlwaysCheckbox = UIUtils.createCheckbox(contentGroup, OracleUIMessages.edit_create_checkbox_content_group_show, OracleUIMessages.edit_create_checkbox_content_group_show_description, false, 1);
useDBAViewsCheckbox = UIUtils.createCheckbox(contentGroup, OracleUIMessages.edit_create_checkbox_content_group_use, OracleUIMessages.edit_create_checkbox_content_group_use_description, false, 1);
useSysSchemaCheckbox = UIUtils.createCheckbox(contentGroup, OracleUIMessages.edit_create_checkbox_content_group_use_sys_schema, OracleUIMessages.edit_create_checkbox_content_group_use_sys_schema_description, false, 1);
}
......@@ -124,6 +125,9 @@ public class OracleConnectionExtraPage extends ConnectionPageAbstract
useOptimizerHint.setToolTipText(OracleUIMessages.edit_create_checkbox_group_use_metadata_optimizer_tip);
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);
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);
......@@ -173,6 +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));
useAlternativeTableMetadataQuery.setSelection(CommonUtils.getBoolean(providerProperties.get(OracleConstants.PROP_METADATA_USE_ALTERNATIVE_TABLE_QUERY), false));
}
@Override
......@@ -224,6 +229,9 @@ public class OracleConnectionExtraPage extends ConnectionPageAbstract
providerProperties.put(
OracleConstants.PROP_USE_META_OPTIMIZER,
String.valueOf(useOptimizerHint.getSelection()));
providerProperties.put(
OracleConstants.PROP_METADATA_USE_ALTERNATIVE_TABLE_QUERY,
String.valueOf(useAlternativeTableMetadataQuery.getSelection()));
}
saveConnectionURL(dataSource.getConnectionConfiguration());
......
plugins/org.jkiss.dbeaver.ext.oracle.ui/src/org/jkiss/dbeaver/ext/oracle/ui/views/PrefPageOracle.java
浏览文件 @ d271ed9f
......@@ -74,7 +74,7 @@ public class PrefPageOracle extends TargetPrefPage
Composite composite = UIUtils.createPlaceholder(parent, 1);
{
Group planGroup = UIUtils.createControlGroup(composite, OracleUIMessages.pref_page_oracle_legend_executin_plan, 2, GridData.FILL_HORIZONTAL, 0);
Group planGroup = UIUtils.createControlGroup(composite, OracleUIMessages.pref_page_oracle_legend_execution_plan, 2, GridData.FILL_HORIZONTAL, 0);
Label descLabel = new Label(planGroup, SWT.WRAP);
descLabel.setText(OracleUIMessages.pref_page_oracle_label_by_default_plan_table);
......
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleSchema.java
浏览文件 @ d271ed9f
......@@ -498,23 +498,30 @@ public class OracleSchema extends OracleGlobalObject implements DBSSchema, DBPRe
String tableOper = "=";
boolean hasAllAllTables = owner.getDataSource().isViewAvailable(session.getProgressMonitor(), null, "ALL_ALL_TABLES");
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";
final JDBCPreparedStatement 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" +
"FROM " + OracleUtils.getAdminAllViewPrefix(session.getProgressMonitor(), getDataSource(), "OBJECTS") + " O\n" +
", " + OracleUtils.getAdminAllViewPrefix(session.getProgressMonitor(), owner.getDataSource(), tablesSource) +
" t WHERE t.OWNER(+) = O.OWNER AND t.TABLE_NAME(+) = o.OBJECT_NAME\n" +
"AND O.OWNER=? AND O.OBJECT_TYPE IN ('TABLE', 'VIEW', 'MATERIALIZED VIEW')" +
(object == null && objectName == null ? "": " AND O.OBJECT_NAME" + tableOper + "?") +
(object instanceof OracleTable ? " AND O.OBJECT_TYPE='TABLE'" : "") +
(object instanceof OracleView ? " AND O.OBJECT_TYPE='VIEW'" : "") +
(object instanceof OracleMaterializedView ? " AND O.OBJECT_TYPE='MATERIALIZED VIEW'" : ""));
dbStat.setString(1, owner.getName());
if (object != null || objectName != null) dbStat.setString(2, object != null ? object.getName() : objectName);
return dbStat;
JDBCPreparedStatement dbStat;
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" +
"FROM " + OracleUtils.getAdminAllViewPrefix(session.getProgressMonitor(), getDataSource(), "OBJECTS") + " O\n" +
", " + OracleUtils.getAdminAllViewPrefix(session.getProgressMonitor(), owner.getDataSource(), tablesSource) +
" t WHERE t.OWNER(+) = O.OWNER AND t.TABLE_NAME(+) = o.OBJECT_NAME\n" +
"AND O.OWNER=? AND O.OBJECT_TYPE IN ('TABLE', 'VIEW', 'MATERIALIZED VIEW')" +
(object == null && objectName == null ? "" : " AND O.OBJECT_NAME" + tableOper + "?") +
(object instanceof OracleTable ? " AND O.OBJECT_TYPE='TABLE'" : "") +
(object instanceof OracleView ? " AND O.OBJECT_TYPE='VIEW'" : "") +
(object instanceof OracleMaterializedView ? " AND O.OBJECT_TYPE='MATERIALIZED VIEW'" : ""));
dbStat.setString(1, owner.getName());
if (object != null || objectName != null)
dbStat.setString(2, object != null ? object.getName() : objectName);
return dbStat;
} else {
return getAlternativeTableStatement(session, owner, object, objectName, tablesSource, tableTypeColumns);
}
}
@Override
......@@ -578,6 +585,60 @@ public class OracleSchema extends OracleGlobalObject implements DBSSchema, DBPRe
super.cacheChildren(parent, oracleTableColumns);
}
@NotNull
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();
String tableQuery = "SELECT t.OWNER, t.TABLE_NAME AS OBJECT_NAME, 'TABLE' AS OBJECT_TYPE, 'VALID' AS STATUS," + tableTypeColumns + ", t.TABLESPACE_NAME,\n" +
"t.PARTITIONED, t.IOT_TYPE, t.IOT_NAME, t.TEMPORARY, t.SECONDARY, t.NESTED, t.NUM_ROWS\n" +
"FROM " + OracleUtils.getAdminAllViewPrefix(session.getProgressMonitor(), owner.getDataSource(), tablesSource) + " t\n" +
"WHERE t.OWNER =?\n" +
"AND NESTED = 'NO'\n";
String viewQuery = "SELECT o.OWNER, o.OBJECT_NAME, 'VIEW' AS OBJECT_TYPE, o.STATUS, NULL, NULL, NULL, 'NO', NULL, NULL, o.TEMPORARY, o.SECONDARY, 'NO', 0\n" +
"FROM " + OracleUtils.getAdminAllViewPrefix(session.getProgressMonitor(), getDataSource(), "OBJECTS") + " o\n" +
"WHERE o.OWNER =?\n" +
"AND o.OBJECT_TYPE = 'VIEW'\n";
String mviewQuery = "SELECT o.OWNER, o.OBJECT_NAME, 'MATERIALIZED VIEW' AS OBJECT_TYPE, o.STATUS, NULL, NULL, NULL, 'NO', NULL, NULL, o.TEMPORARY, o.SECONDARY, 'NO', 0\n" +
"FROM " + OracleUtils.getAdminAllViewPrefix(session.getProgressMonitor(), getDataSource(), "OBJECTS") + " o\n" +
"WHERE o.OWNER =?\n" +
"AND o.OBJECT_TYPE = 'MATERIALIZED VIEW'";
String unionAll = "UNION ALL ";
if (hasName) {
sql.append("SELECT * FROM (");
}
if (object == null) {
sql.append(tableQuery).append(unionAll).append(viewQuery).append(unionAll).append(mviewQuery);
} else if (object instanceof OracleMaterializedView) {
sql.append(mviewQuery);
} else if (object instanceof OracleView) {
sql.append(viewQuery);
} else {
sql.append(tableQuery);
}
if (hasName) {
sql.append(") WHERE OBJECT_NAME").append("=?");
} else if (object != null) {
if (object instanceof OracleTable) {
sql.append(" AND t.TABLE_NAME=?");
} else {
sql.append(" AND o.OBJECT_NAME=?");
}
}
dbStat = session.prepareStatement(sql.toString());
String ownerName = owner.getName();
dbStat.setString(1, ownerName);
if (object == null) {
dbStat.setString(2, ownerName);
dbStat.setString(3, ownerName);
if (objectName != null) {
dbStat.setString(4, objectName);
}
} else {
dbStat.setString(2, object.getName());
}
return dbStat;
}
}
/**
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或