Make sure the columns of a VALUES() clause are named "column%d" even if

the VALUES() clause is a subquery in the FROM clause of an outer query.

FossilOrigin-Name: acf3b9cc9c3932431979995a1dceacc06c659ab400fad95ce3728ff8895a022b

diff --git a/manifest b/manifest
index f9301ef9cc5c528ac4080406cbdc7d9424d90f94..4b3001043151da90e556d2e441fd505cc815e211 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\s--icc,\s--gcc7,\sand\s--orm\soptions\sto\sthe\sspeed-check.sh\stest\sscript.
-D 2017-07-08T22:30:30.933
+C Make\ssure\sthe\scolumns\sof\sa\sVALUES()\sclause\sare\snamed\s"column%d"\seven\sif\nthe\sVALUES()\sclause\sis\sa\ssubquery\sin\sthe\sFROM\sclause\sof\san\souter\squery.
+D 2017-07-09T00:30:58.430
 F Makefile.in 081e48dfe7f995d57ce1a88ddf4d2917b4349158648a6cd45b42beae30de3a12
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 20850e3e8d4d4791e0531955852d768eb06f24138214870d543abb1a47346fba
@@ -448,7 +448,7 @@ F src/printf.c 8757834f1b54dae512fb25eb1acc8e94a0d15dd2290b58f2563f65973265adb2
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 6aa1fb1212e601f65b983ee1215d69a591986c8f97a3805c425c625a53839539
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
-F src/select.c c9f7b7196e196e93979665680d055a789938b8e025556097bf484b184c0dd576
+F src/select.c c1e669e01cb37c0683108a10e929615112572666053381df786806113b9a3ac4
 F src/shell.c a7067f647aef4b81569bbfd025f4fd120a4e7576a647d2aad05028eb50e50e48
 F src/sqlite.h.in c38c31f2a874af2b7d8443aba1fba3652d8ee75f60305d2512215cbe0fa0674a
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1628,7 +1628,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 0c246017b45c5290f3a7932dfce649f1a6d8f9afc00c6c3edf2ef06c17dbca1d
-R 790e0518c141c3e30ee1148ab425730a
+P 70dae08a9a6e35416f7268b9a95f3c8562b74697918bd1e9d5b5cf4719b9d075
+R bd4690b24493be6c9d3f040b4f986ae1
 U drh
-Z 9e4f8a303b6a755dc44ed919de98f263
+Z ceb54c87f0670b76840ec1e6992b9263

diff --git a/manifest.uuid b/manifest.uuid
index 6a4c02ff585fa482c08aa6957ddaa87b19cb4980..55ca94591e33f3a93c9ab4bdaa0206971b25a584 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-70dae08a9a6e35416f7268b9a95f3c8562b74697918bd1e9d5b5cf4719b9d075
\ No newline at end of file
+acf3b9cc9c3932431979995a1dceacc06c659ab400fad95ce3728ff8895a022b
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index c50052f2e91940ee058bb9a4eb728c8a64878ddc..1c700e35a5baade867a5b6306b9e13df476c9b9a 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -1704,7 +1704,11 @@ int sqlite3ColumnsFromExprList(
         zName = pEList->a[i].zSpan;
       }
     }
-    zName = sqlite3MPrintf(db, "%s", zName);
+    if( zName ){
+      zName = sqlite3DbStrDup(db, zName);
+    }else{
+      zName = sqlite3MPrintf(db,"column%d",i);
+    }
 
     /* Make sure the column name is unique.  If the name is not unique,
     ** append an integer to the name so that it becomes unique.