Fix incorrect column names in UPDATE statements generated by the sqldiff

utility.

FossilOrigin-Name: ee53b46011852e27db23708387fe1e918cc8284c

diff --git a/manifest b/manifest
index d6f8442010670922f076a623a91d175ef0a5b302..5b339e5c39bb21a7060c9e5914caa0cffd73f785 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\s--primarykey\soption\sto\sthe\ssqldiff\stool,\swhich\scauses\sit\sto\suse\sthe\nschema-defined\sPRIMARY\sKEY.
-D 2015-04-09T18:14:03.130
+C Fix\sincorrect\scolumn\snames\sin\sUPDATE\sstatements\sgenerated\sby\sthe\ssqldiff\nutility.
+D 2015-04-09T19:39:54.853
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5f78b1ab81b64e7c57a75d170832443e66c0880a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -1239,7 +1239,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
-F tool/sqldiff.c 9334ebc767dda9e02b904d4cbbd31cf8aaba3ca5
+F tool/sqldiff.c 050763654cb28d23c4d9516deb348c8632e432cd
 F tool/stack_usage.tcl f8e71b92cdb099a147dad572375595eae55eca43
 F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d
 F tool/symbols.sh fec58532668296d7c7dc48be9c87f75ccdb5814f
@@ -1250,7 +1250,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 83b342a44ffc9ea07dc4d59f2866cefc68ee4f13
-R 80b4d61d5d12e62d07bcaa502c23a21f
+P 5063f9070afde9374ea0f2bc338fee840d8b3dd4
+R b81a13af06affec3f4deb7b3b6092ef8
 U drh
-Z 965913d93d231505652de01e91883fad
+Z 7a24354f8d3816810c976cc3a62d01ee

diff --git a/manifest.uuid b/manifest.uuid
index fda938f72a3dfd882d2ae180e196d2eb8623fb9c..56fcea9bbfa9d9cc5f2064375099f7367830f27f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5063f9070afde9374ea0f2bc338fee840d8b3dd4
\ No newline at end of file
+ee53b46011852e27db23708387fe1e918cc8284c
\ No newline at end of file

diff --git a/tool/sqldiff.c b/tool/sqldiff.c
index 28b66b2c374945a31f56a43b2c92d2fd032a8326..53c5977ed4cc43b96393d969694cc35c0a927617 100644 (file)
--- a/tool/sqldiff.c
+++ b/tool/sqldiff.c
@@ -658,7 +658,7 @@ static void diff_one_table(const char *zTab){
           zSep = " SET";
           for(i=nPk+1; i<nQ; i+=2){
             if( sqlite3_column_int(pStmt,i)==0 ) continue;
-            printf("%s %s=", zSep, az2[(i-1)/2]);
+            printf("%s %s=", zSep, az2[(i+nPk-1)/2]);
             zSep = ",";
             printQuoted(sqlite3_column_value(pStmt,i+1));
           }