mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
ext/odbc support for phpng (incomplete)
This commit is contained in:
Dmitry Stogov
parent
7435fc88a6
commit
c4fc99ff82
3 changed files with 164 additions and 190 deletions
|
|
@ -416,7 +416,7 @@ ZEND_GET_MODULE(odbc)
|
|||
|
||||
/* {{{ _free_odbc_result
|
||||
*/
|
||||
static void _free_odbc_result(zend_rsrc_list_entry *rsrc TSRMLS_DC)
|
||||
static void _free_odbc_result(zend_resource *rsrc TSRMLS_DC)
|
||||
{
|
||||
odbc_result *res = (odbc_result *)rsrc->ptr;
|
||||
int i;
|
||||
|
|
@ -465,24 +465,21 @@ static void safe_odbc_disconnect( void *handle )
|
|||
|
||||
/* {{{ _close_odbc_conn
|
||||
*/
|
||||
static void _close_odbc_conn(zend_rsrc_list_entry *rsrc TSRMLS_DC)
|
||||
static void _close_odbc_conn(zend_resource *rsrc TSRMLS_DC)
|
||||
{
|
||||
int i, nument, type;
|
||||
void *ptr;
|
||||
zend_resource *p;
|
||||
odbc_result *res;
|
||||
|
||||
odbc_connection *conn = (odbc_connection *)rsrc->ptr;
|
||||
|
||||
nument = zend_hash_next_free_element(&EG(regular_list));
|
||||
for(i = 1; i < nument; i++) {
|
||||
ptr = zend_list_find(i, &type);
|
||||
if (ptr && (type == le_result)) {
|
||||
res = (odbc_result *)ptr;
|
||||
ZEND_HASH_FOREACH_PTR(&EG(regular_list), p) {
|
||||
if (p->ptr && (p->type == le_result)) {
|
||||
res = (odbc_result *)p->ptr;
|
||||
if (res->conn_ptr == conn) {
|
||||
zend_list_delete(i);
|
||||
zend_list_delete(p);
|
||||
}
|
||||
}
|
||||
}
|
||||
} ZEND_HASH_FOREACH_END();
|
||||
|
||||
safe_odbc_disconnect(conn->hdbc);
|
||||
SQLFreeConnect(conn->hdbc);
|
||||
|
|
@ -494,24 +491,21 @@ static void _close_odbc_conn(zend_rsrc_list_entry *rsrc TSRMLS_DC)
|
|||
|
||||
/* {{{ void _close_odbc_pconn
|
||||
*/
|
||||
static void _close_odbc_pconn(zend_rsrc_list_entry *rsrc TSRMLS_DC)
|
||||
static void _close_odbc_pconn(zend_resource *rsrc TSRMLS_DC)
|
||||
{
|
||||
int i, nument, type;
|
||||
void *ptr;
|
||||
zend_resource *p;
|
||||
odbc_result *res;
|
||||
odbc_connection *conn = (odbc_connection *)rsrc->ptr;
|
||||
|
||||
nument = zend_hash_next_free_element(&EG(persistent_list));
|
||||
for(i = 1; i < nument; i++) {
|
||||
ptr = zend_list_find(i, &type);
|
||||
if (ptr && (type == le_result)) {
|
||||
res = (odbc_result *)ptr;
|
||||
ZEND_HASH_FOREACH_PTR(&EG(regular_list), p) {
|
||||
if (p->ptr && (p->type == le_result)) {
|
||||
res = (odbc_result *)p->ptr;
|
||||
if (res->conn_ptr == conn) {
|
||||
zend_list_delete(i);
|
||||
zend_list_delete(p);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} ZEND_HASH_FOREACH_END();
|
||||
|
||||
safe_odbc_disconnect(conn->hdbc);
|
||||
SQLFreeConnect(conn->hdbc);
|
||||
SQLFreeEnv(conn->henv);
|
||||
|
|
@ -721,7 +715,7 @@ PHP_MINIT_FUNCTION(odbc)
|
|||
le_result = zend_register_list_destructors_ex(_free_odbc_result, NULL, "odbc result", module_number);
|
||||
le_conn = zend_register_list_destructors_ex(_close_odbc_conn, NULL, "odbc link", module_number);
|
||||
le_pconn = zend_register_list_destructors_ex(NULL, _close_odbc_pconn, "odbc link persistent", module_number);
|
||||
Z_TYPE(odbc_module_entry) = type;
|
||||
odbc_module_entry.type = type;
|
||||
|
||||
REGISTER_STRING_CONSTANT("ODBC_TYPE", PHP_ODBC_TYPE, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("ODBC_BINMODE_PASSTHRU", 0, CONST_CS | CONST_PERSISTENT);
|
||||
|
|
@ -924,7 +918,7 @@ void php_odbc_fetch_attribs(INTERNAL_FUNCTION_PARAMETERS, int mode)
|
|||
}
|
||||
|
||||
if (Z_LVAL_P(pv_res)) {
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, pv_res, -1, "ODBC result", le_result);
|
||||
if (mode) {
|
||||
result->longreadlen = flag;
|
||||
} else {
|
||||
|
|
@ -1028,7 +1022,7 @@ void odbc_transact(INTERNAL_FUNCTION_PARAMETERS, int type)
|
|||
return;
|
||||
}
|
||||
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
|
||||
rc = SQLTransact(conn->henv, conn->hdbc, (SQLUSMALLINT)((type)?SQL_COMMIT:SQL_ROLLBACK));
|
||||
if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
|
||||
|
|
@ -1040,10 +1034,10 @@ void odbc_transact(INTERNAL_FUNCTION_PARAMETERS, int type)
|
|||
}
|
||||
/* }}} */
|
||||
|
||||
/* {{{ _close_pconn_with_id */
|
||||
static int _close_pconn_with_id(zend_rsrc_list_entry *le, int *id TSRMLS_DC)
|
||||
/* {{{ _close_pconn_with_res */
|
||||
static int _close_pconn_with_res(zend_resource *le, zend_resource *res TSRMLS_DC)
|
||||
{
|
||||
if(Z_TYPE_P(le) == le_pconn && (((odbc_connection *)(le->ptr))->id == *id)){
|
||||
if (le->type == le_pconn && (((odbc_connection *)(le->ptr))->res == res)){
|
||||
return 1;
|
||||
}else{
|
||||
return 0;
|
||||
|
|
@ -1073,7 +1067,7 @@ void odbc_column_lengths(INTERNAL_FUNCTION_PARAMETERS, int type)
|
|||
return;
|
||||
}
|
||||
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, pv_res, -1, "ODBC result", le_result);
|
||||
|
||||
if (result->numcols == 0) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "No tuples available at this result index");
|
||||
|
|
@ -1102,41 +1096,32 @@ void odbc_column_lengths(INTERNAL_FUNCTION_PARAMETERS, int type)
|
|||
Close all ODBC connections */
|
||||
PHP_FUNCTION(odbc_close_all)
|
||||
{
|
||||
void *ptr;
|
||||
int type;
|
||||
int i;
|
||||
int nument;
|
||||
zend_resource *p;
|
||||
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
nument = zend_hash_next_free_element(&EG(regular_list));
|
||||
|
||||
/* Loop through list and close all statements */
|
||||
for(i = 1; i < nument; i++) {
|
||||
ptr = zend_list_find(i, &type);
|
||||
if (ptr && (type == le_result)){
|
||||
zend_list_delete(i);
|
||||
ZEND_HASH_FOREACH_PTR(&EG(regular_list), p) {
|
||||
if (p->ptr && (p->type == le_result)) {
|
||||
zend_list_delete(p);
|
||||
}
|
||||
}
|
||||
} ZEND_HASH_FOREACH_END();
|
||||
|
||||
/* Second loop through list, now close all connections */
|
||||
nument = zend_hash_next_free_element(&EG(regular_list));
|
||||
|
||||
for(i = 1; i < nument; i++) {
|
||||
ptr = zend_list_find(i, &type);
|
||||
if (ptr){
|
||||
if(type == le_conn){
|
||||
zend_list_delete(i);
|
||||
}else if(type == le_pconn){
|
||||
zend_list_delete(i);
|
||||
ZEND_HASH_FOREACH_PTR(&EG(regular_list), p) {
|
||||
if (p->ptr) {
|
||||
if (p->type == le_conn){
|
||||
zend_list_delete(p);
|
||||
} else if (p->type == le_pconn){
|
||||
zend_list_delete(p);
|
||||
/* Delete the persistent connection */
|
||||
zend_hash_apply_with_argument(&EG(persistent_list),
|
||||
(apply_func_arg_t) _close_pconn_with_id, (void *) &i TSRMLS_CC);
|
||||
(apply_func_arg_t) _close_pconn_with_res, (void *)p TSRMLS_CC);
|
||||
}
|
||||
}
|
||||
}
|
||||
} ZEND_HASH_FOREACH_END();
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
|
|
@ -1174,7 +1159,7 @@ PHP_FUNCTION(odbc_prepare)
|
|||
return;
|
||||
}
|
||||
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
|
||||
result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
|
||||
|
||||
|
|
@ -1232,7 +1217,7 @@ PHP_FUNCTION(odbc_prepare)
|
|||
} else {
|
||||
result->values = NULL;
|
||||
}
|
||||
zend_list_addref(conn->id);
|
||||
Z_ADDREF_P(pv_conn);
|
||||
result->conn_ptr = conn;
|
||||
result->fetched = 0;
|
||||
ZEND_REGISTER_RESOURCE(return_value, result, le_result);
|
||||
|
|
@ -1247,7 +1232,7 @@ PHP_FUNCTION(odbc_prepare)
|
|||
Execute a prepared statement */
|
||||
PHP_FUNCTION(odbc_execute)
|
||||
{
|
||||
zval *pv_res, *pv_param_arr, **tmp;
|
||||
zval *pv_res, *pv_param_arr, *tmp;
|
||||
typedef struct params_t {
|
||||
SQLLEN vallen;
|
||||
int fp;
|
||||
|
|
@ -1268,7 +1253,7 @@ PHP_FUNCTION(odbc_execute)
|
|||
return;
|
||||
}
|
||||
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, pv_res, -1, "ODBC result", le_result);
|
||||
|
||||
/* XXX check for already bound parameters*/
|
||||
if (result->numparams > 0 && numArgs == 1) {
|
||||
|
|
@ -1289,7 +1274,7 @@ PHP_FUNCTION(odbc_execute)
|
|||
}
|
||||
|
||||
for(i = 1; i <= result->numparams; i++) {
|
||||
if (zend_hash_get_current_data(Z_ARRVAL_P(pv_param_arr), (void **) &tmp) == FAILURE) {
|
||||
if ((tmp = zend_hash_get_current_data(Z_ARRVAL_P(pv_param_arr))) == NULL) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING,"Error getting parameter");
|
||||
SQLFreeStmt(result->stmt,SQL_RESET_PARAMS);
|
||||
for (i = 0; i < result->numparams; i++) {
|
||||
|
|
@ -1301,9 +1286,9 @@ PHP_FUNCTION(odbc_execute)
|
|||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
otype = (*tmp)->type;
|
||||
otype = Z_TYPE_P(tmp);
|
||||
convert_to_string_ex(tmp);
|
||||
if (Z_TYPE_PP(tmp) != IS_STRING) {
|
||||
if (Z_TYPE_P(tmp) != IS_STRING) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING,"Error converting parameter");
|
||||
SQLFreeStmt(result->stmt, SQL_RESET_PARAMS);
|
||||
for (i = 0; i < result->numparams; i++) {
|
||||
|
|
@ -1316,7 +1301,7 @@ PHP_FUNCTION(odbc_execute)
|
|||
}
|
||||
|
||||
rc = SQLDescribeParam(result->stmt, (SQLUSMALLINT)i, &sqltype, &precision, &scale, &nullable);
|
||||
params[i-1].vallen = Z_STRLEN_PP(tmp);
|
||||
params[i-1].vallen = Z_STRLEN_P(tmp);
|
||||
params[i-1].fp = -1;
|
||||
if (rc == SQL_ERROR) {
|
||||
odbc_sql_error(result->conn_ptr, result->stmt, "SQLDescribeParameter");
|
||||
|
|
@ -1336,14 +1321,14 @@ PHP_FUNCTION(odbc_execute)
|
|||
ctype = SQL_C_CHAR;
|
||||
}
|
||||
|
||||
if (Z_STRLEN_PP(tmp) > 2 &&
|
||||
Z_STRVAL_PP(tmp)[0] == '\'' &&
|
||||
Z_STRVAL_PP(tmp)[Z_STRLEN_PP(tmp) - 1] == '\'') {
|
||||
if (Z_STRLEN_P(tmp) > 2 &&
|
||||
Z_STRVAL_P(tmp)[0] == '\'' &&
|
||||
Z_STRVAL_P(tmp)[Z_STRLEN_P(tmp) - 1] == '\'') {
|
||||
|
||||
if (CHECK_ZVAL_NULL_PATH(*tmp)) {
|
||||
if (CHECK_ZVAL_NULL_PATH(tmp)) {
|
||||
RETURN_FALSE;
|
||||
}
|
||||
filename = estrndup(&Z_STRVAL_PP(tmp)[1], Z_STRLEN_PP(tmp) - 2);
|
||||
filename = estrndup(&Z_STRVAL_P(tmp)[1], Z_STRLEN_P(tmp) - 2);
|
||||
filename[strlen(filename)] = '\0';
|
||||
|
||||
/* Check the basedir */
|
||||
|
|
@ -1390,7 +1375,7 @@ PHP_FUNCTION(odbc_execute)
|
|||
|
||||
rc = SQLBindParameter(result->stmt, (SQLUSMALLINT)i, SQL_PARAM_INPUT,
|
||||
ctype, sqltype, precision, scale,
|
||||
Z_STRVAL_PP(tmp), 0,
|
||||
Z_STRVAL_P(tmp), 0,
|
||||
¶ms[i-1].vallen);
|
||||
}
|
||||
if (rc == SQL_ERROR) {
|
||||
|
|
@ -1486,7 +1471,7 @@ PHP_FUNCTION(odbc_cursor)
|
|||
return;
|
||||
}
|
||||
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, pv_res, -1, "ODBC result", le_result);
|
||||
|
||||
rc = SQLGetInfo(result->conn_ptr->hdbc,SQL_MAX_CURSOR_NAME_LEN, (void *)&max_len,sizeof(max_len),&len);
|
||||
if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
|
||||
|
|
@ -1511,14 +1496,14 @@ PHP_FUNCTION(odbc_cursor)
|
|||
odbc_sql_error(result->conn_ptr, result->stmt, "SQLSetCursorName");
|
||||
RETVAL_FALSE;
|
||||
} else {
|
||||
RETVAL_STRING(cursorname,1);
|
||||
RETVAL_STRING(cursorname);
|
||||
}
|
||||
} else {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQL error: %s, SQL state %s", errormsg, state);
|
||||
RETVAL_FALSE;
|
||||
}
|
||||
} else {
|
||||
RETVAL_STRING(cursorname,1);
|
||||
RETVAL_STRING(cursorname);
|
||||
}
|
||||
efree(cursorname);
|
||||
} else {
|
||||
|
|
@ -1550,7 +1535,7 @@ PHP_FUNCTION(odbc_data_source)
|
|||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &zv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, zv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
|
||||
/* now we have the "connection" lets call the DataSource object */
|
||||
rc = SQLDataSources(conn->henv,
|
||||
|
|
@ -1604,7 +1589,7 @@ PHP_FUNCTION(odbc_exec)
|
|||
return;
|
||||
}
|
||||
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
|
||||
result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
|
||||
|
||||
|
|
@ -1659,7 +1644,7 @@ PHP_FUNCTION(odbc_exec)
|
|||
} else {
|
||||
result->values = NULL;
|
||||
}
|
||||
zend_list_addref(conn->id);
|
||||
Z_ADDREF_P(pv_conn);
|
||||
result->conn_ptr = conn;
|
||||
result->fetched = 0;
|
||||
ZEND_REGISTER_RESOURCE(return_value, result, le_result);
|
||||
|
|
@ -1682,7 +1667,7 @@ static void php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
|
|||
SQLULEN crow;
|
||||
SQLUSMALLINT RowStatus[1];
|
||||
SQLLEN rownum;
|
||||
zval *pv_res, *tmp;
|
||||
zval *pv_res, tmp;
|
||||
long pv_row = -1;
|
||||
|
||||
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &pv_res, &pv_row) == FAILURE) {
|
||||
|
|
@ -1691,14 +1676,14 @@ static void php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
|
|||
|
||||
rownum = pv_row;
|
||||
#else
|
||||
zval *pv_res, *tmp;
|
||||
zval *pv_res, tmp;
|
||||
|
||||
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &pv_res) == FAILURE) {
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, pv_res, -1, "ODBC result", le_result);
|
||||
|
||||
if (result->numcols == 0) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "No tuples available at this result index");
|
||||
|
|
@ -1730,9 +1715,6 @@ static void php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
|
|||
result->fetched++;
|
||||
|
||||
for(i = 0; i < result->numcols; i++) {
|
||||
ALLOC_INIT_ZVAL(tmp);
|
||||
Z_TYPE_P(tmp) = IS_STRING;
|
||||
Z_STRLEN_P(tmp) = 0;
|
||||
sql_c_type = SQL_C_CHAR;
|
||||
|
||||
switch(result->values[i].coltype) {
|
||||
|
|
@ -1740,7 +1722,7 @@ static void php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
|
|||
case SQL_VARBINARY:
|
||||
case SQL_LONGVARBINARY:
|
||||
if (result->binmode <= 0) {
|
||||
Z_STRVAL_P(tmp) = STR_EMPTY_ALLOC();
|
||||
ZVAL_EMPTY_STRING(&tmp);
|
||||
break;
|
||||
}
|
||||
if (result->binmode == 1) {
|
||||
|
|
@ -1751,7 +1733,7 @@ static void php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
|
|||
case SQL_WLONGVARCHAR:
|
||||
#endif
|
||||
if (IS_SQL_LONG(result->values[i].coltype) && result->longreadlen <= 0) {
|
||||
Z_STRVAL_P(tmp) = STR_EMPTY_ALLOC();
|
||||
ZVAL_EMPTY_STRING(&tmp);
|
||||
break;
|
||||
}
|
||||
if (buf == NULL) {
|
||||
|
|
@ -1767,33 +1749,31 @@ static void php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
|
|||
}
|
||||
|
||||
if (rc == SQL_SUCCESS_WITH_INFO) {
|
||||
Z_STRLEN_P(tmp) = result->longreadlen;
|
||||
ZVAL_STRINGL(&tmp, buf, result->longreadlen);
|
||||
} else if (result->values[i].vallen == SQL_NULL_DATA) {
|
||||
ZVAL_NULL(tmp);
|
||||
ZVAL_NULL(&tmp);
|
||||
break;
|
||||
} else {
|
||||
Z_STRLEN_P(tmp) = result->values[i].vallen;
|
||||
ZVAL_STRINGL(&tmp, buf, result->values[i].vallen);
|
||||
}
|
||||
Z_STRVAL_P(tmp) = estrndup(buf, Z_STRLEN_P(tmp));
|
||||
break;
|
||||
|
||||
default:
|
||||
if (result->values[i].vallen == SQL_NULL_DATA) {
|
||||
ZVAL_NULL(tmp);
|
||||
ZVAL_NULL(&tmp);
|
||||
break;
|
||||
}
|
||||
Z_STRLEN_P(tmp) = result->values[i].vallen;
|
||||
Z_STRVAL_P(tmp) = estrndup(result->values[i].value,Z_STRLEN_P(tmp));
|
||||
ZVAL_STRINGL(&tmp, result->values[i].value, result->values[i].vallen);
|
||||
break;
|
||||
}
|
||||
|
||||
if (result_type & ODBC_NUM) {
|
||||
zend_hash_index_update(Z_ARRVAL_P(return_value), i, &tmp, sizeof(zval *), NULL);
|
||||
zend_hash_index_update(Z_ARRVAL_P(return_value), i, &tmp);
|
||||
} else {
|
||||
if (!*(result->values[i].name) && Z_TYPE_P(tmp) == IS_STRING) {
|
||||
zend_hash_update(Z_ARRVAL_P(return_value), Z_STRVAL_P(tmp), Z_STRLEN_P(tmp)+1, &tmp, sizeof(zval *), NULL);
|
||||
if (!*(result->values[i].name) && Z_TYPE(tmp) == IS_STRING) {
|
||||
zend_hash_update(Z_ARRVAL_P(return_value), Z_STR(tmp), &tmp);
|
||||
} else {
|
||||
zend_hash_update(Z_ARRVAL_P(return_value), result->values[i].name, strlen(result->values[i].name)+1, &tmp, sizeof(zval *), NULL);
|
||||
zend_hash_str_update(Z_ARRVAL_P(return_value), result->values[i].name, strlen(result->values[i].name), &tmp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1833,7 +1813,7 @@ PHP_FUNCTION(odbc_fetch_into)
|
|||
RETCODE rc;
|
||||
SQLSMALLINT sql_c_type;
|
||||
char *buf = NULL;
|
||||
zval *pv_res, **pv_res_arr, *tmp;
|
||||
zval *pv_res, *pv_res_arr, tmp;
|
||||
#ifdef HAVE_SQL_EXTENDED_FETCH
|
||||
long pv_row = 0;
|
||||
SQLULEN crow;
|
||||
|
|
@ -1842,26 +1822,26 @@ PHP_FUNCTION(odbc_fetch_into)
|
|||
#endif /* HAVE_SQL_EXTENDED_FETCH */
|
||||
|
||||
#ifdef HAVE_SQL_EXTENDED_FETCH
|
||||
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZ|l", &pv_res, &pv_res_arr, &pv_row) == FAILURE) {
|
||||
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz|l", &pv_res, &pv_res_arr, &pv_row) == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
rownum = pv_row;
|
||||
#else
|
||||
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZ", &pv_res, &pv_res_arr) == FAILURE) {
|
||||
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", &pv_res, &pv_res_arr) == FAILURE) {
|
||||
return;
|
||||
}
|
||||
#endif /* HAVE_SQL_EXTENDED_FETCH */
|
||||
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, pv_res, -1, "ODBC result", le_result);
|
||||
|
||||
if (result->numcols == 0) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "No tuples available at this result index");
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
if (Z_TYPE_PP(pv_res_arr) != IS_ARRAY) {
|
||||
array_init(*pv_res_arr);
|
||||
if (Z_TYPE_P(pv_res_arr) != IS_ARRAY) {
|
||||
array_init(pv_res_arr);
|
||||
}
|
||||
|
||||
#ifdef HAVE_SQL_EXTENDED_FETCH
|
||||
|
|
@ -1887,9 +1867,6 @@ PHP_FUNCTION(odbc_fetch_into)
|
|||
result->fetched++;
|
||||
|
||||
for(i = 0; i < result->numcols; i++) {
|
||||
MAKE_STD_ZVAL(tmp);
|
||||
Z_TYPE_P(tmp) = IS_STRING;
|
||||
Z_STRLEN_P(tmp) = 0;
|
||||
sql_c_type = SQL_C_CHAR;
|
||||
|
||||
switch(result->values[i].coltype) {
|
||||
|
|
@ -1897,7 +1874,7 @@ PHP_FUNCTION(odbc_fetch_into)
|
|||
case SQL_VARBINARY:
|
||||
case SQL_LONGVARBINARY:
|
||||
if (result->binmode <= 0) {
|
||||
Z_STRVAL_P(tmp) = STR_EMPTY_ALLOC();
|
||||
ZVAL_EMPTY_STRING(&tmp);
|
||||
break;
|
||||
}
|
||||
if (result->binmode == 1) sql_c_type = SQL_C_BINARY;
|
||||
|
|
@ -1907,7 +1884,7 @@ PHP_FUNCTION(odbc_fetch_into)
|
|||
case SQL_WLONGVARCHAR:
|
||||
#endif
|
||||
if (IS_SQL_LONG(result->values[i].coltype) && result->longreadlen <= 0) {
|
||||
Z_STRVAL_P(tmp) = STR_EMPTY_ALLOC();
|
||||
ZVAL_EMPTY_STRING(&tmp);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -1922,26 +1899,24 @@ PHP_FUNCTION(odbc_fetch_into)
|
|||
RETURN_FALSE;
|
||||
}
|
||||
if (rc == SQL_SUCCESS_WITH_INFO) {
|
||||
Z_STRLEN_P(tmp) = result->longreadlen;
|
||||
ZVAL_STRINGL(&tmp, buf, result->longreadlen);
|
||||
} else if (result->values[i].vallen == SQL_NULL_DATA) {
|
||||
ZVAL_NULL(tmp);
|
||||
ZVAL_NULL(&tmp);
|
||||
break;
|
||||
} else {
|
||||
Z_STRLEN_P(tmp) = result->values[i].vallen;
|
||||
ZVAL_STRINGL(&tmp, buf, result->values[i].vallen);
|
||||
}
|
||||
Z_STRVAL_P(tmp) = estrndup(buf, Z_STRLEN_P(tmp));
|
||||
break;
|
||||
|
||||
default:
|
||||
if (result->values[i].vallen == SQL_NULL_DATA) {
|
||||
ZVAL_NULL(tmp);
|
||||
ZVAL_NULL(&tmp);
|
||||
break;
|
||||
}
|
||||
Z_STRLEN_P(tmp) = result->values[i].vallen;
|
||||
Z_STRVAL_P(tmp) = estrndup(result->values[i].value,Z_STRLEN_P(tmp));
|
||||
ZVAL_STRINGL(&tmp, result->values[i].value, result->values[i].vallen);
|
||||
break;
|
||||
}
|
||||
zend_hash_index_update(Z_ARRVAL_PP(pv_res_arr), i, &tmp, sizeof(zval *), NULL);
|
||||
zend_hash_index_update(Z_ARRVAL_P(pv_res_arr), i, &tmp);
|
||||
}
|
||||
if (buf) efree(buf);
|
||||
RETURN_LONG(result->numcols);
|
||||
|
|
@ -2001,7 +1976,7 @@ PHP_FUNCTION(odbc_fetch_row)
|
|||
|
||||
rownum = pv_row;
|
||||
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, pv_res, -1, "ODBC result", le_result);
|
||||
|
||||
if (result->numcols == 0) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "No tuples available at this result index");
|
||||
|
|
@ -2044,7 +2019,7 @@ PHP_FUNCTION(odbc_result)
|
|||
int i = 0;
|
||||
RETCODE rc;
|
||||
SQLLEN fieldsize;
|
||||
zval *pv_res, **pv_field;
|
||||
zval *pv_res, *pv_field;
|
||||
#ifdef HAVE_SQL_EXTENDED_FETCH
|
||||
SQLULEN crow;
|
||||
SQLUSMALLINT RowStatus[1];
|
||||
|
|
@ -2053,18 +2028,18 @@ PHP_FUNCTION(odbc_result)
|
|||
field_ind = -1;
|
||||
field = NULL;
|
||||
|
||||
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZ", &pv_res, &pv_field) == FAILURE) {
|
||||
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", &pv_res, &pv_field) == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (Z_TYPE_PP(pv_field) == IS_STRING) {
|
||||
field = Z_STRVAL_PP(pv_field);
|
||||
if (Z_TYPE_P(pv_field) == IS_STRING) {
|
||||
field = Z_STRVAL_P(pv_field);
|
||||
} else {
|
||||
convert_to_long_ex(pv_field);
|
||||
field_ind = Z_LVAL_PP(pv_field) - 1;
|
||||
field_ind = Z_LVAL_P(pv_field) - 1;
|
||||
}
|
||||
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, pv_res, -1, "ODBC result", le_result);
|
||||
|
||||
if ((result->numcols == 0)) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "No tuples available at this result index");
|
||||
|
|
@ -2174,14 +2149,17 @@ PHP_FUNCTION(odbc_result)
|
|||
/* Don't duplicate result, saves one emalloc.
|
||||
For SQL_SUCCESS, the length is in vallen.
|
||||
*/
|
||||
RETURN_STRINGL(field, (rc == SQL_SUCCESS_WITH_INFO) ? fieldsize : result->values[field_ind].vallen, 0);
|
||||
RETVAL_STRINGL(field, (rc == SQL_SUCCESS_WITH_INFO) ? fieldsize : result->values[field_ind].vallen);
|
||||
// TODO: avoid dpouble reallocation ???
|
||||
efree(field);
|
||||
return;
|
||||
break;
|
||||
|
||||
default:
|
||||
if (result->values[field_ind].vallen == SQL_NULL_DATA) {
|
||||
RETURN_NULL();
|
||||
} else {
|
||||
RETURN_STRINGL(result->values[field_ind].value, result->values[field_ind].vallen, 1);
|
||||
RETURN_STRINGL(result->values[field_ind].value, result->values[field_ind].vallen);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -2238,7 +2216,7 @@ PHP_FUNCTION(odbc_result_all)
|
|||
return;
|
||||
}
|
||||
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, pv_res, -1, "ODBC result", le_result);
|
||||
|
||||
if (result->numcols == 0) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "No tuples available at this result index");
|
||||
|
|
@ -2353,7 +2331,7 @@ PHP_FUNCTION(odbc_free_result)
|
|||
return;
|
||||
}
|
||||
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, pv_res, -1, "ODBC result", le_result);
|
||||
if (result->values) {
|
||||
for (i = 0; i < result->numcols; i++) {
|
||||
if (result->values[i].value) {
|
||||
|
|
@ -2364,7 +2342,7 @@ PHP_FUNCTION(odbc_free_result)
|
|||
result->values = NULL;
|
||||
}
|
||||
|
||||
zend_list_delete(Z_LVAL_P(pv_res));
|
||||
zend_list_delete(Z_RES_P(pv_res));
|
||||
|
||||
RETURN_TRUE;
|
||||
}
|
||||
|
|
@ -2564,11 +2542,11 @@ void odbc_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
|
|||
try_and_get_another_connection:
|
||||
|
||||
if (persistent) {
|
||||
zend_rsrc_list_entry *le;
|
||||
zend_resource *le;
|
||||
|
||||
/* the link is not in the persistent list */
|
||||
if (zend_hash_find(&EG(persistent_list), hashed_details, hashed_len + 1, (void **) &le) == FAILURE) {
|
||||
zend_rsrc_list_entry new_le;
|
||||
if ((le = zend_hash_str_find_ptr(&EG(persistent_list), hashed_details, hashed_len)) == NULL) {
|
||||
zend_resource new_le;
|
||||
|
||||
if (ODBCG(max_links) != -1 && ODBCG(num_links) >= ODBCG(max_links)) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%ld)", ODBCG(num_links));
|
||||
|
|
@ -2586,19 +2564,20 @@ try_and_get_another_connection:
|
|||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
Z_TYPE(new_le) = le_pconn;
|
||||
new_le.type = le_pconn;
|
||||
new_le.ptr = db_conn;
|
||||
if (zend_hash_update(&EG(persistent_list), hashed_details, hashed_len + 1, &new_le,
|
||||
sizeof(zend_rsrc_list_entry), NULL) == FAILURE) {
|
||||
new_le.handle = -1;
|
||||
if (zend_hash_str_update_mem(&EG(persistent_list), hashed_details, hashed_len, &new_le,
|
||||
sizeof(zend_resource)) == NULL) {
|
||||
free(db_conn);
|
||||
efree(hashed_details);
|
||||
RETURN_FALSE;
|
||||
}
|
||||
ODBCG(num_persistent)++;
|
||||
ODBCG(num_links)++;
|
||||
db_conn->id = ZEND_REGISTER_RESOURCE(return_value, db_conn, le_pconn);
|
||||
db_conn->res = ZEND_REGISTER_RESOURCE(return_value, db_conn, le_pconn);
|
||||
} else { /* found connection */
|
||||
if (Z_TYPE_P(le) != le_pconn) {
|
||||
if (le->type != le_pconn) {
|
||||
RETURN_FALSE;
|
||||
}
|
||||
/*
|
||||
|
|
@ -2619,7 +2598,7 @@ try_and_get_another_connection:
|
|||
d_name, sizeof(d_name), &len);
|
||||
|
||||
if(ret != SQL_SUCCESS || len == 0) {
|
||||
zend_hash_del(&EG(persistent_list), hashed_details, hashed_len + 1);
|
||||
zend_hash_str_del(&EG(persistent_list), hashed_details, hashed_len);
|
||||
/* Commented out to fix a possible double closure error
|
||||
* when working with persistent connections as submitted by
|
||||
* bug #15758
|
||||
|
|
@ -2631,28 +2610,27 @@ try_and_get_another_connection:
|
|||
}
|
||||
}
|
||||
}
|
||||
db_conn->id = ZEND_REGISTER_RESOURCE(return_value, db_conn, le_pconn);
|
||||
db_conn->res = ZEND_REGISTER_RESOURCE(return_value, db_conn, le_pconn);
|
||||
} else { /* non persistent */
|
||||
zend_rsrc_list_entry *index_ptr, new_index_ptr;
|
||||
zend_resource *index_ptr, new_index_ptr;
|
||||
|
||||
if (zend_hash_find(&EG(regular_list), hashed_details, hashed_len + 1, (void **) &index_ptr) == SUCCESS) {
|
||||
int type, conn_id;
|
||||
void *ptr;
|
||||
if ((index_ptr = zend_hash_str_find_ptr(&EG(regular_list), hashed_details, hashed_len)) != NULL) {
|
||||
int conn_id;
|
||||
zend_resource *p;
|
||||
|
||||
if (Z_TYPE_P(index_ptr) != le_index_ptr) {
|
||||
if (index_ptr->type != le_index_ptr) {
|
||||
RETURN_FALSE;
|
||||
}
|
||||
conn_id = (int)index_ptr->ptr;
|
||||
ptr = zend_list_find(conn_id, &type); /* check if the connection is still there */
|
||||
p = zend_hash_index_find_ptr(&EG(regular_list), conn_id); /* check if the connection is still there */
|
||||
|
||||
if (ptr && (type == le_conn || type == le_pconn)) {
|
||||
zend_list_addref(conn_id);
|
||||
Z_LVAL_P(return_value) = conn_id;
|
||||
Z_TYPE_P(return_value) = IS_RESOURCE;
|
||||
if (p && p->ptr && (p->type == le_conn || p->type == le_pconn)) {
|
||||
GC_REFCOUNT(p)++;
|
||||
RETVAL_RES(p);
|
||||
efree(hashed_details);
|
||||
return;
|
||||
} else {
|
||||
zend_hash_del(&EG(regular_list), hashed_details, hashed_len + 1);
|
||||
zend_hash_str_del(&EG(regular_list), hashed_details, hashed_len);
|
||||
}
|
||||
}
|
||||
if (ODBCG(max_links) != -1 && ODBCG(num_links) >= ODBCG(max_links)) {
|
||||
|
|
@ -2665,12 +2643,12 @@ try_and_get_another_connection:
|
|||
efree(hashed_details);
|
||||
RETURN_FALSE;
|
||||
}
|
||||
db_conn->id = ZEND_REGISTER_RESOURCE(return_value, db_conn, le_conn);
|
||||
new_index_ptr.ptr = (void *) Z_LVAL_P(return_value);
|
||||
Z_TYPE(new_index_ptr) = le_index_ptr;
|
||||
db_conn->res = ZEND_REGISTER_RESOURCE(return_value, db_conn, le_conn);
|
||||
new_index_ptr.ptr = (void *) Z_RES_HANDLE_P(return_value);
|
||||
new_index_ptr.type = le_index_ptr;
|
||||
|
||||
if (zend_hash_update(&EG(regular_list), hashed_details, hashed_len + 1, (void *) &new_index_ptr,
|
||||
sizeof(zend_rsrc_list_entry), NULL) == FAILURE) {
|
||||
if (zend_hash_str_update_mem(&EG(regular_list), hashed_details, hashed_len, (void *) &new_index_ptr,
|
||||
sizeof(zend_resource)) == NULL) {
|
||||
efree(hashed_details);
|
||||
RETURN_FALSE;
|
||||
/* XXX Free Connection */
|
||||
|
|
@ -2686,12 +2664,9 @@ try_and_get_another_connection:
|
|||
PHP_FUNCTION(odbc_close)
|
||||
{
|
||||
zval *pv_conn;
|
||||
void *ptr;
|
||||
zend_resource *p;
|
||||
odbc_connection *conn;
|
||||
odbc_result *res;
|
||||
int nument;
|
||||
int i;
|
||||
int type;
|
||||
int is_pconn = 0;
|
||||
int found_resource_type = le_conn;
|
||||
|
||||
|
|
@ -2699,27 +2674,24 @@ PHP_FUNCTION(odbc_close)
|
|||
return;
|
||||
}
|
||||
|
||||
conn = (odbc_connection *) zend_fetch_resource(&pv_conn TSRMLS_CC, -1, "ODBC-Link", &found_resource_type, 2, le_conn, le_pconn);
|
||||
conn = (odbc_connection *) zend_fetch_resource(pv_conn TSRMLS_CC, -1, "ODBC-Link", &found_resource_type, 2, le_conn, le_pconn);
|
||||
if (found_resource_type==le_pconn) {
|
||||
is_pconn = 1;
|
||||
}
|
||||
|
||||
nument = zend_hash_next_free_element(&EG(regular_list));
|
||||
|
||||
for(i = 1; i < nument; i++){
|
||||
ptr = zend_list_find(i, &type);
|
||||
if(ptr && (type == le_result)){
|
||||
res = (odbc_result *)ptr;
|
||||
if(res->conn_ptr == conn){
|
||||
zend_list_delete(i);
|
||||
ZEND_HASH_FOREACH_PTR(&EG(regular_list), p) {
|
||||
if (p->ptr && (p->type == le_result)) {
|
||||
res = (odbc_result *)p->ptr;
|
||||
if (res->conn_ptr == conn) {
|
||||
zend_list_delete(p);
|
||||
}
|
||||
}
|
||||
}
|
||||
} ZEND_HASH_FOREACH_END();
|
||||
|
||||
zend_list_delete(Z_LVAL_P(pv_conn));
|
||||
zend_list_delete(Z_RES_P(pv_conn));
|
||||
|
||||
if(is_pconn){
|
||||
zend_hash_apply_with_argument(&EG(persistent_list), (apply_func_arg_t) _close_pconn_with_id, (void *) &(Z_LVAL_P(pv_conn)) TSRMLS_CC);
|
||||
zend_hash_apply_with_argument(&EG(persistent_list), (apply_func_arg_t) _close_pconn_with_res, (void *) Z_RES_P(pv_conn) TSRMLS_CC);
|
||||
}
|
||||
}
|
||||
/* }}} */
|
||||
|
|
@ -2735,7 +2707,7 @@ PHP_FUNCTION(odbc_num_rows)
|
|||
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &pv_res) == FAILURE) {
|
||||
return;
|
||||
}
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, pv_res, -1, "ODBC result", le_result);
|
||||
SQLRowCount(result->stmt, &rows);
|
||||
RETURN_LONG(rows);
|
||||
}
|
||||
|
|
@ -2753,7 +2725,7 @@ PHP_FUNCTION(odbc_next_result)
|
|||
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &pv_res) == FAILURE) {
|
||||
return;
|
||||
}
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, pv_res, -1, "ODBC result", le_result);
|
||||
|
||||
if (result->values) {
|
||||
for(i = 0; i < result->numcols; i++) {
|
||||
|
|
@ -2801,7 +2773,7 @@ PHP_FUNCTION(odbc_num_fields)
|
|||
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &pv_res) == FAILURE) {
|
||||
return;
|
||||
}
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, pv_res, -1, "ODBC result", le_result);
|
||||
RETURN_LONG(result->numcols);
|
||||
}
|
||||
/* }}} */
|
||||
|
|
@ -2818,7 +2790,7 @@ PHP_FUNCTION(odbc_field_name)
|
|||
return;
|
||||
}
|
||||
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, pv_res, -1, "ODBC result", le_result);
|
||||
|
||||
if (result->numcols == 0) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "No tuples available at this result index");
|
||||
|
|
@ -2835,7 +2807,7 @@ PHP_FUNCTION(odbc_field_name)
|
|||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
RETURN_STRING(result->values[pv_num - 1].name, 1);
|
||||
RETURN_STRING(result->values[pv_num - 1].name);
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
|
|
@ -2853,7 +2825,7 @@ PHP_FUNCTION(odbc_field_type)
|
|||
return;
|
||||
}
|
||||
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, pv_res, -1, "ODBC result", le_result);
|
||||
|
||||
if (result->numcols == 0) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "No tuples available at this result index");
|
||||
|
|
@ -2871,7 +2843,7 @@ PHP_FUNCTION(odbc_field_type)
|
|||
}
|
||||
|
||||
SQLColAttributes(result->stmt, (SQLUSMALLINT)pv_num, SQL_COLUMN_TYPE_NAME, tmp, 31, &tmplen, NULL);
|
||||
RETURN_STRING(tmp,1)
|
||||
RETURN_STRING(tmp)
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
|
|
@ -2904,7 +2876,7 @@ PHP_FUNCTION(odbc_field_num)
|
|||
return;
|
||||
}
|
||||
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, pv_res, -1, "ODBC result", le_result);
|
||||
|
||||
if (result->numcols == 0) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "No tuples available at this result index");
|
||||
|
|
@ -2939,7 +2911,7 @@ PHP_FUNCTION(odbc_autocommit)
|
|||
return;
|
||||
}
|
||||
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
|
||||
if (ZEND_NUM_ARGS() > 1) {
|
||||
rc = SQLSetConnectOption(conn->hdbc, SQL_AUTOCOMMIT, (pv_onoff) ? SQL_AUTOCOMMIT_ON : SQL_AUTOCOMMIT_OFF);
|
||||
|
|
@ -2996,7 +2968,7 @@ static void php_odbc_lasterror(INTERNAL_FUNCTION_PARAMETERS, int mode)
|
|||
}
|
||||
|
||||
if (ZEND_NUM_ARGS() == 1) {
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_handle, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_handle, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
ptr = ecalloc(len + 1, 1);
|
||||
if (mode == 0) {
|
||||
strlcpy(ptr, conn->laststate, len+1);
|
||||
|
|
@ -3011,7 +2983,9 @@ static void php_odbc_lasterror(INTERNAL_FUNCTION_PARAMETERS, int mode)
|
|||
strlcpy(ptr, ODBCG(lasterrormsg), len+1);
|
||||
}
|
||||
}
|
||||
RETVAL_STRING(ptr, 0);
|
||||
RETVAL_STRING(ptr);
|
||||
// TODO: avoid double reallocation ???
|
||||
efree(ptr);
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
|
|
@ -3053,7 +3027,7 @@ PHP_FUNCTION(odbc_setoption)
|
|||
|
||||
switch (pv_which) {
|
||||
case 1: /* SQLSetConnectOption */
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_handle, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_handle, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
|
||||
if (conn->persistent) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set option for persistent connection");
|
||||
|
|
@ -3066,7 +3040,7 @@ PHP_FUNCTION(odbc_setoption)
|
|||
}
|
||||
break;
|
||||
case 2: /* SQLSetStmtOption */
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_handle, -1, "ODBC result", le_result);
|
||||
ZEND_FETCH_RESOURCE(result, odbc_result *, pv_handle, -1, "ODBC result", le_result);
|
||||
|
||||
rc = SQLSetStmtOption(result->stmt, (unsigned short) pv_opt, pv_val);
|
||||
|
||||
|
|
@ -3105,7 +3079,7 @@ PHP_FUNCTION(odbc_tables)
|
|||
return;
|
||||
}
|
||||
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
|
||||
result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
|
||||
|
||||
|
|
@ -3172,7 +3146,7 @@ PHP_FUNCTION(odbc_columns)
|
|||
return;
|
||||
}
|
||||
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
|
||||
result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
|
||||
|
||||
|
|
@ -3242,7 +3216,7 @@ PHP_FUNCTION(odbc_columnprivileges)
|
|||
return;
|
||||
}
|
||||
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
|
||||
result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
|
||||
|
||||
|
|
@ -3318,7 +3292,7 @@ PHP_FUNCTION(odbc_foreignkeys)
|
|||
EMPTY_TO_NULL(ftable);
|
||||
#endif
|
||||
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
|
||||
result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
|
||||
|
||||
|
|
@ -3384,7 +3358,7 @@ PHP_FUNCTION(odbc_gettypeinfo)
|
|||
|
||||
data_type = (SQLSMALLINT) pv_data_type;
|
||||
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
|
||||
result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
|
||||
|
||||
|
|
@ -3441,7 +3415,7 @@ PHP_FUNCTION(odbc_primarykeys)
|
|||
return;
|
||||
}
|
||||
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
|
||||
result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
|
||||
|
||||
|
|
@ -3507,7 +3481,7 @@ PHP_FUNCTION(odbc_procedurecolumns)
|
|||
return;
|
||||
}
|
||||
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
|
||||
result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
|
||||
|
||||
|
|
@ -3574,7 +3548,7 @@ PHP_FUNCTION(odbc_procedures)
|
|||
return;
|
||||
}
|
||||
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
|
||||
result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
|
||||
|
||||
|
|
@ -3642,7 +3616,7 @@ PHP_FUNCTION(odbc_specialcolumns)
|
|||
scope = (SQLUSMALLINT) vscope;
|
||||
nullable = (SQLUSMALLINT) vnullable;
|
||||
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
|
||||
result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
|
||||
|
||||
|
|
@ -3711,7 +3685,7 @@ PHP_FUNCTION(odbc_statistics)
|
|||
unique = (SQLUSMALLINT) vunique;
|
||||
reserved = (SQLUSMALLINT) vreserved;
|
||||
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
|
||||
result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
|
||||
|
||||
|
|
@ -3774,7 +3748,7 @@ PHP_FUNCTION(odbc_tableprivileges)
|
|||
return;
|
||||
}
|
||||
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
|
||||
|
||||
result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
|
||||
|
||||
|
|
|
|||
|
|
@ -228,7 +228,7 @@ typedef struct odbc_connection {
|
|||
ODBC_SQL_CONN_T hdbc;
|
||||
char laststate[6];
|
||||
char lasterrormsg[SQL_MAX_MESSAGE_LENGTH];
|
||||
int id;
|
||||
zend_resource *res;
|
||||
int persistent;
|
||||
} odbc_connection;
|
||||
|
||||
|
|
|
|||
|
|
@ -43,8 +43,8 @@ bool(false)
|
|||
Warning: odbc_free_result() expects parameter 1 to be resource, null given in %s on line %d
|
||||
NULL
|
||||
|
||||
Warning: odbc_fetch_row(): %d is not a valid ODBC result resource in %s on line %d
|
||||
Warning: odbc_fetch_row(): supplied resource is not a valid ODBC result resource in %s on line %d
|
||||
bool(false)
|
||||
|
||||
Warning: odbc_result(): %d is not a valid ODBC result resource in %s on line %d
|
||||
Warning: odbc_result(): supplied resource is not a valid ODBC result resource in %s on line %d
|
||||
bool(false)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue