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

by Youcef Hilem.

FossilOrigin-Name: e0ed4c3e376248dfbf903e4b5845f910824fa6c6

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

diff --git a/manifest.uuid b/manifest.uuid
index 26496805799a621e0552328eeae3aaacc967f591..cfaa513cbce3bf9563fcf993caba10621a313b0d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-836418d3b7cfcd5ec375c4e08c09bd6b78646307
\ No newline at end of file
+e0ed4c3e376248dfbf903e4b5845f910824fa6c6
\ No newline at end of file

diff --git a/tool/sqldiff.c b/tool/sqldiff.c
index 944968fe0587dd50b1fedd304b57a7513e13c425..90a53fe16a7f428b957c7505949b389e62d849de 100644 (file)
--- a/tool/sqldiff.c
+++ b/tool/sqldiff.c
@@ -702,7 +702,7 @@ static void diff_one_table(const char *zTab, FILE *out){
         for(i=0; i<nPk; i++){
           fprintf(out, "%s %s=", zSep, az2[i]);
           printQuoted(out, sqlite3_column_value(pStmt,i));
-          zSep = ",";
+          zSep = " AND";
         }
         fprintf(out, ";\n");
       }else{                  /* Insert a row */