dprevot/php-sqlsrv
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

minor improvements and fixes

Browse source
This commit is contained in:
Meet Bhagdev 2016-02-23 18:06:51 -08:00
parent a6597fafea
commit e1310c14d6
7 changed files with 56 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sqlsrv/CREDITS
View file

@ -1 +1 @@
Microsoft Drivers 4.0.0 for PHP for SQL Server (SQLSRV driver) Microsoft Drivers 4.0.8219 for PHP for SQL Server (SQLSRV driver)

8
sqlsrv/conn.cpp
View file

@ -900,7 +900,7 @@ PHP_FUNCTION( sqlsrv_prepare )
//mark_params_by_reference( stmt, params_z TSRMLS_CC ); //mark_params_by_reference( stmt, params_z TSRMLS_CC );
stmt->params_z = params_z; stmt->params_z = params_z;
if (params_z) { if (params_z) {
zval_add_ref(params_z); Z_TRY_ADDREF_P(params_z);
} }
stmt->prepared = true; stmt->prepared = true;
@ -1020,7 +1020,7 @@ PHP_FUNCTION( sqlsrv_query )
stmt->params_z = params_z; stmt->params_z = params_z;
if( params_z ) { if( params_z ) {
zval_add_ref( params_z ); Z_TRY_ADDREF_P(params_z);
} }
stmt->set_func( "sqlsrv_query" ); stmt->set_func( "sqlsrv_query" );
@ -1204,7 +1204,7 @@ void add_stmt_option_key( sqlsrv_context& ctx, zend_string* key, size_t key_len,
throw ss::SSException(); throw ss::SSException();
} }
zval_add_ref( data ); // inc the ref count since this is going into the options_ht too. Z_TRY_ADDREF_P(data); // inc the ref count since this is going into the options_ht too.
core::sqlsrv_zend_hash_index_update( ctx, options_ht, option_key, data TSRMLS_CC ); core::sqlsrv_zend_hash_index_update( ctx, options_ht, option_key, data TSRMLS_CC );
} }
@ -1217,7 +1217,7 @@ void add_conn_option_key( sqlsrv_context& ctx, zend_string* key, size_t key_len,
throw ss::SSException(); throw ss::SSException();
} }
zval_add_ref( data ); // inc the ref count since this is going into the options_ht too. Z_TRY_ADDREF_P(data); // inc the ref count since this is going into the options_ht too.
core::sqlsrv_zend_hash_index_update( ctx, options_ht, option_key, data TSRMLS_CC ); core::sqlsrv_zend_hash_index_update( ctx, options_ht, option_key, data TSRMLS_CC );
} }

12
sqlsrv/core_stmt.cpp
View file

