move relations mapping out of way/node objects, so we don't need horrible expensive...

[rails.git] / script / statistics

diff --git a/script/statistics b/script/statistics
index 7105d475d3297381a57276ae065e2c80cb48a219..5a17e8be40da68fd10a4d74be0536418e8614e7d 100755 (executable)
--- a/script/statistics
+++ b/script/statistics
@@ -45,23 +45,23 @@ begin
   puts "<tr><th>Data Type</th><th>Day</th><th>Week</th><th>Month</th></tr>"
 
   day_count = Trace.count(:user_id, :distinct => true, 
-                          :conditions => "timestamp > NOW() - INTERVAL 1 DAY")
+                          :conditions => "timestamp > NOW() - '1 DAY'::INTERVAL")
   week_count = Trace.count(:user_id, :distinct => true, 
-                           :conditions => "timestamp > NOW() - INTERVAL 7 DAY")
+                           :conditions => "timestamp > NOW() - '7 DAYS'::INTERVAL")
   month_count = Trace.count(:user_id, :distinct => true, 
-                            :conditions => "timestamp > NOW() - INTERVAL 28 DAY")
+                            :conditions => "timestamp > NOW() - '28 DAYS'::INTERVAL")
 
   puts "<tr><th>GPX Files</th><td>#{day_count}</td><td>#{week_count}</td><td>#{month_count}</td></tr>"
 
   day_count = OldNode.count(:user_id, :distinct => true,
                             :include => :changeset,
-                            :conditions => "timestamp > NOW() - INTERVAL 1 DAY")
+                            :conditions => "timestamp > NOW() - '1 DAY'::INTERVAL")
   week_count = OldNode.count(:user_id, :distinct => true, 
                              :include => :changeset,
-                             :conditions => "timestamp > NOW() - INTERVAL 7 DAY")
+                             :conditions => "timestamp > NOW() - '7 DAYS'::INTERVAL")
   month_count = OldNode.count(:user_id, :distinct => true, 
                               :include => :changeset,
-                              :conditions => "timestamp > NOW() - INTERVAL 28 DAY")
+                              :conditions => "timestamp > NOW() - '28 DAYS'::INTERVAL")
 
   puts "<tr><th>Nodes</th><td>#{day_count}</td><td>#{week_count}</td><td>#{month_count}</td></tr>"
 
@@ -71,13 +71,13 @@ begin
   puts "<table>"
   puts "<tr><th>Day</th><th>Week</th><th>Month</th></tr>"
 
-  day_users = OldNode.count(:conditions => "timestamp > NOW() - INTERVAL 1 DAY",
+  day_users = OldNode.count(:conditions => "timestamp > NOW() - '1 DAY'::INTERVAL",
                             :include => :changeset, :group => :user_id,
                             :order => "count_all DESC")
-  week_users = OldNode.count(:conditions => "timestamp > NOW() - INTERVAL 7 DAY",
+  week_users = OldNode.count(:conditions => "timestamp > NOW() - '7 DAYS'::INTERVAL",
                              :include => :changeset, :group => :user_id,
                              :order => "count_all DESC", :limit => 60)
-  month_users = OldNode.count(:conditions => "timestamp > NOW() - INTERVAL 28 DAY",
+  month_users = OldNode.count(:conditions => "timestamp > NOW() - '28 DAYS'::INTERVAL",
                               :include => :changeset, :group => :user_id,
                               :order => "count_all DESC", :limit => 60)