sheetsync: Handle sheet_name as an input column to avoid special casing

sheet_name must always be present on a sheet row, but is only present on a db row
if the db actually stores that data.

As a side benefit, the db will now update if sheet_name changes.
pull/401/head
Mike Lang 4 months ago committed by Mike Lang
parent 2db20d202b
commit 00d0ecc3bb

@ -82,6 +82,7 @@ class SheetSync(object):
self.create_missing_ids = False self.create_missing_ids = False
# List of input columns # List of input columns
self.input_columns = [ self.input_columns = [
'sheet_name'
'event_start', 'event_start',
'event_end', 'event_end',
'category', 'category',
@ -101,10 +102,11 @@ class SheetSync(object):
if reverse_sync: if reverse_sync:
# Reverse Sync refers to copying all event data from the database into the sheet, # Reverse Sync refers to copying all event data from the database into the sheet,
# instead of it (mostly) being the other way. In particular: # instead of it (mostly) being the other way. In particular:
# - All columns become output columns # - All columns become output columns (except sheet_name, which can't be changed)
# - We are allowed to create new sheet rows for database events if they don't exist. # - We are allowed to create new sheet rows for database events if they don't exist.
self.create_missing_ids = True self.create_missing_ids = True
self.output_columns += self.input_columns self.output_columns += self.input_columns
self.output_columns.remove("sheet_name")
self.input_columns = [] self.input_columns = []
def run(self): def run(self):
@ -186,7 +188,7 @@ class SheetSync(object):
self.logger.info("Inserting new DB row {}".format(sheet_row['id'])) self.logger.info("Inserting new DB row {}".format(sheet_row['id']))
# Insertion conflict just means that another sheet sync beat us to the insert. # Insertion conflict just means that another sheet sync beat us to the insert.
# We can ignore it. # We can ignore it.
insert_cols = ['id', 'sheet_name'] + self.input_columns insert_cols = ['id'] + self.input_columns
built_query = sql.SQL(""" built_query = sql.SQL("""
INSERT INTO events ({}) INSERT INTO events ({})
VALUES ({}) VALUES ({})

Loading…
Cancel
Save