Skip to content

Commit f276ffd

Browse files
authored
Merge pull request #40 from brandons209/update-3.5
hopefully this is fix same message id errors
2 parents 804b2f1 + f44eb6b commit f276ffd

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

activitylog/database.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,12 +272,13 @@ def _flush_table(self, table_name: str):
272272
m = re.search(r"Duplicate entry '([^']+)' for key '([^']+)'", str(e))
273273
if m:
274274
duplicate_value, key_name = m.groups()
275+
key_name = "message_id" if table_name == "messages" else "id"
275276
else:
276277
duplicate_value, key_name = None, None
277278
else: # sqlite3
278279
m = re.search(r"UNIQUE constraint failed: (.+)", str(e))
279280
if m:
280-
key_name = m.group(1).split(", ")[0]
281+
key_name = "message_id" if table_name == "messages" else "id"
281282
duplicate_value = None
282283
else:
283284
duplicate_value, key_name = None, None

0 commit comments

Comments
 (0)