Dequote column names generated by the query flattener.

FossilOrigin-Name: 5526e0aa3ccb24988a4f351ac994907b6e89018a

diff --git a/manifest b/manifest
index 0c609fcf261f999b3e01bcf88534fd6edd44cb4f..7a0481882d913f741aa890af0fe7f3bcaa184968 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sfailing\sassert()\sin\swal.c.
-D 2012-10-15T11:28:24.947
+C Dequote\scolumn\snames\sgenerated\sby\sthe\squery\sflattener.
+D 2012-10-15T16:24:07.585
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -174,7 +174,7 @@ F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f
 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c 7b986a715ac281643309c29257bb58cfae7aa810
 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
-F src/select.c 2a82736faeca1fe93315eda20c691d68ec13bb6c
+F src/select.c 9b759521f805e25e97baa2dd64037157fe365817
 F src/shell.c 8ee5a3cb502e2d574f97b43972e6c1e275e7bec7
 F src/sqlite.h.in c7be05ad191d2634292fcc77bdb2bcfa4526eb98
 F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
@@ -1021,7 +1021,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P ca86138bda26c5ac5a7e67351acbd19fbd39b0ae
-R 1adb0472104019713641ff3149a537e4
-U dan
-Z 82a77f3539e233996c3bcae559658f67
+P 8745530b9a877db77fe2ca3ea9c6bc99ce033055
+R 695fea8e01da23e7ae53b29020bcbd82
+U drh
+Z 09ce5f99475f4fd2d49afd9b8510012d

diff --git a/manifest.uuid b/manifest.uuid
index 96923ec6e558ac571ed2e0ddc89cc673a779882b..c85b3e5f9182226a549e17205a11dba1b463ffca 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8745530b9a877db77fe2ca3ea9c6bc99ce033055
\ No newline at end of file
+5526e0aa3ccb24988a4f351ac994907b6e89018a
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 51847ffbdb0e4fe485ca7ea76a07fea78e08ae73..ea85d1d71d5827bba27b43987ddad81ec9145c73 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -3098,10 +3098,9 @@ static int flattenSubquery(
     pList = pParent->pEList;
     for(i=0; i<pList->nExpr; i++){
       if( pList->a[i].zName==0 ){
-        const char *zSpan = pList->a[i].zSpan;
-        if( ALWAYS(zSpan) ){
-          pList->a[i].zName = sqlite3DbStrDup(db, zSpan);
-        }
+        char *zName = sqlite3DbStrDup(db, pList->a[i].zSpan);
+        sqlite3Dequote(zName);
+        pList->a[i].zName = zName;
       }
     }
     substExprList(db, pParent->pEList, iParent, pSub->pEList);