allow table name and direction in string order arg

9 files changed, 29 insertions, 25 deletions

diff --git a/activerecord/test/models/author.rb b/activerecord/test/models/author.rb
index 11fe073ab0..f462fdb69a 100644
--- a/activerecord/test/models/author.rb
+++ b/activerecord/test/models/author.rb
@@ -8,9 +8,9 @@ class Author < ActiveRecord::Base
   has_many :posts_with_comments, -> { includes(:comments) }, class_name: "Post"
   has_many :popular_grouped_posts, -> { includes(:comments).group("type").having("SUM(comments_count) > 1").select("type") }, class_name: "Post"
   has_many :posts_with_comments_sorted_by_comment_id, -> { includes(:comments).order(Arel.sql("comments.id")) }, class_name: "Post"
-  has_many :posts_sorted_by_id_limited, -> { order(Arel.sql("posts.id")).limit(1) }, class_name: "Post"
+  has_many :posts_sorted_by_id_limited, -> { order("posts.id").limit(1) }, class_name: "Post"
   has_many :posts_with_categories, -> { includes(:categories) }, class_name: "Post"
-  has_many :posts_with_comments_and_categories, -> { includes(:comments, :categories).order(Arel.sql("posts.id")) }, class_name: "Post"
+  has_many :posts_with_comments_and_categories, -> { includes(:comments, :categories).order("posts.id") }, class_name: "Post"
   has_many :posts_with_special_categorizations, class_name: "PostWithSpecialCategorization"
   has_one  :post_about_thinking, -> { where("posts.title like '%thinking%'") }, class_name: "Post"
   has_one  :post_about_thinking_with_last_comment, -> { where("posts.title like '%thinking%'").includes(:last_comment) }, class_name: "Post"
diff --git a/activerecord/test/models/car.rb b/activerecord/test/models/car.rb
index 0be943a321..3d6a7a96c2 100644
--- a/activerecord/test/models/car.rb
+++ b/activerecord/test/models/car.rb
@@ -19,13 +19,13 @@ class Car < ActiveRecord::Base
   scope :incl_tyres, -> { includes(:tyres) }
   scope :incl_engines, -> { includes(:engines) }
 
-  scope :order_using_new_style,  -> { order(Arel.sql("name asc")) }
+  scope :order_using_new_style,  -> { order("name asc") }
 end
 
 class CoolCar < Car
-  default_scope { order(Arel.sql("name desc")) }
+  default_scope { order("name desc") }
 end
 
 class FastCar < Car
-  default_scope { order(Arel.sql("name desc")) }
+  default_scope { order("name desc") }
 end
diff --git a/activerecord/test/models/company.rb b/activerecord/test/models/company.rb
index 1a82a9e646..bbc5fc2b2d 100644
--- a/activerecord/test/models/company.rb
+++ b/activerecord/test/models/company.rb
@@ -50,7 +50,7 @@ class Firm < Company
   has_many :clients, -> { order "id" }, dependent: :destroy, before_remove: :log_before_remove, after_remove: :log_after_remove
   has_many :unsorted_clients, class_name: "Client"
   has_many :unsorted_clients_with_symbol, class_name: :Client
-  has_many :clients_sorted_desc, -> { order Arel.sql("id DESC") }, class_name: "Client"
+  has_many :clients_sorted_desc, -> { order "id DESC" }, class_name: "Client"
   has_many :clients_of_firm, -> { order "id" }, foreign_key: "client_of", class_name: "Client", inverse_of: :firm
   has_many :clients_ordered_by_name, -> { order "name" }, class_name: "Client"
   has_many :unvalidated_clients_of_firm, foreign_key: "client_of", class_name: "Client", validate: false
diff --git a/activerecord/test/models/company_in_module.rb b/activerecord/test/models/company_in_module.rb
index 9108eb5249..52b7e06a63 100644
--- a/activerecord/test/models/company_in_module.rb
+++ b/activerecord/test/models/company_in_module.rb
@@ -9,7 +9,7 @@ module MyApplication
 
     class Firm < Company
       has_many :clients, -> { order("id") }, dependent: :destroy
