lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-06-28 15:39:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix for ODBC under PHP 4.2+

Browse Source
This commit is contained in:
brianb 2003-01-07 02:24:35 +00:00
parent 52528c6e95
commit c3386d2a43
1 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/odbc/odbc.c
View File

@ -32,7 +32,7 @@
#include "connectparams.h" #include "connectparams.h"
static char software_version[] = "$Id: odbc.c,v 1.7 2002/04/14 23:35:39 brianb Exp $"; static char software_version[] = "$Id: odbc.c,v 1.8 2003/01/07 02:24:35 brianb Exp $";
static void *no_unused_var_warn[] = {software_version, static void *no_unused_var_warn[] = {software_version,
no_unused_var_warn}; no_unused_var_warn};
@ -51,8 +51,8 @@ static SQLRETURN SQL_API _SQLFreeStmt(SQLHSTMT hstmt, SQLUSMALLINT fOption);
#define _MAX_ERROR_LEN 255 #define _MAX_ERROR_LEN 255
static char lastError[_MAX_ERROR_LEN+1]; static char lastError[_MAX_ERROR_LEN+1];
//#define TRACE(x) fprintf(stderr,"Function %s\n", x); #define TRACE(x) fprintf(stderr,"Function %s\n", x);
#define TRACE(x) //#define TRACE(x)
/* The SQL engine is presently non-reenterrant and non-thread safe. /* The SQL engine is presently non-reenterrant and non-thread safe.
See _SQLExecute for details. See _SQLExecute for details.
@ -183,8 +183,28 @@ SQLRETURN SQL_API SQLExtendedFetch(
SQLUINTEGER FAR *pcrow, SQLUINTEGER FAR *pcrow,
SQLUSMALLINT FAR *rgfRowStatus) SQLUSMALLINT FAR *rgfRowStatus)
{ {
struct _hstmt *stmt = (struct _hstmt *) hstmt;
struct _hdbc *dbc = (struct _hdbc *) stmt->hdbc;
struct _henv *env = (struct _henv *) dbc->henv;
TRACE("SQLExtendedFetch"); TRACE("SQLExtendedFetch");
return SQL_SUCCESS; if (fFetchType!=SQL_FETCH_NEXT) {
LogError("Fetch type not supported in SQLExtendedFetch");
return SQL_ERROR;
}
if (pcrow)
*pcrow=1;
if (rgfRowStatus)
*rgfRowStatus = SQL_SUCCESS; /* what is the row status value? */
bind_columns(stmt);
if (mdb_fetch_row(env->sql->cur_table)) {
stmt->rows_affected++;
return SQL_SUCCESS;
} else {
return SQL_NO_DATA_FOUND;
}
} }
SQLRETURN SQL_API SQLForeignKeys( SQLRETURN SQL_API SQLForeignKeys(
@ -753,17 +773,13 @@ SQLRETURN SQL_API SQLExecute(
TRACE("SQLExecute"); TRACE("SQLExecute");
return _SQLExecute(hstmt); return _SQLExecute(hstmt);
} }
static void
SQLRETURN SQL_API SQLFetch( bind_columns(struct _hstmt *stmt)
SQLHSTMT hstmt)
{ {
struct _hstmt *stmt = (struct _hstmt *) hstmt;
struct _hdbc *dbc = (struct _hdbc *) stmt->hdbc; struct _hdbc *dbc = (struct _hdbc *) stmt->hdbc;
struct _henv *env = (struct _henv *) dbc->henv; struct _henv *env = (struct _henv *) dbc->henv;
struct _sql_bind_info *cur; struct _sql_bind_info *cur;
TRACE("SQLFetch");
/* if we bound columns, transfer them to res_info now that we have one */
if (stmt->rows_affected==0) { if (stmt->rows_affected==0) {
cur = stmt->bind_head; cur = stmt->bind_head;
while (cur) { while (cur) {
@ -780,6 +796,17 @@ struct _sql_bind_info *cur;
cur = cur->next; cur = cur->next;
} }
} }
}
SQLRETURN SQL_API SQLFetch(
SQLHSTMT hstmt)
{
struct _hstmt *stmt = (struct _hstmt *) hstmt;
struct _hdbc *dbc = (struct _hdbc *) stmt->hdbc;
struct _henv *env = (struct _henv *) dbc->henv;
TRACE("SQLFetch");
/* if we bound columns, transfer them to res_info now that we have one */
bind_columns(stmt);
//cur = stmt->bind_head; //cur = stmt->bind_head;
//while (cur) { //while (cur) {
//if (cur->column_number>0 && //if (cur->column_number>0 &&