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
David Puglielli
10aa50ced0
Fixed crash caused by non-freed reference
2017-11-06 15:48:51 -08:00
Jenny Tam
e5a3767089
Added error handling for LOB types as output parameters
2017-11-03 10:00:08 -07:00
v-kaywon
2ce10aceb0
change error messages
2017-10-31 09:41:34 -07:00
v-kaywon
631f80a9af
added error handling for using direct_query and emulate_prepare in a Column Encryption enabled connection
2017-10-26 13:58:38 -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
a1d613054e
Merge pull request #520 from david-puglielli/nextrowset-fix
...
Added empty result set check to nextRowset()
2017-10-03 14:31:56 -04: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
9e928672d4
Update pdo_stmt.cpp
2017-09-29 16:17:39 -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
Jenny Tam
302f8540c8
Merge branch 'dev' into missingDriver
2017-09-29 11:37:05 -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
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
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
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
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
v-kaywon
57a41d71e9
fix PDO::quote api when input string contain a NUL ASCII character
2017-09-21 15:59:54 -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
Hadis Kakanejadi Fard
dba7ba4365
added variant const
2017-05-16 15:53:40 -07:00
v-kaywon
8de9669b39
get start_pos out of while loop
2017-05-12 16:02:34 -07:00
v-kaywon
9e3252d4f4
fix uninitialized read if pos of string parser is -1
2017-05-12 10:56:26 -07:00
yitam
9e8cb88ca7
also download MS Online Services sign-in assistant
2017-05-08 08:12:26 -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
v-kaywon
c0707f6991
fix comments
2017-05-01 15:24:32 -07:00
v-kaywon
b7d4a9bec8
changed sql_string_parser::is_placeholder_char from using a switch cases through each acceptable characters to using if else statement that covers a range of characters
2017-04-24 11:33:28 -07:00
v-kaywon
6d7cddf5f6
added error handling for emulate prepare with output parameter
2017-04-21 14:57:57 -07:00
v-kaywon
2aec3b4a95
added error handling for emulate prepared statement with inout parameters
2017-04-21 13:04:24 -07:00
v-kaywon
fa38f7d61c
remove bind_param_encoding from previous implementation of emulate prepare
2017-04-21 09:39:00 -07:00
v-kaywon
7aaa16d49e
implemented emulate prepare and added tests
2017-04-20 17:17:05 -07:00
v-kaywon
8ddf8fdfee
fix spacing
2017-04-07 09:20:34 -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
Jenny Tam
52e05992bd
Merge pull request #344 from v-kaywon/error_numcol
...
workaround for unixODBC bug returning error when getting numcol
2017-04-04 11:40:15 -07:00
v-kaywon
ff3a23f442
got rid of execReturn check since SQL_SUCCESS is 0
2017-04-03 12:43:08 -07:00
v-kaywon
8f67221e18
fix indentation
2017-04-03 10:08:36 -07:00
v-kaywon
20c4fe69c1
fix if sqlreturn is null
2017-03-31 15:48:22 -07:00
v-kaywon
d87c03f5a8
do not check has result if execute returns SQL_NO_DATA
2017-03-31 13:38:57 -07:00
v-kaywon
8fa17294ec
Update pdo_util.cpp
2017-03-28 09:36:36 -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
v-kaywon
c9492ae487
fix memory leak caused by pecalloced persistent connection; fix test indentation
2017-03-17 16:46:02 -07:00
v-kaywon
b701fab642
implement throwing exception when ATTR_PERSISTENT is in the connection options; added tests
2017-03-13 17:54:58 -07:00
Hadis Kakanejadi Fard
0782c56b41
updated versioning to semantic versioning #282
2017-03-03 16:55:28 -08:00
Hadis Kakanejadi Fard
67c4a0a9de
fixed issue #270
2017-02-21 15:14:02 -08:00
yitam
471da9b005
Fix issue #35
2017-02-10 13:21:53 -08:00
v-dareck
fc8433ac83
Fix error message in close cursor. Change prepare to query in test.
2017-02-09 16:41:39 -08:00
v-dareck
690571d41d
Change tab to spaces.
2017-02-08 17:16:02 -08:00
v-dareck
887857eaf2
In closeCursor check if statement has been executed before moving to next result.
2017-02-08 16:38:12 -08:00
v-dareck
044836b048
Tab/indentation fixes.
2017-02-01 16:55:05 -08:00
v-dareck
fa4c0e8c4c
Merge remaining PHP-7.0-Linux changes into merged codebase.
2017-01-31 18:10:37 -08:00
yitam
0bd7169b03
safeguard get_col_meta
2017-01-27 15:05:09 -08:00
David Puglielli
dcbd35709b
Added config.m4
2017-01-26 17:54:55 -08:00
Hadis Kakanejadi Fard
52802e3f46
updated version to 4.1
2017-01-26 17:27:45 -08:00
David Puglielli
c08094317a
Update pdo_parser.cpp
2017-01-25 17:21:10 -08:00
David Puglielli
7c69017257
Update pdo_init.cpp
2017-01-25 17:19:50 -08:00
David Puglielli
921d2c94b0
Update pdo_stmt.cpp
2017-01-25 17:12:20 -08:00
David Puglielli
4d8288a76c
Update pdo_dbh.cpp
2017-01-25 17:11:31 -08:00
David Puglielli
37fe9a0307
Commented code removed
2017-01-23 11:26:16 -08:00
David Puglielli
8ea93d6185
Capitalised win32
2017-01-23 11:25:03 -08:00
David Puglielli
1a4176d624
Commented code removed
2017-01-19 17:05:34 -08:00
David Puglielli
def3ae8375
Spacing fixes
2017-01-19 17:01:58 -08:00
David Puglielli
e785329f16
Small ifdef fix
2017-01-19 16:38:40 -08:00
David Puglielli
aaa3203e55
Merged Linux and Windows PDO_SQLSRV code
2017-01-19 11:53:21 -08:00
Hadis Kakanejadi Fard
c45853a74c
fixed indentations
2017-01-17 14:19:45 -08:00
Hadis Kakanejadi Fard
11e29c0ff6
fix #173 , #138 on Windows code
2017-01-17 14:17:57 -08:00
Hadis Kakanejadi Fard
73cd9c80c5
moved templates to driver folder
2017-01-13 13:22:37 -08:00
Hadis Kakanejadi Fard
c9b85d9908
fixed indentations
2017-01-12 13:44:46 -08:00
Hadis Kakanejadi Fard
80783a5a83
changed tab to spaces
2017-01-12 13:32:43 -08:00
Hadis Kakanejadi Fard
f59274536a
Merge branch 'PHP-7.0' of https://github.com/Microsoft/msphpsql into HEAD
2017-01-12 13:14:20 -08:00
Hadis Kakanejadi Fard
0762fa3353
deleted shared folder inside pdo
2017-01-09 15:36:38 -08:00
Hadis Kakanejadi Fard
86dd9ef420
updated sqlsrv and pdo_sqlsrv config.w32 to get the dir name dynamically
2017-01-09 15:10:04 -08:00
Hadis-Fard
4fb02c3533
added pdo shared folder
2017-01-03 11:25:39 -08:00
Hadis-Fard
8ebae46525
Updated pdo driver source code path
2017-01-03 11:23:01 -08:00
Hadis-Fard
4c42a9ad6a
updated the code structure
2016-12-20 16:00:53 -08:00