Skip to content

Fix for issue 23. #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cpforbes wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for issue 23. #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sql/functions/conflict/event_person_event/time_attendee.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions sql/functions/conflict/event_person_event/time_speaker_speaker.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions sql/functions/conflict/event_person_event/time_speaker_visitor.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions sql/functions/conflict/event_person_event/time_visitor_visitor.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down