INSERT with named columns for a table with generated columns.

FossilOrigin-Name: 64db39f92d68d1b9f23e48af35e16b969c38b58041fbe900066eeb3ddb291cef

diff --git a/manifest b/manifest
index 991a0bbbfff160ec59f00d1c6ab72efaa3f40fb6..45942a0a1ad9bef438293fab6088d884ca08389e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C ALTER\sTABLE\sis\sable\sto\sadd\sa\sVIRTUAL\scolumn.
-D 2019-10-16T20:05:56.905
+C INSERT\swith\snamed\scolumns\sfor\sa\stable\swith\sgenerated\scolumns.
+D 2019-10-16T22:01:56.225
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -477,7 +477,7 @@ F src/date.c e1d8ac7102f3f283e63e13867acb0efa33861cf34f0faf4cdbaf9fa7a1eb7041
 F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7
 F src/dbstat.c c12833de69cb655751487d2c5a59607e36be1c58ba1f4bd536609909ad47b319
 F src/delete.c fd10ac325c73bdf4d558530745d70df01fe6f7a0763553045adf42a62c303dc9
-F src/expr.c 5f2e2678c17325d41fbcb0e76c40d50f4ac5ddbd57bf6a6e62d7db2e5f899654
+F src/expr.c 61d9043b1b9b82d72c919bcf5801a885a0ee7e41bf3e5ce3021b206a5706a949
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 6271fda51794b569d736eba4097d28f13080cd0c9eb66d5fcecb4b77336fae50
 F src/func.c ed33e38cd642058182a31a3f518f2e34f4bbe53aa483335705c153c4d3e50b12
@@ -486,7 +486,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 c54ef99a0c47788a3cf2ace9ef9717b137484569e4c04bd940fc5222a6b3c209
+F src/insert.c 9dabd02b24946f4c38ae7ef566d65abc16476f9d26b3a630261f91e09c726722
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 4ddc65ae13c0d93db0ceedc8b14a28c8c260513448b0eb8c5a2ac375e3b6a85d
 F src/main.c 3e01f6a1c96643381b5f9d79e4ff7f2520bc5712197746fb0852283e78cccf66
@@ -530,7 +530,7 @@ F src/shell.c.in d70bcf630c4073eaa994fa74be98886c781918e794cb8b562be8df10f018e27
 F src/sqlite.h.in 5725a6b20190a1e8d662077a1c1c8ea889ad7be90dd803f914c2de226f5fe6ab
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h cef696ce3293242c67b2339763608427bf72ee66f1f3a05389ac2a7b46001c31
-F src/sqliteInt.h 6418b27039289b0274077c0f4f54b82c3150881b64dddb7d128786b55ec09920
+F src/sqliteInt.h ecade7aec917068cbbc96505eed645419e07799d91052926d418dd256d60b72d
 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
 F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@ -1847,7 +1847,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 7f9f90b1b885fa9905b296f2e0fcc9b2341019b42fc839722a93cf60e49a9252
-R 8a88337d2c1f89903f9ecf943d42ac46
+P 120c6b78cb51532f783014605f1107d40b2e4f54e3852fb1f8f167d0c0b78c69
+R 69bb3625e06cb31ab7b6bfff123323c6
 U drh
-Z e34cdc64b33126ce9923adb3fcc6f90a
+Z 504e145f33a96cfe775ae86c4e357f58

