Skip to content

Commit

Permalink
#16967 ClickHouse Engine info added to tables (#17076)
Browse files Browse the repository at this point in the history
* #16967 ClickHouse Engine info added to tables

* #16967 ability to configure editable table properties during data transfer implemented

* #16967 DDL tab creation moved to Configure target metadata dialog; Clickhouse engine reading changed

* #16967 struct table creation changed

* #16967 refresh DDL after table changes; store changed properties in the mapping container

* #16967 ability to use new created tables properties in data transfer task implemented

* #16967 change table properties tab message for dynamic tables in datatransfer

* #16967 code style fixes
  • Loading branch information
LonwoLonwo committed Jul 20, 2022
1 parent d0e38e3 commit 1879e86
Show file tree
Hide file tree
Showing 25 changed files with 894 additions and 203 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.jkiss.dbeaver.data.transfer;visibility:=reexport,
org.jkiss.dbeaver.ui,
org.jkiss.dbeaver.ui.navigator,
org.jkiss.dbeaver.ui.editors.base,
org.jkiss.dbeaver.ui.editors.connection
Bundle-ClassPath: .
Automatic-Module-Name: org.jkiss.dbeaver.data.transfer.ui
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public class DTUIMessages extends NLS {
public static String database_consumer_wizard_on_duplicate_key_insert_method_text;
public static String database_consumer_wizard_link_label_replace_method_wiki;
public static String database_consumer_wizard_label_replace_method_not_supported;

public static String columns_mapping_dialog_shell_text;
public static String columns_mapping_dialog_composite_label_text_source_container;
public static String columns_mapping_dialog_composite_label_text_source_entity;
Expand Down Expand Up @@ -167,6 +167,8 @@ public class DTUIMessages extends NLS {
public static String database_consumer_page_mapping_message_error_mapping_new_table;
public static String database_consumer_page_mapping_title_target_DDL;
public static String database_consumer_page_mapping_message_error_generating_target_DDL;
public static String database_consumer_page_mapping_title_target_table;
public static String database_consumer_page_mapping_message_error_generating_target_table;
public static String database_producer_page_input_objects_title_assign_error;
public static String database_producer_page_input_objects_message_error_reading_container_objects;
public static String database_producer_page_input_objects_error_message_auto_assign_failed;
Expand Down Expand Up @@ -194,6 +196,13 @@ public class DTUIMessages extends NLS {
public static String sql_script_task_page_settings_error_message_you_must_select_script_execute;
public static String sql_script_task_page_settings_error_message_you_must_select_connection;

public static String page_configure_metadata_title;
public static String page_configure_table_properties_tab_title;
public static String page_configure_table_DDL_button_persist;
public static String page_configure_table_DDL_button_copy;
public static String page_configure_table_properties_no_properties;
public static String page_configure_table_properties_info_text;

public static String value_format_selector_value;
public static String value_format_selector_display;
public static String value_format_selector_editable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ database_consumer_wizard_on_duplicate_key_insert_method_text = Replace method
database_consumer_wizard_link_label_replace_method_wiki = Replace/Ignore method documentation
database_consumer_wizard_label_replace_method_not_supported = Replace method not supported by target database

columns_mapping_dialog_shell_text = Map columns of
columns_mapping_dialog_shell_text = Columns mapping
columns_mapping_dialog_composite_label_text_source_container = Source container
columns_mapping_dialog_composite_label_text_source_entity = Source entity
columns_mapping_dialog_composite_label_text_target_container = Target container
Expand Down Expand Up @@ -136,6 +136,8 @@ database_consumer_page_mapping_message_error_mapping_existing_table = Error mapp
database_consumer_page_mapping_message_error_mapping_new_table = Error mapping new table
database_consumer_page_mapping_title_target_DDL = Target DDL
database_consumer_page_mapping_message_error_generating_target_DDL = Error generating target DDL
database_consumer_page_mapping_title_target_table = Target table
database_consumer_page_mapping_message_error_generating_target_table = Error generating target table
database_producer_page_input_objects_title_assign_error = Assign error
database_producer_page_input_objects_message_error_reading_container_objects = Error reading container objects
database_producer_page_input_objects_error_message_auto_assign_failed = Unable to auto assign source
Expand Down Expand Up @@ -166,6 +168,13 @@ value_format_selector_display = Display (default)
value_format_selector_editable = Editable
value_format_selector_value = Value Format

page_configure_metadata_title = Configure metadata structure
page_configure_table_properties_tab_title = Table properties
page_configure_table_DDL_button_persist = Persist
page_configure_table_DDL_button_copy = Copy
page_configure_table_properties_info_text = Can't create target table properties info
page_configure_table_properties_no_properties = There are no editable fields in the table
data_transfer_event_processor_execute_command_command=&Command
data_transfer_event_processor_execute_command_working_directory=Working &Directory
data_transfer_event_processor_execute_command_working_directory_title=Choose working directory
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.jkiss.dbeaver.tools.transfer.ui.pages.database;

import org.eclipse.jface.dialogs.DialogPage;
import org.eclipse.jface.viewers.*;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.KeyAdapter;
Expand Down Expand Up @@ -49,7 +50,6 @@
import org.jkiss.dbeaver.ui.controls.CustomComboBoxCellEditor;
import org.jkiss.dbeaver.ui.controls.ListContentProvider;
import org.jkiss.dbeaver.ui.controls.ViewerColumnController;
import org.jkiss.dbeaver.ui.dialogs.BaseDialog;
import org.jkiss.utils.CommonUtils;

import java.util.ArrayList;
Expand All @@ -60,7 +60,7 @@
/**
* ColumnsMappingDialog
*/
class ColumnsMappingDialog extends BaseDialog {
class ColumnsMappingDialog extends DialogPage {

private final DatabaseConsumerSettings settings;
private final DatabaseMappingContainer mapping;
Expand All @@ -69,19 +69,13 @@ class ColumnsMappingDialog extends BaseDialog {
private Font boldFont;

ColumnsMappingDialog(DataTransferWizard wizard, DatabaseConsumerSettings settings, DatabaseMappingContainer mapping) {
super(wizard.getShell(), DTUIMessages.columns_mapping_dialog_shell_text + mapping.getTargetName(), null);
this.settings = settings;
this.mapping = mapping;
attributeMappings = mapping.getAttributeMappings(wizard.getRunnableContext());
}

@Override
protected boolean isResizable() {
return true;
}

@Override
protected Composite createDialogArea(Composite parent) {
public void createControl(Composite parent) {
DBPDataSource targetDataSource = settings.getTargetDataSource(mapping);

boldFont = UIUtils.makeBoldFont(parent.getFont());
Expand Down Expand Up @@ -321,17 +315,7 @@ public void update(ViewerCell cell) {

mappingViewer.setInput(attributeMappings);

return parent;
}

@Override
protected void okPressed() {
super.okPressed();
setControl(composite);
}

@Override
public boolean close() {
UIUtils.dispose(boldFont);
return super.close();
}
}
Loading

0 comments on commit 1879e86

Please sign in to comment.