Commit graph

118 commits

Author SHA1 Message Date
Jenny Tam db56c0344e Removed support for Custom Keystore provider 2018-02-08 09:00:16 -08:00
v-kaywon 13d6f9129e change version.h and config flags for debug mode 2018-01-29 16:38:09 -08:00
David Puglielli bc71d659d8 Fixed merge conflicts 2018-01-05 12:14:01 -08:00
Jenny Tam cc303c5904 Use https for fwlinks 2018-01-03 13:02:26 -08:00
David Puglielli 6b177f0ee1 Added immediate binding and fixed some mac related test output 2017-12-21 14:14:23 -08:00
Jenny Tam 244e3401b5 Added Control Flow Guard to configs 2017-12-21 12:52:36 -08:00
v-kaywon 0c0882b93f coding standard 2017-12-15 13:42:59 -08:00
v-kaywon 0284279e9b fix crash related to zend_hash_internal_pointer_reset 2017-12-15 13:37:29 -08:00
Jenny Tam 2236e71234
Merge pull request #631 from yitam/RC1
Updated versions from 5.1 to 5.2
2017-12-14 16:49:54 -08:00
Jenny Tam 8d33f1fc02 Updated versions from 5.1 to 5.2 2017-12-14 16:05:34 -08:00
v-kaywon ad29c28dc4 fix warning according to prefast code analysis 2017-12-13 13:33:32 -08:00
v-kaywon b9579a2426 add error handling for fetching stream with always encrypted 2017-12-07 17:29:06 -08:00
David Puglielli 633024c22b Revert next result changes, improve tests 2017-11-15 17:39:00 -08:00
Jenny Tam e5a3767089 Added error handling for LOB types as output parameters 2017-11-03 10:00:08 -07:00
Jenny Tam ce8d444977 Merge pull request #552 from yitam/missingDriver
Search for installed ODBC driver(s) in non-Windows env and more error handling when driver option is set
2017-10-03 15:05:49 -07:00
David Puglielli 95f76757d0 Merge branch 'nextrowset-fix' of https://github.com/david-puglielli/msphpsql into nextrowset-fix 2017-10-02 13:47:29 -07:00
David Puglielli 4151f8f5d1 Minor fixes 2017-09-29 20:47:24 -07:00
David Puglielli 4674f58a15 Update stmt.cpp 2017-09-29 16:18:27 -07:00
Jenny Tam bbc2701140 Made changes as per review comments 2017-09-29 15:54:34 -07:00
David Puglielli 494527d465 Tweaked tests, added comments per code review comments 2017-09-29 14:30:29 -07:00
David Puglielli 3acab1ae0c Fixed tests and added code comments 2017-09-28 14:16:50 -07:00
Jenny Tam 76e628c963 resumed error handling when driver option is set and added test cases 2017-09-28 13:22:00 -07:00
David Puglielli d039cf66a7 Fixed typos 2017-09-27 17:18:38 -07:00
David Puglielli a749010a67 Moved errors back to pdo_stmt and stmt.cpp 2017-09-27 17:01:20 -07:00
Jenny Tam 5189a9eb65 removed the checks for IM002 because of DM inconsistencies 2017-09-27 16:44:51 -07:00
Jenny Tam 0cbc00384c added more error checking when driver option is set 2017-09-27 15:16:17 -07:00
David Puglielli 68bb42b2cf Moved check to core_sqlsrv_next_result to avoid suppressing a different error message 2017-09-26 18:33:49 -07:00
Jenny Tam 256e712072 also checked if ODBC driver is set when AE is enabled 2017-09-26 16:38:34 -07:00
David Puglielli 1045ea40a9 fixed conflicts 2017-09-26 16:11:24 -07:00
David Puglielli 270f2b446e Use core_sqlsrv_has_any_result to check for null results 2017-09-26 16:02:30 -07:00
David Puglielli be2be4bb27 Merge remote-tracking branch 'upstream/dev' into nextrowset-fix 2017-09-26 15:04:40 -07:00
Jenny Tam 2dbdf12b18 searched for ODBC drivers only in non-windows env 2017-09-25 13:37:42 -07:00
Jenny Tam 96a15f3a48 added legacy_stdio_definitions.lib 2017-09-25 12:35:03 -07:00
David Puglielli 2c28d0bf31 Update stmt.cpp 2017-09-22 00:13:33 -04:00
David Puglielli 7046086f60 Fixed test failures by moving logic back to stmt.cpp and pdo_stmt.cpp 2017-09-21 18:27:56 -07:00
Yuki Wong a47dc0d20f Merge pull request #534 from v-kaywon/requireSqlTypeError
add error handling for using sqlsrv_query without sqltype
2017-09-15 14:20:49 -07:00
Hadis-Fard 4e712ff50a fixed missign driver error message 2017-09-15 13:13:29 -07:00
v-kaywon e70ebbaba1 change error message 2017-09-15 11:15:38 -07:00
Hadis-Fard 80b9f9e603 fixes per review comments 2017-09-14 18:21:25 -07:00
v-kaywon 6c5ef7ad9e add error handling for using sqlsrv_query without sqltype in a column encryption enabled connection 2017-09-14 17:42:28 -07:00
Hadis-Fard db226aa13c Merge branch 'AlwaysEncrypted' of https://github.com/Hadis-Fard/msphpsql into AlwaysEncrypted 2017-09-14 16:56:23 -07:00
Hadis-Fard 98100ee892 aded capability to pass driver with/without curly braces 2017-09-14 16:54:59 -07:00
Hadis Fard 8495cb10a6 Merge branch 'AlwaysEncrypted' into AlwaysEncrypted 2017-09-14 15:21:07 -07:00
Jenny Tam 79ee775b81 Updated versions to 5.1.0-preview 2017-09-13 15:34:06 -07:00
Hadis-Fard 403d51a4e4 fixed Mars error, added driver option in pdo, added invalid driver error 2017-09-12 13:30:14 -07:00
Hadis-Fard fc7173df11 fixed default driver version, sal annotation, and error messages 2017-09-08 10:28:01 -07:00
Hadis-Fard 3343d1eb18 fixed crash and error handling 2017-09-06 18:04:55 -07:00
Hadis-Fard 117b2bf777 resolved merge conflicts 2017-09-06 12:46:22 -07:00
Hadis-Fard f25677e457 refactored odbc connect, added ae connect error 2017-09-06 10:55:08 -07:00
Jenny Tam 58f2068479 conflicts in msodbcsql 2017-09-01 16:10:44 -07:00