Fix MySQL column mapping (#44)

* Fix MySQL column mapping * Remove unused import * Fix formatting * Remove tests
opendatadiscovery · Jun 21, 2022 · 0602898 · 0602898
1 parent b5227c2
commit 0602898
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 38 deletions.
diff --git a/odd_collector/adapters/mysql/mappers/tables.py b/odd_collector/adapters/mysql/mappers/tables.py
@@ -2,7 +2,6 @@
 from odd_models.models import (
  DataEntity,
  DataSet,
- DataTransformer,
  DataEntityType,
  DataEntityGroup,
 )
@@ -29,7 +28,8 @@ def map_tables(
  database: str,
 ) -> List[DataEntity]:
  data_entities: List[DataEntity] = []
- column_index: int = 0
+
+ column_metadata = [ColumnMetadataNamedtuple(*c) for c in columns]
 
  for table in tables:
  metadata: MetadataNamedtuple = MetadataNamedtuple(*table)
@@ -78,22 +78,12 @@ def map_tables(
  metadata.view_definition, oddrn_generator
  )
 
- # DatasetField
- while column_index < len(columns):
- column: tuple = columns[column_index]
- column_metadata: ColumnMetadataNamedtuple = ColumnMetadataNamedtuple(
- *column
- )
-
- if column_metadata.table_name == table_name:
+ for column in column_metadata:
+ if column.table_name == table_name and column.table_schema == database:
  data_entity.dataset.field_list.append(
- map_column(
- column_metadata, oddrn_generator, data_entity.owner, oddrn_path
- )
+ map_column(column, oddrn_generator, data_entity.owner, oddrn_path)
  )
- column_index += 1
- else:
- break
+
  data_entities.append(
  DataEntity(
  oddrn=oddrn_generator.get_oddrn_by_path("databases"),

diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/test_kafka.py b/tests/test_kafka.py