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
7a10c1ce59
fixed the merged issues
2017-09-25 13:49:36 -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
Jenny Tam
183872818d
added header file
2017-09-25 12:35:03 -07:00
Jenny Tam
674d7c818b
search for installed drivers in win
2017-09-25 12:35:03 -07:00
Jenny Tam
ca257fd2f4
search installed ODBC driver in Unix env
2017-09-25 12:35:02 -07:00
Jenny Tam
15e1bce414
added legacy_stdio_definitions.lib
2017-09-22 17:03:33 -07:00
Jenny Tam
2e9999d176
added header file
2017-09-22 16:58:32 -07:00
Jenny Tam
6fc50c100c
search for installed drivers in win
2017-09-22 16:37:05 -07:00
Jenny Tam
695254c29b
search installed ODBC driver in Unix env
2017-09-22 12:55:38 -07:00
David Puglielli
2c28d0bf31
Update stmt.cpp
2017-09-22 00:13:33 -04: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
v-kaywon
36fef13297
fix handling decimal type with no decimal with always encrypted
2017-09-19 12:48:21 -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
b037bfa317
constant mars error per review
2017-09-15 09:58:47 -07:00
Hadis-Fard
e97d5c201a
replaced tab with spaces
2017-09-15 09:45:36 -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
Hadis-Fard
dfee28f22a
fixed indentations
2017-09-14 12:00:51 -07:00
Hadis-Fard
08ca46116f
changed the order of ODBC drivers
2017-09-14 09:34:48 -07:00
Hadis-Fard
0d25563909
reset the flag after a failed conn
2017-09-14 08:11:40 -07:00
Hadis-Fard
9175241358
added pdo test, fixed issue with missing driver
2017-09-13 19:06:28 -07:00
Jenny Tam
79ee775b81
Updated versions to 5.1.0-preview
2017-09-13 15:34:06 -07:00
Hadis-Fard
d88838a605
fixed mem leak
2017-09-13 09:32:40 -07:00
Hadis-Fard
6f3f578219
fixed mars connection, added test for col enrytion
2017-09-12 19:21:55 -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
8a01b6e2f9
placed back setConnAttr after namespace definition
2017-09-12 09:46:22 -07:00
v-kaywon
5fb49b8c77
change typo in error message length
2017-09-12 09:42:46 -07:00
Hadis-Fard
a0e959a6e9
removed driver_version from conn struct
2017-09-11 16:17:24 -07:00
v-kaywon
3ddb8aae78
change conditions for using sql types derived from SQLDescribeParam
2017-09-11 15:41:19 -07:00
v-kaywon
ba7684e8c2
change comment
2017-09-11 13:41:43 -07:00
v-kaywon
f2381ba7b2
change comment
2017-09-11 13:06:20 -07:00
Hadis-Fard
16c5556340
added pooled boolean, fixed linux error
2017-09-11 11:43:52 -07:00
Hadis-Fard
193df5c5b5
added flag and connect using driver set
2017-09-08 17:36:48 -07:00
Hadis-Fard
1abd36b935
passed conn_str to odbc_Connect, removed conn_options
2017-09-08 17:15:31 -07:00
Hadis-Fard
1e61efca7e
refactored conn string funcs, added Driver option
2017-09-08 16:47:43 -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
v-kaywon
376461fab4
fix according to code review
2017-09-07 15:26:46 -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
v-kaywon
01c9f22f63
add code for AE insertion
2017-09-05 16:51:40 -07:00
Jenny Tam
d62d434cd0
modified skipif and code based on review
2017-09-01 16:10:44 -07:00
Jenny Tam
58f2068479
conflicts in msodbcsql
2017-09-01 16:10:44 -07:00
Jenny Tam
babaae71e9
added 2 more columns to ksp test table
2017-09-01 16:10:44 -07:00
Jenny Tam
0441af291c
added checks for server version in the tests
2017-09-01 16:10:43 -07:00
Jenny Tam
8c749e981b
added tests for basic error handling
2017-09-01 16:10:42 -07:00
Jenny Tam
cf9bafc826
merged msodbcsql.h
2017-09-01 16:10:42 -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
f7c9f06108
change comment in core_stmt.cpp
2017-09-01 16:10:41 -07:00
v-kaywon
d2fe48c85a
add comment
2017-09-01 16:10:41 -07:00
v-kaywon
96a0943180
refactored AE related code
2017-09-01 16:10:41 -07:00
v-kaywon
4d6aee9b3d
fixed indentation in core_stmt.cpp
2017-09-01 16:10:41 -07:00
v-kaywon
8fe7039b1b
Implementation of fetching AE max columns
2017-09-01 16:10:41 -07:00
v-kaywon
f744b7e515
merge ae code
2017-09-01 16:10:40 -07:00
Hadis-Fard
278a27c3aa
build connection attrs before connect
2017-08-28 16:34:44 -07:00
v-kaywon
ff671fcde3
change comment in core_stmt.cpp
2017-08-16 16:48:09 -07:00
v-kaywon
f8816b16de
add comment
2017-08-14 17:20:11 -07:00
v-kaywon
0100910be1
refactored AE related code
2017-08-14 17:09:49 -07:00
v-kaywon
7a5384650b
fixed indentation in core_stmt.cpp
2017-08-14 11:44:54 -07:00
v-kaywon
22b4817f65
Implementation of fetching AE max columns
2017-08-08 12:03:51 -07:00
David Puglielli
5a3f2ba201
Update version.h
...
Fixed the location of the dash, since pecl does not like dashes it gets included in VER_FILEVERSION_STR instead of SEMVER_PRERELEASE.
2017-07-25 11:44:01 -07:00
v-kaywon
c8c7bfad57
merge ae code
2017-07-25 11:01:00 -07:00
David Puglielli
3f20e0cab0
updated version.h
2017-07-20 16:39:58 -07:00
David Puglielli
c1e7280dc6
Version updated
2017-07-20 11:44:46 -07:00
David Puglielli
9817f4d598
Tests fixed, version updated
2017-07-19 14:43:28 -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
925a62891c
Merge pull request #465 from v-kaywon/fix_translate_nonascii_to_binary
...
fix unmatching quoted length and quoted_len in pdo_quote
2017-07-04 17:44:09 -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
Hadis-Fard
c949793907
updated the version file
2017-07-04 16:17:53 -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
bcff393895
fix versionhelper header
2017-06-29 12:49:00 -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
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
28301557d6
change annotation
2017-06-22 16:16:30 -07:00
v-kaywon
7a19a270d1
add more annotation to sal_def.h
2017-06-22 16:06:57 -07:00
v-kaywon
e575b6d341
added annotations to sal_def.h
2017-06-22 14:44:33 -07:00
v-kaywon
bde81001e9
added SAL annotations and fixed warnings
2017-06-22 14:04:34 -07:00
Hadis Fard
219de931fd
updated to RC1
2017-06-20 11:54:53 -07:00