Merge from trunk

This commit is contained in:
Charles Haley 2010-06-14 12:36:44 +01:00
commit 5f4a828efe

View File

@ -291,7 +291,11 @@ class SchemaUpgrade(object):
for field in self.field_metadata.itervalues(): for field in self.field_metadata.itervalues():
if field['is_category'] and not field['is_custom'] and 'link_column' in field: if field['is_category'] and not field['is_custom'] and 'link_column' in field:
create_tag_browser_view(field['table'], field['link_column'], field['column']) table = self.conn.get(
'SELECT name FROM sqlite_master WHERE type="table" AND name=?',
('books_%s_link'%field['table'],), all=False)
if table is not None:
create_tag_browser_view(field['table'], field['link_column'], field['column'])
def upgrade_version_11(self): def upgrade_version_11(self):
'Add average rating to tag browser views' 'Add average rating to tag browser views'
@ -363,8 +367,11 @@ class SchemaUpgrade(object):
for field in self.field_metadata.itervalues(): for field in self.field_metadata.itervalues():
if field['is_category'] and not field['is_custom'] and 'link_column' in field: if field['is_category'] and not field['is_custom'] and 'link_column' in field:
print field['table'] table = self.conn.get(
create_std_tag_browser_view(field['table'], field['link_column'], 'SELECT name FROM sqlite_master WHERE type="table" AND name=?',
('books_%s_link'%field['table'],), all=False)
if table is not None:
create_std_tag_browser_view(field['table'], field['link_column'],
field['column'], field['category_sort']) field['column'], field['category_sort'])
db_tables = self.conn.get('''SELECT name FROM sqlite_master db_tables = self.conn.get('''SELECT name FROM sqlite_master