@ -547,7 +547,7 @@ void core_sqlsrv_bind_param(sqlsrv_stmt* stmt, zend_ulong param_num, int directi
HashTable* streams_ht = Z_ARRVAL( stmt->param_streams ); HashTable* streams_ht = Z_ARRVAL( stmt->param_streams );
core::sqlsrv_zend_hash_index_update_mem(*stmt, streams_ht, param_num, &stream_encoding, sizeof(stream_encoding) TSRMLS_CC); core::sqlsrv_zend_hash_index_update_mem(*stmt, streams_ht, param_num, &stream_encoding, sizeof(stream_encoding) TSRMLS_CC);
buffer = reinterpret_cast<SQLPOINTER>( param_num ); buffer = reinterpret_cast<SQLPOINTER>( param_num );
zval_add_ref( param_z ); // so that it doesn't go away while we're using it Z_TRY_ADDREF_P(param_z); // so that it doesn't go away while we're using it
buffer_len = 0; buffer_len = 0;
ind_ptr = SQL_DATA_AT_EXEC; ind_ptr = SQL_DATA_AT_EXEC;
} }
@ -560,7 +560,7 @@ void core_sqlsrv_bind_param(sqlsrv_stmt* stmt, zend_ulong param_num, int directi
zval format_z; zval format_z;
zval params[1]; zval params[1];
bool valid_class_name_found = false; bool valid_class_name_found = false;
zend_class_entry *class_entry = Z_OBJCE_P(param_z TSRMLS_CC); zend_class_entry *class_entry = Z_OBJCE_P(param_z TSRMLS_CC);
while( class_entry != NULL ) { while( class_entry != NULL ) {
@ -581,7 +581,7 @@ void core_sqlsrv_bind_param(sqlsrv_stmt* stmt, zend_ulong param_num, int directi
CHECK_CUSTOM_ERROR( !valid_class_name_found, stmt, SQLSRV_ERROR_INVALID_PARAMETER_PHPTYPE, param_num + 1 ) { CHECK_CUSTOM_ERROR( !valid_class_name_found, stmt, SQLSRV_ERROR_INVALID_PARAMETER_PHPTYPE, param_num + 1 ) {
throw core::CoreException(); throw core::CoreException();
} }
// if the user specifies the 'date' sql type, giving it the normal format will cause a 'date overflow error' // if the user specifies the 'date' sql type, giving it the normal format will cause a 'date overflow error'
// meaning there is too much information in the character string. If the user specifies the 'datetimeoffset' // meaning there is too much information in the character string. If the user specifies the 'datetimeoffset'
// sql type, it lacks the timezone. // sql type, it lacks the timezone.
@ -604,12 +604,12 @@ void core_sqlsrv_bind_param(sqlsrv_stmt* stmt, zend_ulong param_num, int directi
CHECK_CUSTOM_ERROR( zr == FAILURE, stmt, SQLSRV_ERROR_INVALID_PARAMETER_PHPTYPE, param_num + 1 ) { CHECK_CUSTOM_ERROR( zr == FAILURE, stmt, SQLSRV_ERROR_INVALID_PARAMETER_PHPTYPE, param_num + 1 ) {
throw core::CoreException(); throw core::CoreException();
} }
buffer = Z_STRVAL_P( &buffer_z ); buffer = Z_STRVAL( buffer_z );
zr = add_next_index_zval( &(stmt->param_datetime_buffers), &buffer_z ); zr = add_next_index_zval( &(stmt->param_datetime_buffers), &buffer_z );
CHECK_CUSTOM_ERROR( zr == FAILURE, stmt, SQLSRV_ERROR_INVALID_PARAMETER_PHPTYPE, param_num + 1 ) { CHECK_CUSTOM_ERROR( zr == FAILURE, stmt, SQLSRV_ERROR_INVALID_PARAMETER_PHPTYPE, param_num + 1 ) {
throw core::CoreException(); throw core::CoreException();
} }
buffer_len = Z_STRLEN_P( &buffer_z ); buffer_len = Z_STRLEN( buffer_z ) - 1;
ind_ptr = buffer_len; ind_ptr = buffer_len;
break; break;
} }
@ -2379,7 +2379,7 @@ void save_output_param_for_later( sqlsrv_stmt* stmt, sqlsrv_output_param& param
HashTable* param_ht = Z_ARRVAL( stmt->output_params ); HashTable* param_ht = Z_ARRVAL( stmt->output_params );
zend_ulong paramno = static_cast<zend_ulong>(param.param_num); zend_ulong paramno = static_cast<zend_ulong>(param.param_num);
core::sqlsrv_zend_hash_index_update_mem(*stmt, param_ht, paramno, &param, sizeof(sqlsrv_output_param)); core::sqlsrv_zend_hash_index_update_mem(*stmt, param_ht, paramno, &param, sizeof(sqlsrv_output_param));
zval_add_ref( param.param_z ); // we have a reference to the param Z_TRY_ADDREF_P(param.param_z); // we have a reference to the param
} }

1
sqlsrv/php_sqlsrv.h
View file

@ -353,6 +353,7 @@ enum SS_ERROR_CODES {
SS_SQLSRV_ERROR_CONNECT_ILLEGAL_ENCODING, SS_SQLSRV_ERROR_CONNECT_ILLEGAL_ENCODING,
SS_SQLSRV_ERROR_CONNECT_BRACES_NOT_ESCAPED, SS_SQLSRV_ERROR_CONNECT_BRACES_NOT_ESCAPED,
SS_SQLSRV_ERROR_INVALID_OUTPUT_PARAM_TYPE, SS_SQLSRV_ERROR_INVALID_OUTPUT_PARAM_TYPE,
SS_SQLSRV_ERROR_PARAM_VAR_NOT_REF
}; };
extern ss_error SS_ERRORS[]; extern ss_error SS_ERRORS[];

83
sqlsrv/stmt.cpp
View file

@ -88,7 +88,7 @@ const char SS_SQLSRV_WARNING_PARAM_VAR_NOT_REF[] = "Variable parameter %d not pa
/* internal functions */ /* internal functions */
zval convert_to_zval( SQLSRV_PHPTYPE sqlsrv_php_type, void* in_val, SQLLEN field_len ); zval* convert_to_zval( SQLSRV_PHPTYPE sqlsrv_php_type, void* in_val, SQLLEN field_len );
void fetch_fields_common( __inout ss_sqlsrv_stmt* stmt, zend_long fetch_type, __out zval* return_value, bool allow_empty_field_names void fetch_fields_common( __inout ss_sqlsrv_stmt* stmt, zend_long fetch_type, __out zval* return_value, bool allow_empty_field_names
TSRMLS_DC ); TSRMLS_DC );
bool determine_column_size_or_precision( sqlsrv_stmt const* stmt, sqlsrv_sqltype sqlsrv_type, __out SQLUINTEGER* column_size, bool determine_column_size_or_precision( sqlsrv_stmt const* stmt, sqlsrv_sqltype sqlsrv_type, __out SQLUINTEGER* column_size,
@ -1072,8 +1072,8 @@ PHP_FUNCTION( sqlsrv_get_field )
core_sqlsrv_get_field( stmt, field_index, sqlsrv_php_type, false, &field_value, &field_len, false/*cache_field*/, core_sqlsrv_get_field( stmt, field_index, sqlsrv_php_type, false, &field_value, &field_len, false/*cache_field*/,
&sqlsrv_php_type_out TSRMLS_CC ); &sqlsrv_php_type_out TSRMLS_CC );
zval retval_z = convert_to_zval(sqlsrv_php_type_out, field_value, field_len); zval* retval_z = convert_to_zval(sqlsrv_php_type_out, field_value, field_len);
RETURN_ZVAL(&retval_z, 1, 1); RETURN_ZVAL(retval_z, 1, 1);
} }
catch( core::CoreException& ) { catch( core::CoreException& ) {
@ -1200,12 +1200,12 @@ void mark_params_by_reference( ss_sqlsrv_stmt* stmt, zval* params_z TSRMLS_DC )
CHECK_CUSTOM_ERROR(zr == FAILURE, stmt, SS_SQLSRV_ERROR_VAR_REQUIRED, index + 1) { CHECK_CUSTOM_ERROR(zr == FAILURE, stmt, SS_SQLSRV_ERROR_VAR_REQUIRED, index + 1) {
throw ss::SSException(); throw ss::SSException();
} }
ZVAL_MAKE_REF(var); ZVAL_MAKE_REF(var);
} }
} }
// save our parameters for later. // save our parameters for later.
zval_add_ref( params_z ); Z_TRY_ADDREF_P(params_z);
stmt->params_z = params_z; stmt->params_z = params_z;
} }
@ -1484,70 +1484,52 @@ void stmt_option_scrollable:: operator()( sqlsrv_stmt* stmt, stmt_option const*
namespace { namespace {
zval convert_to_zval( SQLSRV_PHPTYPE sqlsrv_php_type, void* in_val, SQLLEN field_len ) zval* convert_to_zval( SQLSRV_PHPTYPE sqlsrv_php_type, void* in_val, SQLLEN field_len )
{ {
zval out_zval; zval* out_zval = NULL;
ZVAL_UNDEF( &out_zval );
if (in_val == NULL) {
out_zval = (zval*)sqlsrv_malloc(sizeof(zval));
ZVAL_NULL(out_zval);
return out_zval;
}
switch( sqlsrv_php_type ) { switch( sqlsrv_php_type ) {
case SQLSRV_PHPTYPE_INT: case SQLSRV_PHPTYPE_INT:
case SQLSRV_PHPTYPE_FLOAT: case SQLSRV_PHPTYPE_FLOAT:
{ {
if( in_val == NULL ) { out_zval = (zval*)sqlsrv_malloc(sizeof(zval));
ZVAL_NULL( &out_zval ); if( sqlsrv_php_type == SQLSRV_PHPTYPE_INT ) {
ZVAL_LONG( out_zval, *(reinterpret_cast<zend_long*>( in_val )));
} }
else { else {
ZVAL_DOUBLE( out_zval, *(reinterpret_cast<double*>( in_val )));
if( sqlsrv_php_type == SQLSRV_PHPTYPE_INT ) {
ZVAL_LONG( &out_zval, *(reinterpret_cast<zend_long*>( in_val )));
}
else {
ZVAL_DOUBLE( &out_zval, *(reinterpret_cast<double*>( in_val )));
}
} }
sqlsrv_free( in_val );
if( in_val ) {
sqlsrv_free( in_val );
}
break; break;
} }
case SQLSRV_PHPTYPE_STRING: case SQLSRV_PHPTYPE_STRING:
{ {
out_zval = (zval*) sqlsrv_malloc( sizeof(zval) );
if( in_val == NULL ) { ZVAL_STRINGL( out_zval, reinterpret_cast<char*>( in_val ), field_len);
sqlsrv_free( in_val );
ZVAL_NULL( &out_zval );
}
else {
ZVAL_STRINGL( &out_zval, reinterpret_cast<char*>( in_val ), field_len);
sqlsrv_free( in_val );
}
break; break;
} }
case SQLSRV_PHPTYPE_STREAM: case SQLSRV_PHPTYPE_STREAM:
case SQLSRV_PHPTYPE_DATETIME :
{ {
out_zval = *(reinterpret_cast<zval*>( in_val )); out_zval = (reinterpret_cast<zval*>( in_val ));
in_val = NULL;
break; break;
} }
case SQLSRV_PHPTYPE_DATETIME:
{
if (in_val == NULL) {
ZVAL_NULL(&out_zval);
}
out_zval = *(reinterpret_cast<zval*>(in_val));
sqlsrv_free(in_val);
break;
}
case SQLSRV_PHPTYPE_NULL: case SQLSRV_PHPTYPE_NULL:
ZVAL_NULL( &out_zval ); out_zval = (zval*)sqlsrv_malloc(sizeof(zval));
ZVAL_NULL( out_zval );
break; break;
default: default:
@ -1865,7 +1847,7 @@ void fetch_fields_common( __inout ss_sqlsrv_stmt* stmt, zend_long fetch_type, __
core_sqlsrv_get_field( stmt, i, sqlsrv_php_type, true /*prefer string*/, core_sqlsrv_get_field( stmt, i, sqlsrv_php_type, true /*prefer string*/,
&field_value, &field_len, false /*cache_field*/, &sqlsrv_php_type_out TSRMLS_CC ); &field_value, &field_len, false /*cache_field*/, &sqlsrv_php_type_out TSRMLS_CC );
field = convert_to_zval( sqlsrv_php_type_out, field_value, field_len ); field = *(convert_to_zval( sqlsrv_php_type_out, field_value, field_len ));
if( fetch_type & SQLSRV_FETCH_NUMERIC ) { if( fetch_type & SQLSRV_FETCH_NUMERIC ) {
@ -1873,7 +1855,7 @@ void fetch_fields_common( __inout ss_sqlsrv_stmt* stmt, zend_long fetch_type, __
CHECK_ZEND_ERROR( zr, stmt, SQLSRV_ERROR_ZEND_HASH ) { CHECK_ZEND_ERROR( zr, stmt, SQLSRV_ERROR_ZEND_HASH ) {
throw ss::SSException(); throw ss::SSException();
} }
zval_add_ref( &field ); Z_TRY_ADDREF_P(&field);
} }
if( fetch_type & SQLSRV_FETCH_ASSOC ) { if( fetch_type & SQLSRV_FETCH_ASSOC ) {
@ -1889,7 +1871,7 @@ void fetch_fields_common( __inout ss_sqlsrv_stmt* stmt, zend_long fetch_type, __
CHECK_ZEND_ERROR( zr, stmt, SQLSRV_ERROR_ZEND_HASH ) { CHECK_ZEND_ERROR( zr, stmt, SQLSRV_ERROR_ZEND_HASH ) {
throw ss::SSException(); throw ss::SSException();
} }
zval_add_ref( &field ); Z_TRY_ADDREF_P(&field);
} }
} }
} //for loop } //for loop
@ -1938,6 +1920,11 @@ void parse_param_array( ss_sqlsrv_stmt* stmt, __inout zval* param_array, zend_ul
stmt, SS_SQLSRV_ERROR_INVALID_PARAMETER_DIRECTION, index + 1 ) { stmt, SS_SQLSRV_ERROR_INVALID_PARAMETER_DIRECTION, index + 1 ) {
throw ss::SSException(); throw ss::SSException();
} }
CHECK_CUSTOM_ERROR(!Z_ISREF_P(var_or_val) && (direction == SQL_PARAM_OUTPUT || direction == SQL_PARAM_INPUT_OUTPUT), stmt, SS_SQLSRV_ERROR_PARAM_VAR_NOT_REF, index + 1) {
throw ss::SSException();
}
} }
else { else {
direction = SQL_PARAM_INPUT; direction = SQL_PARAM_INPUT;

8
sqlsrv/util.cpp
View file

@ -360,6 +360,12 @@ ss_error SS_ERRORS[] = {
SQLSRV_ERROR_INVALID_BUFFER_LIMIT, SQLSRV_ERROR_INVALID_BUFFER_LIMIT,
{ IMSSP, (SQLCHAR*) "Setting for " INI_BUFFERED_QUERY_LIMIT " was non-int or non-positive.", -60, false } { IMSSP, (SQLCHAR*) "Setting for " INI_BUFFERED_QUERY_LIMIT " was non-int or non-positive.", -60, false }
}, },
{
SS_SQLSRV_ERROR_PARAM_VAR_NOT_REF,
{ IMSSP, (SQLCHAR*)"Variable parameter %1!d! not passed by reference (prefaced with an &). "
"Output or bidirectional variable parameters (SQLSRV_PARAM_OUT and SQLSRV_PARAM_INOUT) passed to sqlsrv_prepare or sqlsrv_query should be passed by reference, not by value."
, -61, true }
},
// internal warning definitions // internal warning definitions
{ {
@ -924,7 +930,7 @@ bool sqlsrv_merge_zend_hash( __inout zval* dest_z, zval const* src_z TSRMLS_DC )
zend_hash_apply( Z_ARRVAL_P( dest_z ), sqlsrv_merge_zend_hash_dtor TSRMLS_CC ); zend_hash_apply( Z_ARRVAL_P( dest_z ), sqlsrv_merge_zend_hash_dtor TSRMLS_CC );
return false; return false;
} }
zval_add_ref( value_z ); Z_TRY_ADDREF_P(value_z);
} }
return true; return true;

4
sqlsrv/version.h
View file

@ -16,11 +16,11 @@
// IN THE SOFTWARE. // IN THE SOFTWARE.
//--------------------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------------------
#define VER_FILEVERSION_STR "4.0.0.0" #define VER_FILEVERSION_STR "4.0.8219.0"
#define _FILEVERSION 4,0,0,0 #define _FILEVERSION 4,0,0,0
#define SQLVERSION_MAJOR 4 #define SQLVERSION_MAJOR 4
#define SQLVERSION_MINOR 0 #define SQLVERSION_MINOR 0
#define SQLVERSION_MMDD 0 #define SQLVERSION_MMDD 8219
#define SQLVERSION_REVISION 0 #define SQLVERSION_REVISION 0