Simple INSERT and SELECT operations working with VIRTUAL columns.

FossilOrigin-Name: 7f9f90b1b885fa9905b296f2e0fcc9b2341019b42fc839722a93cf60e49a9252

diff --git a/manifest b/manifest
index d7670f50bb67a24330b01b6b99901f37894d33a2..f1dc653477a8d5acb72033fcdccfec59162b0001 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Initial\sexperimental\scode\sfor\sgenerated\scolumn\ssupport.\s\sNon-functional.
-D 2019-10-16T12:18:59.297
+C Simple\sINSERT\sand\sSELECT\soperations\sworking\swith\sVIRTUAL\scolumns.
+D 2019-10-16T19:31:46.693
 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 6c2b2dc1d7eb9af9920e9f0a51f0fcc5f6bf0166ea88caa32175f3543f2290f1
+F src/expr.c 5f2e2678c17325d41fbcb0e76c40d50f4ac5ddbd57bf6a6e62d7db2e5f899654
 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 40557ebd69f4115e7a273f9304a8ab637a47ce44f3c6923396928f023967b5e8
+F src/insert.c de9dea8081c500156d8c2e0079a123d56ef736d283ec7806f401886dd55c5ab7
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 4ddc65ae13c0d93db0ceedc8b14a28c8c260513448b0eb8c5a2ac375e3b6a85d
 F src/main.c 3e01f6a1c96643381b5f9d79e4ff7f2520bc5712197746fb0852283e78cccf66
@@ -514,11 +514,11 @@ F src/os_win.c 035a813cbd17f355bdcad7ab894af214a9c13a1db8aeac902365350b98cd45a7
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 422fd8cfa59fb9173eff36a95878904a0eeb0dcc62ba49350acc8b1e51c4dc7b
 F src/pager.h 217921e81eb5fe455caa5cda96061959706bcdd29ddb57166198645ef7822ac3
-F src/parse.y 516984fb37a025a2034456924f9e395b12162026c84f81e13270acab519f49e4
+F src/parse.y bc453ce808316facd191413bfa4ec6730a1d693b98fd8be5addef8fbfd62bb7b
 F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177
 F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
 F src/pcache1.c 62714cbd1b7299a6e6a27a587b66b4fd3a836a84e1181e7f96f5c34a50917848
-F src/pragma.c 941aad9029be6fc71fb3dd58db122710d3f8da0ee48bf2b3350364694d000c98
+F src/pragma.c a9511633bc0ee6c67b9ed244d7b1c0770c71e5211d94c8c97d631974166d59b4
 F src/pragma.h 40962d65b645bb3f08c1f4c456effd01c6e7f073f68ea25177e0c95e181cff75
 F src/prepare.c 6049beb71385f017af6fc320d2c75a4e50b75e280c54232442b785fbb83df057
 F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
@@ -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 dcef2c667f65742385e13847823b298fc75a8980ca572ed2bf0ff15b68a4ea32
+F src/sqliteInt.h 47d43085f2165aa4ddb87f8a0341937104dfd94bcce0445d296eac8e59ab25e2
 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
 F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@ -1847,10 +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 7248e3476511ecd317f54edcfe1e87443bfdcc1b10c89c7734eefcabafec6c0b
-R 3d12505eaf33c3dd163aeb1612c4c830
-T *branch * generated-columns
-T *sym-generated-columns *
-T -sym-trunk *
+P 11d472c1df707b8d03ec57d8fc582a34f5eb89a9d02a154a9871650c65065b45
+R 899dceb15c24c2e2f3f3f41aea0d96fa
 U drh
-Z 84f42f4fd8439ebec34b72547b3c2d42
+Z 2fd76d80cb2634f812acd88fb56b891f

