From: drh <drh@noemail.net>
Date: Tue, 3 Oct 2017 16:57:33 +0000 (+0000)
Subject: Fix the sqlite3_column_decltype() interface to return the correct datatype
X-Git-Tag: version-3.21.0~42
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a78d757c36f300ba0fdfefb11ae4a50ee8c0ccc0;p=thirdparty%2Fsqlite.git

Fix the sqlite3_column_decltype() interface to return the correct datatype
when the value comes through a CTE.

FossilOrigin-Name: 966438bd259ade3a2d4a6ec9587ce79c81a21b942248bffb389995b9132b53e3
---

diff --git a/manifest b/manifest
index 0c2ed835c9..0026fbbe1f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\ssimplification\sto\ssqlite3SelectExpand()\sin\slast\snight's\n[3a4ffb21]\scheck-in\swas\snot\scompletely\scorrect.\s\sThis\sadjustment\sis\sneeded\nfor\scorrect\sOOM\shandling\sin\ssome\sconfigurations.
-D 2017-10-03T14:24:24.678
+C Fix\sthe\ssqlite3_column_decltype()\sinterface\sto\sreturn\sthe\scorrect\sdatatype\nwhen\sthe\svalue\scomes\sthrough\sa\sCTE.
+D 2017-10-03T16:57:33.183
 F Makefile.in 4bc36d913c2e3e2d326d588d72f618ac9788b2fd4b7efda61102611a6495c3ff
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 6033b51b6aea702ea059f6ab2d47b1d3cef648695f787247dd4fb395fe60673f
@@ -458,7 +458,7 @@ F src/printf.c 40aee47ae9be4bd3dbdc8968bd07fddc027be8edec8daddf24d3391d36698a1c
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 4324a94573b1e29286f8121e4881db59eaedc014afeb274c8d3e07ed282e0e20
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
-F src/select.c 948aa57117275e1f3c6713254ec2baae09be058bec40ab7dcc41960202b756e5
+F src/select.c cb912fc73ee6dd404acdee580ee3bcea593e6b1f068c539d4298b7010e664c61
 F src/shell.c c1206a23d9239f8f51751d3be9b8c3b02fa4103546bea1add7f864d84a8276ab
 F src/shell.c.in bb9720a8c5c98d3984b16ab7540e7142bcae959666ecf248bfc523a1d44220ee
 F src/sqlite.h.in ab4f8a29d1580dfaeb6891fa1b83cff8229ba0daa56994707ceaca71495d9ab7
@@ -1655,7 +1655,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 e4342fd401d4025eecc53ebfcd59f3150166a5f0bd6adb1b5820703bd4a1ec58
-R 067a132a78e0ff9232176facb949a1bf
+P c5ad5e1675f6cb5a54df21606dfec2198a7cf88acc529460ebe27bdab128a6e5
+R 4e08b893abd2a9bcdfb81ab1fd1cc1bd
 U drh
-Z ad07329ae2092cc1b6846d3db3cadef4
+Z 94cd089961159ef74793b517e37fdcdc
diff --git a/manifest.uuid b/manifest.uuid
index 6176434c11..42b7a639a2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c5ad5e1675f6cb5a54df21606dfec2198a7cf88acc529460ebe27bdab128a6e5
\ No newline at end of file
+966438bd259ade3a2d4a6ec9587ce79c81a21b942248bffb389995b9132b53e3
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 8109408697..75ba752d4c 100644
--- a/src/select.c
+++ b/src/select.c
@@ -1449,12 +1449,12 @@ static const char *columnTypeImpl(
           sNC.pParse = pNC->pParse;
           zType = columnType(&sNC, p,&zOrigDb,&zOrigTab,&zOrigCol); 
         }
-      }else if( pTab->pSchema ){
-        /* A real table */
+      }else{
+        /* A real table or a CTE table */
         assert( !pS );
-        if( iCol<0 ) iCol = pTab->iPKey;
-        assert( iCol==-1 || (iCol>=0 && iCol<pTab->nCol) );
 #ifdef SQLITE_ENABLE_COLUMN_METADATA
+        if( iCol<0 ) iCol = pTab->iPKey;
+        assert( iCol==XN_ROWID || (iCol>=0 && iCol<pTab->nCol) );
         if( iCol<0 ){
           zType = "INTEGER";
           zOrigCol = "rowid";
@@ -1463,11 +1463,12 @@ static const char *columnTypeImpl(
           zType = sqlite3ColumnType(&pTab->aCol[iCol],0);
         }
         zOrigTab = pTab->zName;
-        if( pNC->pParse ){
+        if( pNC->pParse && pTab->pSchema ){
           int iDb = sqlite3SchemaToIndex(pNC->pParse->db, pTab->pSchema);
           zOrigDb = pNC->pParse->db->aDb[iDb].zDbSName;
         }
 #else
+        assert( iCol==XN_ROWID || (iCol>=0 && iCol<pTab->nCol) );
         if( iCol<0 ){
           zType = "INTEGER";
         }else{