From: dan <dan@noemail.net>
Date: Fri, 6 Jan 2017 13:53:37 +0000 (+0000)
Subject: Clarify the documentation on sqlite3_column_count().
X-Git-Tag: version-3.16.2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=872a0e5658de22866ecf181bbb86c59fc164a62d;p=thirdparty%2Fsqlite.git

Clarify the documentation on sqlite3_column_count().

FossilOrigin-Name: 01b4cb26762f42064311445f65304388d6fdcfb5
---

diff --git a/manifest b/manifest
index 056d950d17..2197e888d9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\s"PRAGMA\scase_sensitive_like"\sand\s"PRAGMA\sshrink_memory"\sset\sthe\nnumber\sof\soutput\scolumns\sto\s0\s(as\sthey\sare\sstatements\sthat\sreturn\sno\sdata).
-D 2017-01-06T13:52:58.769
+C Clarify\sthe\sdocumentation\son\ssqlite3_column_count().
+D 2017-01-06T13:53:37.534
 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 2075e22d50833ca2d9956d0b7a6bfb845ad05dd2
@@ -1543,8 +1543,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P b07269413d2d9bcc1b08327a925bc28ac1438381
-Q +6696cd1878be4bd44a24841b04163e52d847711e
-R b9c1432ad06d5c3e0ac38b8288a220ba
+P 4a97ba4ee0d3295569ca01aaea7df74fd481eb3b
+Q +9ea0baddd893e54ec79399ae83033ae139650535
+R 831df29e5e666fb597bfde5e36d65ee1
 U dan
-Z 49256869b6d8e68401d45db27e0cb695
+Z 710a9d02a4c3e4edad9c0044ea831ee6
diff --git a/manifest.uuid b/manifest.uuid
index 38b33965ac..6b6b8ddba4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4a97ba4ee0d3295569ca01aaea7df74fd481eb3b
\ No newline at end of file
+01b4cb26762f42064311445f65304388d6fdcfb5
\ 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()]
 */