Updated attributes-insert with construct query column mismatch

IndustryFusion · Nov 24, 2024 · 6606d96 · 6606d96
1 parent c3e8478
commit 6606d96
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/semantic-model/shacl2flink/create_core_tables.py b/semantic-model/shacl2flink/create_core_tables.py
@@ -195,7 +195,9 @@ def main():
         {'type': 'STRING'},
         {'attributeValue': 'STRING'},
         {'datasetId': 'STRING'},
-        {'unitCode': 'STRING'}
+        {'unitCode': 'STRING'},
+        {'deleted': 'BOOLEAN'},
+        {'synced': 'BOOLEAN'}
     ]
     kafka = {
         'topic': kafka_topic_attributes_insert,
@@ -207,7 +209,7 @@ def main():
         'json.fail-on-missing-field': False,
         'json.ignore-parse-errors': True
     }
-    primary_key = ['entityId', 'name', 'datasetId']
+    primary_key = ['id', 'datasetId']
 
     print('---', file=f)
     yaml.dump(utils.create_yaml_table(spec_name, connector, table,
@@ -231,6 +233,8 @@ def main():
         {'attributeValue': 'STRING'},
         {'datasetId': 'STRING'},
         {'unitCode': 'STRING'},
+        {'deleted': 'BOOLEAN'},
+        {'synced': 'BOOLEAN'},
         {'ts': "TIMESTAMP(3) METADATA FROM 'timestamp'"},
         {'watermark': 'FOR `ts` AS `ts`'}
     ]

diff --git a/semantic-model/shacl2flink/lib/sparql_to_sql.py b/semantic-model/shacl2flink/lib/sparql_to_sql.py
@@ -466,7 +466,9 @@ def wrap_sql_construct(ctx, node):
         construct_query += f'\'{attribute_type}\' as `type`,\n'
         construct_query += f"{get_bound_trim_string(ctx, value_var)} as `attributeValue`,\n"  # value
         construct_query += '\'@none\' as `datasetId`,\n'
-        construct_query += 'CAST(NULL as STRING) as unitCode\n'  # unitCode
+        construct_query += 'CAST(NULL as STRING) as unitCode,\n'  # unitCode
+        construct_query += 'false as `deleted`,\n'  # unitCode
+        construct_query += 'false as `synched`\n'  # unitCode
         construct_query += ',SQL_DIALECT_SQLITE_TIMESTAMP\n'  # ts
 
         construct_query += 'FROM ' + node['target_sql']