Commit graph

310 commits

Author SHA1 Message Date
David Puglielli 66a12d3330 Fixed errant variable name 2017-09-26 18:38:48 -07:00
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
David Puglielli 1045ea40a9 fixed conflicts 2017-09-26 16:11:24 -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
David Puglielli 2c28d0bf31 Update stmt.cpp 2017-09-22 00:13:33 -04:00
David Puglielli 0d06dea2e8 Fixed compile bug 2017-09-21 18:37:23 -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
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 4e712ff50a fixed missign driver error message 2017-09-15 13:13:29 -07:00
v-kaywon e70ebbaba1 change error message 2017-09-15 11:15:38 -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
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 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
David Puglielli 83631cdabc Added empty result set check to nextRowset() 2017-09-07 15:44:43 -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