Fix INSERT into STRICT table with STATIC generated columns.

FossilOrigin-Name: 24285d913678853213532d61aba077d576e3cd7629159e0a75dc3c16e54e2662

diff --git a/manifest b/manifest
index c73273e7a12937a058f93fe2b3a534cf9a5c4bc3..22964ef734e90263e25fb4ac8b621bcad80c3b28 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\s--strict\soption\sto\sspeedtest1.c
-D 2021-11-03T12:50:28.461
+C Fix\sINSERT\sinto\sSTRICT\stable\swith\sSTATIC\sgenerated\scolumns.
+D 2021-11-03T14:02:48.852
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -510,7 +510,7 @@ F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
-F src/insert.c 3f2892de7820d8e0b34a90bff8a3e2f879bc528683fa2ebb9e779ae56b64b741
+F src/insert.c 3ed9d945e4773483c7a1e60719b8fffa214bd6833421d0b89a644de146b3e50e
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c e1dcff1c916bf6834e150b492eddda5d9792453182d2ad64294d2266b6e93c4c
 F src/main.c 546dd2418c4f5d59aced76c68e55290735feb420ee305051fbd55ab8fff0d255
@@ -621,7 +621,7 @@ F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c 30df8356e231dad33be10bb27897655002668343280004ba28c734489414a167
 F src/vacuum.c 6c38ddc52f0619865c91dae9c441d4d48bf3040d7dc1bc5b22da1e45547ed0b3
-F src/vdbe.c 54089e5ebb02d35e52d6b3d51061b79b8923c70e839df4ca4ff7bd9bcb9b9708
+F src/vdbe.c 460bed0a86aeee2269c8d8ae06fa26ac71302e0c36acaffddfc3ffd0b2bb489d
 F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
 F src/vdbeInt.h 38206c8dd6b60ff03d9fd4f626b1b4fd0eef7cdc44f2fc2c1973b0f932a3f26b
 F src/vdbeapi.c 7b83468feb1d42a09d4c2e5241a3eaa3d1f138e289a843cba9fd3f1dad95ca67
@@ -1431,7 +1431,7 @@ F test/stat.test 15a3106eddedfc882f64bc09f237b4169be4b92dd57c93031b8ff8b13af3e7c
 F test/statfault.test 55f86055f9cd7b2d962a621b8a04215c1cebd4eaaecde92d279442327fe648a0
 F test/stmt.test 54ed2cc0764bf3e48a058331813c3dbd19fc1d0827c3d8369914a5d8f564ec75
 F test/stmtvtab1.test 6873dfb24f8e79cbb5b799b95c2e4349060eb7a3b811982749a84b359468e2d5
-F test/strict1.test 2e590641b1f26f9ff0db5b785df07f932988af1ab6ccab792b792ebb8405d657
+F test/strict1.test e010d546fbe8a6427ae93179c631bea9a462315b442f6d27b815a150a2393713
 F test/strict2.test b22c7a98b5000aef937f1990776497f0e979b1a23bc4f63e2d53b00e59b20070
 F test/subjournal.test 8d4e2572c0ee9a15549f0d8e40863161295107e52f07a3e8012a2e1fdd093c49
 F test/subquery.test d7268d193dd33d5505df965399d3a594e76ae13f
@@ -1930,7 +1930,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 5dff1f66731ae35daf9633f8bb3ea942a7c29f4240e57bd2023ee7fc116e7c92
-R cb631ce21ad6ea6f60782b792abdd52f
+P a247b5d88c12b1952b656e4f069c9229e0886ba16d7018ddf600e74592224792
+R d7bb2ae8b0f1e80db6e056f5f83d3b71
 U drh
-Z cc83978627ba4f463162248482a485ff
+Z 143c1e571d41c429c49647e6acfdd03c

diff --git a/manifest.uuid b/manifest.uuid
index 2d7f826fa5e1c0d37348982d0f6da9d7750f32d7..c803df41e78801d6891bd0b5551f4e8c123f1695 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a247b5d88c12b1952b656e4f069c9229e0886ba16d7018ddf600e74592224792
\ No newline at end of file
+24285d913678853213532d61aba077d576e3cd7629159e0a75dc3c16e54e2662
\ No newline at end of file

