Compare commits

...

1 Commits

Author SHA1 Message Date
ycbai
7c9063f688 TUP-16456: TDS Output does not translate reserved field names to
external names
1. Always show db column for new framework: name it: Real Name
2. GenericElementParameter.updateSchema() => Compare metadatatable with
option: IMetadataColumn.OPTIONS_IGNORE_LABEL
3. MetadataToolAvroHelper => Convert column name to be compatible java
when converting avro to meta.
2016-11-30 15:49:07 +08:00
2 changed files with 7 additions and 2 deletions

View File

@@ -33,6 +33,7 @@ import org.talend.components.api.properties.ComponentProperties;
import org.talend.components.api.service.ComponentService;
import org.talend.core.model.components.EComponentType;
import org.talend.core.model.components.IComponent;
import org.talend.core.model.metadata.IMetadataColumn;
import org.talend.core.model.metadata.IMetadataTable;
import org.talend.core.model.metadata.MetadataToolAvroHelper;
import org.talend.core.model.metadata.MetadataToolHelper;
@@ -314,7 +315,8 @@ public class GenericElementParameter extends ElementParameter {
if (schema != null && mainTable != null) {
MetadataTable metadataTable = MetadataToolAvroHelper.convertFromAvro(schema);
IMetadataTable newTable = MetadataToolHelper.convert(metadataTable);
if (!mainTable.sameMetadataAs(newTable) || !newTable.sameMetadataAs(mainTable)) {
if (!mainTable.sameMetadataAs(newTable, IMetadataColumn.OPTIONS_IGNORE_LABEL)
|| !newTable.sameMetadataAs(mainTable, IMetadataColumn.OPTIONS_IGNORE_LABEL)) {
mainTable.setListColumns(newTable.getListColumns());
List<IElementParameter> schemaParameters = node
.getElementParametersFromField(EParameterFieldType.SCHEMA_REFERENCE);

View File

@@ -107,7 +107,10 @@ public class GenericSchemaForm extends AbstractForm {
Composite compositeTable = Form.startNewDimensionnedGridLayout(compositeMetaData, 1, WIDTH_GRIDDATA_PIXEL, 200);
compositeTable.setLayout(new FillLayout());
metadataEditor = new MetadataEmfTableEditor(Messages.getString("GenericSchemaForm.metadataDescription")); //$NON-NLS-1$
tableEditorView = new MetadataEmfTableEditorView(compositeTable, SWT.NONE);
tableEditorView = new MetadataEmfTableEditorView(compositeTable, SWT.NONE, false);
tableEditorView.setShowDbColumnName(true, true);
tableEditorView.setNewFramework(true);
tableEditorView.initGraphicComponents();
}
@Override