Commit graph

649 commits

Author SHA1 Message Date
David Puglielli 9fc7e4bf4b added skipifs to connres and aad tests 2017-09-29 21:06:05 -07:00
David Puglielli 4151f8f5d1 Minor fixes 2017-09-29 20:47:24 -07:00
David Puglielli 329fa3409e Added skipif for SQL Server 2014 2017-09-29 17:25:14 -07:00
Jenny Tam bbc2701140 Made changes as per review comments 2017-09-29 15:54:34 -07:00
David Puglielli dc6e2a34fa Update sqlsrv_empty_result_error.phpt 2017-09-29 14:52:51 -07:00
David Puglielli 0728a1da5a Update pdo_empty_result_error.phpt 2017-09-29 14:52:33 -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 7315d4426a Fixed test output 2017-09-28 15:19:38 -07:00
David Puglielli 257b1cd671 Fixed test outputs 2017-09-28 15:00:14 -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
Yuki Wong 61f881136a Merge pull request #550 from v-kaywon/fixPODQuoteNul
Fix PDO::quote with string containing ASCII NUL character
2017-09-28 12:23:10 -07:00
v-kaywon a5b0dbb8e4 refactored first 60 PDO functional tests 2017-09-28 09:48:08 -07:00
Jenny Tam 4bb6f4df2e changed the default odbc versions in the tests 2017-09-28 08:45:48 -07:00
Jenny Tam 135286056d modified error messages in the tests 2017-09-27 17:03:04 -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
Jenny Tam 144ed8c8f3 added tests for AE and odbc 13 combination 2017-09-27 10:12:25 -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
v-kaywon 5ac1c73533 add description to test 2017-09-26 11:33:56 -07:00
v-susanh 6d3ea18fed moved test descriptions to DESCRIPTION section (#554) 2017-09-25 16:37:27 -07:00
Yuki Wong 14c2af281e Merge pull request #544 from v-kaywon/changeUTC
fix handling decimal type with no decimal with always encrypted
2017-09-25 13:33:56 -07:00
v-kaywon 0d5bd2490b change variable name isCompat to isCompatible 2017-09-25 12:29:15 -07:00
Jenny Tam cba037a809 Merge pull request #463 from yitam/userScripts
adding test users for testing in Azure -- the password tests for both drivers require re-design
2017-09-25 12:27:30 -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 d72504b730 add comments to sqltype compatibility tests 2017-09-21 15:48:48 -07:00
v-kaywon e612621b5a change compatible types list for sqltype in binding param and column datatypes 2017-09-19 16:38:12 -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 0e7e231e9b Merge pull request #542 from v-kaywon/changeUTC
fix fixed_size test
2017-09-18 17:54:20 -07:00
v-kaywon 579af01b26 fix fixed_size test 2017-09-18 17:53:19 -07:00
Yuki Wong 721343696f Merge pull request #541 from v-kaywon/changeUTC
Change utc
2017-09-18 15:13:27 -07:00
v-kaywon b0f618c9f3 use ae_connect 2017-09-18 15:11:14 -07:00
v-kaywon 263963f0ed use ae_connect 2017-09-18 15:01:19 -07:00
Jenny Tam 25c000b13e Updated ODBC version
Changed ODBC from 13 to 17
2017-09-18 12:51:49 -07:00
v-kaywon ae9ab89990 fix tests 2017-09-18 10:32:10 -07:00
v-kaywon 26ed43301e change timezone to Canada/Pacific in tests 2017-09-18 10:05:36 -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 9a0442e659 Merge branch 'AlwaysEncrypted' of https://github.com/Microsoft/msphpsql into AlwaysEncrypted 2017-09-15 13:42:25 -07:00
v-kaywon c12585b77b use skipif_not_ksp.inc in the test: 2017-09-15 11:32:21 -07:00
v-kaywon e70ebbaba1 change error message 2017-09-15 11:15:38 -07:00
v-kaywon d5a8346319 update sqlsrv_encrypted_query_nosqltype test to use skipif_versions_old.inc 2017-09-15 10:19:38 -07:00
Yuki Wong c22a528290 Merge pull request #530 from v-kaywon/AEinsertTests
add insertion tests for Always Encrypted; add common functions in MsC…
2017-09-15 10:06:49 -07:00
Hadis-Fard 7a6a7e8149 fixed expected output 2017-09-15 09:47:27 -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 8a48bd2626 added sqlsrv test for driver options 2017-09-14 16:55:47 -07:00
v-kaywon b1890b818d change expected output in PDO95_Extend2 for the new DropTable function in MsCommon.inc 2017-09-14 15:56:17 -07:00
v-kaywon 8a5fc85aec fix typo in pdo_sqlsrv MsCommin.inc 2017-09-14 15:38:07 -07:00
v-kaywon 4dfe37fe01 fix typo in sqlsrv MsCommon.inc 2017-09-14 15:25:07 -07:00
Hadis Fard 8495cb10a6 Merge branch 'AlwaysEncrypted' into AlwaysEncrypted 2017-09-14 15:21:07 -07:00
v-kaywon ebdb18c837 iteration 2: apply review changes 2017-09-14 15:04:55 -07:00
v-kaywon 27b47665dd iteration 1: apply review changes; fix expected outputs 2017-09-14 13:24:12 -07:00
v-kaywon 8a512d8e97 fixed expected values in pdo tests 2017-09-14 11:52:17 -07:00
v-kaywon 199ad557bb fix expected values in sqlsrv tests 2017-09-14 11:40:13 -07:00
Hadis-Fard 7feac89832 fixed test error code 2017-09-14 11:06:42 -07:00
Hadis-Fard 07f49c807c fixed test regex 2017-09-14 10:19:35 -07:00
v-kaywon 49a5c9e461 added skipif old version to tests 2017-09-14 09:47:40 -07:00
Hadis-Fard 00f9b7edf8 fixed connection test, Driver option is valid 2017-09-14 08:51:52 -07:00
Hadis-Fard 9175241358 added pdo test, fixed issue with missing driver 2017-09-13 19:06:28 -07:00
v-kaywon bef0e3eab7 add insertion tests for Always Encrypted; add common functions in MsCommon.inc for refactoring in the future 2017-09-13 17:46:44 -07:00
Jenny Tam 0b6565da67 escaped the periods as per review comments 2017-09-13 16:50:42 -07:00
Jenny Tam 0d4e6373a0 removed the hardcoded values for ODBC versions 2017-09-13 16:36:29 -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
Hadis-Fard 6f3f578219 fixed mars connection, added test for col enrytion 2017-09-12 19:21:55 -07:00
Jenny Tam 834402ba8d added skipif_not_ksp file as per review comment 2017-09-11 16:07:40 -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
David Puglielli f4117a88d4 Added PHPT test 2017-09-07 19:27:45 -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
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 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 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
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
v-kaywon 2eb652cdcd debug 2017-09-01 16:10:39 -07:00
v-kaywon c8e2cc3f1d debug 2017-09-01 16:10:39 -07:00
v-kaywon a1e82d4283 debug 2017-09-01 16:10:39 -07:00
v-kaywon 7f5637a1a7 debug 2017-09-01 16:10:39 -07:00
v-kaywon 6e52306529 debug 2017-09-01 16:10:39 -07:00
v-kaywon 9950041ed6 debug setup.dbs.py 2017-09-01 16:10:39 -07:00
v-kaywon cb45f05c11 debug 2017-09-01 16:10:39 -07:00
v-kaywon 8150c0113e fix setupAE params 2017-09-01 16:10:39 -07:00
v-kaywon be267022c0 fix test 2017-09-01 16:10:39 -07:00
v-kaywon d8adc048a0 fix certificate path 2017-09-01 16:10:38 -07:00
v-kaywon 396537c3a1 added failing message in test_ae_keys_setup.phpt 2017-09-01 16:10:38 -07:00
v-kaywon 5c2064e762 check if cert exist in test_ae_keys_setup.phpt 2017-09-01 16:10:38 -07:00
v-kaywon 51d358ab33 added IsAEQualified 2017-09-01 16:10:38 -07:00
v-kaywon 0fe5172651 import certificate and generate CMK and CEK using tsql, no long depends on SSMS 2017-09-01 16:10:38 -07:00
v-kaywon 5240a3420a refactor sqlsrv_fetch_ae_int.phpt 2017-09-01 16:10:38 -07:00
v-kaywon 8caf1ec078 more database setup 2017-09-01 16:10:38 -07:00
v-kaywon ff63d38799 initial ae setup 2017-09-01 16:10:38 -07:00
Jenny Tam 2713ab12ab Fixed minor issues 2017-08-21 13:02:46 -07:00
Jenny Tam 5b2ec69c37 Added a new sqlsrv test to test the string boundaries 2017-08-21 12:59:17 -07:00
v-susanh 259f13c45c Merge pull request #481 from lilgreenbird/php72_testfixes
test fixes for PHP 7.2
2017-07-25 10:04:31 -07:00
lilgreenbird e3fd38c873 removed redundant count() as per review comment 2017-07-24 16:59:23 -07:00
lilgreenbird 3e8b44546f test fixes for PHP 7.2 2017-07-21 16:56:16 -07:00
David Puglielli 8a9d2d66fc Tests fixed to use temp tables 2017-07-20 17:07:02 -07:00
David Puglielli c1e7280dc6 Version updated 2017-07-20 11:44:46 -07:00
David Puglielli 4dc7464be4 Tests fixed 2017-07-19 16:08:20 -07:00
David Puglielli 1904877d8c Tests fixed 2017-07-19 15:55:57 -07:00
David Puglielli 9d86b861b9 Tests fixed 2017-07-19 15:13:23 -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 a1dd674c44 Tests added 2017-07-19 14:08:48 -07:00
yitam 8d7f1853a4 Temporary entity names to ensure uniqueness 2017-07-12 13:39:02 -07:00
ulvii f25f844719 Modifying UNIX connection pooling tests to not require root permissions (#471)
* Editing unix connection pooling tests to not requiere root permissions

* Fix type in sqlsrv_ConnPool_Unix.phpt

* Fix type in PDO_ConnPool_Unix.phpt
2017-07-12 12:57:43 -05:00
yitam b458db2893 adding test users 2017-07-04 12:02:49 -07:00
yitam f03b62e6b2 cleaned up toConnect helper method 2017-06-28 13:28:08 -07:00
yitam 00aa8ad7c8 modified a comment 2017-06-28 12:18:45 -07:00
yitam dcb232e7b9 removed ConnectSpecial helper function 2017-06-28 11:51:40 -07:00
yitam e93a40561a fixed line number 2017-06-28 09:59:55 -07:00
yitam 465a72352f modified the comments based on review 2017-06-28 09:48:33 -07:00
yitam c1747ef572 daasMode = false by default 2017-06-27 15:46:08 -07:00
yitam 60575a552f simplified skip conditions 2017-06-27 15:10:27 -07:00
yitam e7f00c1fed modified the comments for the passwords tests 2017-06-27 15:03:04 -07:00
yitam 6e8111418d resiliency tests and skip azure condition 2017-06-27 14:20:53 -07:00
yitam 49ba138797 set placeholders for daasMode 2017-06-27 13:34:27 -07:00
yitam 44dbd78c92 fixed connection resiliency tests 2017-06-27 13:17:31 -07:00
yitam e535e85d1f modified tests for Azure testing 2017-06-27 13:00:07 -07:00
yitam c678f9a648 moved setup folder to functional 2017-06-23 16:08:54 -07:00
yitam 6c6061819f moved output.py too 2017-06-23 14:05:23 -07:00
yitam 6c0be02618 rearrange test folders as functional 2017-06-23 13:09:37 -07:00