fake arel!

closes CNVS-4705

 * use the fake_arel gem to get a good portion of the way there
 * override fake_arel's AR override even more to get proper behavior
   of select and group merging
 * add even more Rails 3 query methods to Scope (except, reorder,
   pluck, uniq)
 * fix some spots in our code that break with the new semantics

test plan:
 * test all the things!

Change-Id: I4290d00db407f3250570df4e89c8c78283fe5f5f
Reviewed-on: https://gerrit.instructure.com/18427
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Hetherington <clare@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>

Author: ccutrer

Gemfile

@@ -13,6 +13,7 @@ gem 'daemons',        '1.1.0'
 gem 'diff-lcs',       '1.1.2',  :require => 'diff/lcs'
 gem 'encrypted_cookie_store-instructure', '1.0.2', :require => 'encrypted_cookie_store'
 gem 'erubis',         '2.7.0'
+gem 'fake_arel',      '1.0.0'
 gem 'ffi',            '1.1.5'
 gem 'hairtrigger',    '0.1.14'
 gem 'sass',           '3.2.3'

app/controllers/context_controller.rb

@@ -324,7 +324,8 @@ def prior_users
     if authorized_action(@context, @current_user, [:manage_students, :manage_admin_users, :read_prior_roster])
       @prior_users = @context.prior_users.
         where(Enrollment.not_fake.proxy_options[:conditions]).
-        by_top_enrollment(:select => "users.*, NULL AS prior_enrollment").
+        select("users.*, NULL AS prior_enrollment").
+        by_top_enrollment.
         paginate(:page => params[:page], :per_page => 20)
 
       users = @prior_users.index_by(&:id)

app/controllers/gradebooks_controller.rb

@@ -223,17 +223,9 @@ def gradebook_init_json
         params[:user_ids] ||= params[:user_id]
         user_ids = params[:user_ids].split(",").map(&:to_i) if params[:user_ids]
         assignment_ids = params[:assignment_ids].split(",").map(&:to_i) if params[:assignment_ids]
-        # you need to specify specifically which submission fields you want returned to the gradebook here
-        scope_options = {
-          :select => ["assignment_id", "attachment_id", "grade", "grade_matches_current_submission", "group_id", "has_rubric_assessment", "id", "score", "submission_comments_count", "submission_type", "submitted_at", "url", "user_id"].join(" ,")
-        }
-        if user_ids && assignment_ids
-          @submissions = @context.submissions.scoped(scope_options).find(:all, :conditions => {:user_id => user_ids, :assignment_id => assignment_ids})
-        elsif user_ids
-          @submissions = @context.submissions.scoped(scope_options).find(:all, :conditions => {:user_id => user_ids})
-        else
-          @submissions = @context.submissions.scoped(scope_options)
-        end
+        @submissions = @context.submissions
+        @submissions = @submissions.where(:user_id => user_ids) if user_ids
+        @submissions = @submissions.where(:assignment_id => assignment_ids) if assignment_ids
         render :json => @submissions.to_json(:include => [:attachments, :quiz_submission, :submission_comments])
       end
     end

app/controllers/question_banks_controller.rb

@@ -24,7 +24,7 @@ class QuestionBanksController < ApplicationController
 
   def index
     if @context == @current_user || authorized_action(@context, @current_user, :manage_assignments)
-      @question_banks = @context.assessment_question_banks.active
+      @question_banks = @context.assessment_question_banks.active.all
       if params[:include_bookmarked] == '1'
         @question_banks += @current_user.assessment_question_banks.active
       end

app/controllers/user_notes_controller.rb

@@ -41,7 +41,7 @@ def user_notes
         @is_course = true
       end
       count = @users.count
-      @users = @users.order_by_sortable_name(:select=> "name, users.id, last_user_note", :order=>"last_user_note ASC")
+      @users = @users.select("name, users.id, last_user_note").order("last_user_note").order_by_sortable_name
       @users = @users.paginate(:page => params[:page], :per_page => 20, :total_entries=>count)
       # rails gets confused by :include => :courses, because has_current_student_enrollments above references courses in a subquery
       User.send(:preload_associations, @users, :courses)

