From: drh <drh@noemail.net>
Date: Fri, 3 Sep 2010 12:05:11 +0000 (+0000)
Subject: Improved documentation of the sqlite3_column_count() and sqlite3_data_count()
X-Git-Tag: experimental~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=877cef4b8474fb62b6b9417e8ae9ec87246901d8;p=thirdparty%2Fsqlite.git

Improved documentation of the sqlite3_column_count() and sqlite3_data_count()
interfaces.

FossilOrigin-Name: 0593373d4bf4f3451b41810513fd12cd8ebd0395
---

diff --git a/manifest b/manifest
index 8c38845191..28e8133dc0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Add\sa\sfew\smore\ssubquery\stests\sto\se_expr.test.
-D 2010-09-03T10:58:47
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Improved\sdocumentation\sof\sthe\ssqlite3_column_count()\sand\ssqlite3_data_count()\ninterfaces.
+D 2010-09-03T12:05:12
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -173,7 +176,7 @@ F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 F src/select.c eb57331a0f37fbfff0b24824555ac70dbc996c4d
 F src/shell.c 8517fc1f9c59ae4007e6cc8b9af91ab231ea2056
-F src/sqlite.h.in b77b914f5f4c301ca00b2fc0fe253240ec177503
+F src/sqlite.h.in 795e12e8f3c4d3fe3a4f30656c1cd13c6ea2bb0a
 F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
 F src/sqliteInt.h 4e31d3b58720d6251e08ba394641b9a63725eb8a
 F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
@@ -853,7 +856,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P f213e133f6e69b0edd73d96142014bdcab9dfe41
-R 4840eab4671662ef903de303cfd3b278
-U dan
-Z e60132511cfbf6157149a68a152e2582
+P 189cba0072dd0b90e064f889457921aeaeefda01
+R d926ab15c40b79350a15d770aeb017e1
+U drh
+Z 6f7c1425246e66e3c6038da9d7023f84
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFMgOR7oxKgR168RlERAoi0AJ4zhpKV4wAS/KyC1fUb0bKCS1oUPACgh6kd
+rp6N9Os8gQvjyq3jh8IItPU=
+=zXNW
+-----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index a9b205861e..48e9a1a167 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-189cba0072dd0b90e064f889457921aeaeefda01
\ No newline at end of file
+0593373d4bf4f3451b41810513fd12cd8ebd0395
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index a7adae5d92..be50df55c8 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -2816,6 +2816,8 @@ int sqlite3_clear_bindings(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]).
+**
+** See also: [sqlite3_data_count()]
 */
 int sqlite3_column_count(sqlite3_stmt *pStmt);
 
@@ -3006,8 +3008,14 @@ int sqlite3_step(sqlite3_stmt*);
 /*
 ** CAPI3REF: Number of columns in a result set
 **
-** ^The sqlite3_data_count(P) the number of columns in the
-** of the result set of [prepared statement] P.
+** ^The sqlite3_data_count(P) interface returns the number of columns in the
+** current row of the result set of [prepared statement] P.
+** ^If prepared statement P does not have results ready to return
+** (via calls to the [sqlite3_column_int | sqlite3_column_*()] of
+** interfaces) then sqlite3_data_count(P) returns 0.
+** ^The sqlite3_data_count(P) routine also returns 0 if P is a NULL pointer.
+**
+** See also: [sqlite3_column_count()]
 */
 int sqlite3_data_count(sqlite3_stmt *pStmt);