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
|
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
|
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
|
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
|
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
|
36fef13297
|
fix handling decimal type with no decimal with always encrypted
|
2017-09-19 12:48:21 -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 |
|
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 |
|
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 |
|
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 |
|
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
|
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
|
48223ff107
|
fix for fortify warnings
|
2017-06-29 10:51:58 -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 |
|
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 |
|
v-kaywon
|
56dcce01b7
|
Fix indentation in core_sqlsrv.h
|
2017-06-19 09:58:04 -07:00 |
|
yitam
|
25e7705249
|
added a comment for CEKeystoreData
|
2017-06-08 15:45:22 -07:00 |
|
yitam
|
1afc509125
|
removed unnecessary definitions
|
2017-06-08 15:21:50 -07:00 |
|
yitam
|
7c105ac08e
|
added a comment about this file being a subset
|
2017-06-08 12:02:12 -07:00 |
|
yitam
|
74800c993c
|
fixed CEKeystoreProvider interface
|
2017-06-08 11:59:34 -07:00 |
|
yitam
|
48478125e0
|
Updated odbc header constants
|
2017-06-08 09:33:37 -07:00 |
|
v-kaywon
|
208cc4a078
|
Add TNIR conn option and tests
|
2017-06-07 13:53:04 -07:00 |
|
Hadis Kakanejadi Fard
|
d74e4083f2
|
updated headers versions to 4.2
|
2017-05-24 10:05:32 -07:00 |
|
yitam
|
ae9957d684
|
revert indentation
|
2017-05-18 13:53:03 -07:00 |
|
yitam
|
52cf72edf9
|
indentation
|
2017-05-18 13:24:56 -07:00 |
|
yitam
|
a0b6d5644b
|
update version
|
2017-05-18 13:08:26 -07:00 |
|
Hadis Fard
|
29bb60282d
|
Merge pull request #399 from Hadis-Fard/dev
sql variant support
|
2017-05-18 13:01:45 -07:00 |
|
David Puglielli
|
a88b187f50
|
Removed ODBCVER #define
|
2017-05-17 14:59:32 -07:00 |
|
David Puglielli
|
ddab6d3f9d
|
Removed more unneeded code - MPLAT_UNIX defines and unnecessary typedefs
|
2017-05-16 15:47:32 -07:00 |
|
David Puglielli
|
674fce0ded
|
Removed extraneous comments
|
2017-05-15 16:30:05 -07:00 |
|
David Puglielli
|
a297fe0c54
|
Removed unused xplat functions
|
2017-05-15 16:22:58 -07:00 |
|
Hadis Kakanejadi Fard
|
5d4ca446fc
|
Merge branch 'dev' of https://github.com/Microsoft/msphpsql into dev
|
2017-05-15 14:19:49 -07:00 |
|
Hadis Kakanejadi Fard
|
7904bddb6e
|
added sql_variant const
|
2017-05-15 14:19:36 -07:00 |
|