Take the declared column time into account when computing the values for

generated columns, and apply appropriate affinity.

FossilOrigin-Name: 9e04ba22dfce3998e61331ac229ff543ecccc590284c9dd5def21efbe594fba0

diff --git a/manifest b/manifest
index 69998370160e73d52986f03c1f8729640a037dac..da5bf8a3de071a3c65a80bf5068a92f5ec270c77 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sthe\srow-value\sfix\sfrom\strunk.
-D 2019-10-22T20:16:04.350
+C Take\sthe\sdeclared\scolumn\stime\sinto\saccount\swhen\scomputing\sthe\svalues\sfor\ngenerated\scolumns,\sand\sapply\sappropriate\saffinity.
+D 2019-10-22T21:01:34.082
 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 d08c9e01a2664afd12edcfa3a9c6578517e8ff8735f35509582693adbe0edeaf
-F src/expr.c 738bcc441279eead08581ee8ee37d0dd56ded11361585b20b0af470c7c785291
+F src/expr.c bf20202a8db15eda35f160df741805509be8c1e5e3258e4770e48db6e27d7994
 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 760925fe9b4796e968bb9cd11426a3b9f6cc2c35b7b7acc5f25bcc84b73fb5a8
+F src/insert.c 7ab2c74825809a7e3cb1fa5b480d052c96c939dafb449713a7a9da0d949447af
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 4ddc65ae13c0d93db0ceedc8b14a28c8c260513448b0eb8c5a2ac375e3b6a85d
 F src/main.c 3e01f6a1c96643381b5f9d79e4ff7f2520bc5712197746fb0852283e78cccf66
@@ -530,7 +530,7 @@ F src/shell.c.in 3093bdf5eedd91da08f0268f1442aa510a60798c9441868149ddbecdf8bcaa7
 F src/sqlite.h.in 5725a6b20190a1e8d662077a1c1c8ea889ad7be90dd803f914c2de226f5fe6ab
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h cef696ce3293242c67b2339763608427bf72ee66f1f3a05389ac2a7b46001c31
-F src/sqliteInt.h ca968d2d348b7aa4cef7a16fdb7738c15834318e5bd9eca8a49388f48f0695a8
+F src/sqliteInt.h f8609e5a04eec2e89f35520b31c0b506ef905a3485f09b4dc4e20583743cee31
 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 1a54743a3d327efc8ecc45b9fde91ddfea3fca36408f9b753453c31f2e4cc69c 5c118617cf08e17a6edfdfba86e3fc49132a780990b68b52724c2aaeac85f506
-R 61ca5ca7599f2be6c4e9cd152abdc4cf
+P 1fbd7438611174aa594485241c8cc2f4ea6d09c57ef2fc16c8995e8061fdfdd6
+R fea3b2f358faeafe90a4680ffb2fd073
 U drh
-Z c94abd09133b87123ef5ae9e8b7dbfb2
+Z e96baec64b302955260568266fc4d764

diff --git a/manifest.uuid b/manifest.uuid
index c432a3e36c670afb53a7befa462269e2d79cd20c..5810853df277fe3c2f8f4545eb3236992b850332 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1fbd7438611174aa594485241c8cc2f4ea6d09c57ef2fc16c8995e8061fdfdd6
\ No newline at end of file
+9e04ba22dfce3998e61331ac229ff543ecccc590284c9dd5def21efbe594fba0
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 04dbd28798b8c9cf11f15181389bb5e19541767e..0eb7af7f403c790675385ea5cf2296603425a778 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -3395,6 +3395,24 @@ void sqlite3ExprCodeLoadIndexColumn(
   }
 }
 
