You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by ni...@apache.org on 2006/03/31 14:09:41 UTC
svn commit: r390399 - in /apr/apr-util/trunk/dbd: apr_dbd_pgsql.c
apr_dbd_sqlite2.c apr_dbd_sqlite3.c
Author: niq
Date: Fri Mar 31 04:09:39 2006
New Revision: 390399
URL: http://svn.apache.org/viewcvs?rev=390399&view=rev
Log:
apr_dbd_get_name driver patches from Bojan Smojver
Modified:
apr/apr-util/trunk/dbd/apr_dbd_pgsql.c
apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c
apr/apr-util/trunk/dbd/apr_dbd_sqlite3.c
Modified: apr/apr-util/trunk/dbd/apr_dbd_pgsql.c
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/dbd/apr_dbd_pgsql.c?rev=390399&r1=390398&r2=390399&view=diff
==============================================================================
--- apr/apr-util/trunk/dbd/apr_dbd_pgsql.c (original)
+++ apr/apr-util/trunk/dbd/apr_dbd_pgsql.c Fri Mar 31 04:09:39 2006
@@ -116,6 +116,11 @@
return 0;
}
+static const char *dbd_pgsql_get_name(const apr_dbd_results_t *res, int n)
+{
+ return (res->res ? PQfname(res->res, n) : NULL);
+}
+
static int dbd_pgsql_get_row(apr_pool_t *pool, apr_dbd_results_t *res,
apr_dbd_row_t **rowp, int rownum)
{
@@ -640,5 +645,6 @@
dbd_pgsql_pvselect,
dbd_pgsql_pquery,
dbd_pgsql_pselect,
+ dbd_pgsql_get_name
};
#endif
Modified: apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c?rev=390399&r1=390398&r2=390399&view=diff
==============================================================================
--- apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c (original)
+++ apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c Fri Mar 31 04:09:39 2006
@@ -114,6 +114,15 @@
return ret;
}
+static const char *dbd_sqlite_get_name(const apr_dbd_results_t *res, int n)
+{
+ if ((n < 0) || (n >= res->sz)) {
+ return NULL;
+ }
+
+ return res->res[n];
+}
+
static int dbd_sqlite_get_row(apr_pool_t * pool, apr_dbd_results_t * res,
apr_dbd_row_t ** rowp, int rownum)
{
@@ -387,5 +396,6 @@
dbd_sqlite_pvselect,
dbd_sqlite_pquery,
dbd_sqlite_pselect,
+ dbd_sqlite_get_name
};
#endif
Modified: apr/apr-util/trunk/dbd/apr_dbd_sqlite3.c
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/dbd/apr_dbd_sqlite3.c?rev=390399&r1=390398&r2=390399&view=diff
==============================================================================
--- apr/apr-util/trunk/dbd/apr_dbd_sqlite3.c (original)
+++ apr/apr-util/trunk/dbd/apr_dbd_sqlite3.c Fri Mar 31 04:09:39 2006
@@ -186,6 +186,15 @@
return ret;
}
+static const char *dbd_sqlite3_get_name(const apr_dbd_results_t *res, int n)
+{
+ if ((n < 0) || (n >= res->sz)) {
+ return NULL;
+ }
+
+ return res->next_row->columns[n]->name;
+}
+
static int dbd_sqlite3_get_row(apr_pool_t *pool, apr_dbd_results_t *res,
apr_dbd_row_t **rowp, int rownum)
{
@@ -424,5 +433,6 @@
dbd_sqlite3_pvselect,
dbd_sqlite3_pquery,
dbd_sqlite3_pselect,
+ dbd_sqlite3_get_name
};
#endif
Re: svn commit: r390399 - in /apr/apr-util/trunk/dbd: apr_dbd_pgsql.c apr_dbd_sqlite2.c apr_dbd_sqlite3.c
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
On 3/31/06, niq@apache.org <ni...@apache.org> wrote:
> Author: niq
> Date: Fri Mar 31 04:09:39 2006
> New Revision: 390399
>
> URL: http://svn.apache.org/viewcvs?rev=390399&view=rev
> Log:
> apr_dbd_get_name driver patches from Bojan Smojver
This kind of stuff should really get a CHANGES entry, especially since
most of it came from an external contributor who should get some
credit (other than the commit log).
-garrett