From: Adam <redacted>
Date: Thu, 20 Oct 2016 22:40:36 +0000 (-0400)
Subject: Update trivia query to use less memory in temporary tables
X-Git-Url: https://jfr.im/git/irc/rizon/acid.git/commitdiff_plain/99e59c09a91634e0a3389b5f69a4398400bded70?hp=271722b46e7b3beb62f6e19a9e854632bee9ca8c

Update trivia query to use less memory in temporary tables
---

diff --git a/pyva/pyva/src/main/python/trivia/trivia_engine.py b/pyva/pyva/src/main/python/trivia/trivia_engine.py
index f3b9cf8..c18f135 100644
--- a/pyva/pyva/src/main/python/trivia/trivia_engine.py
+++ b/pyva/pyva/src/main/python/trivia/trivia_engine.py
@@ -68,8 +68,7 @@ class Trivia(object):
 				return
 
 		try:
-			query = "SELECT tq.question, tq.answer FROM `trivia_questions` AS tq JOIN `trivia_themes` AS tt "
-			query += "ON tq.theme_id=tt.theme_id AND tt.theme_name='%s' ORDER BY rand() LIMIT 1"
+			query = "SELECT tq.question, tq.answer FROM `trivia_questions` AS tq JOIN (SELECT tq2.id FROM `trivia_questions` AS tq2 JOIN `trivia_themes` AS tt ON tq2.theme_id=tt.theme_id AND tt.theme_name='default' ORDER BY rand() LIMIT 1) AS x WHERE tq.id = x.id"
 			self.dbp.execute(query % self.themes[self.theme])
 		except Exception, ex:
 			self.module.elog.error('Unable to look up trivia question: %s' % ex)