qurator-spk/modstool
1
0
Fork 0
mirror of https://github.com/qurator-spk/modstool.git synced 2025-06-07 19:05:06 +02:00
Code Issues Releases Wiki Activity

🚧 Avoid nested quotes for Python < 3.12

Browse source
This commit is contained in:
Mike Gerber 2024-11-27 16:38:18 +01:00
parent b385f27391
commit eeaad03686
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/mods4pandas/lib.py
View file

@ -337,6 +337,14 @@ def valid_column_key(k):
else: else:
return False return False
def column_names_csv(columns):
"""
Format Column names (identifiers) as a comma-separated list.
This uses double quotes per SQL standard.
"""
return ",".join('"' + c + '"' for c in columns)
current_columns = defaultdict(list) current_columns = defaultdict(list)
def insert_into_db(con, table, d: Dict): def insert_into_db(con, table, d: Dict):
@ -345,16 +353,16 @@ def insert_into_db(con, table, d: Dict):
# Create table if necessary # Create table if necessary
if not current_columns[table]: if not current_columns[table]:
for k in d.keys(): for k in d.keys():
assert valid_column_key(k), f"\"{k}\" is not a valid column name" assert valid_column_key(k), f'"{k}" is not a valid column name'
current_columns[table].append(k) current_columns[table].append(k)
con.execute(f"CREATE TABLE {table} ({",".join(f"\"{c}\"" for c in current_columns[table])})") con.execute(f"CREATE TABLE {table} ({column_names_csv(current_columns[table])})")
# Add columns if necessary # Add columns if necessary
for k in d.keys(): for k in d.keys():
if not k in current_columns[table]: if not k in current_columns[table]:
assert valid_column_key(k), f"\"{k}\" is not a valid column name" assert valid_column_key(k), f'"{k}" is not a valid column name'
current_columns[table].append(k) current_columns[table].append(k)
con.execute(f"ALTER TABLE {table} ADD COLUMN \"{k}\"") con.execute(f'ALTER TABLE {table} ADD COLUMN "{k}"')
# Insert # Insert
# Unfortunately, Python3's sqlite3 does not like named placeholders with spaces, so we # Unfortunately, Python3's sqlite3 does not like named placeholders with spaces, so we
@ -362,9 +370,9 @@ def insert_into_db(con, table, d: Dict):
columns = d.keys() columns = d.keys()
con.execute( con.execute(
f"INSERT INTO {table}" f"INSERT INTO {table}"
f"( {",".join(f"\"{c}\"" for c in columns)} )" f"( {column_names_csv(columns)} )"
"VALUES" "VALUES"
f"( {",".join("?" for c in columns)} )", f"( {','.join('?' for c in columns)} )",
[str(d[c]) for c in columns] [str(d[c]) for c in columns]
) )