diff --git a/src/insert.c b/src/insert.c
index 400f2caafd5969e7d7d4178ebbac2c90be5da49b..538a33dae1e2ab42041bd74160d419aae562538f 100644 (file)
--- a/src/insert.c
+++ b/src/insert.c
@@ -282,24 +282,32 @@ void sqlite3ComputeGeneratedColumns(
   ** that appropriate affinity has been applied to the regular columns
   */
   sqlite3TableAffinity(pParse->pVdbe, pTab, iRegStore);
-  if( (pTab->tabFlags & TF_HasStored)!=0
-   && (pOp = sqlite3VdbeGetOp(pParse->pVdbe,-1))->opcode==OP_Affinity
-  ){
-    /* Change the OP_Affinity argument to '@' (NONE) for all stored
-    ** columns.  '@' is the no-op affinity and those columns have not
-    ** yet been computed. */
-    int ii, jj;
-    char *zP4 = pOp->p4.z;
-    assert( zP4!=0 );
-    assert( pOp->p4type==P4_DYNAMIC );
-    for(ii=jj=0; zP4[jj]; ii++){
-      if( pTab->aCol[ii].colFlags & COLFLAG_VIRTUAL ){
-        continue;
-      }
-      if( pTab->aCol[ii].colFlags & COLFLAG_STORED ){
-        zP4[jj] = SQLITE_AFF_NONE;
+  if( (pTab->tabFlags & TF_HasStored)!=0 ){
+    pOp = sqlite3VdbeGetOp(pParse->pVdbe,-1);
+    if( pOp->opcode==OP_Affinity ){
+      /* Change the OP_Affinity argument to '@' (NONE) for all stored
+      ** columns.  '@' is the no-op affinity and those columns have not
+      ** yet been computed. */
+      int ii, jj;
+      char *zP4 = pOp->p4.z;
+      assert( zP4!=0 );
+      assert( pOp->p4type==P4_DYNAMIC );
+      assert( (pTab->tabFlags & TF_Strict)==0 );
+      for(ii=jj=0; zP4[jj]; ii++){
+        if( pTab->aCol[ii].colFlags & COLFLAG_VIRTUAL ){
+          continue;
+        }
+        if( pTab->aCol[ii].colFlags & COLFLAG_STORED ){
+          zP4[jj] = SQLITE_AFF_NONE;
+        }
+        jj++;
       }
-      jj++;
+    }else if( pOp->opcode==OP_TypeCheck ){
+      /* If an OP_TypeCheck was generated because the table is STRICT,
+      ** then set the P3 operand to indicate that generated columns should
+      ** not be checked */
+      assert( pTab->tabFlags & TF_Strict );
+      pOp->p3 = 1;
     }
   }
 

diff --git a/src/vdbe.c b/src/vdbe.c
index 2b06eea91efdc7e8df29371459f300edc6c95e28..0798db5efe85d25c542bf5dc1d7351d87eeca770 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -2899,7 +2899,7 @@ op_column_corrupt:
   }
 }
 
-/* Opcode: TypeCheck P1 P2 * P4 *
+/* Opcode: TypeCheck P1 P2 P3 P4 *
 ** Synopsis: typecheck(r[P1@P2])
 **
 ** Apply affinities to the range of P2 registers beginning with P1.
@@ -2910,6 +2910,11 @@ op_column_corrupt:
 ** forces the register type to the Table column type.  This is used
 ** to implement "strict affinity".
 **
+** GENERATED ALWAYS AS ... STATIC columns are only checked if P3
+** is zero.  When P3 is non-zero, no type checking occurs for
+** static generated columns.  Virtual columns are computed at query time
+** and so they are never checked.
+**
 ** Preconditions:
 **
 ** <ul>
@@ -2932,7 +2937,10 @@ case OP_TypeCheck: {
   aCol = pTab->aCol;
   pIn1 = &aMem[pOp->p1];
   for(i=0; i<pTab->nCol; i++){
-    if( aCol[i].colFlags & COLFLAG_VIRTUAL ) continue;
+    if( aCol[i].colFlags & COLFLAG_GENERATED ){
+      if( aCol[i].colFlags & COLFLAG_VIRTUAL ) continue;
+      if( pOp->p3 ){ pIn1++; continue; }
+    }
     assert( pIn1 < &aMem[pOp->p1+pOp->p2] );
     applyAffinity(pIn1, aCol[i].affinity, encoding);
     if( (pIn1->flags & MEM_Null)==0 ){

diff --git a/test/strict1.test b/test/strict1.test
index 606136abe014ab474b987cedcedb8499def605d7..9ba7f7a6d31c2bd90c88abed2c8633b2f8c0592f 100644 (file)
--- a/test/strict1.test
+++ b/test/strict1.test
@@ -116,4 +116,15 @@ do_catchsql_test strict1-6.3 {
   INSERT INTO t1(e) VALUES(x'3456');
 } {1 {cannot store BLOB value in REAL column t1.e}}
 
+do_execsql_test strict1-7.1 {
+  DROP TABLE IF EXISTS t4;
+  CREATE TABLE t4(
+    a INT AS (b*2) VIRTUAL,
+    b INT AS (c*2) STORED,
+    c INT PRIMARY KEY
+  ) STRICT;
+  INSERT INTO t4(c) VALUES(1);
+  SELECT * FROM t4;
+} {4 2 1}
+
 finish_test