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 f3b9cf89d143b4cfef8f8384da16738cba6611f8..c18f135e3bc744bc0517e59c347da0d0a4fae0af 100644 (file)
--- 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)