Improved matching of COLLATE clauses within the ON CONFLICT conflict-target.

FossilOrigin-Name: 8f4376e52b6124986937a3837ad83a18863c3144ef3b438a0d5e9231bf6c8980

diff --git a/manifest b/manifest
index d084f11197d2722b35d4a8059a3bd1b826f77b75..f379e65340d41601ee603fdec10aee580bb2a6eb 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sextra\stest\scases\sfor\sUPSERT.
-D 2018-04-18T17:56:37.901
+C Improved\smatching\sof\sCOLLATE\sclauses\swithin\sthe\sON\sCONFLICT\sconflict-target.
+D 2018-04-18T18:18:12.893
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 5ce9343cba9c189046f1afe6d2bcc1f68079439febc05267b98aec6ecc752439
@@ -557,7 +557,7 @@ F src/tokenize.c 5b0c661a85f783d35b9883830736eeb63be4aefc4f6b7d9cd081d48782c041e
 F src/treeview.c 14d5d1254702ec96876aa52642cb31548612384134970409fae333b25b39d6bb
 F src/trigger.c 4ace6d1d5ba9a89822deb287317f33c810440526eafe185c2d8a48c31df1e995
 F src/update.c 5787acf0a12a20cf31c0c50db644a667590f720e404b3616bc2efeb9bd5bbc06
-F src/upsert.c 3e152ac4073449bef7f13ed9d932eee86399c9180bd92fc201a2bfa7ee3e7b0e
+F src/upsert.c ed50cfcf0d3ae6b0b1c4b6456e64216e54c948733f0d9f9ae4e4d02572334100
 F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
 F src/util.c d9eb0a6c4aae1b00a7369eadd7ca0bbe946cb4c953b6751aa20d357c2f482157
 F src/vacuum.c 762ee9bbf8733d87d8cd06f58d950e881982e416f8c767334a40ffd341b6bff5
@@ -1722,7 +1722,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P fb16348a5bd52752098c9aeacc3281c4e1e8eb5a868d131ea6c3271dc4226b40
-R bf451bcdfd0a3cb7daf666d841400ba4
-U dan
-Z c15e182adb19b110e30902ffd8c90113
+P 7ea08d0750dd9e07d2ffea336127034800db14aa23e60adec384d338871bf53a
+R 434a68562af45a25f29ff21161feb7ed
+U drh
+Z b6eb3d8ec4f1858ff9bef1c9a2cc8590

diff --git a/manifest.uuid b/manifest.uuid
index d14e9212d8bae853520564f39807c738ad55d9c3..f956dd0727e3e4915645a05394f75ac019e17107 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7ea08d0750dd9e07d2ffea336127034800db14aa23e60adec384d338871bf53a
\ No newline at end of file
+8f4376e52b6124986937a3837ad83a18863c3144ef3b438a0d5e9231bf6c8980
\ No newline at end of file

diff --git a/src/upsert.c b/src/upsert.c
index 25fcf6d6703317943b4f887a126f940c8055081a..866f9b9531e8c8815bf4661aca63f00c80016cd7 100644 (file)
--- a/src/upsert.c
+++ b/src/upsert.c
@@ -148,13 +148,18 @@ int sqlite3UpsertAnalyzeTarget(
     nn = pIdx->nKeyCol;
     for(ii=0; ii<nn; ii++){
       Expr *pExpr;
+      sCol[0].u.zToken = (char*)pIdx->azColl[ii];
       if( pIdx->aiColumn[ii]==XN_EXPR ){
         assert( pIdx->aColExpr!=0 );
         assert( pIdx->aColExpr->nExpr>ii );
         pExpr = pIdx->aColExpr->a[ii].pExpr;
+        if( pExpr->op!=TK_COLLATE ){
+          sCol[0].pLeft = pExpr;
+          pExpr = &sCol[0];
+        }
       }else{
+        sCol[0].pLeft = &sCol[1];
         sCol[1].iColumn = pIdx->aiColumn[ii];
-        sCol[0].u.zToken = (char*)pIdx->azColl[ii];
         pExpr = &sCol[0];
       }
       for(jj=0; jj<nn; jj++){