Improved VDBE branch coverage in the run-time frame-spec error detection

logic of window functions.

FossilOrigin-Name: f56d305a7bad6608d51d8c8cef417ddb66cff50f0a75d28554ea669e47f3d90d

diff --git a/manifest b/manifest
index d4695bec2a094e8e0bcf27bd795730bf4f6a6a4f..ad30446b14b11ea80157fe805a96266a35e2c800 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\scomments\son\sthe\sVDBE\sbranch\scoverage\stesting\slogic.\s\sFix\sthe\nVDBE\sbranch\scoverage\smeasurement\son\sthe\sOP_MustBeInt\sopcode.
-D 2019-04-01T14:01:21.321
+C Improved\sVDBE\sbranch\scoverage\sin\sthe\srun-time\sframe-spec\serror\sdetection\nlogic\sof\swindow\sfunctions.
+D 2019-04-01T14:30:30.127
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -606,7 +606,7 @@ F src/where.c ff2955dc2743c1af05ba5a8232ab72724d9a63b76dbee256368f40fd3ef82db5
 F src/whereInt.h 5f14db426ca46a83eabab1ae9aa6d4b8f27504ad35b64c290916289b1ddb2e88
 F src/wherecode.c 9572aab9eff42859a5f3e9b212f704521a84bf77e444217f0339d8b811e6333f
 F src/whereexpr.c 90859652920f153d2c03f075488744be2926625ebd36911bcbcb17d0d29c891c
-F src/window.c bd1e1c2674546d0a61c04895352b2651756136757c2c399bd11b6cc609416e0d
+F src/window.c 76a3a9bea5e1b6823fdcab93601fdb5ec8ccb619cbf3142b9d67a8e3a262dff1
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
 F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
@@ -1814,7 +1814,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 1fcf3307d37f0e8e0c8c54491c609b73c7add6eaa38409a41c7cd6614a877a19
-R 548d264b85d1f84e31c647fc92a651ab
+P 8681750e855a020ee374cb9f973f701a72068e33f97d0101a4fab3a228e5ebda
+R d88739e3fc7524dd1061128e4965a1fa
 U drh
-Z 3917bade205e6ba6a19fe2a0919e61ee
+Z 0bbe78fa3e82a47d788c8c31972dadc2

diff --git a/manifest.uuid b/manifest.uuid
index c728b670fa01c1ba4f2353c8852f4b7f3d32e33d..6a58a8dca1e078e450eec2c14c8c2fd43726a708 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8681750e855a020ee374cb9f973f701a72068e33f97d0101a4fab3a228e5ebda
\ No newline at end of file
+f56d305a7bad6608d51d8c8cef417ddb66cff50f0a75d28554ea669e47f3d90d
\ No newline at end of file

diff --git a/src/window.c b/src/window.c
index b766956f9c522844054411cfec364d8afc2ddafb..87dfac7470a8b6da0a03f4b202a8e8faffda9a0e 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -1309,7 +1309,7 @@ static void windowCheckValue(Parse *pParse, int reg, int eCond){
     int regString = sqlite3GetTempReg(pParse);
     sqlite3VdbeAddOp4(v, OP_String8, 0, regString, 0, "", P4_STATIC);
     sqlite3VdbeAddOp3(v, OP_Ge, regString, sqlite3VdbeCurrentAddr(v)+2, reg);
-    sqlite3VdbeChangeP5(v, SQLITE_AFF_NUMERIC);
+    sqlite3VdbeChangeP5(v, SQLITE_AFF_NUMERIC|SQLITE_JUMPIFNULL);
     VdbeCoverage(v);
     assert( eCond==3 || eCond==4 );
     VdbeCoverageIf(v, eCond==3);
@@ -1323,11 +1323,11 @@ static void windowCheckValue(Parse *pParse, int reg, int eCond){
     VdbeCoverageIf(v, eCond==2);
   }
   sqlite3VdbeAddOp3(v, aOp[eCond], regZero, sqlite3VdbeCurrentAddr(v)+2, reg);
-  VdbeCoverageIf(v, eCond==0);
-  VdbeCoverageIf(v, eCond==1);
-  VdbeCoverageIf(v, eCond==2);
-  VdbeCoverageIf(v, eCond==3);
-  VdbeCoverageIf(v, eCond==4);
+  VdbeCoverageNeverNullIf(v, eCond==0); /* NULL case captured by */
+  VdbeCoverageNeverNullIf(v, eCond==1); /*   the OP_MustBeInt */
+  VdbeCoverageNeverNullIf(v, eCond==2);
+  VdbeCoverageNeverNullIf(v, eCond==3); /* NULL case caught by */
+  VdbeCoverageNeverNullIf(v, eCond==4); /*   the OP_Ge */
   sqlite3MayAbort(pParse);
   sqlite3VdbeAddOp2(v, OP_Halt, SQLITE_ERROR, OE_Abort);
   sqlite3VdbeAppendP4(v, (void*)azErr[eCond], P4_STATIC);