diff options
| author | drh <drh@noemail.net> | 2014-01-15 02:40:11 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-01-15 02:40:11 +0000 |
| commit | f9db522fee74370e6994fe2c323da2412a097cf9 (patch) | |
| tree | 6a2f6f38b5776227bd58e05f98fb7b147f5d570e | |
| parent | 8ce7184bc26b1330817a68bca751beac4712cbb0 (diff) | |
| download | sqlite-f9db522fee74370e6994fe2c323da2412a097cf9.tar.gz sqlite-f9db522fee74370e6994fe2c323da2412a097cf9.zip | |
Use the user-supplied table name in WITH RECURSIVE tables as the internal
name of the table and the name of the table in VDBE comments.
FossilOrigin-Name: a29330238be6366444269a0b1b328475b2d01ae2
| -rw-r--r-- | manifest | 14 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/select.c | 2 |
3 files changed, 9 insertions, 9 deletions
@@ -1,5 +1,5 @@ -C Add\scode\sto\shandle\srecursive\sCTEs. -D 2014-01-14T20:14:09.053 +C Use\sthe\suser-supplied\stable\sname\sin\sWITH\sRECURSIVE\stables\sas\sthe\sinternal\nname\sof\sthe\stable\sand\sthe\sname\sof\sthe\stable\sin\sVDBE\scomments. +D 2014-01-15T02:40:11.688 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 0f7779b0c1c317dcac0f65f695d036030c16775f +F src/select.c 3d93e3b4736a95507540b708106c1db6d01c41a8 F src/shell.c a3541193d5fce37e91dad8ef46a9505aa7c9b344 F src/sqlite.h.in d94a8b89522f526ba711182ee161e06f8669bcc9 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e @@ -1150,7 +1150,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 8839850c44a8938883e493eacd752fa686e542df -R 1d5d9f6beb143e76aa04b4bf9953f5da -U dan -Z 1616366ca894deb1473f9b1eb1563ebc +P a5c2a54a07d35166911abc792008c05dea897742 +R cc1fc541222b981017b72fc3aee14bde +U drh +Z dcce44e449a071e984cc874f0c8e1e54 diff --git a/manifest.uuid b/manifest.uuid index f994f09e9..1be3de130 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a5c2a54a07d35166911abc792008c05dea897742
\ No newline at end of file +a29330238be6366444269a0b1b328475b2d01ae2
\ No newline at end of file diff --git a/src/select.c b/src/select.c index 0db4b0180..22eaf1b1c 100644 --- a/src/select.c +++ b/src/select.c @@ -3558,7 +3558,7 @@ static int withExpand( pFrom->pTab = pTab = sqlite3DbMallocZero(db, sizeof(Table)); if( pTab==0 ) return WRC_Abort; pTab->nRef = 1; - pTab->zName = sqlite3MPrintf(db, "sqlite_sq_%p", (void*)pTab); + pTab->zName = sqlite3MPrintf(db, "%s", pCte->zName); pTab->iPKey = -1; pTab->nRowEst = 1048576; pTab->tabFlags |= TF_Ephemeral; |