Commit graph

419 commits

Author SHA1 Message Date
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
Jenny Tam 00a2e82ca8 Changed connection order to ODBC drivers 2018-01-02 15:26:33 -08:00
Jenny Tam 44e447a86a
Update version.h
Renamed RC RC1 for PECL
2017-12-21 11:02:11 -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
Jenny Tam ef45560db0 Modified how to bind parameters when AE is enabled 2017-11-16 10:30:44 -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
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
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
Jenny Tam afb8167995 modified core_sqlsrv_connect based on review comments 2017-10-02 16:13:32 -07:00
Jenny Tam bbc2701140 Made changes as per review comments 2017-09-29 15:54:34 -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
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 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 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 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 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
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
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
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
v-kaywon 22b4817f65 Implementation of fetching AE max columns 2017-08-08 12:03:51 -07:00
David Puglielli 5a3f2ba201 Update version.h
Fixed the location of the dash, since pecl does not like dashes it gets included in VER_FILEVERSION_STR instead of SEMVER_PRERELEASE.
2017-07-25 11:44:01 -07:00
v-kaywon c8c7bfad57 merge ae code 2017-07-25 11:01:00 -07:00
David Puglielli 3f20e0cab0 updated version.h 2017-07-20 16:39:58 -07:00
David Puglielli c1e7280dc6 Version updated 2017-07-20 11:44:46 -07:00
David Puglielli 9817f4d598 Tests fixed, version updated 2017-07-19 14:43:28 -07:00
Hadis-Fard c949793907 updated the version file 2017-07-04 16:17:53 -07:00
v-kaywon f2510c7d5d Merge pull request #461 from v-kaywon/moreSAL
add more annotations
2017-06-30 16:35:29 -07:00
v-kaywon f5f5d5e82f add more annotations 2017-06-30 15:17:14 -07:00
v-kaywon d2690aad12 Merge branch 'dev' into fix_fortify_warning 2017-06-30 13:01:48 -07:00
v-kaywon bcff393895 fix versionhelper header 2017-06-29 12:49:00 -07:00
v-kaywon b78bcf8be3 fix GetVersionExA is Deprecated warning 2017-06-29 12:23:46 -07:00
v-kaywon 48223ff107 fix for fortify warnings 2017-06-29 10:51:58 -07:00
v-kaywon 28301557d6 change annotation 2017-06-22 16:16:30 -07:00
v-kaywon 7a19a270d1 add more annotation to sal_def.h 2017-06-22 16:06:57 -07:00
v-kaywon e575b6d341 added annotations to sal_def.h 2017-06-22 14:44:33 -07:00
v-kaywon bde81001e9 added SAL annotations and fixed warnings 2017-06-22 14:04:34 -07:00
Hadis Fard 219de931fd updated to RC1 2017-06-20 11:54:53 -07:00
Hadis Kakanejadi Fard a879e40162 updated version to 4.3 rc 2017-06-20 10:12:23 -07:00
v-kaywon 84ee58cb5f Merge pull request #426 from v-kaywon/tnir
Add TNIR conn option and tests
2017-06-19 17:27:39 -07:00
v-kaywon 56dcce01b7 Fix indentation in core_sqlsrv.h 2017-06-19 09:58:04 -07:00
yitam 25e7705249 added a comment for CEKeystoreData 2017-06-08 15:45:22 -07:00
yitam 1afc509125 removed unnecessary definitions 2017-06-08 15:21:50 -07:00
yitam 7c105ac08e added a comment about this file being a subset 2017-06-08 12:02:12 -07:00
yitam 74800c993c fixed CEKeystoreProvider interface 2017-06-08 11:59:34 -07:00
yitam 48478125e0 Updated odbc header constants 2017-06-08 09:33:37 -07:00
v-kaywon 208cc4a078 Add TNIR conn option and tests 2017-06-07 13:53:04 -07:00
Hadis Kakanejadi Fard d74e4083f2 updated headers versions to 4.2 2017-05-24 10:05:32 -07:00
yitam ae9957d684 revert indentation 2017-05-18 13:53:03 -07:00
yitam 52cf72edf9 indentation 2017-05-18 13:24:56 -07:00
yitam a0b6d5644b update version 2017-05-18 13:08:26 -07:00
Hadis Fard 29bb60282d Merge pull request #399 from Hadis-Fard/dev
sql variant support
2017-05-18 13:01:45 -07:00
David Puglielli a88b187f50 Removed ODBCVER #define 2017-05-17 14:59:32 -07:00
David Puglielli ddab6d3f9d Removed more unneeded code - MPLAT_UNIX defines and unnecessary typedefs 2017-05-16 15:47:32 -07:00
David Puglielli 674fce0ded Removed extraneous comments 2017-05-15 16:30:05 -07:00
David Puglielli a297fe0c54 Removed unused xplat functions 2017-05-15 16:22:58 -07:00
Hadis Kakanejadi Fard 5d4ca446fc Merge branch 'dev' of https://github.com/Microsoft/msphpsql into dev 2017-05-15 14:19:49 -07:00
Hadis Kakanejadi Fard 7904bddb6e added sql_variant const 2017-05-15 14:19:36 -07:00
David Puglielli c846076c53 Removed extraneous null terminator that caused Address Sanitizer to complain 2017-05-12 13:50:13 -07:00
ulvii f2a453cdb1 update version.h 2017-05-10 16:30:32 -07:00
ulvii 4c3705f93e update version.h 2017-05-10 16:29:41 -07:00
ulvii 554e29db68 update version.h 2017-05-10 16:28:19 -07:00
ulvii c436a8fec9 reverting pecl repackaging 2017-05-10 16:21:46 -07:00
ulvii 9cdefd3fe3 Adding PECL_REPACKAGE macro (#392)
Merging this with unpassed checks. The checks are failing because they are using wrong setup file. Will be fixed by #386
2017-05-10 13:04:16 -07:00
ulvii 4648a800fa Adding PECL_REPACKAGE macro 2017-05-10 12:39:03 -07:00
ulvii 760a3b4af9 update version to 4.1.9 (#387) 2017-05-08 13:17:55 -07:00
yitam 7d8004bf5a fixed indendations and tabs 2017-05-05 16:39:51 -07:00
yitam 1e527865a9 Implemented Azure AD plus tests 2017-05-05 16:28:33 -07:00
Hadis Kakanejadi Fard c5af000e56 fixed issue #378 2017-05-03 14:41:19 -07:00
v-kaywon ea761587d5 Change version (#363)
* change version number for release

* revert version

* change version number to 4.1.8-preview
2017-04-07 13:04:31 -07:00
David Puglielli f330830eef Connection resiliency changes (#356)
* Connection resiliency changes

* Changed connres test to check appveyor protocol

* Changed connres test to check appveyor protocol

* Changed connres test to check appveyor protocol

* Reverted test because appveyor still won't use the correct protocol

* Removed unnecessary connres #defines from msodbcsql.h
2017-04-04 13:40:30 -07:00
Jenny Tam 52e05992bd Merge pull request #344 from v-kaywon/error_numcol
workaround for unixODBC bug returning error when getting numcol
2017-04-04 11:40:15 -07:00
v-kaywon df3e23af45 changed default execReturn to SQL_ERROR 2017-04-04 11:10:56 -07:00
David Puglielli 55d0461bf6 Merge pull request #343 from ulvii/ColCache
Column meta cache
2017-03-31 17:35:24 -07:00
v-kaywon 20c4fe69c1 fix if sqlreturn is null 2017-03-31 15:48:22 -07:00
v-kaywon 9d033e716a added more to test 2017-03-31 13:59:30 -07:00
v-kaywon d87c03f5a8 do not check has result if execute returns SQL_NO_DATA 2017-03-31 13:38:57 -07:00
v-kaywon 816856cbc0 cleaner code 2017-03-29 13:45:57 -07:00
v-kaywon 0fd7ebb6d3 fix seg fault 2017-03-29 11:26:45 -07:00
v-kaywon 53c280fe54 get error without recording it 2017-03-28 16:37:40 -07:00
v-kaywon 7c4efbcad8 Update core_sqlsrv.h 2017-03-28 09:29:57 -07:00
v-kaywon 7256685a4c workaround for unixODBC bug returning error when pdo::exec query with empty result set 2017-03-27 17:49:01 -07:00
ulvii d0aed143dc Clear Cache before next results set
We need to clear cache if a statement has multiple rowsets.
2017-03-27 15:24:41 -07:00
ulvii 6809f0f7ea Workaround for a bug in unixODBC 2.3.4 (#334)
* Adding a workaround for the error handling issue with unixODBC 2.3.4 when conneciton pooling is enabled

* Adding a check to apply the workaround only to PDO SQLSRV

* Update core_util.cpp

* Unix Conn Pool test

* Modifying the test to use autonomous_setup.php

* Updating path to isPooled.php
2017-03-27 14:07:43 -07:00
ulvii b883ee47e4 Update core_stmt.cpp 2017-03-27 12:58:42 -07:00
ulvii 80b510ef2f removing tabs 2017-03-27 12:57:18 -07:00
ulvii f835c34319 Update core_stmt.cpp 2017-03-24 17:12:10 -07:00
ulvii 48e9914986 Update spaces 2017-03-24 17:03:24 -07:00
ulvii 4339bad694 Update identation 2017-03-24 16:01:45 -07:00
ulvii 27bae233c0 Update identation 2017-03-24 15:53:41 -07:00
ulvii 5e42b191ea Implementing new cache to remove unnecessary ODBC calls 2017-03-24 15:46:53 -07:00
v-kaywon d68300ff53 Update core_results.cpp 2017-03-23 10:52:02 -07:00
v-kaywon c1a1a06061 fix crash from getting the numrow of a null buffered result set; add test 2017-03-20 15:58:57 -07:00
Hadis Kakanejadi Fard 91f27c0958 updated PECL package version 2017-03-07 11:13:53 -08:00
ulvii 9d7a79270b Merge pull request #314 from yitam/locale
changed locale for mac
2017-03-06 10:12:00 -08:00
yitam d6f6bc847b changed locale for mac 2017-03-03 17:54:42 -08:00
Hadis Kakanejadi Fard 0782c56b41 updated versioning to semantic versioning #282 2017-03-03 16:55:28 -08:00
yitam 161ccacddb String release first 2017-02-28 15:27:13 -08:00