diff --git a/manifest.uuid b/manifest.uuid
index 3dd4dbb53487700b65cfa86d02328cd22db25741..927a0182f267cf058d32438eb4ea1d60df373cff 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-120c6b78cb51532f783014605f1107d40b2e4f54e3852fb1f8f167d0c0b78c69
\ No newline at end of file
+64db39f92d68d1b9f23e48af35e16b969c38b58041fbe900066eeb3ddb291cef
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index e02e146582126c43b272677b1162861ef94a52da..c21006b1158a5b69e03d83c720a52ffb9f8d29df 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -3381,6 +3381,7 @@ void sqlite3ExprCodeGetColumnOfTable(
   int regOut      /* Extract the value into this register */
 ){
   Vdbe *v = pParse->pVdbe;
+  Column *pCol;
   assert( v!=0 );
   if( pTab==0 ){
     sqlite3VdbeAddOp3(v, OP_Column, iTabCur, iCol, regOut);
@@ -3395,11 +3396,17 @@ void sqlite3ExprCodeGetColumnOfTable(
       op = OP_VColumn;
       x = iCol;
 #ifndef SQLITE_OMIT_GENERATED_COLUMNS
-    }else if( pTab->aCol[iCol].colFlags & COLFLAG_VIRTUAL ){
-      int savedSelfTab = pParse->iSelfTab;
-      pParse->iSelfTab = iTabCur+1;
-      sqlite3ExprCode(pParse, pTab->aCol[iCol].pDflt, regOut);
-      pParse->iSelfTab = savedSelfTab;
+    }else if( (pCol = &pTab->aCol[iCol])->colFlags & COLFLAG_VIRTUAL ){
+      if( pCol->colFlags & COLFLAG_BUSY ){
+        sqlite3ErrorMsg(pParse, "generated column loop on \"%s\"", pCol->zName);
+      }else{
+        int savedSelfTab = pParse->iSelfTab;
+        pCol->colFlags |= COLFLAG_BUSY;
+        pParse->iSelfTab = iTabCur+1;
+        sqlite3ExprCode(pParse, pTab->aCol[iCol].pDflt, regOut);
+        pParse->iSelfTab = savedSelfTab;
+        pCol->colFlags &= ~COLFLAG_BUSY;
+      }
       return;
 #endif
     }else if( !HasRowid(pTab) ){

diff --git a/src/insert.c b/src/insert.c
index 22c48d7f3c8af0489f0e2dacfb1be6430d132575..20b5d9a91cae4c516c2fa814fcd049b77b8385a1 100644 (file)
--- a/src/insert.c
+++ b/src/insert.c
@@ -130,7 +130,7 @@ const char *sqlite3IndexAffinityStr(sqlite3 *db, Index *pIdx){
 **  'E'            REAL
 */
 void sqlite3TableAffinity(Vdbe *v, Table *pTab, int iReg){
-  int i;
+  int i, j;
   char *zColAff = pTab->zColAff;
   if( zColAff==0 ){
     sqlite3 *db = sqlite3VdbeDb(v);
@@ -140,13 +140,15 @@ void sqlite3TableAffinity(Vdbe *v, Table *pTab, int iReg){
       return;
     }
 
-    for(i=0; i<pTab->nCol; i++){
+    for(i=j=0; i<pTab->nCol; i++){
       assert( pTab->aCol[i].affinity!=0 );
-      zColAff[i] = pTab->aCol[i].affinity;
+      if( (pTab->aCol[i].colFlags & COLFLAG_VIRTUAL)==0 ){
+        zColAff[j++] = pTab->aCol[i].affinity;
+      }
     }
     do{
-      zColAff[i--] = 0;
-    }while( i>=0 && zColAff[i]<=SQLITE_AFF_BLOB );
+      zColAff[j--] = 0;
+    }while( j>=0 && zColAff[j]<=SQLITE_AFF_BLOB );
     pTab->zColAff = zColAff;
   }
   assert( zColAff!=0 );
@@ -1006,6 +1008,9 @@ void sqlite3Insert(
     nHidden = 0;
     iRegStore = regRowid+1;
     for(i=0; i<pTab->nCol; i++, iRegStore++){
+      int k;
+      assert( i>=nHidden );
+      assert( iRegStore==sqlite3ColumnOfTable(pTab,i)+regRowid+1 );
       if( i==pTab->iPKey ){
         /* The value of the INTEGER PRIMARY KEY column is always a NULL.
         ** Whenever this column is read, the rowid will be substituted
@@ -1015,32 +1020,41 @@ void sqlite3Insert(
         sqlite3VdbeAddOp1(v, OP_SoftNull, iRegStore);
         continue;
       }
-      if( pColumn==0 ){
-        if( pTab->aCol[i].colFlags & COLFLAG_NOINSERT ){
-          j = -1;
-          nHidden++;
-          if( pTab->aCol[i].colFlags & COLFLAG_VIRTUAL ){
-            iRegStore--;
-            continue;
-          }
+      if( pTab->aCol[i].colFlags & COLFLAG_NOINSERT ){
+        nHidden++;
+        if( pTab->aCol[i].colFlags & COLFLAG_VIRTUAL ){
+          /* Virtual columns are no stored */
+          iRegStore--;
         }else{
-          j = i - nHidden;
-        }
-      }else{
-        for(j=0; j<pColumn->nId; j++){
-          if( pColumn->a[j].idx==i ) break;
+          /* Hidden and stored columns get the default value */
+          sqlite3ExprCodeFactorable(pParse, pTab->aCol[i].pDflt, iRegStore);
         }
+        continue;
       }
-      if( j<0 || nColumn==0 || (pColumn && j>=pColumn->nId) ){
+      if( pColumn ){
+        for(j=0; j<pColumn->nId && pColumn->a[j].idx!=i; j++){}
+        if( j>=pColumn->nId ){
+          /* A column not named in the insert column list gets its
+          ** default value */
+          sqlite3ExprCodeFactorable(pParse, pTab->aCol[i].pDflt, iRegStore);
+          continue;
+        }
+        k = j;
+      }else if( nColumn==0 ){
         sqlite3ExprCodeFactorable(pParse, pTab->aCol[i].pDflt, iRegStore);
-      }else if( useTempTable ){
-        sqlite3VdbeAddOp3(v, OP_Column, srcTab, j, iRegStore); 
+        continue;
+      }else{
+        k = i - nHidden;
+      }
+
+      if( useTempTable ){
+        sqlite3VdbeAddOp3(v, OP_Column, srcTab, k, iRegStore); 
       }else if( pSelect ){
         if( regFromSelect!=regData ){
-          sqlite3VdbeAddOp2(v, OP_SCopy, regFromSelect+j, iRegStore);
+          sqlite3VdbeAddOp2(v, OP_SCopy, regFromSelect+k, iRegStore);
         }
       }else{
-        sqlite3ExprCode(pParse, pList->a[j].pExpr, iRegStore);
+        sqlite3ExprCode(pParse, pList->a[k].pExpr, iRegStore);
       }
     }
 

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index eb815a79e0eddfcf445eefd5d7141dc6fc31bf03..8455155ae03a26350933b5c05d64b2c0b2e6dd4b 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -1840,6 +1840,7 @@ struct Column {
 #define COLFLAG_SORTERREF 0x0010   /* Use sorter-refs with this column */
 #define COLFLAG_VIRTUAL   0x0020   /* GENERATED ALWAYS AS ... VIRTUAL */
 #define COLFLAG_STORED    0x0040   /* GENERATED ALWAYS AS ... STORED */
+#define COLFLAG_BUSY      0x0080   /* Blocks recursion on VIRTUAL columns */
 #define COLFLAG_GENERATED 0x0060   /* Combo: _STORED, _VIRTUAL */
 #define COLFLAG_NOINSERT  0x0062   /* Combo: _HIDDEN, _STORED, _VIRTUAL */