Remove code from the constraint checker that generates virtual column values

with the incorrect time.  Turns out the the regular code for all other
columns works correctly and so the incorrect special-case code is not
actually needed.  Fix for ticket [3ea175512444b0d1].

FossilOrigin-Name: 5b4c0f2ddc6f324e23bbde0ee3d1ab672cfe8ab5044c9b693f4c33cdd75c211e

diff --git a/manifest b/manifest
index c4de10d00052b53ea90124542532bc9d795d633c..2405222cbef0d083955a31427db13d395da25459 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sredundant\scode\sresulting\sfrom\sa\smerge\serror\son\sthe\sprevious\scheck-in.
-D 2019-10-26T18:56:12.322
+C Remove\scode\sfrom\sthe\sconstraint\schecker\sthat\sgenerates\svirtual\scolumn\svalues\nwith\sthe\sincorrect\stime.\s\sTurns\sout\sthe\sthe\sregular\scode\sfor\sall\sother\ncolumns\sworks\scorrectly\sand\sso\sthe\sincorrect\sspecial-case\scode\sis\snot\nactually\sneeded.\s\sFix\sfor\sticket\s[3ea175512444b0d1].
+D 2019-10-26T23:51:44.685
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -487,7 +487,7 @@ F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
 F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
 F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
-F src/insert.c 00f36e4061c4e85ff63ba3dc3ccffe6a53ab4013f090d64061584f414dbf9efe
+F src/insert.c dfb4a734327097ee8e61c2668227e6dc57b35018a24da07d2c19efef573a4b80
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 4ddc65ae13c0d93db0ceedc8b14a28c8c260513448b0eb8c5a2ac375e3b6a85d
 F src/main.c 3e01f6a1c96643381b5f9d79e4ff7f2520bc5712197746fb0852283e78cccf66
@@ -1848,7 +1848,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 b855acf1831943b3914491ed0bc333131321930cab480a5281012a3aebbba492
-R 0a3a520f870448808e97b5392bf1f816
+P 713fe86b8c9f3c9ef8af952019e99ba2f4741326226264de6a66baaeb1803d2a
+R 911d1cba6780e60660279f15cc5e6d6a
 U drh
-Z ae64f236a7851596712eed7ea9b59b3e
+Z 9d034d9c80d0c7936d2ef22f3b68e349

diff --git a/manifest.uuid b/manifest.uuid
index 690740748c4b8ed037001062d2cea1df85aada59..3df7283d095a13fdb02fdce8be7b421f6d51b69c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-713fe86b8c9f3c9ef8af952019e99ba2f4741326226264de6a66baaeb1803d2a
\ No newline at end of file
+5b4c0f2ddc6f324e23bbde0ee3d1ab672cfe8ab5044c9b693f4c33cdd75c211e
\ No newline at end of file

diff --git a/src/insert.c b/src/insert.c
index 806e285131bcb1d027ee38a52326b2f537c5a36e..8d53bafe7262df8bb1cb7c2586b5246a71bb7934 100644 (file)
--- a/src/insert.c
+++ b/src/insert.c
@@ -1862,13 +1862,6 @@ void sqlite3GenerateConstraintChecks(
         x = regNewData;
         sqlite3VdbeAddOp2(v, OP_IntCopy, x, regIdx+i);
         VdbeComment((v, "rowid"));
-#ifndef SQLITE_OMIT_GENERATED_COLUMNS
-      }else if( pTab->aCol[iField].colFlags & COLFLAG_VIRTUAL ){
-        pParse->iSelfTab = -(regNewData+1);
-        sqlite3ExprCodeCopy(pParse, pTab->aCol[iField].pDflt, regIdx+i);
-        pParse->iSelfTab = 0;
-        VdbeComment((v, "%s column %d", pIdx->zName, i));
-#endif
       }else{
         testcase( sqlite3TableColumnToStorage(pTab, iField)!=iField );
         x = sqlite3TableColumnToStorage(pTab, iField) + regNewData + 1;