Commit graph

597 commits

Author SHA1 Message Date
Jenny Tam 44d1bb39ba Use SQLSRV_ASSERT for checking NULL ptrs 2018-06-06 13:18:58 -07:00
Jenny Tam 10ff344fca Fixed the potential error reported by Prefast code analysis 2018-06-05 13:09:51 -07:00
David Puglielli 13144d9c5e
Merge pull request #783 from david-puglielli/type-conversion-for-ae
Added select type conversion test
2018-05-28 15:48:18 -07:00
David Puglielli c348aadd68 Addressed review comments 2018-05-28 15:08:46 -07:00
David Puglielli d35575b164 Added select type conversion test and updated values 2018-05-25 21:47:25 -07:00
Jenny Tam 45f422abba
Merge pull request #780 from yitam/version
Modified version.h for 5.2.1-preview
2018-05-25 16:48:13 -07:00
David Puglielli 1747df1ced addressed review comments 2018-05-25 14:42:32 -07:00
Jenny Tam 6817c7b4d4 Modified the comments to clarify things 2018-05-25 09:38:23 -07:00
Jenny Tam d26440b207 Modified version.h for 5.2.1-preview 2018-05-24 16:30:12 -07:00
David Puglielli e0f9afae2f
Merge pull request #768 from david-puglielli/azure-key-vault-support
Azure key vault support
2018-05-18 14:43:36 -07:00
David Puglielli e2ed131b41 Final style fixes 2018-05-18 14:05:18 -07:00
David Puglielli 10ea9286d8 Fixed coding style 2018-05-18 12:24:37 -07:00
David Puglielli 757a84fd4c Added constant for AKV name 2018-05-17 16:24:40 -07:00
Jenny Tam 64e2241ba2 Extend output buffer sizes with SQL decimals or numerics 2018-05-17 13:06:22 -07:00
David Puglielli 079c4ea0fe Fixed tests, fixed wide char name in keystore struct 2018-05-16 15:14:47 -07:00
Jenny Tam 4747537a96 Fixed the formatting 2018-05-15 16:13:36 -07:00
Jenny Tam 0b5ceb001d Reverted the changes 2018-05-15 15:57:47 -07:00
Jenny Tam 4c7c08515d Added workaround for the test plus use BIGINT for 64-bit systems 2018-05-15 14:28:26 -07:00
Jenny Tam bca311081d Modified the output param initial value 2018-05-15 12:41:28 -07:00
Jenny Tam 9a82e9daa3 Used sizeof not INT_MAX 2018-05-15 10:00:36 -07:00
Jenny Tam 999312be8b Tried using INT_MAX instead 2018-05-15 09:33:52 -07:00
David Puglielli 2239511f80 Workaround for error returned in Linux 2018-05-14 12:04:25 -07:00
David Puglielli 3b94eb4726 Merging 2018-05-08 17:56:28 -07:00
David Puglielli 2aaae26f55 Minor fixes 2018-05-08 17:09:58 -07:00
David Puglielli fb1a2ecb70 Changes according to PR review comments 2018-05-08 14:12:14 -07:00
Jenny Tam 5a842c9b32
Merge pull request #761 from yitam/vso2823
Made changes to output param handling code to convert doubles to ints, if necessary
2018-05-08 13:13:14 -07:00
David Puglielli 2fe0b5a2bc Removed more unnecessary comments 2018-05-05 17:24:34 -07:00
David Puglielli 52cd004b79 Removed unnecessary comments 2018-05-05 17:22:02 -07:00
David Puglielli 977e5309dd Support for Azure Key Vault 2018-05-05 17:08:01 -07:00
Jenny Tam 5f6c3994ca A huge negative number is out of range too 2018-04-26 08:57:22 -07:00
Jenny Tam 5bb3f1a2ec Modified the error message to indicate value out of range 2018-04-26 08:48:41 -07:00
Jenny Tam 218497c642 Made changes to output param handling code to convert doubles to ints if necessary 2018-04-25 15:43:56 -07:00
Jenny Tam 3033a26c51 Added a comment to address the issue 2018-04-25 07:56:58 -07:00
Jenny Tam 72ca1cd1eb Fixed incorrect error when binding inout PDO STR with binary encoding 2018-04-24 15:38:53 -07:00
Jenny Tam 93b9938e02 Replace most strlen with strnlen_s 2018-04-13 15:06:10 -07:00
David Puglielli 454bc2739f
Merge pull request #744 from david-puglielli/Revert-bigint-change
Reverted change handling bigint output parameters
2018-04-11 14:21:20 -07:00
David Puglielli 2960738883 Reverted change handling bigint output parameters 2018-04-09 17:15:58 -07:00
Jenny Tam 812db3da38 Increase LAST_INSERT_ID_BUFF_LEN for other data types for identity columns 2018-04-06 11:35:32 -07:00
Jenny Tam 88f0bcfc92 Added bigint into the options 2018-04-04 13:37:41 -07:00
Jenny Tam 4740ed25b8 Fix issue 705 by including the possible negative sign 2018-04-02 15:41:54 -07:00
Jenny Tam db56c0344e Removed support for Custom Keystore provider 2018-02-08 09:00:16 -08:00
Yuki Wong 3bc2c74fd3
Merge pull request #676 from v-kaywon/versionh
change version.h and config flags for debug mode
2018-01-29 21:06:13 -08:00
v-kaywon 13d6f9129e change version.h and config flags for debug mode 2018-01-29 16:38:09 -08:00
Jenny Tam 6d5763abd6 Replace SQL_IS_SMALLINT with SQL_IS_INTEGER 2018-01-29 16:34:57 -08:00
Jenny Tam 9e2c080dda Replace 0 with SQL_IS_SMALLINT 2018-01-29 15:56:25 -08:00
v-kaywon 253a0f3d44 fix typo 2018-01-17 10:12:31 -08:00
v-kaywon abd2c65348 fix indentation 2018-01-16 16:50:17 -08:00
v-kaywon 53e5a51760 remove workaround for limitation on fetching stream 2018-01-15 11:57:52 -08:00
David Puglielli bc71d659d8 Fixed merge conflicts 2018-01-05 12:14:01 -08:00
Jenny Tam cc303c5904 Use https for fwlinks 2018-01-03 13:02:26 -08:00
Jenny Tam 00a2e82ca8 Changed connection order to ODBC drivers 2018-01-02 15:26:33 -08:00
David Puglielli 6b177f0ee1 Added immediate binding and fixed some mac related test output 2017-12-21 14:14:23 -08:00
Jenny Tam 244e3401b5 Added Control Flow Guard to configs 2017-12-21 12:52:36 -08:00
Jenny Tam 44e447a86a
Update version.h
Renamed RC RC1 for PECL
2017-12-21 11:02:11 -08:00
v-kaywon 0c0882b93f coding standard 2017-12-15 13:42:59 -08:00
v-kaywon 0284279e9b fix crash related to zend_hash_internal_pointer_reset 2017-12-15 13:37:29 -08:00
Jenny Tam 2236e71234
Merge pull request #631 from yitam/RC1
Updated versions from 5.1 to 5.2
2017-12-14 16:49:54 -08:00
Jenny Tam 8d33f1fc02 Updated versions from 5.1 to 5.2 2017-12-14 16:05:34 -08:00
v-kaywon ad29c28dc4 fix warning according to prefast code analysis 2017-12-13 13:33:32 -08:00
v-kaywon 9f8078dde9 fix spacing in core_stmt.cpp 2017-12-08 16:15:24 -08:00
v-kaywon b9579a2426 add error handling for fetching stream with always encrypted 2017-12-07 17:29:06 -08:00
Yuki Wong f2884e0979
Merge pull request #594 from v-kaywon/adjustprecision
Adjust precision for decimal input when column encryption is enabled
2017-11-22 13:58:53 -08:00
Jenny Tam 11c6fe6f46 chech param num against vector size 2017-11-21 16:41:18 -08:00
Jenny Tam ab5bdb4ac0 Merge branch 'dev' into describeParam 2017-11-21 15:29:09 -08:00
v-kaywon 0b135b1529 if not scientific notation, only parse up to decimal_digits 2017-11-21 13:17:39 -08:00
v-susanh 54f1e5e22f
support for non-utf8 locales (#598)
* support non-utf8 locales
2017-11-20 17:56:45 -08:00
v-kaywon 20480812c2 remove include string in core_stmt.cpp 2017-11-20 16:06:39 -08:00
v-kaywon acb0300271 change changelog and version.h for 5.1.2-preview 2017-11-17 16:12:57 -08:00
v-kaywon fc7c4fb89b return if the length of the decimal string is greater than maxDecimalStrLen 2017-11-17 13:27:45 -08:00
v-kaywon bb1e1c0168 do not throw an error if the decimal string is ill formed; let SQL Server handle it 2017-11-17 12:30:14 -08:00
v-kaywon 90029e7e54 add test for scientific notation 2017-11-17 10:21:03 -08:00
David Puglielli 01dd22cac2
Merge pull request #595 from david-puglielli/nextrowset-revert
Revert nextRowset changes
2017-11-16 22:06:12 -05:00
Jenny Tam ef45560db0 Modified how to bind parameters when AE is enabled 2017-11-16 10:30:44 -08:00
David Puglielli 633024c22b Revert next result changes, improve tests 2017-11-15 17:39:00 -08:00
v-kaywon 9acfab9ec2 include vector library 2017-11-15 16:38:27 -08:00
v-kaywon 9d6aba62ce implement adjustInputPrecision 2017-11-15 16:36:10 -08:00
Jenny Tam 1a2459614e Adjusted the initial length for string and LOB fields 2017-11-15 11:00:56 -08:00
Jenny Tam d633691b5b Raised the initial buffer size and modified tests as per review 2017-11-10 15:04:07 -08:00
Jenny Tam 52b612ece8 Fix to GitHub issue 574 2017-11-09 15:24:08 -08:00
David Puglielli 10aa50ced0 Fixed crash caused by non-freed reference 2017-11-06 15:48:51 -08:00
Jenny Tam ef144000c3 Fixed the typo in the comment 2017-11-03 12:17:43 -07:00
Jenny Tam b44a5dd1fb Modified comments as per review feedback 2017-11-03 11:14:55 -07:00
Jenny Tam e5a3767089 Added error handling for LOB types as output parameters 2017-11-03 10:00:08 -07:00
v-kaywon 2ce10aceb0 change error messages 2017-10-31 09:41:34 -07:00
v-kaywon 631f80a9af added error handling for using direct_query and emulate_prepare in a Column Encryption enabled connection 2017-10-26 13:58:38 -07:00
Yuki Wong 779c39abc2 Merge pull request #571 from v-kaywon/AEdecimalprecision
fix for right truncation error when precision of the column definition and input is not aligned
2017-10-26 13:43:27 -07:00
v-kaywon 7a496acfbe change test title in pdo_decimal_precision.phpt and sqlsrv_decimal_precision.phpt 2017-10-20 15:10:56 -07:00
Jenny Tam f25d5d59dd update version to 5.1.1 2017-10-19 15:14:02 -07:00
v-kaywon 02e145d988 fix for right truncation error when precision of the column definition and input is not aligned 2017-10-18 18:10:30 -07:00
v-kaywon 6a4f625e56 change encoding 2017-10-18 15:40:58 -07:00
v-kaywon f2f3bc1ff5 change encoding 2017-10-18 13:08:07 -07:00
v-kaywon f4c736a073 only change encoding if it is invalid 2017-10-18 12:17:52 -07:00
v-kaywon b73539c311 remove setting encoding in core_stmt.cpp 2017-10-18 11:17:55 -07:00
v-kaywon d7212e60cb change output biging to encoding utf8 2017-10-17 16:11:05 -07:00
v-kaywon f67240e566 change encoding to converting from long to string to UTF8 2017-10-17 16:02:12 -07:00
v-kaywon 9e847c1ca8 detect appveyor problem 2017-10-17 15:51:41 -07:00
v-kaywon 6b223a77c9 detect appveyor problem 2017-10-17 15:44:52 -07:00
v-kaywon 597d54476e detect appveyor problem 2017-10-17 15:37:59 -07:00
v-kaywon 3e247c6a25 detect appveyor problem 2017-10-17 15:30:27 -07:00
v-kaywon 98edd5df85 detect appveyor problem 2017-10-17 15:22:00 -07:00
v-kaywon 8397f7b8bf detect appveyor problem 2017-10-17 15:13:29 -07:00
v-kaywon b5a0d1f859 cosmetic changes 2017-10-13 15:50:50 -07:00
v-kaywon c30f2d6100 change encoding to SYSTEM when converting int to string for inout and output param 2017-10-12 11:33:45 -07:00
v-kaywon a0e886273f convert long output param to string, then convert back to long if less than max int 2017-10-11 18:03:14 -07:00
Jenny Tam ce8d444977 Merge pull request #552 from yitam/missingDriver
Search for installed ODBC driver(s) in non-Windows env and more error handling when driver option is set
2017-10-03 15:05:49 -07:00
Jenny Tam 002f631ae4 modified comments for sql state 2017-10-03 12:42:19 -07:00
David Puglielli a1d613054e Merge pull request #520 from david-puglielli/nextrowset-fix
Added empty result set check to nextRowset()
2017-10-03 14:31:56 -04:00
Jenny Tam afb8167995 modified core_sqlsrv_connect based on review comments 2017-10-02 16:13:32 -07:00
David Puglielli 95f76757d0 Merge branch 'nextrowset-fix' of https://github.com/david-puglielli/msphpsql into nextrowset-fix 2017-10-02 13:47:29 -07:00
David Puglielli 4151f8f5d1 Minor fixes 2017-09-29 20:47:24 -07:00
David Puglielli 4674f58a15 Update stmt.cpp 2017-09-29 16:18:27 -07:00
David Puglielli 9e928672d4 Update pdo_stmt.cpp 2017-09-29 16:17:39 -07:00
Jenny Tam bbc2701140 Made changes as per review comments 2017-09-29 15:54:34 -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 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
David Puglielli d56446c41c More tiny fixes 2017-09-27 18:08:24 -07:00
David Puglielli 7713b70d1f Fixed typos again 2017-09-27 17:50:20 -07:00
David Puglielli d039cf66a7 Fixed typos 2017-09-27 17:18:38 -07:00
David Puglielli a749010a67 Moved errors back to pdo_stmt and stmt.cpp 2017-09-27 17:01:20 -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 4ea4259af3 Merge branch 'dev' into missingDriver 2017-09-27 09:24:05 -07:00
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
Jenny Tam 256e712072 also checked if ODBC driver is set when AE is enabled 2017-09-26 16:38:34 -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
Jenny Tam 7a10c1ce59 fixed the merged issues 2017-09-25 13:49:36 -07:00
Jenny Tam 2dbdf12b18 searched for ODBC drivers only in non-windows env 2017-09-25 13:37:42 -07:00
Jenny Tam 96a15f3a48 added legacy_stdio_definitions.lib 2017-09-25 12:35:03 -07:00
Jenny Tam 183872818d added header file 2017-09-25 12:35:03 -07:00
Jenny Tam 674d7c818b search for installed drivers in win 2017-09-25 12:35:03 -07:00
Jenny Tam ca257fd2f4 search installed ODBC driver in Unix env 2017-09-25 12:35:02 -07:00
Jenny Tam 15e1bce414 added legacy_stdio_definitions.lib 2017-09-22 17:03:33 -07:00
Jenny Tam 2e9999d176 added header file 2017-09-22 16:58:32 -07:00
Jenny Tam 6fc50c100c search for installed drivers in win 2017-09-22 16:37:05 -07:00
Jenny Tam 695254c29b search installed ODBC driver in Unix env 2017-09-22 12:55:38 -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 57a41d71e9 fix PDO::quote api when input string contain a NUL ASCII character 2017-09-21 15:59:54 -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
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 f744b7e515 merge ae code 2017-09-01 16:10:40 -07:00
Hadis-Fard 278a27c3aa build connection attrs before connect 2017-08-28 16:34:44 -07:00
v-kaywon ff671fcde3 change comment in core_stmt.cpp 2017-08-16 16:48:09 -07:00
v-kaywon f8816b16de add comment 2017-08-14 17:20:11 -07:00
v-kaywon 0100910be1 refactored AE related code 2017-08-14 17:09:49 -07:00
v-kaywon 7a5384650b fixed indentation in core_stmt.cpp 2017-08-14 11:44:54 -07:00