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
Jenny Tam
15247faae0
Added support for loading a custom keystore provider for Column Encryption
2017-09-01 16:10:42 -07:00
v-kaywon
f744b7e515
merge ae code
2017-09-01 16:10:40 -07:00
v-kaywon
c8c7bfad57
merge ae code
2017-07-25 11:01:00 -07:00
David Puglielli
c1e7280dc6
Version updated
2017-07-20 11:44:46 -07:00
v-kaywon
f2510c7d5d
Merge pull request #461 from v-kaywon/moreSAL
...
add more annotations
2017-06-30 16:35:29 -07:00
ulvii
58e8a24b17
Fixing issues reported by binary analysis - Hardening checks ( #460 )
...
* Adding compiler and linker options for hardening check
* Update config.m4
* Adding fstack protector to compiler options
* Detect platform in config.m4
* Removing the newly added linker flag, because its breaking the PDO_SQLSRV load. Creating a backlog item
* Update config.m4
* Update config.m4
* Testing with -O3
* Adding optimization flag to windows config files
* Update config.w32
2017-06-30 16:28:04 -07:00
v-kaywon
f5f5d5e82f
add more annotations
2017-06-30 15:17:14 -07:00
v-kaywon
b78bcf8be3
fix GetVersionExA is Deprecated warning
2017-06-29 12:23:46 -07:00
v-kaywon
fb64892e37
fix inconsistent annotation in get_error_message in util.cpp
2017-06-29 11:53:04 -07:00
v-kaywon
f0da33db26
change _In_ to _Inout_ annotation for pdo_dbh and pdo_stmt objects
2017-06-27 15:17:21 -07:00
v-kaywon
bde81001e9
added SAL annotations and fixed warnings
2017-06-22 14:04:34 -07:00
Hadis Kakanejadi Fard
a879e40162
updated version to 4.3 rc
2017-06-20 10:12:23 -07:00
v-kaywon
a97a2f5880
Merge pull request #443 from v-kaywon/fix_leak
...
Fix leak in connection and statement resource in SQLSRV driver
2017-06-19 17:29:28 -07:00
v-kaywon
84ee58cb5f
Merge pull request #426 from v-kaywon/tnir
...
Add TNIR conn option and tests
2017-06-19 17:27:39 -07:00
v-kaywon
c508a84ef1
changed structure of UTF8 data; added comment for fix in source code
2017-06-19 12:55:40 -07:00
v-kaywon
c408f8c294
fix leak in SQLSRV driver: prevent leak in zval containing the connection and statement resource
2017-06-16 15:43:15 -07:00
susanh
fe2a14c798
Merge branch 'macconfig' of https://github.com/lilgreenbird/msphpsql into macconfig
2017-06-16 13:00:20 -07:00
susanh
e7f621e4f9
remove comment about workaround
2017-06-16 12:49:05 -07:00
susanh
f4ae5e1e4c
added MACOSX_DEPLOYMENT_TARGET to not use linker flat_namespace flag
2017-06-15 17:46:04 -07:00
v-kaywon
208cc4a078
Add TNIR conn option and tests
2017-06-07 13:53:04 -07:00
Hadis Kakanejadi Fard
e0a65cd0a5
reverted m4 files
2017-05-24 12:45:42 -07:00
Hadis Kakanejadi Fard
7ffa4d470a
added the header to m4 and updated SQLSRV headers to 4.2
2017-05-24 10:09:46 -07:00
Hadis Fard
b31ee170f3
fixed indentations
2017-05-17 13:52:22 -07:00
Hadis Kakanejadi Fard
42ebf9465d
removed sqlsrv variant const
2017-05-16 15:54:13 -07:00
Hadis Kakanejadi Fard
7904bddb6e
added sql_variant const
2017-05-15 14:19:36 -07:00
yitam
75ee4f90ad
modified sqlsrv test
2017-05-08 08:57:30 -07:00
yitam
28fc51df3d
updated to ODBC 13.1
2017-05-05 17:17:52 -07:00
yitam
7d8004bf5a
fixed indendations and tabs
2017-05-05 16:39:51 -07:00
yitam
1e527865a9
Implemented Azure AD plus tests
2017-05-05 16:28:33 -07:00
Hadis Kakanejadi Fard
4922e97b5d
removed unused function ( #383 )
2017-05-04 18:15:39 -07:00
v-kaywon
68eca075ab
rename g_henv_cp and g_henv_ncp to g_pdo_henv_.. and gg_ss_henv_.. to prevent name clashing problem in the pdo_sqlsrv and sqlsrv drivers
2017-04-06 15:44:04 -07:00
David Puglielli
f330830eef
Connection resiliency changes ( #356 )
...
* Connection resiliency changes
* Changed connres test to check appveyor protocol
* Changed connres test to check appveyor protocol
* Changed connres test to check appveyor protocol
* Reverted test because appveyor still won't use the correct protocol
* Removed unnecessary connres #defines from msodbcsql.h
2017-04-04 13:40:30 -07:00
v-kaywon
f7983472a3
Merge pull request #335 from v-kaywon/driverorder
...
rename stmt_option_scrollable to driver specific names
2017-03-30 13:47:02 -07:00
v-kaywon
4057a9210d
Update util.cpp
2017-03-28 09:37:11 -07:00
v-kaywon
9f3c0cee54
Update init.cpp
2017-03-23 11:55:33 -07:00
v-kaywon
b4f7684db3
Update init.cpp
...
fix indentation
2017-03-23 10:57:35 -07:00
v-kaywon
6b2aa39e19
convert const char[] to char[] to avoid conversion warnings
2017-03-23 10:21:48 -07:00
v-kaywon
ccd80a32d9
Update util.cpp
2017-03-21 17:00:13 -07:00
v-kaywon
06a343f611
rename stmt_option_scrollable to driver specific names and put get_error_message into namespace
2017-03-21 15:28:13 -07:00
Hadis Kakanejadi Fard
0782c56b41
updated versioning to semantic versioning #282
2017-03-03 16:55:28 -08:00
yitam
f7a1c7296b
use static cast for SQLSRV_ENCODING
2017-02-21 13:20:50 -08:00
yitam
8dc946d3f0
Merge branch 'dev' of https://github.com/Microsoft/msphpsql into GH231
2017-02-21 13:16:04 -08:00
Jenny Tam
e448281049
Merge pull request #295 from v-kaywon/PHP71DebugAbort
...
fix PHP7.1 debug abort error
2017-02-21 12:54:24 -08:00
v-kaywon
f5b9bd93f0
fix PHP7.1 debug abort error
2017-02-21 12:02:16 -08:00
yitam
0705d9b1a8
calculate field size instead of using column size and fixed the parameter encoding
2017-02-20 15:24:41 -08:00
v-dareck
c35d998942
Fix clang compile errors.
2017-02-14 16:52:42 -08:00
yitam
010d23f7a1
removed inconsistent code calling convert_string_from_utf16
2017-02-02 14:20:50 -08:00
v-dareck
ea445f4a18
Merge remote-tracking branch 'Microsoft/merged-codebase' into merged-codebase
2017-02-01 16:49:30 -08:00
yitam
3280d76682
modified ifdef __linux__
2017-02-01 12:41:13 -08:00
v-dareck
fa4c0e8c4c
Merge remaining PHP-7.0-Linux changes into merged codebase.
2017-01-31 18:10:37 -08:00
Jenny Tam
263622fac1
Merge pull request #265 from v-dareck/PHP-7.0
...
Merge latest PHP-7.0 branch changes to merged-codebase
2017-01-31 16:34:53 -08:00
Jenny Tam
1fe9c605d1
Merge pull request #256 from v-dareck/github37_has_rows
...
Github 37 sqlsrv_has_rows
2017-01-30 16:29:24 -08:00
David Puglielli
7b9adee14e
Added build directory
2017-01-26 17:58:11 -08:00
Hadis Kakanejadi Fard
8e24758564
updated to version 4.1
2017-01-26 17:27:12 -08:00
v-dareck
75aa64ec18
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.
2017-01-25 13:55:55 -08:00
v-dareck
69a744d808
Issue 228. Don't allow 0 for sqlsrv ClientBufferMaxKBSize.
...
Add new tests for sqlsrv and pdo.
2017-01-25 13:37:48 -08:00
yitam
1b38d24b0f
config.m4
2017-01-20 15:20:32 -08:00
yitam
d60d8f7528
fixed preprocessor directives
2017-01-20 10:24:22 -08:00
yitam
76a6a2da94
fixed indentations
2017-01-19 15:08:39 -08:00
yitam
a60184f187
modified based on reviews
2017-01-19 14:43:00 -08:00
yitam
0860f7086d
merged Linux to php_sqlsrv.h
2017-01-19 11:05:51 -08:00