From 9f57d0ef102ea97d97310a523ebb1aed66079cef Mon Sep 17 00:00:00 2001
From: "Craig P. Forbes" <cpforbes@bsfs.org>
Date: Tue, 22 Mar 2011 18:25:52 -0400
Subject: [PATCH] Fixed event_person_event function column order to match
 return type conflict.conflict_event_person_event

---
 sql/functions/conflict/event_person_event/time_attendee.sql   | 4 ++--
 .../conflict/event_person_event/time_speaker_speaker.sql      | 4 ++--
 .../conflict/event_person_event/time_speaker_visitor.sql      | 4 ++--
 .../conflict/event_person_event/time_visitor_visitor.sql      | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sql/functions/conflict/event_person_event/time_attendee.sql b/sql/functions/conflict/event_person_event/time_attendee.sql
index 16a658b45..483337e43 100644
--- a/sql/functions/conflict/event_person_event/time_attendee.sql
+++ b/sql/functions/conflict/event_person_event/time_attendee.sql
@@ -1,9 +1,9 @@
 -- returns attendees with conflicting events
 CREATE OR REPLACE FUNCTION conflict.conflict_event_person_event_time_attendee(integer) RETURNS SETOF conflict.conflict_event_person_event AS $$
   SELECT
-    ep1.person_id AS person_id,
     ep1.event_id AS event_id1,
-    ep2.event_id AS event_id2
+    ep2.event_id AS event_id2,
+    ep1.person_id AS person_id
   FROM
     event_person AS ep1
     INNER JOIN event AS e1 ON (
diff --git a/sql/functions/conflict/event_person_event/time_speaker_speaker.sql b/sql/functions/conflict/event_person_event/time_speaker_speaker.sql
index 9451c2df9..862dc96cb 100644
--- a/sql/functions/conflict/event_person_event/time_speaker_speaker.sql
+++ b/sql/functions/conflict/event_person_event/time_speaker_speaker.sql
@@ -2,9 +2,9 @@
 
 CREATE OR REPLACE FUNCTION conflict.conflict_event_person_event_time_speaker_speaker(integer) RETURNS SETOF conflict.conflict_event_person_event AS $$
   SELECT
-    ep1.person_id AS person_id,
     ep1.event_id AS event_id1,
-    ep2.event_id AS event_id2
+    ep2.event_id AS event_id2,
+    ep1.person_id AS person_id
   FROM
     event_person AS ep1
     INNER JOIN event AS e1 ON (
diff --git a/sql/functions/conflict/event_person_event/time_speaker_visitor.sql b/sql/functions/conflict/event_person_event/time_speaker_visitor.sql
index 0e5c52376..7d4b58805 100644
--- a/sql/functions/conflict/event_person_event/time_speaker_visitor.sql
+++ b/sql/functions/conflict/event_person_event/time_speaker_visitor.sql
@@ -1,9 +1,9 @@
 -- Check for time conflicts between speakers and visitors
 CREATE OR REPLACE FUNCTION conflict.conflict_event_person_event_time_speaker_visitor(integer) RETURNS SETOF conflict.conflict_event_person_event AS $$
   SELECT
-    ep1.person_id AS person_id,
     ep1.event_id AS event_id1,
-    ep2.event_id AS event_id2
+    ep2.event_id AS event_id2,
+    ep1.person_id AS person_id
   FROM
     event_person AS ep1
     INNER JOIN event AS e1 ON (
diff --git a/sql/functions/conflict/event_person_event/time_visitor_visitor.sql b/sql/functions/conflict/event_person_event/time_visitor_visitor.sql
index ec410657c..0a7160ca3 100644
--- a/sql/functions/conflict/event_person_event/time_visitor_visitor.sql
+++ b/sql/functions/conflict/event_person_event/time_visitor_visitor.sql
@@ -1,9 +1,9 @@
 
 CREATE OR REPLACE FUNCTION conflict.conflict_event_person_event_time_visitor_visitor(integer) RETURNS SETOF conflict.conflict_event_person_event AS $$
   SELECT
-    ep1.person_id AS person_id,
     ep1.event_id AS event_id1,
-    ep2.event_id AS event_id2
+    ep2.event_id AS event_id2,
+    ep1.person_id AS person_id
   FROM
     event_person AS ep1
     INNER JOIN event AS e1 ON (