Have the sqlite3_column_decltype() API report the declared types for the left-most...

FossilOrigin-Name: 3e1d71fcaf57c0223ab9a7366c8607f8f66bb21c

diff --git a/manifest b/manifest
index f70e8620e97eaaa819c2c13e53b878cce197a606..c3e7dba32886986d028bfde8ba18996862fc7e0c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sincorrect,\sthough\sharmless,\sassert()\sin\sthe\sunix\sVFS.
-D 2015-12-02T17:40:13.058
+C Have\sthe\ssqlite3_column_decltype()\sAPI\sreport\sthe\sdeclared\stypes\sfor\sthe\sleft-most\sSELECT\sstatement\sin\sa\scompound\sSELECT.
+D 2015-12-02T18:59:44.537
 F Makefile.in 23d9a63484a383fc64951b25ef44067930f98dc6
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e8fdca1cb89a1b58b5f4d3a130ea9a3d28cb314d
@@ -339,7 +339,7 @@ F src/printf.c ca05561795ad6c2fa47acdd007702586282f7feb
 F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c f4c897ca76ca6d5e0b3f0499c627392ffe657c8e
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
-F src/select.c e10586c750d87211caa8f4b239e2bfa6a2049e5b
+F src/select.c dd04f017d1402e1a8cbacb13f53c279dc48543b4
 F src/shell.c 2796237990d42e6a5a7beafee65ef70cc8767d21
 F src/sqlite.h.in 5bd83191711d3dc85030326daa9e8e5226a495e7
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
@@ -508,7 +508,7 @@ F test/cacheflush.test a755c93482ce2e20c04825304bef27e7b7ea0111
 F test/capi2.test 011c16da245fdc0106a2785035de6b242c05e738
 F test/capi3.test bf6f0308bbbba1e770dac13aa08e5c2ac61c7324
 F test/capi3b.test efb2b9cfd127efa84433cd7a2d72ce0454ae0dc4
-F test/capi3c.test fdc0d67a2cb8e8fc400d5b7735e330161ea057a2
+F test/capi3c.test 06f6261f9e9b4ef6f76afcd9900f3665408af1c8
 F test/capi3d.test 485048dc5cd07bc68011e4917ad035ad6047ab82
 F test/capi3e.test 3d49c01ef2a1a55f41d73cba2b23b5059ec460fe
 F test/cast.test 4c275cbdc8202d6f9c54a3596701719868ac7dc3
@@ -1408,7 +1408,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 58c15c6af964563ac7ece8606d16730ccf9ee72b
-R b2d2115192da5a36c6008a1f85419e31
-U drh
-Z a2ea6ee7bac71fd2eda9f163b8a48c3e
+P 4692ae84f93530e27d7c106a60236355e176b7fd
+R cccfb2982bfd6a0aab4098f75a44ccf8
+U dan
+Z e453763f88995e08cd02dca755bc7590

diff --git a/manifest.uuid b/manifest.uuid
index a67ac0541e43a7df693a6a3ba0b78d284be30dd7..d924d8a8d353d3b169baf41eddda83cb8f5ebf9d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4692ae84f93530e27d7c106a60236355e176b7fd
\ No newline at end of file
+3e1d71fcaf57c0223ab9a7366c8607f8f66bb21c
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index cf486e5b85e6bd5a84060e9175b20216a17fab07..c9d9637fcb40544db42e07fdc0c3fae7b8df32e8 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -2369,7 +2369,7 @@ static int multiSelect(
         if( dest.eDest==SRT_Output ){
           Select *pFirst = p;
           while( pFirst->pPrior ) pFirst = pFirst->pPrior;
-          generateColumnNames(pParse, 0, pFirst->pEList);
+          generateColumnNames(pParse, pFirst->pSrc, pFirst->pEList);
         }
         iBreak = sqlite3VdbeMakeLabel(v);
         iCont = sqlite3VdbeMakeLabel(v);
@@ -2444,7 +2444,7 @@ static int multiSelect(
       if( dest.eDest==SRT_Output ){
         Select *pFirst = p;
         while( pFirst->pPrior ) pFirst = pFirst->pPrior;
-        generateColumnNames(pParse, 0, pFirst->pEList);
+        generateColumnNames(pParse, pFirst->pSrc, pFirst->pEList);
       }
       iBreak = sqlite3VdbeMakeLabel(v);
       iCont = sqlite3VdbeMakeLabel(v);
@@ -3059,7 +3059,7 @@ static int multiSelectOrderBy(
   if( pDest->eDest==SRT_Output ){
     Select *pFirst = pPrior;
     while( pFirst->pPrior ) pFirst = pFirst->pPrior;
-    generateColumnNames(pParse, 0, pFirst->pEList);
+    generateColumnNames(pParse, pFirst->pSrc, pFirst->pEList);
   }
 
   /* Reassembly the compound query so that it will be freed correctly

diff --git a/test/capi3c.test b/test/capi3c.test
index 6ab3bc24f6bdc5476a71f0aa2d8493cd5898cc8d..15307a7f7ac90bc4fe5d92375b3788c2a21fb870 100644 (file)
--- a/test/capi3c.test
+++ b/test/capi3c.test
@@ -18,6 +18,7 @@
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
+set testprefix capi3c
 
 # Do not use a codec for tests in this file, as the database file is
 # manipulated directly using tcl scripts (using the [hexio_write] command).
@@ -1375,4 +1376,26 @@ do_test capi3c-24.3 {
   decltype {SELECT (SELECT x FROM (SELECT t5.a AS x)) FROM t5}
 } {INTEGER}
 
+
+# Further tests of sqlite3_column_decltype():
+#
+do_execsql_test 25.0 {
+  CREATE TABLE t11(a VARCHAR(10), b INTEGER);
+  CREATE TABLE t12(a VARCHAR(15), b FLOAT);
+}
+
+foreach {tn sql} {
+  1 "SELECT * FROM t11 UNION ALL SELECT * FROM t12"
+  2 "SELECT * FROM t11 UNION SELECT * FROM t12"
+  3 "SELECT * FROM t11 EXCEPT SELECT * FROM t12"
+  4 "SELECT * FROM t11 INTERSECT SELECT * FROM t12"
+
+  5 "SELECT * FROM t11 UNION ALL SELECT * FROM t12 ORDER BY 1"
+  6 "SELECT * FROM t11 UNION SELECT * FROM t12 ORDER BY 1"
+  7 "SELECT * FROM t11 EXCEPT SELECT * FROM t12 ORDER BY 1"
+  8 "SELECT * FROM t11 INTERSECT SELECT * FROM t12 ORDER BY 1"
+} {
+  do_test 25.$tn { decltype $sql } {VARCHAR(10) INTEGER}
+}
+
 finish_test