Merge pull request rails#53928 from claudiob/upsert_doc

fatkodima · web-flow · commit ef4201c204e6 · 2024-12-13T00:04:33.000+02:00
Fix `:returning` docs for `upsert_all` [ci skip]
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
@@ -820,7 +820,7 @@ def upsert(attributes, **kwargs)
     #
     # [:returning]
     #   (PostgreSQL, SQLite3, and MariaDB only) An array of attributes to return for all successfully
-    #   inserted records, which by default is the primary key.
+    #   upserted records, which by default is the primary key.
     #   Pass <tt>returning: %w[ id name ]</tt> for both id and name
     #   or <tt>returning: false</tt> to omit the underlying <tt>RETURNING</tt> SQL
     #   clause entirely.

Original file line number	Diff line number	Diff line change
`@@ -820,7 +820,7 @@ def upsert(attributes, **kwargs)`
`820`	`820`	`#`
`821`	`821`	`# [:returning]`
`822`	`822`	`# (PostgreSQL, SQLite3, and MariaDB only) An array of attributes to return for all successfully`
`823`		`- # inserted records, which by default is the primary key.`
	`823`	`+ # upserted records, which by default is the primary key.`
`824`	`824`	`# Pass <tt>returning: %w[ id name ]</tt> for both id and name`
`825`	`825`	`# or <tt>returning: false</tt> to omit the underlying <tt>RETURNING</tt> SQL`
`826`	`826`	`# clause entirely.`