app/controllers/users_controller.rb

@@ -195,11 +195,10 @@ def index
         if @context && @context.is_a?(Account) && @query
           @users = @context.users_name_like(@query)
         elsif params[:enrollment_term_id].present? && @root_account == @context
-          @users = @context.fast_all_users.scoped({
-            :joins => :courses,
-            :conditions => ["courses.enrollment_term_id = ?", params[:enrollment_term_id]],
-            :group => @context.connection.group_by('users.id', 'users.name', 'users.sortable_name')
-          })
+          # fast_all_users already specifies a select for the distinct to work on
+          @users = @context.fast_all_users.joins(:courses).
+              where(:courses => { :enrollment_term_id => params[:enrollment_term_id] })
+          @users = @users.uniq
         elsif !api_request?
           @users = @context.fast_all_users
         end

app/models/account.rb

@@ -354,7 +354,7 @@ def all_users(limit=250)
 
   def fast_all_users(limit=nil)
     @cached_fast_all_users ||= {}
-    @cached_fast_all_users[limit] ||= self.all_users(limit).active.order_by_sortable_name.scoped(:select => "users.id, users.name, users.sortable_name")
+    @cached_fast_all_users[limit] ||= self.all_users(limit).active.select("users.id, users.name, users.sortable_name").order_by_sortable_name
   end
 
   def users_not_in_groups_sql(groups, opts={})

app/models/appointment_group.rb

@@ -313,8 +313,9 @@ def possible_participants(registration_status=nil)
 
   def participant_ids
     appointments_participants.
-      scoped(:select => 'context_id', :conditions => ["calendar_events.context_type = ?", participant_type]).
-      map(&:context_id)
+        except(:order).
+        where(:context_type => participant_type).
+        pluck(:context_id)
   end
 
   def participant_table

app/models/course.rb

@@ -425,7 +425,7 @@ def update_account_associations
   end
 
   def associated_accounts
-    self.non_unique_associated_accounts.uniq
+    self.non_unique_associated_accounts.all.uniq
   end
 
   named_scope :recently_started, lambda {
@@ -1314,7 +1314,7 @@ def send_final_grades_to_endpoint(publishing_user)
     # 'publish_final_grades'
 
     self.recompute_student_scores_without_send_later
-    enrollments = self.student_enrollments.not_fake.order_by_sortable_name(:include => [:user, :course_section])
+    enrollments = self.student_enrollments.not_fake.includes(:user, :course_section).order_by_sortable_name
 
     errors = []
     posts_to_make = []
@@ -1392,7 +1392,7 @@ def gradebook_to_csv(options = {})
     includes = [:user, :course_section]
     includes = {:user => :pseudonyms, :course_section => []} if options[:include_sis_id]
     scope = options[:user] ? self.enrollments_visible_to(options[:user]) : self.student_enrollments
-    student_enrollments = scope.order_by_sortable_name(:include => includes) # remove duplicate enrollments for students enrolled in multiple sections
+    student_enrollments = scope.includes(includes).order_by_sortable_name # remove duplicate enrollments for students enrolled in multiple sections
     student_enrollments = student_enrollments.all.uniq_by(&:user_id)
 
     calc = GradeCalculator.new(student_enrollments.map(&:user_id), self,

app/models/enrollment.rb

@@ -898,9 +898,13 @@ def self.cached_temporary_invitations(email)
     end
   end
 
-  def self.order_by_sortable_name(options = {})
-    add_sort_key!(options, User.sortable_name_order_by_clause('users'))
-    uber_scope(options)
+  def self.order_by_sortable_name
+    clause = User.sortable_name_order_by_clause('users')
+    scope = self.order(clause)
+    if scope.scope(:find, :select)
+      scope = scope.select(clause)
+    end
+    scope
   end
 
   def self.top_enrollment_by(key, rank_order = :default)