@@ -43,7 +43,7 @@ module Freemium find( :all, :include => :subscription_plan, - :conditions => ['rate_cents > 0 AND paid_through <= ? AND (expire_on IS NULL or expire_on < paid_through)', date.to_date] + :conditions => ['subscription_plans.rate_cents > 0 AND paid_through <= ? AND (expire_on IS NULL or expire_on < paid_through)', date.to_date] ) end end lib/freemium/manual_billing.rb @@ -52,7 +52,7 @@ module Freemium find( :all, :include => :subscription_plan, - :conditions => ['rate_cents > 0 AND paid_through < ? AND (expire_on IS NULL OR expire_on < paid_through)', Date.today] + :conditions => ['subscription_plans.rate_cents > 0 AND paid_through < ? AND (expire_on IS NULL OR expire_on < paid_through)', Date.today] ) end end lib/freemium/recurring_billing.rb 079f005b68dd2e262e444478f89846d7d35fca18 Lance Ivy lance@cainlevy.net http://github.com/cainlevy/freemium/commit/6629bb3da0d503244a0ec35ea8a50496fcac40e7 6629bb3da0d503244a0ec35ea8a50496fcac40e7 2008-04-16T16:55:28-07:00 2008-04-16T16:55:28-07:00 more explicit sql conditions for compat with rails preloading 6cc17ef819fc311262c9547fdbd8d577c1f8c55e Lance Ivy lance@cainlevy.net