Parent Directory
| 
Revision Log
| Links to HEAD: | (view) (annotate) |
| Sticky Revision: |
Tagged 1.2.11
Update licence headers.
Merge r413798 and r414125 from trunk to 1.2.x branch. Original message: Don't expect variable argument list to end with NULL for PostgreSQL and SQLite3 DBD drivers. Count instead.
Merge r412612 from trunk to 1.2.x branch Original message: Simplify cleanup run.
Merge r412390 from trunk to 1.2.x branch Original message: Adjust cleanup_kill calls to new wrappers.
Merge r412384 from trunk to 1.2.x branch Original message: Don't cast cleanup functions, provide wrappers instead (PgSQL, SQLite3).
Rework r409059 from the trunk to apply to 1.2.x branch. Correct detection of various databases (PostgreSQL, MySQL, SQLite2/3). Use mysql_config to help detect required CPPFLAGS/LDFLAGS for MySQL.
Check bad transaction state in dbd_pgsql_pquery()/dbd_pgsql_pselect()
Backport simple fixes to pgsql driver
Merge r349448 into 1.2.x. Original log message: Fix args counting in apr_dbd_prepare in case of double-% (thanks to Chris Darroch for pointing it out)
Branch 1.2.x
* include/private/apr_dbd_internal.h: Include public header; remove duplicate typedefs and use of APR_DBD_INTERNAL. * include/apr_dbd.h: Unconditionally define the typedefs. * dbd/apr_dbd_sqlite2.c, dbd/apr_dbd_sqlite3.c, dbd/apr_dbd_pgsql.c: Include just the private header; remove duplicate typedefs and use of APR_DBD_INTERNAL.
Be a bit more correct in our handling of varargs in the DBD code. * include/private/apr_dbd_internal.h (apr_dbd_driver_t::pvquery, apr_dbd_driver_t::pvselect): take a va_list, not ... * dbd/apr_dbd_sqlite2.c (dbd_sqlite_pvquery, dbd_sqlite_pvselect): take a va_list arg. not that it really matters since this just returns ENOTIMPL... * dbd/apr_dbd_sqlite3.c (dbd_sqlite3_pvquery, dbd_sqlite3_pvselect): ditto. * dbd/apr_dbd_pgsql.c (dbd_pgsql_pvquery, dbd_pgsql_pvselect): take va_list args, as such stop doing va_start and va_end, since it's already been done in the upper level wrapper function.
Remove conditional include from apr_dbd.h. That means putting it explicitly in to all the drivers. *sigh*
* dbd/apr_dbd_pgsql.c: Pick up apr_sleep() prototype to fix: dbd/apr_dbd_pgsql.c: In function `dbd_pgsql_get_row': dbd/apr_dbd_pgsql.c:165: warning: implicit declaration of function `apr_sleep'
* dbd/apr_dbd_pgsql.c (dbd_pgsql_transaction): rename to... (dbd_pgsql_start_transaction): this, for symmetry with external dbd API. (apr_dbd_pgsql_driver): update for rename.
Move transaction bookkeeping into the apr_dbd_t object, thus avoiding the need to pass explicit transactions into most of the dbd functions. * include/apr_dbd.h (apr_dbd_driver_t): remove transaction argument from query, select, pvquery, pvselect, pquery, pselect methods. (apr_dbd_query, apr_dbd_select, apr_dbd_pquery, apr_dbd_pselect): remove transaction arguments. * dbd/apr_dbd_pgsql.c (apr_dbd_t): forward declare, cache in-progress transaction. (apr_dbd_transaction_t): store a pointer to the dbd instead of just the PGconn. (dbd_pgsql_select, dbd_pgsql_query, dbd_pgsql_pquery, dbd_pgsql_pvquery, dbd_pgsql_pselect, dbd_pgsql_pvselect): remove transaction arguments, use transaction in the dbd instead. (dbd_pgsql_transaction): use transaction inside dbd, note where we need to handle recursive transactions. (dbd_pgsql_end_transaction): use transaction inside dbd, null it out when we're done with it. * test/testdbd.c (create_table, drop_table, insert_rows, invalid_op, select_sequential, select_random, test_transactions, test_pquery): stop passing transactions to functions that no longer take them.
* include/apr_dbd.h (apr_dbd_transaction, apr_dbd_results, apr_dbd_row, apr_dbd_prepared): in the interest of consistency, add _t to the end of these typedefs. (apr_dbd_driver_t, apr_dbd_transaction_start, apr_dbd_transaction_end, apr_dbd_query, apr_dbd_select, apr_dbd_num_cols, apr_dbd_num_tuples, apr_dbd_get_row, apr_dbd_get_entry, apr_dbd_prepare, apr_dbd_pquery, apr_dbd_pselect): update all uses of those typedefs. * test/testdbd.c: update all uses of those typedefs. * dbd/apr_dbd_pgsql.c: ditto. * dbd/apr_dbd.c: ditto.
Start preparations to move the transaction handling code inside the apr_dbd_t structure. * dbd/apr_dbd_pgsql.c (apr_dbd_t): make this a structure that contains the connection, as a first step towards eventually putting the transaction data in here. (apr_dbd_transaction): cache a pointer to a PGconn, not an apr_dbt_t. (dbd_pgsql_select, dbd_pgsql_error, dbd_pgsql_query, dbd_pgsql_prepare, dbd_pgsql_pquery, dbd_pgsql_pselect, dbd_pgsql_transaction, dbd_pgsql_close, dbd_pgsql_check_conn, dbd_pgsql_select_db): account for the fact that the apr_dbd_t is no longer just a typedef for PGconn. (dbd_pgsql_open): ditto, plus catch errors that come from having a bogus params string, otherwise we're likely to crash inside PQreset.
* dbd/apr_dbd_pgsql.c: wrap some overly long lines, add some whitespace.
Update copyright year to 2005 and standardize on current copyright owner line.
svn:eol-style = native
Fix license notice in apr_dbd stuff
Introducing apr_dbd stuff
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.
| apache@apache.org | ViewVC Help |
| Powered by ViewVC 1.1.2 |