From: dan <Dan Kennedy>
Date: Mon, 15 Feb 2021 14:32:05 +0000 (+0000)
Subject: Add tests for sqlite3_column_count().
X-Git-Tag: version-3.35.0~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f2b32e8915384bbfe4783de481280b8bdb1b367f;p=thirdparty%2Fsqlite.git

Add tests for sqlite3_column_count().

FossilOrigin-Name: 7cc65ae57183b3c16f1102fca5603a36acda432e5d45e22a2996e5ebe069fc6a
---

diff --git a/manifest b/manifest
index 69fdb0bdad..9d684a6c24 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\sthe\sALTER\sTABLE\sstatements\sreturn\s0\sfor\nsqlite3_column_count().
-D 2021-02-15T13:17:19.534
+C Add\stests\sfor\ssqlite3_column_count().
+D 2021-02-15T14:32:05.655
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -766,6 +766,7 @@ F test/collateA.test b8218ab90d1fa5c59dcf156efabb1b2599c580d6
 F test/collateB.test 1e68906951b846570f29f20102ed91d29e634854ee47454d725f2151ecac0b95
 F test/colmeta.test 2c765ea61ee37bc43bbe6d6047f89004e6508eb1
 F test/colname.test 87ad5458bb8709312dac0d6755fd30e8e4ca83298d0a9ef6e5c24277a3c3390e
+F test/columncount.test eff33d402a7b0fde0a52a1920d238af200ca573327021e0ce3b7e5688de41449
 F test/conflict.test ac0667090f66130ac77d5fb764655558ca6600dd6d88f670ca9123b61c448337
 F test/conflict2.test 5557909ce683b1073982f5d1b61dfb1d41e369533bfdaf003180c5bc87282dd1
 F test/conflict3.test 81865d9599609aca394fb3b9cd5f561d4729ea5b176bece3644f6ecb540f88ac
@@ -1899,7 +1900,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 5411bfa41ea9a492ca1f567327d8e0a1b3db047292fec1753bfef8a157cf8c1d
-R 26a1b41fc224209a7df396ceab19e9c5
-U drh
-Z 636bc50c9ef75b6ac02dee0a656e0aee
+P 29c1932a47cd46c2585ebbf937c03544a8a355014776129662789e15db9ed4de
+R f9be004d695acd30974fbbc52a7a4370
+U dan
+Z 4ef0a84d25d02d84a3a2cc2fe061f3e4
diff --git a/manifest.uuid b/manifest.uuid
index 7c0f2a322e..5f39af6f20 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-29c1932a47cd46c2585ebbf937c03544a8a355014776129662789e15db9ed4de
\ No newline at end of file
+7cc65ae57183b3c16f1102fca5603a36acda432e5d45e22a2996e5ebe069fc6a
\ No newline at end of file
diff --git a/test/columncount.test b/test/columncount.test
new file mode 100644
index 0000000000..3ecc1f8d8a
--- /dev/null
+++ b/test/columncount.test
@@ -0,0 +1,57 @@
+# 2021 February 15
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+# This file implements regression tests for SQLite library.  The
+# focus of this file is testing the sqlite3_column_count() API.
+#
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+set testprefix columncount
+
+proc do_ccsql_test {tn sql res} {
+
+  uplevel [list do_test $tn [subst -nocommands {
+    set stmt [sqlite3_prepare_v2 db {$sql} -1 dummy]
+    set res [sqlite3_column_count [set stmt]]
+    while {[sqlite3_step [set stmt]]=="SQLITE_ROW"} {
+      for {set i 0} {[set i] < [sqlite3_data_count [set stmt]]} {incr i} {
+        lappend res [sqlite3_column_text [set stmt] [set i]]
+      }
+    }
+  
+    set rc [sqlite3_finalize [set stmt]]
+    if {[set rc]!="SQLITE_OK"} {
+      error [sqlite3_errmsg db]
+    }
+
+    set res
+  }] [list {*}$res]]
+
+}
+
+do_execsql_test 1.0 {
+  CREATE TABLE t1(x, y, z);
+  INSERT INTO t1 VALUES('a', 'b', 'c');
+}
+
+do_ccsql_test 1.1 { SELECT * FROM t1 }      {3    a b c}
+do_ccsql_test 1.2 { CREATE TABLE t2(a, b) } {0}
+
+do_ccsql_test 1.3 { ALTER TABLE t2 RENAME TO t3 } {0}
+do_ccsql_test 1.4 { ALTER TABLE t3 RENAME b TO ccc } {0}
+do_ccsql_test 1.5 { ALTER TABLE t3 ADD COLUMN d } {0}
+
+do_ccsql_test 1.6 { DROP TABLE t3 } {0}
+
+
+
+finish_test
+