Skip to content

Commit

Permalink
Merge branch 'master' of github.com:LMFDB/lmfdb into g2c_find
Browse files Browse the repository at this point in the history
  • Loading branch information
roed314 committed Sep 29, 2023
2 parents f118808 + 1086da6 commit 45ae629
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lmfdb/backend/table.py
Original file line number Diff line number Diff line change
Expand Up @@ -1068,7 +1068,7 @@ def update_from_file(
raise ValueError("You must specify a column that is contained in the datafile and uniquely specifies each row")
with open(datafile) as F:
tables = [self.search_table]
columns = self.search_cols
columns = list(self.search_cols)
if self.extra_table is not None:
tables.append(self.extra_table)
columns.extend(self.extra_cols)
Expand Down Expand Up @@ -1156,7 +1156,7 @@ def drop_tmp():
ordered = False
if etable is not None:
ecols = SQL(", ").join([
SQL("{0} = {1}.{0}").format(col, Identifier(tmp_table))
SQL("{0} = {1}.{0}").format(Identifier(col), Identifier(tmp_table))
for col in ecols
])
self._execute(updater.format(
Expand Down

0 comments on commit 45ae629

Please sign in to comment.