Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix some remaining references to zephyr. 

(imported from commit 2072d3451cc08bc32b997d7fafaafd7b6ac568df)
This commit is contained in:
Tim Abbott 2013-08-06 16:15:05 -04:00
parent 1026215512
commit d8f78a5e2d
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
servers/puppet/modules/zulip/files/postgresql/process_fts_updates
View File

@ -9,7 +9,7 @@ def update_fts_columns(cursor):
cursor.execute("SELECT id, message_id FROM fts_update_log;") cursor.execute("SELECT id, message_id FROM fts_update_log;")
ids = [] ids = []
for (id, message_id) in cursor.fetchall(): for (id, message_id) in cursor.fetchall():
cursor.execute("UPDATE zephyr_message SET " cursor.execute("UPDATE zerver_message SET "
"search_tsvector = to_tsvector('humbug.english_us_search', " "search_tsvector = to_tsvector('humbug.english_us_search', "
"subject || rendered_content) " "subject || rendered_content) "
"WHERE id = %s", (message_id,)) "WHERE id = %s", (message_id,))

10
zerver/management/commands/realm_stats.py
View File

@ -82,11 +82,11 @@ class Command(BaseCommand):
print "%d active users (%d total)" % (num_active, len(user_profiles)) print "%d active users (%d total)" % (num_active, len(user_profiles))
streams = Stream.objects.filter(realm=realm).extra( streams = Stream.objects.filter(realm=realm).extra(
tables=['zephyr_subscription', 'zephyr_recipient'], tables=['zerver_subscription', 'zerver_recipient'],
where=['zephyr_subscription.recipient_id = zephyr_recipient.id', where=['zerver_subscription.recipient_id = zerver_recipient.id',
'zephyr_recipient.type = 2', 'zerver_recipient.type = 2',
'zephyr_recipient.type_id = zephyr_stream.id', 'zerver_recipient.type_id = zerver_stream.id',
'zephyr_subscription.active = true']).annotate(count=Count("name")) 'zerver_subscription.active = true']).annotate(count=Count("name"))
print "%d streams" % (streams.count(),) print "%d streams" % (streams.count(),)
for days_ago in (1, 7, 30): for days_ago in (1, 7, 30):

2
zerver/management/commands/update_permissions.py
View File

@ -9,4 +9,4 @@ class Command(BaseCommand):
def handle(self, *args, **options): def handle(self, *args, **options):
# From http://stackoverflow.com/a/11914435/90777 # From http://stackoverflow.com/a/11914435/90777
create_permissions(get_app("zephyr"), get_models(), 2) create_permissions(get_app("zerver"), get_models(), 2)