From bc5cc9ff4801fa33a3a3d2caad7fb43201f34b14 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Wed, 5 Sep 2012 16:06:10 -0400
Subject: [PATCH] remove cartesian cross-product on some SQL queries

---
 airtime_mvc/application/models/Show.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php
index 6f50a5823..9fcaee13e 100644
--- a/airtime_mvc/application/models/Show.php
+++ b/airtime_mvc/application/models/Show.php
@@ -1833,7 +1833,8 @@ SELECT si.starts AS start_timestamp,
        starts,
        ends
 FROM cc_show_instances si,
-     cc_show s
+     LEFT JOIN cc_show s
+     ON si.instance_id = s.id
 WHERE si.show_id = s.id
   AND si.starts <= :timeNow1::timestamp
   AND si.ends > :timeNow2::timestamp
@@ -1875,7 +1876,8 @@ SELECT si.starts AS start_timestamp,
        starts,
        ends
 FROM cc_show_instances si,
-     cc_show s
+     LEFT JOIN cc_show s
+     ON si.instance_id = s.id
 WHERE si.show_id = s.id
   AND si.starts > :timeNow1::timestamp - INTERVAL '2 days'
   AND si.ends < :timeNow2::timestamp + INTERVAL '2 days'