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
9e928672d4
Update pdo_stmt.cpp
2017-09-29 16:17:39 -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
David Puglielli
d56446c41c
More tiny fixes
2017-09-27 18:08:24 -07:00
David Puglielli
7713b70d1f
Fixed typos again
2017-09-27 17:50:20 -07:00
David Puglielli
a749010a67
Moved errors back to pdo_stmt and stmt.cpp
2017-09-27 17:01:20 -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
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
David Puglielli
0d06dea2e8
Fixed compile bug
2017-09-21 18:37:23 -07: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
David Puglielli
8666ea63c7
Fixed bug for sqlsrv too, sqlsrv test added
2017-09-21 17:55:59 -07:00
Hadis-Fard
4e712ff50a
fixed missign driver error message
2017-09-15 13:13:29 -07:00
Hadis-Fard
80b9f9e603
fixes per review comments
2017-09-14 18:21:25 -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
David Puglielli
83631cdabc
Added empty result set check to nextRowset()
2017-09-07 15:44:43 -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
David Puglielli
ca4a2d9b7d
changed line endings
2017-07-19 14:10:53 -07:00
David Puglielli
53318fbbdd
new PR for lastInsertID
2017-07-19 14:05:14 -07:00
v-kaywon
49fd20d31c
fix unmatching quoted length and quoted_len in pdo_quote (fix for uninitialized read)
2017-07-04 16:32:35 -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
d2690aad12
Merge branch 'dev' into fix_fortify_warning
2017-06-30 13:01:48 -07:00
v-kaywon
d32250a61f
added in a SAL annotation for pdo_sqlsrv_dbh_quote
2017-06-30 10:59:31 -07:00
v-kaywon
c470d59f07
change back ordering for checking stmt != NULL
2017-06-30 09:38:01 -07:00
v-kaywon
c107a64368
change ordering of != NULL check
2017-06-29 12:53:00 -07:00
v-kaywon
48223ff107
fix for fortify warnings
2017-06-29 10:51:58 -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
84ee58cb5f
Merge pull request #426 from v-kaywon/tnir
...
Add TNIR conn option and tests
2017-06-19 17:27:39 -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
3577a9281a
updated header files to 4.2
2017-05-24 10:01:44 -07:00
