For statements of just an unadorned VALUES clause, assign column names

as "columnN" for increasing whole numbers N.

FossilOrigin-Name: 260587d2727f66d7fd65ef672ee46c92024f1d30

diff --git a/manifest b/manifest
index 03003dd0c5e92557909e442b1b4bd84879f958d0..f27dba4a8ebf2736af4cbb0067fdc6fbe605bdbc 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sLEMON,\slimit\sthe\ssize\sof\sthe\sgrammar\sfile\sto\s100MB.\s\sThis\sensures\sthat\nthe\sprogram\swill\snever\sexperience\sinteger\soverflow.\s\sTo\sbe\sdoubly\ssure,\nuse\scalloc()\sinstead\sof\smalloc()\swhen\sallocating\sarrays.
-D 2014-01-11T12:52:25.201
+C For\sstatements\sof\sjust\san\sunadorned\sVALUES\sclause,\sassign\scolumn\snames\nas\s"columnN"\sfor\sincreasing\swhole\snumbers\sN.
+D 2014-01-13T20:32:18.451
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -219,7 +219,7 @@ F src/printf.c 85d07756e45d7496d19439dcae3e6e9e0090f269
 F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
 F src/resolve.c 7eda9097b29fcf3d2b42fdc17d1de672134e09b6
 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
-F src/select.c 819bb090c9a348d17f69f136cad2bfa9ee9cbb41
+F src/select.c 996d8b88603edbd478aaa70b75d535a3ddea933d
 F src/shell.c a3541193d5fce37e91dad8ef46a9505aa7c9b344
 F src/sqlite.h.in d94a8b89522f526ba711182ee161e06f8669bcc9
 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
@@ -1148,7 +1148,7 @@ F tool/vdbe-compress.tcl 0cf56e9263a152b84da86e75a5c0cdcdb7a47891
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P cb5d1f83e0a33d546d4c0cb817ef1f8440d1f738
-R 28679f157b50c114aa03e50f74a7a104
+P 29ba458d849ad8864711cbe59fb10447a947e06a
+R cfc0f0611de592f2675967818ec833a9
 U drh
-Z 608e7b6009060d93ac39bb2434b3c874
+Z 9bc6839af49500894d0d88a693460511

diff --git a/manifest.uuid b/manifest.uuid
index d8b23d3f34fb1cecaec59899a071ae8d3b38919d..169cbd691ead2369aa327cf67dc23a4e7c20a518 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-29ba458d849ad8864711cbe59fb10447a947e06a
\ No newline at end of file
+260587d2727f66d7fd65ef672ee46c92024f1d30
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index d075116749e0a000a2bef420aabf5aabcef2f8db..58458974091e0704e73b35746f1478ef57a038d5 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -1363,8 +1363,9 @@ static void generateColumnNames(
         sqlite3VdbeSetColName(v, i, COLNAME_NAME, zCol, SQLITE_TRANSIENT);
       }
     }else{
-      sqlite3VdbeSetColName(v, i, COLNAME_NAME, 
-          sqlite3DbStrDup(db, pEList->a[i].zSpan), SQLITE_DYNAMIC);
+      const char *z = pEList->a[i].zSpan;
+      z = z==0 ? sqlite3MPrintf(db, "column%d", i+1) : sqlite3DbStrDup(db, z);
+      sqlite3VdbeSetColName(v, i, COLNAME_NAME, z, SQLITE_DYNAMIC);
     }
   }
   generateColumnTypes(pParse, pTabList, pEList);