Merge pull request rails#34626 from gmcgibbon/sqlite_pluck_quoting

kamipo · web-flow · commit b802e08273f8 · 2018-12-06T02:31:27.000+09:00
Fix join table column quoting with SQLite.
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Fix join table column quoting with SQLite.
+
+    *Gannon McGibbon*
+
 *   Allow disabling scopes generated by `ActiveRecord.enum`.
 
     *Alfred Dominic*
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3/quoting.rb b/activerecord/lib/active_record/connection_adapters/sqlite3/quoting.rb
@@ -12,6 +12,10 @@ def quote_table_name_for_assignment(table, attr)
           quote_column_name(attr)
         end
 
+        def quote_table_name(name)
+          @quoted_table_names[name] ||= super.gsub(".", "\".\"").freeze
+        end
+
         def quote_column_name(name)
           @quoted_column_names[name] ||= %Q("#{super.gsub('"', '""')}")
         end
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
@@ -721,6 +721,10 @@ def test_pluck_with_includes_offset
     assert_equal [], Topic.includes(:replies).order(:id).offset(5).pluck(:id)
   end
 
+  def test_pluck_with_join
+    assert_equal [[2, 2], [4, 4]], Reply.includes(:topic).pluck(:id, :"topics.id")
+  end
+
   def test_group_by_with_limit
     expected = { "Post" => 8, "SpecialPost" => 1 }
     actual = Post.includes(:comments).group(:type).order(:type).limit(2).count("comments.id")
