Commit graph

1141 commits

Author SHA1 Message Date
Jenny Tam 79ee775b81 Updated versions to 5.1.0-preview 2017-09-13 15:34:06 -07:00
Yuki Wong b7d5b76afc Merge pull request #514 from v-kaywon/AEInsertCode
add code for AE insertion
2017-09-13 14:53:09 -07:00
Jenny Tam adc0cdec3f Merge pull request #519 from yitam/MsSetup
added two new variables to enable AE testing
2017-09-12 11:19:46 -07:00
v-kaywon 5fb49b8c77 change typo in error message length 2017-09-12 09:42:46 -07:00
Jenny Tam 2d41ee8897 Merge branch 'MsSetup' of https://github.com/yitam/msphpsql into MsSetup 2017-09-11 16:08:14 -07:00
Jenny Tam 834402ba8d added skipif_not_ksp file as per review comment 2017-09-11 16:07:40 -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
Jenny Tam 2b466cb1f8 Merge branch 'MsSetup' of https://github.com/yitam/msphpsql into MsSetup 2017-09-08 12:05:47 -07:00
Jenny Tam 99fa9c66dd skip KSP tests if the flag in MsSetup is not set 2017-09-08 12:05:10 -07:00
Jenny Tam 696a1fb722 added two new variables to enable AE testing 2017-09-08 11:59:08 -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
Jenny Tam ed5a0e5e48 added two new variables to enable AE testing 2017-09-07 15:57:53 -07:00
v-kaywon 376461fab4 fix according to code review 2017-09-07 15:26:46 -07:00
Jenny Tam 2143a9659b renamed skipf and used AEQualified method instead 2017-09-07 11:21:21 -07:00
v-kaywon cdc60e7018 change test to provide sql type when binding parameter query using sqlsrv_prepare in a column encryption enabled connection 2017-09-06 12:58:09 -07:00
v-kaywon 01c9f22f63 add code for AE insertion 2017-09-05 16:51:40 -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