+#ifndef SQLITE_OMIT_GENERATED_COLUMNS
+/*
+** Generate code that will compute the value of generated column pCol
+** and store the result in register regOut
+*/
+void sqlite3ExprCodeGeneratedColumn(
+  Parse *pParse,
+  Column *pCol,
+  int regOut
+){
+  sqlite3ExprCode(pParse, pCol->pDflt, regOut);
+  if( pCol->affinity>=SQLITE_AFF_TEXT ){
+    sqlite3VdbeAddOp4(pParse->pVdbe, OP_Affinity, regOut, 1, 0,
+                      &pCol->affinity, 1);
+  }
+}
+#endif /* SQLITE_OMIT_GENERATED_COLUMNS */
+
 /*
 ** Generate code to extract the value of the iCol-th column of a table.
 */
@@ -3428,7 +3446,7 @@ void sqlite3ExprCodeGetColumnOfTable(
         int savedSelfTab = pParse->iSelfTab;
         pCol->colFlags |= COLFLAG_BUSY;
         pParse->iSelfTab = iTabCur+1;
-        sqlite3ExprCode(pParse, pTab->aCol[iCol].pDflt, regOut);
+        sqlite3ExprCodeGeneratedColumn(pParse, pCol, regOut);
         pParse->iSelfTab = savedSelfTab;
         pCol->colFlags &= ~COLFLAG_BUSY;
       }
@@ -3630,7 +3648,7 @@ expr_code_doover:
             }
             pCol->colFlags |= COLFLAG_BUSY;
             if( pCol->colFlags & COLFLAG_NOTAVAIL ){
-              sqlite3ExprCode(pParse, pCol->pDflt, iSrc);
+              sqlite3ExprCodeGeneratedColumn(pParse, pCol, iSrc);
             }
             pCol->colFlags &= ~(COLFLAG_BUSY|COLFLAG_NOTAVAIL);
             return iSrc;

diff --git a/src/insert.c b/src/insert.c
index 1995f9634c2219969e01e7e8dc758092a026d6a5..be5f49c9ec3dd7e37cf691c0b13040810684106a 100644 (file)
--- a/src/insert.c
+++ b/src/insert.c
@@ -240,14 +240,14 @@ void sqlite3ComputeGeneratedColumns(
       if( colFlags & COLFLAG_VIRTUAL ){
         /* Virtual columns go at the end */
         assert( pTab->nNVCol+nv == sqlite3TableColumnToStorage(pTab,i) );
-        sqlite3ExprCode(pParse, pTab->aCol[i].pDflt,
-                        iRegStore+pTab->nNVCol+nv);
+        sqlite3ExprCodeGeneratedColumn(pParse, &pTab->aCol[i],
+                                       iRegStore+pTab->nNVCol+nv);
       }else{
         /* Stored columns go in column order */
         assert( i-nv == sqlite3TableColumnToStorage(pTab,i) );
-        sqlite3ExprCode(pParse, pTab->aCol[i].pDflt, iRegStore+i-nv);
+        sqlite3ExprCodeGeneratedColumn(pParse, &pTab->aCol[i], iRegStore+i-nv);
       }
-      colFlags &= ~COLFLAG_NOTAVAIL;
+      pTab->aCol[i].colFlags &= ~COLFLAG_NOTAVAIL;
     }
     if( (colFlags & COLFLAG_VIRTUAL)!=0 ) nv++;
   }

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 06464acb5599ddbba915aeb7dee1b8bb2242c0c7..e2002810fe93993815dc55ec9e0da401f05a08c0 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -4096,6 +4096,9 @@ int sqlite3ExprCodeGetColumn(Parse*, Table*, int, int, int, u8);
 void sqlite3ExprCodeGetColumnOfTable(Vdbe*, Table*, int, int, int);
 void sqlite3ExprCodeMove(Parse*, int, int, int);
 void sqlite3ExprCode(Parse*, Expr*, int);
+#ifndef SQLITE_OMIT_GENERATED_COLUMNS
+void sqlite3ExprCodeGeneratedColumn(Parse*, Column*, int);
+#endif
 void sqlite3ExprCodeCopy(Parse*, Expr*, int);
 void sqlite3ExprCodeFactorable(Parse*, Expr*, int);
 int sqlite3ExprCodeAtInit(Parse*, Expr*, int);