Refs #3367 Change Time table overlap query

1 files changed, 5 insertions, 1 deletions

diff --git a/app/models/chouette/time_table.rb b/app/models/chouette/time_table.rb
index 3f56f6a1d..8aff3bf36 100644
--- a/app/models/chouette/time_table.rb
+++ b/app/models/chouette/time_table.rb
@@ -22,7 +22,11 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
   belongs_to :created_from, class_name: 'Chouette::TimeTable'
 
   scope :overlapping, -> (date_start, date_end) do
-    joins(:periods).where('(period_start, period_end) OVERLAPS (?, ?)', date_start, date_end)
+    joins("
+      LEFT JOIN time_table_periods ON time_tables.id = time_table_periods.time_table_id
+      LEFT JOIN time_table_dates ON time_tables.id = time_table_dates.time_table_id
+    ")
+    .where("(time_table_periods.period_start <= :end AND time_table_periods.period_end >= :start) OR (time_table_dates.date BETWEEN :start AND :end)", {start: date_start, end: date_end})
   end
 
   after_save :save_shortcuts