Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

issue #270 fix #297

Merged
merged 9 commits into from
Feb 22, 2017
Merged

issue #270 fix #297

merged 9 commits into from
Feb 22, 2017

Conversation

Hadis-Knj
Copy link

@Hadis-Knj Hadis-Knj commented Feb 22, 2017

Fix to retrieve the data as inserted in binary columns #270

@Hadis-Knj Hadis-Knj requested a review from yitam February 22, 2017 01:28
@coveralls
Copy link

Coverage Status

Coverage increased (+0.3%) to 46.42% when pulling a5983ef on Hadis-Fard:dev into e448281 on Microsoft:dev.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.3%) to 46.42% when pulling 73a70da on Hadis-Fard:dev into e448281 on Microsoft:dev.

$conn = new PDO( "sqlsrv:server=$serverName", "$username", "$password" );

// CREATE database
$conn->query("CREATE DATABASE ". $dbName) ?: die();
Copy link
Contributor

@yitam yitam Feb 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to create a database. It suffices to create a table name unique enough (e.g. attached the table name with something like a timestamp or a random number).

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is better to have self-contained exportable tests, and since the db is dropped at the end of the test, doesn't matter if the table name is unique or not


$result = "";
$stmt = $conn->query($sql);
$result = $stmt->fetchALL( PDO::FETCH_COLUMN );
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo? fetchAll()

function test_fetch($conn, $tableName, $columnName, $input){

$len = strlen($input);
$result = "";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indentation a little off?

//binary is fixed size, to evaluate output, compare it using strncmp
if( strncmp($result, $input, $len) !== 0){
print_r("\nRetrieving using bindColumn failed");
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps testing equality like ($result === $input) is enough?

Copy link
Author

@Hadis-Knj Hadis-Knj Feb 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

binary column is fixed size (50), and input len is 36, so we don't care about the white spaces appended to the output and only compare the first 36 characters, this is just testing that value is not hex number anymore

@@ -1306,6 +1304,8 @@ sqlsrv_phptype pdo_sqlsrv_stmt::sql_type_to_php_type( SQLINTEGER sql_type, SQLUI
"Invalid encoding on the connection. Must not be invalid or default." );
}

sqlsrv_phptype.typeinfo.encoding = local_encoding;

switch( sql_type ) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this change mean that each field can have its own encoding set via bindColumn?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it sets the encoding to stmt or conn encoding and in case of binary or invalid it is set to binary or invalid encoding respectively.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.3%) to 46.42% when pulling c89c464 on Hadis-Fard:dev into e448281 on Microsoft:dev.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.3%) to 46.42% when pulling c89c464 on Hadis-Fard:dev into e448281 on Microsoft:dev.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.3%) to 46.42% when pulling f559610 on Hadis-Fard:dev into e448281 on Microsoft:dev.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.8%) to 46.955% when pulling 9ec0956 on Hadis-Fard:dev into e448281 on Microsoft:dev.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.8%) to 46.955% when pulling 9ec0956 on Hadis-Fard:dev into e448281 on Microsoft:dev.

@yitam yitam merged commit 12e6535 into microsoft:dev Feb 22, 2017
v-dareck added a commit to v-dareck/msphpsql that referenced this pull request Feb 23, 2017
ulvii pushed a commit that referenced this pull request Mar 14, 2017
* fixed Github #182, empty bound output parameters

* Fixing the issue with buffered result sets, when connection option is set to utf8. See issue #192

* removing new lines

* Replcaing SQLSRV_ENCODING ( CP_UTF8) with SQLSRV_ENCODING_UTF8

* Replcaing SQLSRV_ENCODING ( CP_UTF8) with SQLSRV_ENCODING_UTF8

* fixed tab and spacing

* updated the code structure

* deleted pdo_sqlsrv obsolete folder

* Updated pdo driver source code path

* added pdo shared folder

* updated sqlsrv and pdo_sqlsrv config.w32 to get the dir name dynamically

* deleted shared folder inside pdo

* Initial AppVeyor CI test build.

* Remove AppVeyor whitelist for testing.

* Fix source file path.

* Update pdo_util.cpp

* changed tab to spaces

* fixed indentations

* fixed indentations

* moved templates to driver folder

* Enable build matrix for different SQL Server versions.

* fixed the limit for row count

* fix #173, #138 on Windows code

* fixed indentations

* revert core_results to 365220a

* Readme and Change updates for Windows release.

* Fix table rendering.

* Readme and Change updates for Windows release.

* Update change log.

* Readme and Change updates for Windows release.

* Remove Linux section.

* merged Linux to CPP files

* merged Linux to php_sqlsrv.h

* Merged Linux and Windows PDO_SQLSRV code

* merged core_conn from linux to Windows

* modified based on reviews

* updated to version 4.1.5

* fixed indentations

* updated the date to Jan 19

* updated core_init

* Small ifdef fix

* Spacing fixes

* Commented code removed

* fixed preprocessor directives

* merged core_stmt from Linux

* merged conversion functions in core_sqlsrv and core_util

* config.m4

* Capitalised win32

* Commented code removed

* merged core_sqlsrv.h

* merged core_stream

* merged core_results

* added Linux specific files

* added Linux specific files

* removed windows header

* removed header files included in core_sqlv from xplat

