decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

fix partial findvalue commit

Browse source
This commit is contained in:
j 2013-01-31 11:19:21 +00:00
parent d63e5cba32
commit e6aaf0aa6b
2 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pandora/item/management/commands/sqlfindindex.py
View file

@ -42,8 +42,3 @@ class Command(BaseCommand):
name = 'findvalue' name = 'findvalue'
if name not in indexes: if name not in indexes:
create_table("%s_%s_idx"%(table_name, name), table_name, name) create_table("%s_%s_idx"%(table_name, name), table_name, name)
for name in settings.CONFIG['clipLayers']:
name = '%s_findvalue' % name
if name not in indexes:
create_table("%s_%s_idx"%(table_name, name), table_name, name)

13
pandora/item/management/commands/sync_itemsort.py
View file

@ -76,10 +76,6 @@ class Command(BaseCommand):
if name not in model_fields: if name not in model_fields:
sql = 'ALTER TABLE "%s" DROP COLUMN "%s"' % (table_name, name) sql = 'ALTER TABLE "%s" DROP COLUMN "%s"' % (table_name, name)
changes.append(sql) changes.append(sql)
if settings.DB_GIN_TRGM:
gin_indexes = ['%s_findvalue' % n for n in settings.CONFIG['clipLayers']]
else:
gin_indexes = []
for f in clip.models.Clip._meta.fields: for f in clip.models.Clip._meta.fields:
if not f.primary_key and not isinstance(f, fields.related.ForeignKey): if not f.primary_key and not isinstance(f, fields.related.ForeignKey):
name = f.name name = f.name
@ -87,13 +83,8 @@ class Command(BaseCommand):
if name not in db_fields: if name not in db_fields:
sql = 'ALTER TABLE "%s" ADD COLUMN "%s" %s' % (table_name, name, col_type) sql = 'ALTER TABLE "%s" ADD COLUMN "%s" %s' % (table_name, name, col_type)
changes.append(sql) changes.append(sql)
if name in gin_indexes: sql = 'CREATE INDEX "%s_%s_idx" ON "%s" ("%s")' % (table_name, name,
sql = 'CREATE INDEX "%s_%s_idx" ON "%s" USING gin ("%s" gin_trgm_ops);' % ( table_name, name)
table_name, name, table_name, name
)
else:
sql = 'CREATE INDEX "%s_%s_idx" ON "%s" ("%s")' % (table_name, name,
table_name, name)
changes.append(sql) changes.append(sql)
sql = 'ALTER TABLE "%s" ALTER COLUMN "%s" SET NOT NULL' % (table_name, name) sql = 'ALTER TABLE "%s" ALTER COLUMN "%s" SET NOT NULL' % (table_name, name)
changes.append(sql) changes.append(sql)