Commit graph

594 commits

Author SHA1 Message Date
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
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
David Puglielli ca4a2d9b7d changed line endings 2017-07-19 14:10:53 -07:00
David Puglielli 53318fbbdd new PR for lastInsertID 2017-07-19 14:05:14 -07:00
v-kaywon 925a62891c Merge pull request #465 from v-kaywon/fix_translate_nonascii_to_binary
fix unmatching quoted length and quoted_len in pdo_quote
2017-07-04 17:44:09 -07:00
v-kaywon 49fd20d31c fix unmatching quoted length and quoted_len in pdo_quote (fix for uninitialized read) 2017-07-04 16:32:35 -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
ulvii 58e8a24b17 Fixing issues reported by binary analysis - Hardening checks (#460)
* Adding compiler and linker options for hardening check

* Update config.m4

* Adding fstack protector to compiler options

* Detect platform in config.m4

* Removing the newly added linker flag, because its breaking the PDO_SQLSRV load. Creating a backlog item

* Update config.m4

* Update config.m4

* Testing with -O3

* Adding optimization flag to windows config files

* Update config.w32
2017-06-30 16:28:04 -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 d32250a61f added in a SAL annotation for pdo_sqlsrv_dbh_quote 2017-06-30 10:59:31 -07:00
v-kaywon c470d59f07 change back ordering for checking stmt != NULL 2017-06-30 09:38:01 -07:00
v-kaywon c107a64368 change ordering of != NULL check 2017-06-29 12:53:00 -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 fb64892e37 fix inconsistent annotation in get_error_message in util.cpp 2017-06-29 11:53:04 -07:00
v-kaywon 48223ff107 fix for fortify warnings 2017-06-29 10:51:58 -07:00
v-kaywon f0da33db26 change _In_ to _Inout_ annotation for pdo_dbh and pdo_stmt objects 2017-06-27 15:17:21 -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 a97a2f5880 Merge pull request #443 from v-kaywon/fix_leak
Fix leak in connection and statement resource in SQLSRV driver
2017-06-19 17:29:28 -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 c508a84ef1 changed structure of UTF8 data; added comment for fix in source code 2017-06-19 12:55:40 -07:00
v-kaywon 56dcce01b7 Fix indentation in core_sqlsrv.h 2017-06-19 09:58:04 -07:00
v-kaywon c408f8c294 fix leak in SQLSRV driver: prevent leak in zval containing the connection and statement resource 2017-06-16 15:43:15 -07:00
susanh fe2a14c798 Merge branch 'macconfig' of https://github.com/lilgreenbird/msphpsql into macconfig 2017-06-16 13:00:20 -07:00
susanh e7f621e4f9 remove comment about workaround 2017-06-16 12:49:05 -07:00
susanh f4ae5e1e4c added MACOSX_DEPLOYMENT_TARGET to not use linker flat_namespace flag 2017-06-15 17:46: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 e0a65cd0a5 reverted m4 files 2017-05-24 12:45:42 -07:00
Hadis Kakanejadi Fard 7ffa4d470a added the header to m4 and updated SQLSRV headers to 4.2 2017-05-24 10:09:46 -07:00
Hadis Kakanejadi Fard d74e4083f2 updated headers versions to 4.2 2017-05-24 10:05:32 -07:00
Hadis Kakanejadi Fard 3577a9281a updated header files to 4.2 2017-05-24 10:01:44 -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
Hadis Fard b31ee170f3 fixed indentations 2017-05-17 13:52:22 -07:00
Hadis Kakanejadi Fard 42ebf9465d removed sqlsrv variant const 2017-05-16 15:54:13 -07:00
Hadis Kakanejadi Fard dba7ba4365 added variant const 2017-05-16 15:53:40 -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
v-kaywon 4537021d1b Merge pull request #395 from v-kaywon/fix_uninit_read
fix uninitialized read if pos of string parser is -1
2017-05-12 16:39:26 -07:00
v-kaywon 8de9669b39 get start_pos out of while loop 2017-05-12 16:02:34 -07:00
David Puglielli c846076c53 Removed extraneous null terminator that caused Address Sanitizer to complain 2017-05-12 13:50:13 -07:00
v-kaywon 9e3252d4f4 fix uninitialized read if pos of string parser is -1 2017-05-12 10:56:26 -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 75ee4f90ad modified sqlsrv test 2017-05-08 08:57:30 -07:00
yitam 9e8cb88ca7 also download MS Online Services sign-in assistant 2017-05-08 08:12:26 -07:00
yitam 28fc51df3d updated to ODBC 13.1 2017-05-05 17:17:52 -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 4922e97b5d removed unused function (#383) 2017-05-04 18:15:39 -07:00
Hadis Kakanejadi Fard c5af000e56 fixed issue #378 2017-05-03 14:41:19 -07:00
v-kaywon c0707f6991 fix comments 2017-05-01 15:24:32 -07:00
v-kaywon b7d4a9bec8 changed sql_string_parser::is_placeholder_char from using a switch cases through each acceptable characters to using if else statement that covers a range of characters 2017-04-24 11:33:28 -07:00
v-kaywon 6d7cddf5f6 added error handling for emulate prepare with output parameter 2017-04-21 14:57:57 -07:00
v-kaywon 2aec3b4a95 added error handling for emulate prepared statement with inout parameters 2017-04-21 13:04:24 -07:00
v-kaywon fa38f7d61c remove bind_param_encoding from previous implementation of emulate prepare 2017-04-21 09:39:00 -07:00
v-kaywon 7aaa16d49e implemented emulate prepare and added tests 2017-04-20 17:17:05 -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
v-kaywon 8ddf8fdfee fix spacing 2017-04-07 09:20:34 -07:00
v-kaywon 68eca075ab rename g_henv_cp and g_henv_ncp to g_pdo_henv_.. and gg_ss_henv_.. to prevent name clashing problem in the pdo_sqlsrv and sqlsrv drivers 2017-04-06 15:44:04 -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
v-kaywon ff3a23f442 got rid of execReturn check since SQL_SUCCESS is 0 2017-04-03 12:43:08 -07:00
v-kaywon 8f67221e18 fix indentation 2017-04-03 10:08:36 -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 f7983472a3 Merge pull request #335 from v-kaywon/driverorder
rename stmt_option_scrollable to driver specific names
2017-03-30 13:47:02 -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 4057a9210d Update util.cpp 2017-03-28 09:37:11 -07:00
v-kaywon 8fa17294ec Update pdo_util.cpp 2017-03-28 09:36:36 -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 bd8d1e1bf4 Merge pull request #337 from v-kaywon/string_warning
convert const char[] to char[] to avoid conversion warnings
2017-03-23 12:30:30 -07:00
v-kaywon 9f3c0cee54 Update init.cpp 2017-03-23 11:55:33 -07:00
v-kaywon b4f7684db3 Update init.cpp
fix indentation
2017-03-23 10:57:35 -07:00
v-kaywon d68300ff53 Update core_results.cpp 2017-03-23 10:52:02 -07:00
v-kaywon 6b2aa39e19 convert const char[] to char[] to avoid conversion warnings 2017-03-23 10:21:48 -07:00
v-kaywon ccd80a32d9 Update util.cpp 2017-03-21 17:00:13 -07:00
v-kaywon 06a343f611 rename stmt_option_scrollable to driver specific names and put get_error_message into namespace 2017-03-21 15:28:13 -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
v-kaywon c9492ae487 fix memory leak caused by pecalloced persistent connection; fix test indentation 2017-03-17 16:46:02 -07:00
v-kaywon b701fab642 implement throwing exception when ATTR_PERSISTENT is in the connection options; added tests 2017-03-13 17:54:58 -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
yitam 9c2cfe4610 String release first 2017-02-28 13:26:50 -08:00
yitam ee1fcb83d5 Use a simpler way 2017-02-28 13:20:57 -08:00
yitam 357bc95c1e Fix spacing 2017-02-28 10:08:46 -08:00
yitam 26c5f1785f Issue #308 2017-02-28 10:04:59 -08:00
v-dareck 8e22e4ca17 Fix memory leaks in buffered resultsets. 2017-02-24 13:29:09 -08:00
Jenny Tam e854a9ca53 Merge pull request #296 from v-dareck/remove_uchar
Remove uchar.h
2017-02-23 13:27:49 -08:00
Jenny Tam 12e6535a7f Merge pull request #297 from Hadis-Fard/dev
issue #270 fix
2017-02-22 14:18:56 -08:00
v-dareck 7f89d82889 Change errno check to ERROR_SUCCESS 2017-02-22 11:51:31 -08:00
v-dareck 043d1ece8d Modify string_to_number utf8 conversion. 2017-02-21 18:47:53 -08:00
Hadis Kakanejadi Fard 67c4a0a9de fixed issue #270 2017-02-21 15:14:02 -08:00
yitam f7a1c7296b use static cast for SQLSRV_ENCODING 2017-02-21 13:20:50 -08:00
yitam 8dc946d3f0 Merge branch 'dev' of https://github.com/Microsoft/msphpsql into GH231 2017-02-21 13:16:04 -08:00
Jenny Tam e448281049 Merge pull request #295 from v-kaywon/PHP71DebugAbort
fix PHP7.1 debug abort error
2017-02-21 12:54:24 -08:00
v-kaywon f5b9bd93f0 fix PHP7.1 debug abort error 2017-02-21 12:02:16 -08:00
v-dareck 5951e32886 Remove uchar.h usage from buffered results. 2017-02-20 18:11:27 -08:00
yitam 0705d9b1a8 calculate field size instead of using column size and fixed the parameter encoding 2017-02-20 15:24:41 -08:00
Jenny Tam cc925ad9b3 Merge pull request #292 from v-dareck/bindparam_out_string_fault
Add check for SQL_NO_TOTAL for SQLBindParameter out parameter
2017-02-20 07:49:17 -08:00
v-dareck 98fd299a31 Add check for SQL_NO_TOTAL for SQLBindParameter out parameter. 2017-02-16 11:50:24 -08:00
v-dareck c35d998942 Fix clang compile errors. 2017-02-14 16:52:42 -08:00
yitam 471da9b005 Fix issue #35 2017-02-10 13:21:53 -08:00
yitam 9b035cce6f fix formatting 2017-02-10 10:22:16 -08:00
yitam 27d35af223 Fix and tests for issue #69 2017-02-10 09:51:51 -08:00
Jenny Tam e363a44cf5 Merge pull request #281 from v-dareck/github267_closeCursor
Github #267 close cursor error
2017-02-10 08:04:48 -08:00
v-dareck fc8433ac83 Fix error message in close cursor. Change prepare to query in test. 2017-02-09 16:41:39 -08:00
David Puglielli 15c0573e76 Merge pull request #279 from yitam/sql_guid
define SQL_GUID for PECL packages
2017-02-09 15:25:27 -08:00
yitam 23510b21f1 Fix for issue 223 2017-02-09 10:44:33 -08:00
v-dareck 690571d41d Change tab to spaces. 2017-02-08 17:16:02 -08:00
v-dareck 887857eaf2 In closeCursor check if statement has been executed before moving to next result. 2017-02-08 16:38:12 -08:00
yitam 8df3d00f02 check if constant defined first 2017-02-08 14:28:04 -08:00
yitam 8bb8dfe399 define SQL_GUID for PECL 2017-02-06 16:55:39 -08:00
Jenny Tam 695dd19aff Merge pull request #271 from v-dareck/ReadmeUpdate
Readme and Changelog update
2017-02-03 11:59:20 -08:00
yitam e7f4165f0b corrected comment 2017-02-02 14:25:09 -08:00
yitam 010d23f7a1 removed inconsistent code calling convert_string_from_utf16 2017-02-02 14:20:50 -08:00
v-dareck 75191e84fc Update version.h 2017-02-02 14:16:21 -08:00
v-dareck 1f9d1583d1 replace __linux__ with _WIN32 define. 2017-02-01 17:36:41 -08:00
v-dareck 044836b048 Tab/indentation fixes. 2017-02-01 16:55:05 -08:00
v-dareck ea445f4a18 Merge remote-tracking branch 'Microsoft/merged-codebase' into merged-codebase 2017-02-01 16:49:30 -08:00
yitam 3280d76682 modified ifdef __linux__ 2017-02-01 12:41:13 -08:00
v-dareck fa4c0e8c4c Merge remaining PHP-7.0-Linux changes into merged codebase. 2017-01-31 18:10:37 -08:00
Jenny Tam 263622fac1 Merge pull request #265 from v-dareck/PHP-7.0
Merge latest PHP-7.0 branch changes to merged-codebase
2017-01-31 16:34:53 -08:00
Jenny Tam 1fe9c605d1 Merge pull request #256 from v-dareck/github37_has_rows
Github 37 sqlsrv_has_rows
2017-01-30 16:29:24 -08:00
Hadis Kakanejadi Fard d2d3d32be3 removed unused sqlsrv_zend_hash_add 2017-01-30 13:29:26 -08:00
Hadis Kakanejadi Fard 66fa134f17 fixed get_processor_arch comparisons 2017-01-30 13:11:11 -08:00
Hadis Kakanejadi Fard 1fc3243eb5 added packagize.sh 2017-01-30 13:07:34 -08:00
Hadis Kakanejadi Fard 0e70a95d63 applied peer review comments 2017-01-30 13:05:38 -08:00
Hadis Kakanejadi Fard 64e08eb1a0 Merge branch 'merged-codebase' of https://github.com/Microsoft/msphpsql into merged-codebase 2017-01-30 09:43:55 -08:00
Hadis Kakanejadi Fard 832102be17 removed comments 2017-01-27 17:46:58 -08:00
Hadis Kakanejadi Fard 1ebf507b9f updated renamed header 2017-01-27 17:09:47 -08:00
Hadis Kakanejadi Fard a7d95b7a5f fixed invalid user pass issue in core_conn 2017-01-27 15:27:44 -08:00
Hadis Kakanejadi Fard 0fb418a1f8 edited included headers 2017-01-27 15:10:37 -08:00
yitam 0bd7169b03 safeguard get_col_meta 2017-01-27 15:05:09 -08:00
Hadis Kakanejadi Fard aec47fcf9f renamed <intsafe> in xplat.h to xplat_intsafe 2017-01-27 14:26:34 -08:00
Hadis Kakanejadi Fard 480df47625 renamed header files with the same name as windows headers 2017-01-27 13:42:10 -08:00
Hadis Kakanejadi Fard a647013e93 Merge branch 'merged-codebase' of https://github.com/Microsoft/msphpsql into merged-codebase 2017-01-27 10:30:02 -08:00
Hadis Kakanejadi Fard 9c27732fbb fixed core_conn 2017-01-26 18:21:15 -08:00
David Puglielli 7b9adee14e Added build directory 2017-01-26 17:58:11 -08:00
David Puglielli dcbd35709b Added config.m4 2017-01-26 17:54:55 -08:00
Hadis Kakanejadi Fard 9ec0b25774 Merge branch 'merged-codebase' of https://github.com/Microsoft/msphpsql into merged-codebase 2017-01-26 17:30:13 -08:00
Hadis Kakanejadi Fard 52802e3f46 updated version to 4.1 2017-01-26 17:27:45 -08:00
Hadis Kakanejadi Fard 8e24758564 updated to version 4.1 2017-01-26 17:27:12 -08:00
Hadis Kakanejadi Fard 92ca301433 Merge pull request #243 from david-puglielli/merged-codebase
Merged Windows and Linux PDO_SQLSRV specific files
2017-01-26 17:25:01 -08:00
Hadis Kakanejadi Fard a08d4c4055 bumped up the version to 4.1 2017-01-26 17:17:12 -08:00
Hadis Kakanejadi Fard decb9c5cde bumped up the version to 4.1 2017-01-26 17:14:14 -08:00
Hadis Kakanejadi Fard 9dcef967fb bumped version to 4.1 2017-01-26 17:13:29 -08:00
Hadis Kakanejadi Fard 431a9af8a8 fixed L166 indentations 2017-01-26 17:12:11 -08:00
Hadis Kakanejadi Fard 56f1029acf made the ifdef consitent 2017-01-26 17:06:17 -08:00
Hadis Kakanejadi Fard 2bcf972731 bumped version to windows version 2017-01-26 15:16:03 -08:00
Hadis Kakanejadi Fard 29931a8546 fixed indentations 2017-01-26 15:14:30 -08:00
Hadis Kakanejadi Fard f42824d390 fixed indentations 2017-01-26 15:05:30 -08:00
Hadis Kakanejadi Fard 33f5fce36e fixed indentations in updated code 2017-01-26 14:59:23 -08:00
Hadis Kakanejadi Fard b8a162fa18 fixed indentations on rowCount 2017-01-26 14:43:15 -08:00
Hadis Kakanejadi Fard f3656481d5 fixed indentations on core_results 2017-01-26 14:37:34 -08:00
Hadis Kakanejadi Fard b46c3fa018 fixed indentations and spacing 2017-01-26 14:26:42 -08:00
Hadis Kakanejadi Fard 4f05da0b3f fixed included headers order 2017-01-26 13:54:02 -08:00
David Puglielli c08094317a Update pdo_parser.cpp 2017-01-25 17:21:10 -08:00