Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

newdb: Handle multiple different case items when setting many-many fields

Browse Source 
Fixes #1216398 [Same tag twice in different case causes ConstraintError](https://bugs.launchpad.net/calibre/+bug/1216398)
This commit is contained in:
Kovid Goyal 2013-08-25 08:11:17 +05:30
parent be776e5900
commit 50634ff252
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/db/tests/writing.py
View File

@ -294,6 +294,8 @@ class WritingTest(BaseTest):
# Test setting with the same value repeated # Test setting with the same value repeated
ae(sf('tags', {3: ('a', 'b', 'a')}), {3}) ae(sf('tags', {3: ('a', 'b', 'a')}), {3})
ae(sf('tags', {3: ('x', 'X')}), {3}, 'Failed when setting tag twice with different cases')
ae(('x',), cache.field_for('tags', 3))
# }}} # }}}

11
src/calibre/db/write.py
View File

@ -10,6 +10,7 @@ __docformat__ = 'restructuredtext en'
import re import re
from functools import partial from functools import partial
from datetime import datetime from datetime import datetime
from future_builtins import zip
from calibre.constants import preferred_encoding, ispy3 from calibre.constants import preferred_encoding, ispy3
from calibre.ebooks.metadata import author_to_author_sort, title_sort from calibre.ebooks.metadata import author_to_author_sort, title_sort
@ -338,12 +339,14 @@ def many_one(book_id_val_map, db, field, allow_case_change, *args):
# Many-Many fields {{{ # Many-Many fields {{{
def uniq(vals): def uniq(vals, kmap):
' Remove all duplicates from vals, while preserving order. Items in vals must be hashable ' ''' Remove all duplicates from vals, while preserving order. kmap must be a
callable that returns a hashable value for every item in vals '''
vals = vals or () vals = vals or ()
lvals = (kmap(x) for x in vals)
seen = set() seen = set()
seen_add = seen.add seen_add = seen.add
return tuple(x for x in vals if x not in seen and not seen_add(x)) return tuple(x for x, k in zip(vals, lvals) if k not in seen and not seen_add(k))
def many_many(book_id_val_map, db, field, allow_case_change, *args): def many_many(book_id_val_map, db, field, allow_case_change, *args):
dirtied = set() dirtied = set()
@ -357,7 +360,7 @@ def many_many(book_id_val_map, db, field, allow_case_change, *args):
rid_map = {kmap(item):item_id for item_id, item in table.id_map.iteritems()} rid_map = {kmap(item):item_id for item_id, item in table.id_map.iteritems()}
val_map = {} val_map = {}
case_changes = {} case_changes = {}
book_id_val_map = {k:uniq(vals) for k, vals in book_id_val_map.iteritems()} book_id_val_map = {k:uniq(vals, kmap) for k, vals in book_id_val_map.iteritems()}
for vals in book_id_val_map.itervalues(): for vals in book_id_val_map.itervalues():
for val in vals: for val in vals:
get_db_id(val, db, m, table, kmap, rid_map, allow_case_change, get_db_id(val, db, m, table, kmap, rid_map, allow_case_change,