A proposed fix for the problem of CREATE TABLE AS generating a table that

has INTEGER values in a TEXT column.  Ticket [f2ad7de056ab1dc92].

FossilOrigin-Name: d5e2c1fc7625130a3cbacc95c28bb553a0119cb8

diff --git a/manifest b/manifest
index 10bfc3621fb03a4cee1921b3f7059ab991483658..081a393c434914e61f4227c41dae45f1f3d2ee12 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\shandling\sof\squeries\swith\sVALUES\son\sthe\sleft\sand\sUNION\sALL\sSELECT\son\sthe\nright\sand\sa\sLIMIT\sclause.
-D 2015-05-20T00:15:27.101
+C A\sproposed\sfix\sfor\sthe\sproblem\sof\sCREATE\sTABLE\sAS\sgenerating\sa\stable\sthat\nhas\sINTEGER\svalues\sin\sa\sTEXT\scolumn.\s\sTicket\s[f2ad7de056ab1dc92].
+D 2015-05-20T15:51:09.466
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 0a6ae26396ec696221021780dffbb894ff3cead7
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -195,7 +195,7 @@ F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
 F src/btree.c 30a80340481098d699398cba3536c895373b2e2c
 F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
 F src/btreeInt.h 973a22a6fd61350b454ad614832b1f0a5e25a1e4
-F src/build.c 61b47073f79f31e80a05db9ce13c5ca81bf8f74e
+F src/build.c 857606eac00ffdcc35267e2b78aaebb5c4a4bd06
 F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
 F src/complete.c a5cf5b4b56390cfb7b8636e8f7ddef90258dd575
 F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
@@ -1278,7 +1278,10 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 45d3893c6142ee1dfed48e26a13cf547da12468a
-R d2f9de9f0b0e2d9149961be12bc360a3
+P c403502cdce8b82e570e6fc49ab7f5144800c189
+R 50de0e4641ea4d7735e732fb73d3af44
+T *branch * create-table-as-type-fix
+T *sym-create-table-as-type-fix *
+T -sym-trunk *
 U drh
-Z dfad787f317538afb4e1ced0974df5c8
+Z 78e916760aff70e5689a89cd2eb362da

diff --git a/manifest.uuid b/manifest.uuid
index 8f7a7be3d9f3daf39ec6e8c919fddb6b94a7e3c7..e81f5435d778041fde31a0bfd554ded6853d6a1d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c403502cdce8b82e570e6fc49ab7f5144800c189
\ No newline at end of file
+d5e2c1fc7625130a3cbacc95c28bb553a0119cb8
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index 799056139316045c668849516dfbd6dba1449bd1..8003a2cb1398eff77355de83812d61ccebb0aa11 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -1915,15 +1915,24 @@ void sqlite3EndTable(
     if( pSelect ){
       SelectDest dest;
       Table *pSelTab;
+      int regYield;       /* Register holding co-routine entry-point */
+      int addrTop;        /* Top of the co-routine */
 
+      regYield = ++pParse->nMem;
       assert(pParse->nTab==1);
       sqlite3VdbeAddOp3(v, OP_OpenWrite, 1, pParse->regRoot, iDb);
       sqlite3VdbeChangeP5(v, OPFLAG_P2ISREG);
       pParse->nTab = 2;
-      sqlite3SelectDestInit(&dest, SRT_Table, 1);
+      addrTop = sqlite3VdbeCurrentAddr(v) + 1;
+      sqlite3VdbeAddOp3(v, OP_InitCoroutine, regYield, 0, addrTop);
+      sqlite3SelectDestInit(&dest, SRT_Coroutine, regYield);
       sqlite3Select(pParse, pSelect, &dest);
-      sqlite3VdbeAddOp1(v, OP_Close, 1);
+      sqlite3VdbeAddOp1(v, OP_EndCoroutine, regYield);
+      sqlite3VdbeJumpHere(v, addrTop - 1);
       if( pParse->nErr==0 ){
+        int regRec = ++pParse->nMem;
+        int regRowid = ++pParse->nMem;
+        int addrInsLoop;
         pSelTab = sqlite3ResultSetOfSelect(pParse, pSelect);
         if( pSelTab==0 ) return;
         assert( p->aCol==0 );
@@ -1932,6 +1941,15 @@ void sqlite3EndTable(
         pSelTab->nCol = 0;
         pSelTab->aCol = 0;
         sqlite3DeleteTable(db, pSelTab);
+        addrInsLoop = sqlite3VdbeAddOp1(v, OP_Yield, dest.iSDParm);
+        VdbeCoverage(v);
+        sqlite3VdbeAddOp3(v, OP_MakeRecord, dest.iSdst, dest.nSdst, regRec);
+        sqlite3TableAffinity(v, p, 0);
+        sqlite3VdbeAddOp2(v, OP_NewRowid, 1, regRowid);
+        sqlite3VdbeAddOp3(v, OP_Insert, 1, regRec, regRowid);
+        sqlite3VdbeAddOp2(v, OP_Goto, 0, addrInsLoop);
+        sqlite3VdbeJumpHere(v, addrInsLoop);
+        sqlite3VdbeAddOp1(v, OP_Close, 1);
       }
     }