diff --git a/manifest.uuid b/manifest.uuid
index cd38124276e385fb0296c3c383d9b0434897b9ec..43616447f968281fd1e05c406212b0535e4e8c36 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-11d472c1df707b8d03ec57d8fc582a34f5eb89a9d02a154a9871650c65065b45
\ No newline at end of file
+7f9f90b1b885fa9905b296f2e0fcc9b2341019b42fc839722a93cf60e49a9252
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index fea7b0a18bbc30a55cec45d71a59bee6a477c195..e02e146582126c43b272677b1162861ef94a52da 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -3398,7 +3398,7 @@ void sqlite3ExprCodeGetColumnOfTable(
     }else if( pTab->aCol[iCol].colFlags & COLFLAG_VIRTUAL ){
       int savedSelfTab = pParse->iSelfTab;
       pParse->iSelfTab = iTabCur+1;
-      sqlite3ExprCode(pParse, pTab->aCol[iCol].pDflt, iCol);
+      sqlite3ExprCode(pParse, pTab->aCol[iCol].pDflt, regOut);
       pParse->iSelfTab = savedSelfTab;
       return;
 #endif

diff --git a/src/insert.c b/src/insert.c
index d9078b89dba00957d2a42238ecfebc76ca30fcf1..f2ed9d9a323f9d95acb1e7af6f061065fbd511f2 100644 (file)
--- a/src/insert.c
+++ b/src/insert.c
@@ -37,7 +37,8 @@ void sqlite3OpenTable(
   sqlite3TableLock(pParse, iDb, pTab->tnum, 
                    (opcode==OP_OpenWrite)?1:0, pTab->zName);
   if( HasRowid(pTab) ){
-    sqlite3VdbeAddOp4Int(v, opcode, iCur, pTab->tnum, iDb, pTab->nCol);
+    sqlite3VdbeAddOp4Int(v, opcode, iCur, pTab->tnum, iDb,
+                         pTab->nCol - pTab->nVCol);
     VdbeComment((v, "%s", pTab->zName));
   }else{
     Index *pPk = sqlite3PrimaryKeyIndex(pTab);
@@ -673,6 +674,14 @@ void sqlite3Insert(
           if( j==pTab->iPKey ){
             ipkColumn = i;  assert( !withoutRowid );
           }
+#ifndef SQLITE_OMIT_GENERATED_COLUMNS
+          if( pTab->aCol[j].colFlags & (COLFLAG_STORED|COLFLAG_VIRTUAL) ){
+            sqlite3ErrorMsg(pParse, 
+               "cannot INSERT into generated column \"%s\"",
+               pTab->aCol[j].zName);
+            goto insert_cleanup;
+          }
+#endif
           break;
         }
       }
@@ -788,7 +797,7 @@ void sqlite3Insert(
   ** of columns to be inserted into the table.
   */
   for(i=0; i<pTab->nCol; i++){
-    nHidden += (IsHiddenColumn(&pTab->aCol[i]) ? 1 : 0);
+    if( pTab->aCol[i].colFlags & COLFLAG_NOINSERT ) nHidden++;
   }
   if( pColumn==0 && nColumn && nColumn!=(pTab->nCol-nHidden) ){
     sqlite3ErrorMsg(pParse, 
@@ -1006,9 +1015,12 @@ void sqlite3Insert(
         continue;
       }
       if( pColumn==0 ){
-        if( IsHiddenColumn(&pTab->aCol[i]) ){
+        if( pTab->aCol[i].colFlags & COLFLAG_NOINSERT ){
           j = -1;
           nHidden++;
+          if( pTab->aCol[i].colFlags & COLFLAG_VIRTUAL ){
+            continue;
+          }
         }else{
           j = i - nHidden;
         }
@@ -1862,7 +1874,8 @@ void sqlite3GenerateConstraintChecks(
   /* Generate the table record */
   if( HasRowid(pTab) ){
     int regRec = aRegIdx[ix];
-    sqlite3VdbeAddOp3(v, OP_MakeRecord, regNewData+1, pTab->nCol, regRec);
+    sqlite3VdbeAddOp3(v, OP_MakeRecord, regNewData+1,
+                      pTab->nCol-pTab->nVCol, regRec);
     sqlite3SetMakeRecordP5(v, pTab);
     if( !bAffinityDone ){
       sqlite3TableAffinity(v, pTab, 0);

diff --git a/src/parse.y b/src/parse.y
index 028a8c77dd1b790cfd3a761d76ed5faaf4aa7dac..b38304aa7c568dda559f041f0042e95e53f7d965 100644 (file)
--- a/src/parse.y
+++ b/src/parse.y
@@ -349,10 +349,8 @@ ccons ::= defer_subclause(D).    {sqlite3DeferForeignKey(pParse,D);}
 ccons ::= COLLATE ids(C).        {sqlite3AddCollateType(pParse, &C);}
 ccons ::= GENERATED ALWAYS AS generated.
 ccons ::= AS generated.
-generated ::= LP expr(E) RP.
-     {sqlite3AddGenerated(pParse,E,0);}
-generated ::= LP expr(E) RP ID(TYPE).
-     {sqlite3AddGenerated(pParse,E,&TYPE);}
+generated ::= LP expr(E) RP.          {sqlite3AddGenerated(pParse,E,0);}
+generated ::= LP expr(E) RP ID(TYPE). {sqlite3AddGenerated(pParse,E,&TYPE);}
 
 // The optional AUTOINCREMENT keyword
 %type autoinc {int}

diff --git a/src/pragma.c b/src/pragma.c
index 4c715019e723f1285cb0b069801a3b5a4d4fb220..652810eae229deef25a473062b0f992f734d3c19 100644 (file)
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -1577,7 +1577,7 @@ void sqlite3Pragma(
         loopTop = sqlite3VdbeAddOp2(v, OP_AddImm, 7, 1);
         if( !isQuick ){
           /* Sanity check on record header decoding */
-          sqlite3VdbeAddOp3(v, OP_Column, iDataCur, pTab->nCol-1, 3);
+          sqlite3VdbeAddOp3(v, OP_Column, iDataCur, pTab->nCol-pTab->nVCol-1,3);
           sqlite3VdbeChangeP5(v, OPFLAG_TYPEOFARG);
         }
         /* Verify that all NOT NULL columns really are NOT NULL */

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index e16a5066c94d4164ecedc3328150b927ed96a8b2..94d7107a08289d6dacb9da7f134b2b288a649c8c 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_NOINSERT  0x0062   /* Combo: _HIDDEN, _STORED, _VIRTUAL */
 
 /*
 ** A "Collating Sequence" is defined by an instance of the following