From: drh <drh@noemail.net>
Date: Fri, 6 Jan 2017 01:09:43 +0000 (+0000)
Subject: Clarify the documentation on sqlite3_column_count().
X-Git-Tag: version-3.17.0~130
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d775e7586c0d12ab25e98c91b2b2555a9220638;p=thirdparty%2Fsqlite.git

Clarify the documentation on sqlite3_column_count().

FossilOrigin-Name: 9ea0baddd893e54ec79399ae83033ae139650535
---

diff --git a/manifest b/manifest
index b2cb0deb1e..76c54f19bf 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sseveral\snon-portable\stests\sfor\sthe\sdeprecated\stemp_store_directory\sPRAGMA.
-D 2017-01-06T00:02:51.046
+C Clarify\sthe\sdocumentation\son\ssqlite3_column_count().
+D 2017-01-06T01:09:43.612
 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -390,7 +390,7 @@ F src/resolve.c bb070cf5f23611c44ab7e4788803684e385fc3fb
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c 4437d9d5d56b6ffdedabf394c7fe3a07ff521ce9
 F src/shell.c 6095531aa900decdaa765e0f3993fba7153c92c1
-F src/sqlite.h.in e8e2d108d82647f0a812fdb74accf91c1ec08ddc
+F src/sqlite.h.in 29bda4bee01248a5650567d7a22fac39bad1b542
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
 F src/sqliteInt.h 9fdfb8789b27a621f3401468bc1705c32308f877
@@ -1543,7 +1543,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 2f57939a5583ae420b525c7e0f0dcda8626fe992
-R fe38b9aa03d8e8ab9362e6172ccc3a88
-U mistachkin
-Z 07de6a6fd8f3c259d9e548da02c451b3
+P 28d87789141d816e0bce6d3965ce84c79b803218
+R e3a76d24c91b951960fc78f33b2e8a32
+U drh
+Z 1cf489d9fb6392442bdd62aaa6400c28
diff --git a/manifest.uuid b/manifest.uuid
index b3f7ca7a13..1c75ad6a44 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-28d87789141d816e0bce6d3965ce84c79b803218
\ No newline at end of file
+9ea0baddd893e54ec79399ae83033ae139650535
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index caa89721e1..1bcb62256c 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -3896,8 +3896,12 @@ int sqlite3_clear_bindings(sqlite3_stmt*);
 ** METHOD: sqlite3_stmt
 **
 ** ^Return the number of columns in the result set returned by the
-** [prepared statement]. ^This routine returns 0 if pStmt is an SQL
-** statement that does not return data (for example an [UPDATE]).
+** [prepared statement]. ^If this routine returns 0, that means the 
+** [prepared statement] returns no data (for example an [UPDATE]).
+** ^However, just because this routine returns a positive number does not
+** mean that one or more rows of data will be returned.  ^A SELECT statement
+** will always have a positive sqlite3_column_count() but depending on the
+** WHERE clause constraints and the table content, it might return no rows.
 **
 ** See also: [sqlite3_data_count()]
 */