Skip to content

Commit c3e2ba7

Browse files
committed
updated for test cases
1 parent 6c0ef64 commit c3e2ba7

File tree

2 files changed

+27
-19
lines changed

2 files changed

+27
-19
lines changed

src/translators/sql_translator.py

+16
Original file line numberDiff line numberDiff line change
@@ -730,6 +730,22 @@ def _update_metadata_table(self, table_name, metadata):
730730
# This implementation paves
731731
# the way to lost updates...
732732

733+
def query_metadata_table(self):
734+
# Bring translation table!
735+
stmt = 'select entity_attrs from "{}" limit 100'.format(
736+
METADATA_TABLE_NAME)
737+
# By design, one entry per table_name
738+
try:
739+
res = self.cursor.execute(stmt)
740+
row = self.cursor.fetchall()
741+
persisted_metadata = row[0][0] if row else {}
742+
except Exception as e:
743+
self.sql_error_handler(e)
744+
# Metadata table still not created
745+
logging.debug(str(e), exc_info=True)
746+
persisted_metadata = {}
747+
return persisted_metadata
748+
733749
def _store_metadata(self, table_name, persisted_metadata):
734750
raise NotImplementedError
735751

src/translators/tests/test_insert.py

+11-19
Original file line numberDiff line numberDiff line change
@@ -777,24 +777,16 @@ def test_ngsi_ld(translator, ngsi_ld):
777777
translator.clean()
778778

779779

780-
def expected_entity_attrs_meta_version():
781-
return {
782-
'entity_id': ['id', 'Text'],
783-
'entity_type': ['type', 'Text'],
784-
TIME_INDEX_NAME: ['time_index', 'DateTime'],
785-
'ql_version': [__version__, 'Text'],
786-
'a_number': ['a_number', 'Number'],
787-
'an_integer': ['an_integer', 'Integer'],
788-
'a_bool': ['a_bool', 'Boolean'],
789-
'a_datetime': ['a_datetime', 'DateTime'],
790-
'a_point': ['a_point', 'geo:point'],
791-
'a_geom': ['a_geom', 'geo:json'],
792-
'a_text': ['a_text', 'Text'],
793-
'an_obj': ['an_obj', 'Custom'],
794-
'an_array': ['an_array', 'StructuredValue']
795-
}
780+
@pytest.mark.parametrize("translator", translators, ids=["crate", "timescale"])
781+
def test_entity_meta_version(translator):
796782

783+
entities = create_random_entities(1, 2, 3, use_time=True, use_geo=True)
784+
result = translator.insert(entities)
785+
assert result.rowcount > 0
786+
table_name = "et0"
787+
data = translator.query_metadata_table()
788+
observed = data['ql_version']
789+
expected = [__version__, 'Text']
797790

798-
def assert_entity_attrs_meta_version(translator, entity):
799-
data = select_entity_attrs_meta_version(translator, entity)
800-
assert data == expected_entity_attrs_meta_version()
791+
assert observed == expected
792+
translator.clean()

0 commit comments

Comments
 (0)