Simplification to the logic that computes column type names.

FossilOrigin-Name: f10ece964f1f484ff8985ebabd007db32640350c3723bf39d435a48af988d03d

manifest

diff --git a/manifest b/manifest
index 7c8cd81..1eb1837 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\scompute\scolumn\sand\srow\ssize\sestimates\sfor\sthe\stransient\sTable\sobjects\nassociated\swith\sthe\sresult\sset\sof\sa\sSELECT\sstatement,\ssince\sthose\sestimates\nare\snever\sused\sfor\sanything\sconstructive.
-D 2017-10-03T03:01:09.197
+C Simplification\sto\sthe\slogic\sthat\scomputes\scolumn\stype\snames.
+D 2017-10-03T03:24:13.675
 F Makefile.in 4bc36d913c2e3e2d326d588d72f618ac9788b2fd4b7efda61102611a6495c3ff
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 6033b51b6aea702ea059f6ab2d47b1d3cef648695f787247dd4fb395fe60673f
@@ -458,7 +458,7 @@
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 4324a94573b1e29286f8121e4881db59eaedc014afeb274c8d3e07ed282e0e20
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
-F src/select.c 1a11e6ab321c22a20146c44d315ece07899f7abad5dab839c9d4cf6556ef588b
+F src/select.c 9ff172fe334d91d778339549493206069c0172914e710349ae32efeb832f5bc2
 F src/shell.c c1206a23d9239f8f51751d3be9b8c3b02fa4103546bea1add7f864d84a8276ab
 F src/shell.c.in bb9720a8c5c98d3984b16ab7540e7142bcae959666ecf248bfc523a1d44220ee
 F src/sqlite.h.in ab4f8a29d1580dfaeb6891fa1b83cff8229ba0daa56994707ceaca71495d9ab7
@@ -1655,7 +1655,7 @@
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 3a4ffb21d0ee2326c31b9ddc512d79d4ebf3a249a2840e88e99165978eec31fd
-R 2ffb7cd4a155ee43580067e1a47b5521
+P e4342fd401d4025eecc53ebfcd59f3150166a5f0bd6adb1b5820703bd4a1ec58
+R bd4ed218e17d4e6cf75a42b79042fa89
 U drh
-Z 7536be1ae6bc2716a9cf67864c3578f3
+Z f23443ba1b508493e6d31d86a7684486

manifest.uuid

diff --git a/manifest.uuid b/manifest.uuid
index 0fc4d2a..cba6534 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e4342fd401d4025eecc53ebfcd59f3150166a5f0bd6adb1b5820703bd4a1ec58
\ No newline at end of file
+f10ece964f1f484ff8985ebabd007db32640350c3723bf39d435a48af988d03d
\ No newline at end of file

src/select.c

diff --git a/src/select.c b/src/select.c
index c77e14a..f4aa7c6 100644
--- a/src/select.c
+++ b/src/select.c
@@ -1449,12 +1449,13 @@
           sNC.pParse = pNC->pParse;
           zType = columnType(&sNC, p,&zOrigDb,&zOrigTab,&zOrigCol); 
         }
-      }else if( pTab->pSchema ){
-        /* A real table */
+      }else{
+        /* Usually a real table, but sometimes a CTE table */
         assert( !pS );
+        testcase( pTab->pSchema==0 );
+#ifdef SQLITE_ENABLE_COLUMN_METADATA
         if( iCol<0 ) iCol = pTab->iPKey;
         assert( iCol==-1 || (iCol>=0 && iCol<pTab->nCol) );
-#ifdef SQLITE_ENABLE_COLUMN_METADATA
         if( iCol<0 ){
           zType = "INTEGER";
           zOrigCol = "rowid";
@@ -1468,6 +1469,7 @@
           zOrigDb = pNC->pParse->db->aDb[iDb].zDbSName;
         }
 #else
+        assert( iCol==-1 || (iCol>=0 && iCol<pTab->nCol) );
         if( iCol<0 ){
           zType = "INTEGER";
         }else{