You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2011/04/19 13:16:39 UTC

svn commit: r1095028 - in /subversion/trunk/subversion: include/private/svn_sqlite.h libsvn_subr/sqlite.c

Author: rhuijben
Date: Tue Apr 19 11:16:39 2011
New Revision: 1095028

URL: http://svn.apache.org/viewvc?rev=1095028&view=rev
Log:
Add a new sqlite column function, which I need for fixing the had_props
reporting from _read_info() and _base_get_info() in the WC library.

* subversion/include/private/svn_sqlite.h
  (svn_sqlite__column_bytes): New function.

* subversion/libsvn_subr/sqlite.c
  (svn_sqlite__column_bytes): New function.

Modified:
    subversion/trunk/subversion/include/private/svn_sqlite.h
    subversion/trunk/subversion/libsvn_subr/sqlite.c

Modified: subversion/trunk/subversion/include/private/svn_sqlite.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_sqlite.h?rev=1095028&r1=1095027&r2=1095028&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_sqlite.h (original)
+++ subversion/trunk/subversion/include/private/svn_sqlite.h Tue Apr 19 11:16:39 2011
@@ -291,6 +291,11 @@ svn_sqlite__column_checksum(const svn_ch
 svn_boolean_t
 svn_sqlite__column_is_null(svn_sqlite__stmt_t *stmt, int column);
 
+/* Return the number of bytes the column uses in a text or blob representation.
+   0 for NULL columns. */
+int
+svn_sqlite__column_bytes(svn_sqlite__stmt_t *stmt, int column);
+
 
 /* --------------------------------------------------------------------- */
 

Modified: subversion/trunk/subversion/libsvn_subr/sqlite.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/sqlite.c?rev=1095028&r1=1095027&r2=1095028&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/sqlite.c (original)
+++ subversion/trunk/subversion/libsvn_subr/sqlite.c Tue Apr 19 11:16:39 2011
@@ -536,6 +536,11 @@ svn_sqlite__column_is_null(svn_sqlite__s
   return sqlite3_column_type(stmt->s3stmt, column) == SQLITE_NULL;
 }
 
+svn_boolean_t
+svn_sqlite__column_bytes(svn_sqlite__stmt_t *stmt, int column)
+{
+  return sqlite3_column_bytes(stmt->s3stmt, column);
+}
 
 svn_error_t *
 svn_sqlite__finalize(svn_sqlite__stmt_t *stmt)



Re: svn commit: r1095028 - in /subversion/trunk/subversion: include/private/svn_sqlite.h libsvn_subr/sqlite.c

Posted by Greg Stein <gs...@gmail.com>.
On Apr 19, 2011 7:17 AM, <rh...@apache.org> wrote:
>...
> +++ subversion/trunk/subversion/libsvn_subr/sqlite.c Tue Apr 19 11:16:39
2011
> @@ -536,6 +536,11 @@ svn_sqlite__column_is_null(svn_sqlite__s
>   return sqlite3_column_type(stmt->s3stmt, column) == SQLITE_NULL;
>  }
>
> +svn_boolean_t
> +svn_sqlite__column_bytes(svn_sqlite__stmt_t *stmt, int column)
> +{
> +  return sqlite3_column_bytes(stmt->s3stmt, column);
> +}

That is not a boolean return.