From 83d79907f0b6c95b16e1f531e787c6c37c98caf7 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Wed, 5 Sep 2012 15:51:38 -0400
Subject: [PATCH 1/3] CC-4356: Improved method of detecting RabbitMQ PID
-fixed
---
utils/rabbitmq-update-pid.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/utils/rabbitmq-update-pid.sh b/utils/rabbitmq-update-pid.sh
index d5360b2fe..a756c0d1c 100755
--- a/utils/rabbitmq-update-pid.sh
+++ b/utils/rabbitmq-update-pid.sh
@@ -5,8 +5,7 @@ pid_found="$?"
if [ "$pid_found" == "0" ]; then
#PID is available in the status message
- rabbitmqstatus=`/etc/init.d/rabbitmq-server status | grep "\[{pid"`
- rabbitmqpid=`echo $rabbitmqstatus | sed "s/.*,\(.*\)\}.*/\1/"`
+ rabbitmqpid=`/etc/init.d/rabbitmq-server status | grep "\[{pid" | sed "s/.*,\(.*\)\}.*/\1/"`
else
#PID should be available from file
rabbitmqpid=`sed "s/.*,\(.*\)\}.*/\1/" /var/lib/rabbitmq/pids`
From 27bd22f10c505d42ca745aee4020ee0f421cd1aa Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Wed, 5 Sep 2012 16:02:23 -0400
Subject: [PATCH 2/3] CC-4348: Prepared statements - part 4
-Syntax error
---
airtime_mvc/application/models/Show.php | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php
index d9c6c834c..6f50a5823 100644
--- a/airtime_mvc/application/models/Show.php
+++ b/airtime_mvc/application/models/Show.php
@@ -2012,9 +2012,10 @@ SELECT si.starts AS start_timestamp,
s.url,
starts,
ends
-FROM cc_show_instances,
- cc_show
-WHERE si.show_id = s.id"
+FROM cc_show_instances si
+ LEFT JOIN cc_show s
+ ON si.instance_id = s.id
+WHERE si.show_id = s.id
AND si.starts >= :timeStart::timestamp
AND si.starts < :timeEnd::timestamp
AND modified_instance != TRUE
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 3/3] 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'