Add the --upsert option to the wordcount test program.

FossilOrigin-Name: ee1e750baaf4c66b4e1f103d8b80362f57e711ac601e57f99ed6a33913f443d2

diff --git a/manifest b/manifest
index b8e2136f185c67f28b46ecd59d4ddec72c1b8e82..29b30fa9f7f82f14333a437a1972492ea5f019dd 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sext/misc/tmeplatevtab.c\stemplate\sfor\svirtual\stables.\s\sThis\sis\sa\nwork-in-progress\sas\sit\sstill\sneeds\simprovements\sto\sthe\scomments\sin\sorder\sto\nbe\suseful\sas\sa\stemplate.
-D 2018-04-19T16:14:59.612
+C Add\sthe\s--upsert\soption\sto\sthe\swordcount\stest\sprogram.
+D 2018-04-19T16:52:37.885
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 5ce9343cba9c189046f1afe6d2bcc1f68079439febc05267b98aec6ecc752439
@@ -1619,7 +1619,7 @@ F test/without_rowid3.test 2724c787a51a5dce09d078453a758117b4b728f1
 F test/without_rowid4.test 4e08bcbaee0399f35d58b5581881e7a6243d458a
 F test/without_rowid5.test 89b1c587bd92a0590e440da33e7666bf4891572a
 F test/without_rowid6.test 1f99644e6508447fb050f73697350c7ceca3392e
-F test/wordcount.c cb589cec469a1d90add05b1f8cee75c7210338d87a5afd65260ed5c0f4bbf8ac
+F test/wordcount.c d721a4b6fae93e6e33449700bce1686bc23257c27425bc3ef1599dc912adec66
 F test/writecrash.test f1da7f7adfe8d7f09ea79b42e5ca6dcc41102f27f8e334ad71539501ddd910cc
 F test/zeroblob.test 3857870fe681b8185654414a9bccfde80b62a0fa
 F test/zerodamage.test 9c41628db7e8d9e8a0181e59ea5f189df311a9f6ce99cc376dc461f66db6f8dc
@@ -1724,7 +1724,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 b6d5ea59fe83716f464e408b7eef0310c6d30b3493e3f966362db2e30b36e821
-R 4146a3c1f6cf5cee510b4dc0190bc8f5
+P 22358fb5495c727a4dde129128fe409a7b929a5ffa143b1e2879f84d7680ec3c
+R a7b654c566d8bf5093f4f641ac4c2186
 U drh
-Z 44dfccccf923e5b7ed9b322a17bb80ee
+Z 0b3b7a1ecad6bb8c912a235e1f89d43e

diff --git a/manifest.uuid b/manifest.uuid
index cbded7db7d997758f6db71e1fe92a94a78eaaa14..1a7f43a8b287b2002e97809586bcebd357e3d330 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-22358fb5495c727a4dde129128fe409a7b929a5ffa143b1e2879f84d7680ec3c
\ No newline at end of file
+ee1e750baaf4c66b4e1f103d8b80362f57e711ac601e57f99ed6a33913f443d2
\ No newline at end of file

diff --git a/test/wordcount.c b/test/wordcount.c
index 27aed724603a4595d73a398730d050cb53b26205..4a21d25ddd6b535d733055e382bc2d83543fde73 100644 (file)
--- a/test/wordcount.c
+++ b/test/wordcount.c
@@ -28,6 +28,10 @@
 **    (1) REPLACE INTO wordcount
 **        VALUES($new,ifnull((SELECT cnt FROM wordcount WHERE word=$new),0)+1);
 **
+** Upsert mode means:
+**    (1) INSERT INTO wordcount VALUES($new,1)
+**            ON CONFLICT(word) DO UPDATE SET cnt=cnt+1
+**
 ** Select mode means:
 **    (1) SELECT 1 FROM wordcount WHERE word=$new
 **    (2) INSERT INTO wordcount VALUES($new,1) -- if (1) returns nothing
@@ -90,6 +94,7 @@ const char zHelp[] =
 " --timer              Time the operation of this program\n"
 " --trace              Enable sqlite3_trace() output.\n"
 " --update             Use UPDATE mode\n"
+" --upsert             Use UPSERT mode\n"
 " --without-rowid      Use a WITHOUT ROWID table to store the words.\n"
 ;
 
@@ -208,17 +213,19 @@ static void checksumFinalize(sqlite3_context *context){
 /* Define operating modes */
 #define MODE_INSERT     0
 #define MODE_REPLACE    1
-#define MODE_SELECT     2
-#define MODE_UPDATE     3
-#define MODE_DELETE     4
-#define MODE_QUERY      5
-#define MODE_COUNT      6
+#define MODE_UPSERT     2
+#define MODE_SELECT     3
+#define MODE_UPDATE     4
+#define MODE_DELETE     5
+#define MODE_QUERY      6
+#define MODE_COUNT      7
 #define MODE_ALL      (-1)
 
 /* Mode names */
 static const char *azMode[] = {
   "--insert",
   "--replace",
+  "--upsert",
   "--select",
   "--update",
   "--delete",
@@ -292,6 +299,8 @@ int main(int argc, char **argv){
         useWithoutRowid = 1;
       }else if( strcmp(z,"replace")==0 ){
         iMode = MODE_REPLACE;
+      }else if( strcmp(z,"upsert")==0 ){
+        iMode = MODE_UPSERT;
       }else if( strcmp(z,"select")==0 ){
         iMode = MODE_SELECT;
       }else if( strcmp(z,"insert")==0 ){
@@ -467,6 +476,14 @@ int main(int argc, char **argv){
       if( rc ) fatal_error("Could not prepare the REPLACE statement: %s\n",
                             sqlite3_errmsg(db));
     }
+    if( iMode2==MODE_UPSERT ){
+      rc = sqlite3_prepare_v2(db,
+          "INSERT INTO wordcount(word,cnt) VALUES(?1,1) "
+          "ON CONFLICT(word) DO UPDATE SET cnt=cnt+1",
+          -1, &pInsert, 0);
+      if( rc ) fatal_error("Could not prepare the UPSERT statement: %s\n",
+                            sqlite3_errmsg(db));
+    }
     if( iMode2==MODE_DELETE ){
       rc = sqlite3_prepare_v2(db,
             "DELETE FROM wordcount WHERE word=?1",