database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-27 20:41:58 +03:00
Code Activity

Finish incomplete edit of resolve.c from check-in (5998). (CVS 6000)

Browse Source 
FossilOrigin-Name: 0d7e150e8c6cb801e68273c9d0793ce31d1f31fd
This commit is contained in:
drh
2008-12-09 14:03:22 +00:00
parent e1991d2a8d
commit cd2b561302
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@ -1,5 +1,5 @@
C Additional\stest\scases\sfor\snested\ssubqueries\sin\sa\sWHERE\sclause.\s(CVS\s5999) C Finish\sincomplete\sedit\sof\sresolve.c\sfrom\scheck-in\s(5998).\s(CVS\s6000)
D 2008-12-09T13:12:57 D 2008-12-09T14:03:22
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in f7e4c81c347b04f7b0f1c1b081a168645d7b8af7 F Makefile.in f7e4c81c347b04f7b0f1c1b081a168645d7b8af7
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@ -149,7 +149,7 @@ F src/pragma.c 539e28c90e782fa909a3b3a6849d18a9eb11a548
F src/prepare.c fcadb25d2ad722d87103517333c825b56b79a770 F src/prepare.c fcadb25d2ad722d87103517333c825b56b79a770
F src/printf.c e29d9475c63e1dbfae005b98da3a60e07b5c1ca5 F src/printf.c e29d9475c63e1dbfae005b98da3a60e07b5c1ca5
F src/random.c 67bf41b20f1983a0e481e7abb98d64704ee26884 F src/random.c 67bf41b20f1983a0e481e7abb98d64704ee26884
F src/resolve.c 6c32f21b5835136591b86cce6a82cde5947027c4 F src/resolve.c 6dd09880a8a9b74f5bc1aa2ae4247b1afe6acd65
F src/rowset.c 2256fa4a928f750e2f3d6fc733523034beceb1d6 F src/rowset.c 2256fa4a928f750e2f3d6fc733523034beceb1d6
F src/select.c 1d3616e4e48f6c15a0c69bf14bc5423f31624f87 F src/select.c 1d3616e4e48f6c15a0c69bf14bc5423f31624f87
F src/shell.c 484bddeefac9314be18d4a60d401e93848274ee8 F src/shell.c 484bddeefac9314be18d4a60d401e93848274ee8
@ -664,7 +664,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
P be03fa0543044dc46952695e963d9b82afed892b P 4f10f19dd1e66cd29b0e1e26506154d670c3bc46
R 057a876e0e088f55d386cc2e6b809ed8 R 4236110168ec16d57589408a5d31ff17
U drh U drh
Z b90a9972d4a72f68d7f8576ec0ce01e7 Z 3c8f3bd0788523faf648732cd5785f4b

2
manifest.uuid
View File

@ -1 +1 @@
4f10f19dd1e66cd29b0e1e26506154d670c3bc46 0d7e150e8c6cb801e68273c9d0793ce31d1f31fd

4
src/resolve.c
View File

@ -14,7 +14,7 @@
** resolve all identifiers by associating them with a particular ** resolve all identifiers by associating them with a particular
** table and column. ** table and column.
** **
** $Id: resolve.c,v 1.12 2008/12/09 13:04:29 drh Exp $ ** $Id: resolve.c,v 1.13 2008/12/09 14:03:22 drh Exp $
*/ */
#include "sqliteInt.h" #include "sqliteInt.h"
#include <stdlib.h> #include <stdlib.h>
@ -963,7 +963,7 @@ static int resolveSelectStep(Walker *pWalker, Select *p){
if( pItem->pSelect ){ if( pItem->pSelect ){
const char *zSavedContext = pParse->zAuthContext; const char *zSavedContext = pParse->zAuthContext;
if( pItem->zName ) pParse->zAuthContext = pItem->zName; if( pItem->zName ) pParse->zAuthContext = pItem->zName;
sqlite3ResolveSelectNames(pParse, pItem->pSelect, pOuterNC /*&sNC*/); sqlite3ResolveSelectNames(pParse, pItem->pSelect, pOuterNC);
pParse->zAuthContext = zSavedContext; pParse->zAuthContext = zSavedContext;
if( pParse->nErr || db->mallocFailed ) return WRC_Abort; if( pParse->nErr || db->mallocFailed ) return WRC_Abort;
} }