Merging Sqlsrv source code from linux to windows #240
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
v-kigos
reviewed
Jan 19, 2017
| @@ -18,9 +18,12 @@ | |||
| //--------------------------------------------------------------------------------------------------------------------------------- | |||
|
|
|||
| #include "php_sqlsrv.h" | |||
|
|
|||
| #ifndef __linux__ | |||
There was a problem hiding this comment.
Have you tried compiling without these headers on Windows? I've found they're not needed in the PDO_SQLSRV source.
There was a problem hiding this comment.
You're right. I've removed them.
Hadis-Fard
reviewed
Jan 19, 2017
| @@ -21,7 +21,9 @@ | |||
|
|
|||
| #include "php_sqlsrv.h" | |||
|
|
|||
| #ifndef __linux__ | |||
There was a problem hiding this comment.
for windows specifics use #ifdef _WIN32
| bool converted = convert_string_from_utf16( encoding, field_name_w, field_name_len_w, ( char** ) &field_name, field_name_len ); | ||
| core::SQLColAttributeW ( stmt, i + 1, SQL_DESC_NAME, field_name_w, ( SS_MAXCOLNAMELEN + 1 ) * 2, &field_name_len_w, NULL | ||
| TSRMLS_CC ); | ||
| #ifdef __linux__ |
There was a problem hiding this comment.
indentation is off, should be aligned with others
| @@ -1821,11 +1821,19 @@ void fetch_fields_common( _Inout_ ss_sqlsrv_stmt* stmt, zend_long fetch_type, _O | |||
| sqlsrv_malloc_auto_ptr<char> field_name; | |||
| sqlsrv_malloc_auto_ptr<sqlsrv_fetch_field_name> field_names; | |||
| field_names = static_cast<sqlsrv_fetch_field_name*>( sqlsrv_malloc( num_cols * sizeof( sqlsrv_fetch_field_name ))); | |||
| SQLSRV_ENCODING encoding = (( stmt->encoding() == SQLSRV_ENCODING_DEFAULT ) ? stmt->conn->encoding() : stmt->encoding()); | |||
| SQLSRV_ENCODING encoding = (( stmt->encoding() == SQLSRV_ENCODING_DEFAULT ) ? stmt->conn->encoding() : | |||
| stmt->encoding()); | |||
There was a problem hiding this comment.
indentation and spacing issue, move stmt->encoding in 1 line
| core_sqlsrv_get_field( stmt, field_index, sqlsrv_php_type, false, field_value, &field_len, false/*cache_field*/, | ||
| &sqlsrv_php_type_out TSRMLS_CC ); | ||
| core_sqlsrv_get_field( stmt, static_cast<SQLUSMALLINT>( field_index ), sqlsrv_php_type, false, field_value, &field_len, false/*cache_field*/, | ||
| &sqlsrv_php_type_out TSRMLS_CC ); |
There was a problem hiding this comment.
indentation, &sqlsrv_php_type_out should be under stmt, use spaces instead of tabs
| @@ -1067,7 +1067,7 @@ PHP_FUNCTION( sqlsrv_get_field ) | |||
| sqlsrv_php_type.typeinfo.type = SQLSRV_PHPTYPE_INVALID; | |||
| SQLSRV_PHPTYPE sqlsrv_php_type_out = SQLSRV_PHPTYPE_INVALID; | |||
| void* field_value = NULL; | |||
| int field_index = -1; | |||
| zend_long field_index = -1; | |||
| SQLLEN field_len = -1; | |||
| zval retval_z; | |||
There was a problem hiding this comment.
please fix this indentations here too
Hadis-Fard
approved these changes
Jan 23, 2017
david-puglielli
approved these changes
Jan 26, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.