-      has_many :clients_sorted_desc, -> { order(Arel.sql("id DESC")) }, class_name: "Client"
+      has_many :clients_sorted_desc, -> { order("id DESC") }, class_name: "Client"
       has_many :clients_of_firm, -> { order "id" }, foreign_key: "client_of", class_name: "Client"
       has_many :clients_like_ms, -> { where("name = 'Microsoft'").order("id") }, class_name: "Client"
       has_one :account, class_name: "MyApplication::Billing::Account", dependent: :destroy
diff --git a/activerecord/test/models/developer.rb b/activerecord/test/models/developer.rb
index c2a21eac04..8881c69368 100644
--- a/activerecord/test/models/developer.rb
+++ b/activerecord/test/models/developer.rb
@@ -4,7 +4,7 @@ require "ostruct"
 
 module DeveloperProjectsAssociationExtension2
   def find_least_recent
-    order(Arel.sql("id ASC")).first
+    order("id ASC").first
   end
 end
 
@@ -13,7 +13,7 @@ class Developer < ActiveRecord::Base
 
   has_and_belongs_to_many :projects do
     def find_most_recent
-      order(Arel.sql("id DESC")).first
+      order("id DESC").first
     end
   end
 
@@ -41,7 +41,7 @@ class Developer < ActiveRecord::Base
       join_table: "developers_projects",
       association_foreign_key: "project_id" do
         def find_least_recent
-          order(Arel.sql("id ASC")).first
+          order("id ASC").first
         end
       end
 
@@ -126,7 +126,7 @@ end
 
 class DeveloperFilteredOnJoins < ActiveRecord::Base
   self.table_name = "developers"
-  has_and_belongs_to_many :projects, -> { order(Arel.sql("projects.id")) }, foreign_key: "developer_id", join_table: "developers_projects"
+  has_and_belongs_to_many :projects, -> { order("projects.id") }, foreign_key: "developer_id", join_table: "developers_projects"
 
   def self.default_scope
     joins(:projects).where(projects: { name: "Active Controller" })
@@ -135,9 +135,9 @@ end
 
 class DeveloperOrderedBySalary < ActiveRecord::Base
   self.table_name = "developers"
-  default_scope { order(Arel.sql("salary DESC")) }
+  default_scope { order("salary DESC") }
 
-  scope :by_name, -> { order(Arel.sql("name DESC")) }
+  scope :by_name, -> { order("name DESC") }
 end
 
 class DeveloperCalledDavid < ActiveRecord::Base
@@ -225,14 +225,14 @@ end
 
 class EagerDeveloperWithDefaultScope < ActiveRecord::Base
   self.table_name = "developers"
-  has_and_belongs_to_many :projects, -> { order(Arel.sql("projects.id")) }, foreign_key: "developer_id", join_table: "developers_projects"
+  has_and_belongs_to_many :projects, -> { order("projects.id") }, foreign_key: "developer_id", join_table: "developers_projects"
 
   default_scope { includes(:projects) }
 end
 
 class EagerDeveloperWithClassMethodDefaultScope < ActiveRecord::Base
   self.table_name = "developers"
-  has_and_belongs_to_many :projects, -> { order(Arel.sql("projects.id")) }, foreign_key: "developer_id", join_table: "developers_projects"
+  has_and_belongs_to_many :projects, -> { order("projects.id") }, foreign_key: "developer_id", join_table: "developers_projects"
 
   def self.default_scope
     includes(:projects)
@@ -241,21 +241,21 @@ end
 
 class EagerDeveloperWithLambdaDefaultScope < ActiveRecord::Base
   self.table_name = "developers"
-  has_and_belongs_to_many :projects, -> { order(Arel.sql("projects.id")) }, foreign_key: "developer_id", join_table: "developers_projects"
+  has_and_belongs_to_many :projects, -> { order("projects.id") }, foreign_key: "developer_id", join_table: "developers_projects"
 
   default_scope lambda { includes(:projects) }
 end
 
 class EagerDeveloperWithBlockDefaultScope < ActiveRecord::Base
   self.table_name = "developers"
-  has_and_belongs_to_many :projects, -> { order(Arel.sql("projects.id")) }, foreign_key: "developer_id", join_table: "developers_projects"
+  has_and_belongs_to_many :projects, -> { order("projects.id") }, foreign_key: "developer_id", join_table: "developers_projects"
 
   default_scope { includes(:projects) }
 end
 
 class EagerDeveloperWithCallableDefaultScope < ActiveRecord::Base
   self.table_name = "developers"
