Skip to content
Snippets Groups Projects
Commit 87d72953 authored by Leah Tacke genannt Unterberg's avatar Leah Tacke genannt Unterberg
Browse files

maybe fixed another syntax error

parent ea1ada47
No related branches found
No related tags found
No related merge requests found
...@@ -74,12 +74,12 @@ def mk_link_table_name(mitm: MITM, concept: ConceptName, type_name: RelationName ...@@ -74,12 +74,12 @@ def mk_link_table_name(mitm: MITM, concept: ConceptName, type_name: RelationName
return mk_type_table_name(mitm, concept, type_name) + '_' + fk_name.lower() return mk_type_table_name(mitm, concept, type_name) + '_' + fk_name.lower()
def has_type_tables(mitm: MITM, concept: ConceptName) -> bool: def has_type_tables(mitm_def: MITMDefinition, concept: ConceptName) -> bool:
return get_mitm_def(mitm).get_properties(concept).permit_attributes return mitm_def.get_properties(concept).permit_attributes
def has_natural_pk(mitm: MITM, concept: ConceptName) -> bool: def has_natural_pk(mitm_def: MITMDefinition, concept: ConceptName) -> bool:
return len(get_mitm_def(mitm).get_identity(concept)) > 0 return len(mitm_def.get_identity(concept)) > 0
def pick_table_pk(mitm: MITM, concept: ConceptName, created_columns: ColumnsDict) -> ColumnsDict | None: def pick_table_pk(mitm: MITM, concept: ConceptName, created_columns: ColumnsDict) -> ColumnsDict | None:
...@@ -87,7 +87,7 @@ def pick_table_pk(mitm: MITM, concept: ConceptName, created_columns: ColumnsDict ...@@ -87,7 +87,7 @@ def pick_table_pk(mitm: MITM, concept: ConceptName, created_columns: ColumnsDict
concept_properties, concept_relations = mitm_def.get(concept) concept_properties, concept_relations = mitm_def.get(concept)
prepended_cols = None prepended_cols = None
if not has_natural_pk(mitm, concept): if not has_natural_pk(mitm_def, concept):
prepended_cols = lambda: [_within_concept_id_col(mitm, concept)] prepended_cols = lambda: [_within_concept_id_col(mitm, concept)]
names, mapped_names = map_col_groups(mitm_def, concept, { names, mapped_names = map_col_groups(mitm_def, concept, {
'kind': lambda: 'kind', 'kind': lambda: 'kind',
...@@ -193,7 +193,7 @@ def _gen_denormalized_views(mitm: MITM, concept_tables: ConceptTablesDict, type_ ...@@ -193,7 +193,7 @@ def _gen_denormalized_views(mitm: MITM, concept_tables: ConceptTablesDict, type_
for concept in mitm_def.get_leafs(main_concept): for concept in mitm_def.get_leafs(main_concept):
view_name = mk_concept_table_name(mitm, concept) + '_denormalized_view' view_name = mk_concept_table_name(mitm, concept) + '_denormalized_view'
q = None q = None
if has_type_tables(mitm, concept): if has_type_tables(mitm_def, concept):
selections = [] selections = []
for leaf_concept in mitm_def.get_leafs(concept): for leaf_concept in mitm_def.get_leafs(concept):
...@@ -288,7 +288,7 @@ def mk_sql_rep_schema(header: Header, ...@@ -288,7 +288,7 @@ def mk_sql_rep_schema(header: Header,
_gen_foreign_key_constraints,) if not skip_fk_constraints else base_schema_item_generators _gen_foreign_key_constraints,) if not skip_fk_constraints else base_schema_item_generators
for he in header.header_entries: for he in header.header_entries:
he_concept = he.concept he_concept = he.concept
if has_type_tables(header.mitm, he_concept): if has_type_tables(mitm_def, he_concept):
concept_properties, concept_relations = mitm_def.get(he_concept) concept_properties, concept_relations = mitm_def.get(he_concept)
table_name = mk_type_table_name(header.mitm, he_concept, he.type_name) table_name = mk_type_table_name(header.mitm, he_concept, he.type_name)
...@@ -364,7 +364,7 @@ def _insert_type_df(conn: sa.Connection, ...@@ -364,7 +364,7 @@ def _insert_type_df(conn: sa.Connection,
type_df = type_df.assign(**{concept_id_col_name: artificial_ids}) type_df = type_df.assign(**{concept_id_col_name: artificial_ids})
conn.execute(t_concept.insert(), _df_to_table_records(type_df, t_concept)) conn.execute(t_concept.insert(), _df_to_table_records(type_df, t_concept))
inserted_rows = no_instances inserted_rows = no_instances
if has_type_tables(mitm, concept): if has_type_tables(mitm_def, concept):
# generated_ids = conn.execute(sa.select(t_concept.columns[concept_id_col_name])).scalars() # generated_ids = conn.execute(sa.select(t_concept.columns[concept_id_col_name])).scalars()
t_type = sql_rep_schema.type_tables[concept][type_name] t_type = sql_rep_schema.type_tables[concept][type_name]
conn.execute(t_type.insert(), _df_to_table_records(type_df, t_type)) conn.execute(t_type.insert(), _df_to_table_records(type_df, t_type))
......
from mitm_tooling.extraction.sql.data_models import SourceDBType from mitm_tooling.extraction.sql.data_models import SourceDBType
from mitm_tooling.extraction.sql.mapping import ConceptMapping, ForeignRelation from mitm_tooling.extraction.sql.mapping import ConceptMapping, ForeignRelation
from mitm_tooling.representation import Header, SQLRepresentationSchema from mitm_tooling.representation import Header, SQLRepresentationSchema
from mitm_tooling.representation.sql_representation import has_type_tables
def sql_rep_into_mappings(header: Header, sql_rep_schema: SQLRepresentationSchema) -> list[ConceptMapping]: def sql_rep_into_mappings(header: Header, sql_rep_schema: SQLRepresentationSchema) -> list[ConceptMapping]:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment