Hadis-Fard
|
8a01b6e2f9
|
placed back setConnAttr after namespace definition
|
2017-09-12 09:46:22 -07:00 |
|
|
Hadis-Fard
|
a0e959a6e9
|
removed driver_version from conn struct
|
2017-09-11 16:17:24 -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
|
20607ad403
|
Merge branch 'AlwaysEncrypted' of https://github.com/Microsoft/msphpsql into AlwaysEncrypted
|
2017-09-08 16:48:01 -07:00 |
|
|
Hadis-Fard
|
1e61efca7e
|
refactored conn string funcs, added Driver option
|
2017-09-08 16:47:43 -07:00 |
|
Jenny Tam
|
26aa3ed574
|
Merge pull request #517 from yitam/SkipVersions
renamed skipf and used AEQualified method instead
|
2017-09-08 11:57:47 -07:00 |
|
|
Hadis-Fard
|
fc7173df11
|
fixed default driver version, sal annotation, and error messages
|
2017-09-08 10:28:01 -07:00 |
|
|
Jenny Tam
|
2143a9659b
|
renamed skipf and used AEQualified method instead
|
2017-09-07 11:21:21 -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
|
a604abe871
|
Merge branch 'AlwaysEncrypted' of https://github.com/Microsoft/msphpsql into AlwaysEncrypted
|
2017-09-01 16:11:39 -07:00 |
|
|
Jenny Tam
|
519e93a5be
|
modified sqlsrv_connect_encrypted_ksp_errors.phpt based on review
|
2017-09-01 16:10:45 -07:00 |
|
|
Jenny Tam
|
6f8a065eb8
|
another sqlsrv ksp test for simple insertion, retrieval and update
|
2017-09-01 16:10:44 -07:00 |
|
|
Jenny Tam
|
2554d4976c
|
used skipif_server_old for ksp tests
|
2017-09-01 16:10:44 -07:00 |
|
|
Jenny Tam
|
f21e790250
|
added two new tests to retrieve encrypted data
|
2017-09-01 16:10:44 -07:00 |
|
|
Jenny Tam
|
98a9137198
|
synced travis / docker with dev
|
2017-09-01 16:10:44 -07:00 |
|
|
Jenny Tam
|
3ab720b8be
|
fixed travis.yml
|
2017-09-01 16:10:44 -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
|
652087d06b
|
modified the tests to also check sql server version
|
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
|
1540692b5e
|
minor modifications to build_ksp.py
|
2017-09-01 16:10:43 -07:00 |
|
|
Jenny Tam
|
bfd01a2bc2
|
added two more tests for KSP
|
2017-09-01 16:10:43 -07:00 |
|
|
Jenny Tam
|
1ccb1c7013
|
reverted docker file and removed the commented out block in the test
|
2017-09-01 16:10:43 -07:00 |
|
|
Jenny Tam
|
3800a2c0ab
|
resolved conflicts in travis and docker
|
2017-09-01 16:10:43 -07:00 |
|
|
Jenny Tam
|
0441af291c
|
added checks for server version in the tests
|
2017-09-01 16:10:43 -07:00 |
|
|
Jenny Tam
|
8177786ddf
|
use working directory
|
2017-09-01 16:10:43 -07:00 |
|
|
Jenny Tam
|
fe6f5b2a8f
|
merged changes to travis and Docker
|
2017-09-01 16:10:42 -07:00 |
|
|
Jenny Tam
|
f8d87cd268
|
modified the KSP include files
|
2017-09-01 16:10:42 -07:00 |
|
|
Jenny Tam
|
1e4366242a
|
modified a failing pdo test
|
2017-09-01 16:10:42 -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
|
7a0ea56c78
|
change odbc version back to 13
|
2017-09-01 16:10:41 -07:00 |
|
|
v-kaywon
|
446ae075cb
|
fix setup_dbs.py
|
2017-09-01 16:10:40 -07:00 |
|
|
v-kaywon
|
bf7e4d80f6
|
reply reviews from Jenny
|
2017-09-01 16:10:40 -07:00 |
|
|
v-kaywon
|
baf73565b4
|
fix ae setup test
|
2017-09-01 16:10:40 -07:00 |
|
|
v-kaywon
|
7b390493d1
|
added ae keys setup test for pdo
|
2017-09-01 16:10:40 -07:00 |
|
|
v-kaywon
|
07726b0600
|
remove encrypttable.ps1
|
2017-09-01 16:10:40 -07:00 |
|
|
v-kaywon
|
2fdaa8a03c
|
revert some changes in mscommon
|
2017-09-01 16:10:40 -07:00 |
|
|
v-kaywon
|
f744b7e515
|
merge ae code
|
2017-09-01 16:10:40 -07:00 |
|
|
v-kaywon
|
1d838ea887
|
clean up
|
2017-09-01 16:10:40 -07:00 |
|