From d13a9e44ded4e93570c6ba42ec84e45ddca2505b Mon Sep 17 00:00:00 2001
From: Nick Pope <nick.pope@flightdataservices.com>
Date: Mon, 11 Dec 2017 12:08:45 +0000
Subject: Fixed #28909 -- Simplified code using tuple/list/set/dict unpacking.

---
 django/db/models/sql/compiler.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'django/db/models/sql')

diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py
index 9e381fd269..7930d223f1 100644
--- a/django/db/models/sql/compiler.py
+++ b/django/db/models/sql/compiler.py
@@ -476,10 +476,7 @@ class SQLCompiler:
                     params.extend(s_params)
                     out_cols.append(s_sql)
 
-                result.append(', '.join(out_cols))
-
-                result.append('FROM')
-                result.extend(from_)
+                result += [', '.join(out_cols), 'FROM', *from_]
                 params.extend(f_params)
 
                 if self.query.select_for_update and self.connection.features.has_select_for_update:
-- 
cgit v1.3