Fully qualify column names

a8e997db · Eric Davis · 489566a3 · a8e997db
Commit a8e997db authored Aug 23, 2011 by Eric Davis
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

calendars_controller.rb app/controllers/calendars_controller.rb +2 -2

No files found.
--- a/app/controllers/calendars_controller.rb
+++ b/app/controllers/calendars_controller.rb
@@ -36,9 +36,9 @@ class CalendarsController < ApplicationController
    if @query.valid?
      events = []
      events += @query.issues(:include => [:tracker, :assigned_to, :priority],
-                              :conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
+                              :conditions => ["((#{Issue.table_name}.start_date BETWEEN ? AND ?) OR (#{Issue.table_name}.due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
                              )
-      events += @query.versions(:conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
+      events += @query.versions(:conditions => ["#{Version.table_name}.effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
      @calendar.events = events
    end