database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Fix incorrect WHERE clause in sqldiff, as reported on the mailing list

Browse Source 
by Youcef Hilem.

FossilOrigin-Name: e0ed4c3e376248dfbf903e4b5845f910824fa6c6
This commit is contained in:
drh
2015-11-09 12:47:04 +00:00
parent f10b1f78ee
commit 7450494c50
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Check\sin\sthe\scg_anno.tcl\sand\srun-speed-test.sh\sscripts,\sas\san\shistorical\nrecord. C Fix\sincorrect\sWHERE\sclause\sin\ssqldiff,\sas\sreported\son\sthe\smailing\slist\nby\sYoucef\sHilem.
D 2015-11-09T12:44:19.680 D 2015-11-09T12:47:04.583
F Makefile.in 3a705bb4bd12e194212ddbdbf068310d17153cdb F Makefile.in 3a705bb4bd12e194212ddbdbf068310d17153cdb
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc 702d3e98f3afc6587a78481257f3c4c900efc3a4 F Makefile.msc 702d3e98f3afc6587a78481257f3c4c900efc3a4
@@ -1392,7 +1392,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 7ce07da76b5e745783e703a834417d725b7d45fd F tool/speedtest8inst1.c 7ce07da76b5e745783e703a834417d725b7d45fd
F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
F tool/sqldiff.c 37ab2cd4f0c8b4f0bbdc2f41f63f0f262e25805d F tool/sqldiff.c 40e3458f0015290be8ecb6e03f9dbf1bb1e264c0
F tool/stack_usage.tcl f8e71b92cdb099a147dad572375595eae55eca43 F tool/stack_usage.tcl f8e71b92cdb099a147dad572375595eae55eca43
F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d
F tool/symbols.sh fec58532668296d7c7dc48be9c87f75ccdb5814f F tool/symbols.sh fec58532668296d7c7dc48be9c87f75ccdb5814f
@@ -1403,7 +1403,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 7c6a19ba9b0bdb1cc0b9a9796b7c1c114944d927 P 836418d3b7cfcd5ec375c4e08c09bd6b78646307
R 9d7a4cba8878c4f3f14011449d7a4d87 R d937c57aac217cda0397e7f6695d66bb
U drh U drh
Z cd8c6de9d269073054c5419c6ba867b6 Z 203526c61164c46fffc3cfcb2374dd46

2
manifest.uuid
View File

@@ -1 +1 @@
836418d3b7cfcd5ec375c4e08c09bd6b78646307 e0ed4c3e376248dfbf903e4b5845f910824fa6c6

2
tool/sqldiff.c
View File

@@ -702,7 +702,7 @@ static void diff_one_table(const char *zTab, FILE *out){
for(i=0; i<nPk; i++){ for(i=0; i<nPk; i++){
fprintf(out, "%s %s=", zSep, az2[i]); fprintf(out, "%s %s=", zSep, az2[i]);
printQuoted(out, sqlite3_column_value(pStmt,i)); printQuoted(out, sqlite3_column_value(pStmt,i));
zSep = ","; zSep = " AND";
} }
fprintf(out, ";\n"); fprintf(out, ";\n");
}else{ /* Insert a row */ }else{ /* Insert a row */