remote/sqlite-utils
1
0
Fork 0
mirror of https://github.com/simonw/sqlite-utils.git synced 2026-09-17 22:14:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Allow iterables other than Lists in m2m records

Browse source
This commit is contained in:
Adam Wolf 2020-10-26 13:36:50 -05:00
commit 0193ba04d5
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sqlite_utils/db.py
View file

@ -1,5 +1,6 @@
from .utils import sqlite3, OperationalError, suggest_column_types, column_affinity from .utils import sqlite3, OperationalError, suggest_column_types, column_affinity
from collections import namedtuple, OrderedDict from collections import namedtuple, OrderedDict
from collections.abc import Mapping
import contextlib import contextlib
import datetime import datetime
import decimal import decimal
@ -1772,15 +1773,15 @@ class Table(Queryable):
return pk return pk
def m2m( def m2m(
self, other_table, record_or_list=None, pk=DEFAULT, lookup=None, m2m_table=None self, other_table, record_or_iterable=None, pk=DEFAULT, lookup=None, m2m_table=None
): ):
if isinstance(other_table, str): if isinstance(other_table, str):
other_table = self.db.table(other_table, pk=pk) other_table = self.db.table(other_table, pk=pk)
our_id = self.last_pk our_id = self.last_pk
if lookup is not None: if lookup is not None:
assert record_or_list is None, "Provide lookup= or record, not both" assert record_or_iterable is None, "Provide lookup= or record, not both"
else: else:
assert record_or_list is not None, "Provide lookup= or record, not both" assert record_or_iterable is not None, "Provide lookup= or record, not both"
tables = list(sorted([self.name, other_table.name])) tables = list(sorted([self.name, other_table.name]))
columns = ["{}_id".format(t) for t in tables] columns = ["{}_id".format(t) for t in tables]
if m2m_table is not None: if m2m_table is not None:
@ -1801,10 +1802,11 @@ class Table(Queryable):
m2m_table_name = m2m_table or "{}_{}".format(*tables) m2m_table_name = m2m_table or "{}_{}".format(*tables)
m2m_table = self.db.table(m2m_table_name, pk=columns, foreign_keys=columns) m2m_table = self.db.table(m2m_table_name, pk=columns, foreign_keys=columns)
if lookup is None: if lookup is None:
# if records is only one record, put the record in a list
records = ( records = (
[record_or_list] [record_or_iterable]
if not isinstance(record_or_list, (list, tuple)) if isinstance(record_or_iterable, Mapping)
else record_or_list else record_or_iterable
) )
# Ensure each record exists in other table # Ensure each record exists in other table
for record in records: for record in records: