database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00
Code Activity

Alternative fix for the double-initialization of type and collating sequence

Browse Source 
problem that leaves the estimated table size intact.

FossilOrigin-Name: 623ddbdbf48d26dac58c593bcb9e7b184334ddfc
This commit is contained in:
drh
2015-04-21 17:17:47 +00:00
parent dfb5e1cbc6
commit 1cb50c880e
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Make\ssure\sthe\sdatatype\sand\scollating\ssequence\sof\stransients\stables\sare\nnot\sinitialized\smore\sthan\sonce.\s\sOtherwise\sa\smemory\sleak\sresults. C Alternative\sfix\sfor\sthe\sdouble-initialization\sof\stype\sand\scollating\ssequence\nproblem\sthat\sleaves\sthe\sestimated\stable\ssize\sintact.
D 2015-04-21T17:07:01.179 D 2015-04-21T17:17:47.197
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in faaf75b89840659d74501bea269c7e33414761c1 F Makefile.in faaf75b89840659d74501bea269c7e33414761c1
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -230,7 +230,7 @@ F src/printf.c 08fa675c200aac29e561c6153f91f909ed17612f
F src/random.c ba2679f80ec82c4190062d756f22d0c358180696 F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
F src/resolve.c 53486a98c17b7ae09b8c2b398013e973ce4c1aae F src/resolve.c 53486a98c17b7ae09b8c2b398013e973ce4c1aae
F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
F src/select.c 01c386a3fda06bf3a1fee5391f103390480937bb F src/select.c 35433ea8894ac42594ddc31eb0165a6d6401cfe5
F src/shell.c 78eabce4c16c45e36fea2368f95118116399ba8a F src/shell.c 78eabce4c16c45e36fea2368f95118116399ba8a
F src/sqlite.h.in ca27603a36fcacdaac5a19d8ee35aaff8ce8516f F src/sqlite.h.in ca27603a36fcacdaac5a19d8ee35aaff8ce8516f
F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
@@ -1252,7 +1252,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 9d887b92f8086961e045f8acb9ee7a443796d411 P 9e6beda2c8d879e438ee933e658f860d6eb42a20
R 3636eb5c943e6a1ccf08bc5de8e48684 R e945ee9cd5bcd63adee2f8cd77bbfeb7
U drh U drh
Z d704b3d64babe71da7ea3a63e7e599d3 Z a3d2a31d5a72cc2f0da62ee0f93b8c64

2
manifest.uuid
View File

@@ -1 +1 @@
9e6beda2c8d879e438ee933e658f860d6eb42a20 623ddbdbf48d26dac58c593bcb9e7b184334ddfc

6
src/select.c
View File

@@ -1700,14 +1700,14 @@ static void selectAddColumnTypeAndCollation(
a = pSelect->pEList->a; a = pSelect->pEList->a;
for(i=0, pCol=pTab->aCol; i<pTab->nCol; i++, pCol++){ for(i=0, pCol=pTab->aCol; i<pTab->nCol; i++, pCol++){
p = a[i].pExpr; p = a[i].pExpr;
if( pCol->zType ) break; if( pCol->zType==0 ){
if( pCol->zColl ) break;
pCol->zType = sqlite3DbStrDup(db, columnType(&sNC, p,0,0,0, &pCol->szEst)); pCol->zType = sqlite3DbStrDup(db, columnType(&sNC, p,0,0,0, &pCol->szEst));
}
szAll += pCol->szEst; szAll += pCol->szEst;
pCol->affinity = sqlite3ExprAffinity(p); pCol->affinity = sqlite3ExprAffinity(p);
if( pCol->affinity==0 ) pCol->affinity = SQLITE_AFF_NONE; if( pCol->affinity==0 ) pCol->affinity = SQLITE_AFF_NONE;
pColl = sqlite3ExprCollSeq(pParse, p); pColl = sqlite3ExprCollSeq(pParse, p);
if( pColl ){ if( pColl && pCol->zColl==0 ){
pCol->zColl = sqlite3DbStrDup(db, pColl->zName); pCol->zColl = sqlite3DbStrDup(db, pColl->zName);
} }
} }