Commit graph

1176 commits

Author SHA1 Message Date
Hadis Fard 8495cb10a6 Merge branch 'AlwaysEncrypted' into AlwaysEncrypted 2017-09-14 15:21:07 -07:00
Jenny Tam d6d91e053f Merge pull request #527 from yitam/fixVersions
removed the hardcoded values for ODBC versions
2017-09-14 13:42:53 -07:00
Jenny Tam 2d1f89c4c6 Merge pull request #528 from yitam/version51
Updated versions to 5.1.0-preview
2017-09-14 13:39:59 -07:00
Hadis-Fard dfee28f22a fixed indentations 2017-09-14 12:00:51 -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
Hadis-Fard 08ca46116f changed the order of ODBC drivers 2017-09-14 09:34:48 -07:00
Hadis-Fard 00f9b7edf8 fixed connection test, Driver option is valid 2017-09-14 08:51:52 -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 9149778cc5 escaped periods as per review 2017-09-13 16:54:42 -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
David Puglielli 964ec5f087 Merge pull request #524 from david-puglielli/bvt-test-fix
Bvt test fix
2017-09-13 19:28:53 -04:00
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 5362b2286e removed the hardcoded values for ODBC versions 2017-09-13 14:45:11 -07:00
David Puglielli 8df36f82ba Typo fixed 2017-09-13 14:41:27 -07:00
David Puglielli 0130f68610 Narrowed range of acceptable values 2017-09-13 12:25:14 -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
David Puglielli f0e12e3ba3 changed line endings 2017-09-12 17:08:23 -07:00
David Puglielli 471fce2bac Changed test result to expectregex 2017-09-12 17:06:17 -07:00
Hadis-Fard 2737b9cc0d Merge branch 'AlwaysEncrypted' of https://github.com/Microsoft/msphpsql into AlwaysEncrypted 2017-09-12 14:04:12 -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
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
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
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
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 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
Hadis-Fard fc7173df11 fixed default driver version, sal annotation, and error messages 2017-09-08 10:28:01 -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
Hadis-Fard 3343d1eb18 fixed crash and error handling 2017-09-06 18:04:55 -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
Hadis-Fard 117b2bf777 resolved merge conflicts 2017-09-06 12:46:22 -07:00