* Issue 228. Don't allow 0 for sqlsrv ClientBufferMaxKBSize.

Add new tests for sqlsrv and pdo.

* Issue 37. sqlsrv_has_rows does not fetch if already true.

Change sqlsrv_has_rows to not scroll if already true
when using forward only cursor.

* gaurded strsafe header

* Update pdo_dbh.cpp

* Update pdo_stmt.cpp

* Update pdo_init.cpp

* Update pdo_parser.cpp

* Remove comment line from test.

* Update test comments.

* Add Description section to phpt test.

* fixed included headers order

* fixed indentations and spacing

* fixed indentations on core_results

* fixed indentations on rowCount

* fixed indentations in updated code

* fixed indentations

* fixed indentations

* bumped version to windows version

* made the ifdef consitent

* fixed L166 indentations

* bumped version to 4.1

* bumped up the version to 4.1

* bumped up the version to 4.1

* updated to version 4.1

* updated version to 4.1

* Added config.m4

* Added build directory

* fixed closing } dropped indentations

* fixed core_conn

* renamed header files with the same name as windows headers

* renamed <intsafe> in xplat.h to xplat_intsafe

* safeguard get_col_meta

* edited included headers

* fixed invalid user pass issue in core_conn

* added TravisCI to merged-code branch

* updated renamed header

* removed comments

* updated travis docker with latest from linux branch

* applied peer review comments

* added packagize.sh

* fixed get_processor_arch comparisons

* removed unused sqlsrv_zend_hash_add

* Update srv_075_database_wide_string.phpt

* Update srv_075_database.phpt

* Update srv_074_database.phpt

* Update srv_074_database_wide_string.phpt

* Update srv_073_database.phpt

* Merge remaining PHP-7.0-Linux changes into merged codebase.

* Change $sample calculation to avoid conversion to float.

* Change FORMAT SQL to CAST as SQL 2008 does not support FORMAT.

* modified ifdef __linux__

* Update srv_037_transaction_rollback.phpt

* Tab/indentation fixes.

* replace __linux__ with _WIN32 define.

* Update Readme and Changelog for merged code.

* Add re2c and gcc to readme steps.

* Update version.h

* removed inconsistent code calling convert_string_from_utf16

* corrected comment

* Change branch links to dev in README

* Test: Bind values with PDO::PARAM_BOOL

* Update pdo_023.phpt

* Update README.md

Add unixODBC 2.3.1 limitation for connection pooling with PDO.

* define SQL_GUID for PECL

* check if constant defined first

* In closeCursor check if statement has been executed before moving to next result.

* Change tab to spaces.

* Fix for issue 223

* added a test

* Modified the test 

to make it more robust

* Fix error message in close cursor. Change prepare to query in test.

* Fix and tests for issue #69

* fix formatting

* Fix issue #35

* add a simple test case with an input file

* simplified the test without image input

* Fix clang compile errors.

* Update README.md

* Add check for SQL_NO_TOTAL for SQLBindParameter out parameter.

* Update PHPT comment.

* Update PHPT comment and script.

* calculate field size instead of using column size and fixed the parameter encoding

* Remove uchar.h usage from buffered results.

* fix PHP7.1 debug abort error

* Add buffered sqlsrv test.

* use static cast for SQLSRV_ENCODING

* Update phpt comment.

* fixed issue #270

* test fetch binary

* added autonomous setup to test

* caps description

* Modify string_to_number utf8 conversion.

* Added survey

* fixed indentation and typo

* fixed indentations

* Changed db to tempdb and random table name

* fixed string quotes and free stmt

* fixed comment

* Change errno check to ERROR_SUCCESS

* Fix baseline for #297 changes.

* batch 1

* batch 2

* Fix memory leaks in buffered resultsets.

* batch 3

* modified tests based on review

* Added SELinux note for RedHat

* Issue #308

* Fix spacing

* Use a simpler way

* String release first

* String release first

* Modified based on review

* Modified note

* added a sqlsrv test, a variant

* Update srv_308_empty_output_param.phpt

* Update README.md

* appveyor.yml now outputs details of failing tests

* updated versioning to semantic versioning #282

* Update README.md

* changed locale for mac

* added client info tests

* added versioning notes

* updated precedence order example

* added 4.1.7 to changedlog

* updated PECL package version

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update CHANGELOG.md

* part 1 with utf8 data

* MAC OS X announcement

* part 2 testing diff API

* part 3 testing rowCount

* part 4 fetching various types

* part 5 new sqlsrv tests

* removed redundant tests

* fixed some tests

* modified a failing test

* one more test

* Mac instructions (#319)

* Initial Mac instructions

* Add pecl install for mac

* Changing instructions for loading the drivers

* Updating apache install intructions for MAC

* Adding Mac related notes

* Minor cleanup

* appveyor.yml now outputs details of failing tests

* updated versioning to semantic versioning #282

* Update README.md

* changed locale for mac

* added client info tests

* added versioning notes

* updated precedence order example

* added 4.1.7 to changedlog

* updated PECL package version

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update CHANGELOG.md

* MAC OS X announcement

* Updating Mac Apache Instructions. Also removing the step of manually adding drivers to the ini file.

* Adding php7.1-xml installation

* Apache config for Mac

* Fixing Apache config

* Update PECL instructions

* Fixed headers formatting
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants