Add a test to verify the sqlite3_column_name() interface returns the

correct value when the query is of the form: "SELECT rowid,* FROM...".
Ticket #3429. (CVS 5785)

FossilOrigin-Name: e90d5a5515f7096e247e6059cf77f8089ed90b2c

diff --git a/manifest b/manifest
index d246414a9cb996bdab13bd8a11a06c95f5220659..01ebbf8e2feb70c5175850936b691c5b24bf3e6f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\sversion\snumber\sto\s3.6.4.\s(CVS\s5784)
-D 2008-10-09T15:56:06
+C Add\sa\stest\sto\sverify\sthe\ssqlite3_column_name()\sinterface\sreturns\sthe\ncorrect\svalue\swhen\sthe\squery\sis\sof\sthe\sform:\s"SELECT\srowid,*\sFROM...".\nTicket\s#3429.\s(CVS\s5785)
+D 2008-10-09T15:56:46
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 7fc26e087207e7a4a7723583dbd7997477af3b13
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -251,7 +251,7 @@ F test/collate8.test df26649cfcbddf109c04122b340301616d3a88f6
 F test/collate9.test 3adcc799229545940df2f25308dd1ad65869145a
 F test/collateA.test b8218ab90d1fa5c59dcf156efabb1b2599c580d6
 F test/colmeta.test 087c42997754b8c648819832241daf724f813322
-F test/colname.test 0f05fea3e5c9260ece53117ad400657515c34280
+F test/colname.test 69fea30632d55862a012d3786c7d5fd1329f78db
 F test/conflict.test bb29b052c60a1f7eb6382be77902061d1f305318
 F test/corrupt.test 5bcf7a986358123b8055dfa64b45fc2fb54dcaa9
 F test/corrupt2.test b83f690753525ddac4a9c96e6ba11886ddaf24ea
@@ -642,7 +642,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P ec01bd72ee875df179c680c1a40304d2f807fe38
-R 8f6702073db25ee1c5fb916487a4ec6b
+P 4b973ac98d027cc1097fa9845eb4a8489b633ea4
+R 45542fbff8d14207e2f09fb766bf04f6
 U drh
-Z 28ed5a3ec7c80a027758863ae9132762
+Z 351753422fadf7662b5a45fc736c1469

diff --git a/manifest.uuid b/manifest.uuid
index 84dad15499274488153341467b0368f845b6cbf6..3a3b78e74117d1e99ea8cd2302cb2dbbde51ecfc 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4b973ac98d027cc1097fa9845eb4a8489b633ea4
\ No newline at end of file
+e90d5a5515f7096e247e6059cf77f8089ed90b2c
\ No newline at end of file

diff --git a/test/colname.test b/test/colname.test
index 26833a12a0ac1dfe34438853e0aa5a9a56c29722..37eb20690c80a7656fa6adbd31b6801164c1ac8d 100644 (file)
--- a/test/colname.test
+++ b/test/colname.test
@@ -13,7 +13,7 @@
 # The focus of this file is testing how SQLite generates the names
 # of columns in a result set.
 #
-# $Id: colname.test,v 1.5 2008/09/13 01:20:15 drh Exp $
+# $Id: colname.test,v 1.6 2008/10/09 15:56:46 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -303,4 +303,17 @@ do_test colname-6.19 {
   execsql2 {SELECT "`a`", max([`a`]) AS m FROM t6}
 } {`a` 5 m 5}
 
+
+# Ticket #3429
+# We cannot find anything wrong, but it never hurts to add another
+# test case.
+#
+do_test colname-7.1 {
+  db eval {
+    CREATE TABLE t7(x INTEGER PRIMARY KEY, y);
+    INSERT INTO t7 VALUES(1,2);
+  }
+  execsql2 {SELECT rowid, * FROM t7}
+} {x 1 x 1 y 2}
+
 finish_test