-  has_and_belongs_to_many :projects, -> { order(Arel.sql("projects.id")) }, foreign_key: "developer_id", join_table: "developers_projects"
+  has_and_belongs_to_many :projects, -> { order("projects.id") }, foreign_key: "developer_id", join_table: "developers_projects"
 
   default_scope OpenStruct.new(call: includes(:projects))
 end
diff --git a/activerecord/test/models/membership.rb b/activerecord/test/models/membership.rb
index 47cb4d2146..09ee7544b3 100644
--- a/activerecord/test/models/membership.rb
+++ b/activerecord/test/models/membership.rb
@@ -12,7 +12,7 @@ class CurrentMembership < Membership
 end
 
 class SuperMembership < Membership
-  belongs_to :member, -> { order(Arel.sql("members.id DESC")) }
+  belongs_to :member, -> { order("members.id DESC") }
   belongs_to :club
 end
 
diff --git a/activerecord/test/models/pirate.rb b/activerecord/test/models/pirate.rb
index 99de37a52f..c8617d1cfe 100644
--- a/activerecord/test/models/pirate.rb
+++ b/activerecord/test/models/pirate.rb
@@ -3,7 +3,7 @@
 class Pirate < ActiveRecord::Base
   belongs_to :parrot, validate: true
   belongs_to :non_validated_parrot, class_name: "Parrot"
-  has_and_belongs_to_many :parrots, -> { order(Arel.sql("parrots.id ASC")) }, validate: true
+  has_and_belongs_to_many :parrots, -> { order("parrots.id ASC") }, validate: true
   has_and_belongs_to_many :non_validated_parrots, class_name: "Parrot"
   has_and_belongs_to_many :parrots_with_method_callbacks, class_name: "Parrot",
     before_add: :log_before_add,
@@ -23,7 +23,7 @@ class Pirate < ActiveRecord::Base
   has_one :ship
   has_one :update_only_ship, class_name: "Ship"
   has_one :non_validated_ship, class_name: "Ship"
-  has_many :birds, -> { order(Arel.sql("birds.id ASC")) }
+  has_many :birds, -> { order("birds.id ASC") }
   has_many :birds_with_method_callbacks, class_name: "Bird",
     before_add: :log_before_add,
     after_add: :log_after_add,
diff --git a/activerecord/test/models/post.rb b/activerecord/test/models/post.rb
index 49bbbaaab7..4508f727d0 100644
--- a/activerecord/test/models/post.rb
+++ b/activerecord/test/models/post.rb
@@ -35,8 +35,8 @@ class Post < ActiveRecord::Base
   def first_comment
     super.body
   end
-  has_one :first_comment, -> { order(Arel.sql("id ASC")) }, class_name: "Comment"
-  has_one :last_comment, -> { order(Arel.sql("id desc")) }, class_name: "Comment"
+  has_one :first_comment, -> { order("id ASC") }, class_name: "Comment"
+  has_one :last_comment, -> { order("id desc") }, class_name: "Comment"
 
   scope :with_special_comments, -> { joins(:comments).where(comments: { type: "SpecialComment" }) }
   scope :with_very_special_comments, -> { joins(:comments).where(comments: { type: "VerySpecialComment" }) }
@@ -52,7 +52,7 @@ class Post < ActiveRecord::Base
 
   has_many :comments do
     def find_most_recent
-      order(Arel.sql("id DESC")).first
+      order("id DESC").first
     end
 
     def newest
@@ -323,5 +323,9 @@ class FakeKlass
     def enforce_raw_sql_whitelist(*args)
       # noop
     end
+
+    def attribute_names_and_aliases
+      []
+    end
   end
 end
diff --git a/activerecord/test/models/tag.rb b/activerecord/test/models/tag.rb
index e0d42f4f66..bc13c3a42d 100644
--- a/activerecord/test/models/tag.rb
+++ b/activerecord/test/models/tag.rb
@@ -11,6 +11,6 @@ end
 class OrderedTag < Tag
   self.table_name = "tags"
 
-  has_many :taggings, -> { order(Arel.sql("taggings.id DESC")) }, foreign_key: "tag_id"
+  has_many :taggings, -> { order("taggings.id DESC") }, foreign_key: "tag_id"
   has_many :tagged_posts, through: :taggings, source: "taggable", source_type: "Post"
 end