Commit Graph

176 Commits

Author SHA1 Message Date
foobar
748e75774d - Fixed bug #15803 (and propably others related too, part 2/2)
. Changed the configure/compile so that it doesn't "pollute" the INCLUDES
    anymore and thus cause trouble with other extensions which
    might use the same header files. (e.g. Informix)
  . Separated the #include statements to own file so we don't get any
    errors when compiling main/internal_functions.c
2002-06-14 00:07:16 +00:00
Dan Kalowsky
d55c9134c8 reverting the cursor change as it seems to break many ODBC drivers. 2002-04-30 13:17:48 +00:00
Dan Kalowsky
ce39ba7265 bug fix for bug #15758, a double free'ing of an ODBC connection 2002-04-26 14:56:34 +00:00
Dan Kalowsky
55e43151d5 clearing up some code to remove any possible confusion in variable counts 2002-04-24 22:07:29 +00:00
foobar
7cafcc1ef5 ws fix 2002-04-08 22:54:06 +00:00
foobar
edead0523b CPP directives must start on the beginning of line 2002-04-08 22:21:08 +00:00
Andi Gutmans
c8e7db984c - Allow duality between Engine 1 & 2 using ZEND_STANDARD_CLASS_DEF_PTR 2002-03-12 20:18:01 +00:00
Dan Kalowsky
af4b22ceb5 Breaking BC, but making odbc_fetch_into behavior more consistent 2002-03-05 16:45:02 +00:00
James Cox
0c78c87f34 Changing the Velocis extension to now be called Birdstep, due to a product/company change.
added aliases for Velocis to the birdstep functions.
# testing is both advised and encouraged!
@ The Velocis extension is no
2002-03-04 09:10:32 +00:00
Sebastian Bergmann
90613d2282 Maintain headers. 2002-02-28 08:29:35 +00:00
Dan Kalowsky
a4113ee734 Bug fix 15719 as submited by Joseph Southwell and allows NULL values in ODBC
# I haven't been able to fully test this due to MacOSX compliation errors.
# if someone in the QA group could that'd be appriciated.
2002-02-26 15:33:54 +00:00
Dan Kalowsky
cd88ac738b fix for bug 15516, patch submitted by torben@php.net 2002-02-15 17:24:44 +00:00
Dan Kalowsky
860e2e97ee Fix for bug #14803 2002-01-30 21:54:54 +00:00
Dan Kalowsky
31cd8e0b75 this closes off a number of ODBC bugs.
# this is a bit hack-ish in it's functionality.  The proper answer (allowing
# users to set their cursor type) has bugs with some tests cases at this time.
#  But this is being done to just get ODBC back into working order.
2002-01-21 14:11:17 +00:00
Sebastian Bergmann
38933514e1 Update headers. 2001-12-11 15:32:16 +00:00
Dan Kalowsky
89aa330637 Fix for bug #13628.
# basically handles a SQL_ERROR case for all odbc_execute()'s
2001-12-07 17:21:49 +00:00
Stig Bakken
689252082c * zend_module_entry change: apino, debug and zts are moved first,
see README.EXTENSIONS file for upgrade help.
@Introduced extension version numbers (Stig)
2001-10-11 23:33:59 +00:00
Jeroen van Wolffelaar
c033288573 Back-substitute for Z_* macro's. If it breaks some extension (the script isn't optimal, it parses for example var->zval.value incorrect) please let me know. 2001-09-25 21:58:48 +00:00
Derick Rethans
78747bd2df - Don't wrap lines... this is annoying while coding. 2001-09-09 13:29:31 +00:00
Dan Kalowsky
24b54b866f Patch to stop the crashing behavior exhibited by PHP/ODBC in SOLID/DB2
submitted by Walter Franzini (walter@sys-net.it)
@Fix for LONG_VARCHAR type crashing submitted by Walter Franzini (walter@sys-net.it)
#Should this also be put into the 4.0.7 RC cycle?
2001-09-05 16:19:48 +00:00
Andi Gutmans
9a3d4e736c - More ZE2 fixes 2001-08-13 16:13:25 +00:00
Rasmus Lerdorf
4d11d90880 Track down a few more functions that don't check for 0 args and use
faster mechanism
2001-08-13 07:55:39 +00:00
Rasmus Lerdorf
8c497f05c4 We don't consistently check for args passed to functions that don't
take any args.  In some cases we probably want to skip the check for
performance reasons, but in other cases where performance is unlikely
to be a factor, not throwing a warning on the wrong number of args passed
to a function is at best inconsistent, and at worst it could hide a bug.
So, add a few such checks.  There are still lots of cases out there.
2001-08-13 06:43:47 +00:00
Andi Gutmans
d80ee070f9 - Make odbc_fetch_object() work with Engine 2 2001-08-11 18:28:31 +00:00
Sascha Schumann
373b3e101e more tsrm cleanup -- output.c is not doing any fetches anymore 2001-08-05 15:55:43 +00:00
Zeev Suraski
aa1772ca72 More TSRMLS_FETCH annihilation 2001-07-31 05:44:11 +00:00
Zeev Suraski
d76cf1da18 More TSRMLS_FETCH work 2001-07-31 04:53:54 +00:00
Zeev Suraski
c43806f415 Zend compatibility patch 2001-07-30 08:24:42 +00:00
Zeev Suraski
797a079a95 More TSRMLS_FETCH work, and a bit of cleanup 2001-07-30 06:18:13 +00:00
Zeev Suraski
7b1c400631 More TSRMLS_FETCH annihilation (Zend compatibility patch) 2001-07-30 04:58:07 +00:00
Andi Gutmans
75ba1461dd - Object macros... 2001-07-28 19:29:16 +00:00
Zeev Suraski
d87cc976e1 Redesigned thread safety mechanism - nua nua 2001-07-28 11:36:37 +00:00
Zeev Suraski
fe6f8712a4 - Get rid of ELS_*(), and use TSRMLS_*() instead.
- Move to the new ts_allocate_id() API
This patch is *bound* to break some files, as I must have had typos somewhere.
If you use any uncommon extension, please try to build it...
2001-07-27 10:16:41 +00:00
Dan Kalowsky
746dd9cbe4 Closed off Solid DB access to a function that it doesn't support in 3.0 and less.
Thanks to Eric Veldhuzen
2001-06-19 17:58:09 +00:00
Dan Kalowsky
f2ec3fa6e5 adding in some error checking for parameter counts, and some thread safety for
functions
2001-06-14 15:02:17 +00:00
Dan Kalowsky
a7e9b56112 # just correcting the evil vim removal of {{{'s and }}}'s ... bad vim! no folding for you! 2001-06-11 01:00:43 +00:00
Dan Kalowsky
eea60318d7 corrected a compile error (named variable missing). thanks to sebastian for pointing it out
# but why is he getting php-cvs commit messages and i'm not?!?
# i hope to hear that the mailing lists will be back online soon...
2001-06-10 22:40:32 +00:00
Dan Kalowsky
c3a3d5c853 added in a bit more checking on the persistent connection checks... 2001-06-08 15:31:29 +00:00
Rasmus Lerdorf
81e2cf03ac Fix folding and clean up some extensions 2001-06-06 13:06:12 +00:00
Rasmus Lerdorf
25c3a3a39d vim-6 does folding - clean up a bunch of missing folding tags plus
some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 13:12:10 +00:00
foobar
328258ac08 Output something if password is not set. 2001-06-01 05:01:50 +00:00
Stig Bakken
1beda9ee1e * include "config.h" if HAVE_CONFIG_H is defined (for standalone dso build) 2001-05-24 10:07:29 +00:00
Frank M. Kromann
251996bb79 Fixing prototypes to match function names 2001-05-22 18:26:36 +00:00
Dan Kalowsky
b3a509ac9e this is a fix for bug 10250. it basically provides the unixODBC driver with
access to the SQLDriver functions.  patch originally submitted by
dzoll@nyscul.org, and is going to be tested by some of the unixODBC people.
2001-05-08 19:47:20 +00:00
Andi Gutmans
eb4d840a40 - More strncpy() -> strlcpy() changes. Am I getting bored yet? :) 2001-05-02 23:20:04 +00:00
Andi Gutmans
a5a4b4e2f8 - Use memcpy() instead of strlcpy() which is faster. 2001-04-19 21:42:45 +00:00
Dan Kalowsky
d7383e3255 appling patch for joey since he has no ODBC karma. this is for bug #10252 2001-04-19 19:55:05 +00:00
Dan Kalowsky
f41f369754 corrects bug #7488, patch supplied by submitter (torben@php.net).
quick local tests show it to work.
2001-04-19 02:31:23 +00:00
Dan Kalowsky
685186f9fd This change seems to fix bugs 7158, 7807, 8531, and 8636. After asking why this patch was applied no one seemed to respond with anything useful. If you find this change in error, sorry, I tested it on as many systems as I could. 2001-04-17 02:02:36 +00:00
Kevin
3cd2c989d3 Fixed compatibility issues in the ODBC extension for the Velocis Database server. Specifically, config.m4 was changed to use the client libraries instead of the serer libraries, and to look for the libs in the $RDSHOME/lin directory ass opposed to the $RDSHOME/bin directory. Makefile.in was changed to use the php_odbc.c file as the source for Velocis support. Other misc changes include a few #defines for some undefined data types and some #ifdefs for unsupported functions. 2001-04-10 16:26:28 +00:00
Nick Gorham
971d65059a Added small change to php_odbc module, to check for failed SQLDisconnects
and to close any outstanding transactions if the call fails, then disconnect
again. This can cause chaos with SQL Server, this regards a SELECT as
starting a transaction, and will leave it  open if the result set is not all
read.
2001-04-02 15:18:47 +00:00
Dan Kalowsky
959f40a957 The last fix was missing a &, Marc Boeren either made the patch wrong, or I applied it improperly. Anyways, Sebastian Bergmann discovered it, and supposedly is fixed with this. 2001-03-27 15:46:27 +00:00
Dan Kalowsky
0d7729ed58 Fix for Bug #9272, as submitted by marc boeren (m.boeren@guidance.nl).
Applied by me, due to apparently a lack of cvs access to ext/odbc for him.
2001-03-27 14:17:52 +00:00
Frank M. Kromann
f98710c870 Adding a new function odbc_next_result() allowing the query to return more than one result.
This can be done with a stored procedure or by sending more than one select to the server.
2001-03-09 23:44:55 +00:00
Andi Gutmans
eb6ba01d1c - Fix copyright notices with 2001 2001-02-26 06:11:02 +00:00
Zeev Suraski
90c8e2cf75 Fix Win32 build 2001-01-15 10:22:19 +00:00
Stig Bakken
fcdf6ac680 @- Added odbc_error() and odbc_errormsg() functions (Stig) 2001-01-15 01:11:06 +00:00
Frank M. Kromann
e4d1107058 Adding hack to allow odbc_tables to work on Access databases 2001-01-05 22:01:22 +00:00
Dan Kalowsky
8b2dbfca77 added #define(OPENLINK) to the SDWORD instead of SQLINTEGER line.. this is for bug #5526 to allow compiles. 2000-12-28 19:23:09 +00:00
Stig Bakken
ac2e12a9a9 @Added ODBC_TYPE constant (Stig) 2000-12-15 00:57:04 +00:00
Stig Bakken
92fc209384 Applied IBM DB2 patch by Walter Franzini <walter@sys-net.it>
@ext/odbc: IBM DB2 patch by Walter Franzini <walter@sys-net.it>
2000-12-05 12:11:30 +00:00
Dan Kalowsky
b52648efd5 Missed one section that required the addition of a new HAVE_SOLID_30
This should be correct now.
2000-11-17 15:48:09 +00:00
Dan Kalowsky
3e2ddd1edf Corrected the spelling of verion to version, and cleaned the configuration
code up a bit.  Also added in much better (read: tested) support for
Solid 3.0.   Credit for almost all of the patch goes to Eric Veldhuyzen,
minor modifications done (by me) to make it non-linux specific.

This commit also creates the HAVE_SOLID_30 define

@ Fixed/created support for Solid 3.0 databases (kalowsky)
@ Fixed support for Solid 2.3 databases (kalowsky)
2000-11-17 15:09:46 +00:00
Andrei Zmievski
f1dcb32c9f Use zend_register_list_destructors_ex() instead. 2000-10-25 17:44:02 +00:00
Andrei Zmievski
7b4983c8f8 Mega-patch to get better resource information for modules.
* Fixed a bug in zend_rsrc_list_get_rsrc_type()
  * Switched register_list_destructors() to use
    zend_register_list_destructors_ex() instead
  * Updated all relevant modules to provide the resource type name
    to register_list_destructors() call
  * Updated var_dump() to output resource type name instead of number

@- Made resource type names visible, e.g. var_dump() and
@  get_resource_type() display "file" for file resources. (Andrei)
2000-10-20 18:25:16 +00:00
Dan Kalowsky
ca1b12c5a1 corrected lines for Solid 2.3 systems after some advice from users, please test... 2000-09-29 19:03:23 +00:00
Frank M. Kromann
e048e34e80 Having odbc_tables() and odbc_columns() match the documentation with parameters optionel from the right 2000-09-28 16:42:04 +00:00
Stig Bakken
81ded022e0 Applied DBMaker patch by Jeffrey Lin <clin@lion.syscom.com.tw> 2000-07-06 08:38:12 +00:00
Andi Gutmans
b9037f7d69 - Make PHP compile again under Windows.
- Please be careful when you make such changes.
2000-07-02 15:12:34 +00:00
Dan Kalowsky
5f81cba573 updates for the SolidEE to work for 3.5 with PHP4.0.1. Still causes warning of "integer from pointer used without typecast" but does not seem to effect the final build any. have not found a correction yet. has not shown the SQLParamData bug either, but unknown if it is closed as i was unable to reproduce it.
basically fixed the config.m4 file, and added a #define of HAVE_SOLID_35, due to the solidee 3.5 vs all other solidee systems being drastically different.  and solidtech providing no means for testing what version you are using.

does not include fixes for the linux users of glibc2 (automatically assumes libc5).  temporary work around, link your /usr/local/solid/lib files from a scll2x23 or scll2x30 to a scllux30 or scllux23 name...  suggestions to automate this are welcome.
2000-06-30 19:22:52 +00:00
Sascha Schumann
0c03253635 Stop including dl/phpdl.h. 2000-06-24 15:36:04 +00:00
Andi Gutmans
2987d5216e - More #if WIN32|WINNT -> #ifdef PHP_WIN32 conversions 2000-06-15 23:45:05 +00:00
Zeev Suraski
022159a6cd - Fix Win32 build
- Nuke a warning
2000-06-07 18:10:21 +00:00
Andi Gutmans
3701bc4207 - ARG_COUNT(ht) -> ZEND_NUM_ARGS() mega patch 2000-06-05 19:47:54 +00:00
Andreas Karajannis
2980f7f92d Changed parameter naming some function prototypes 2000-05-28 17:23:24 +00:00
Andreas Karajannis
e50b33c240 Cosmetic changes. 2000-05-28 12:48:12 +00:00
Sascha Schumann
4686a3b50e Use #ifdef COMPILE_DL_EXTNAME solely. 2000-05-23 09:33:51 +00:00
Andreas Karajannis
11f4909068 Turn off retrieving the whole error stack 2000-05-21 08:46:51 +00:00
Zeev Suraski
e043439ff6 Update the license with the new clause 6 2000-05-18 15:34:45 +00:00
Andreas Karajannis
07f7b8c1e3 Prototype adapted 2000-05-11 16:25:58 +00:00
Andreas Karajannis
010f7850e0 Restoring old parameter ordering in odbc_fetch_into() 2000-05-11 16:24:03 +00:00
Egon Schmid
7a3e2ee70a Fixed some typos. 2000-05-11 12:10:53 +00:00
Andreas Karajannis
f4357f3254 Forcing passing by reference for array in odbc_fetch_into()
Added function odbc_column_scale(), new alias odbc_column_precision for odbc_column_len
Added better description in Prototypes for some functions
2000-05-11 11:46:06 +00:00
Sascha Schumann
fe50664d4d #if COMPILE_DL
becomes

    #if defined(COMPILE_DL) || defined(COMPILE_DL_EXTENSION_NAME)
2000-05-02 00:44:35 +00:00
Sascha Schumann
0d383d9373 Replace the various get_module() functions with a uniform
ZEND_GET_MODULE(name) macro.
2000-05-02 00:30:36 +00:00
Nick Gorham
1b7bfe5bbf Removed unnecessary FAR's (I am assuming we don't need to work under
16 bit windows). They break several ODBC builds.
2000-04-16 16:16:59 +00:00
Colin Viebrock
a7c8bfb9fb phpinfo() prettying 2000-04-06 21:07:44 +00:00
Andi Gutmans
50a2574e97 - ELS are passed to internal functions 2000-03-14 05:15:33 +00:00
Andreas Karajannis
773d0560f2 odbc_close() and odbc_close_all() working again 2000-03-13 15:22:47 +00:00
Sascha Schumann
bb09ee9505 Use sprintf everywhere and define sprintf to php_sprintf, if sprintf is broken. 2000-03-12 17:18:21 +00:00
Sascha Schumann
caeaaf4d98 Fix build on systems which lack snprintf or vsnprintf.
PR: #3786
2000-03-12 15:47:34 +00:00
Leo Baschy
355eda0cf3 remove recent patch to _close_odbc_conn calling _free_odbc_result 2000-03-12 01:03:23 +00:00
Andi Gutmans
9dca788ca0 - Don't define DEBUG anymore. Everyone should use PHP_DEBUG.
There are 2-3 third-party libs in PHP which use DEBUG and I left them
  this way (primary example is pcrelib).
- Please test things and Andrei, can you check that pcrelib stopped
  printing the warning messages?
2000-03-11 20:48:49 +00:00
Leo Baschy
db33bb8ff6 _close_odbc_conn calls _free_odbc_result if possible 2000-03-09 22:19:57 +00:00
Stig Bakken
d02fe90b00 Change extension names in all extensions' zend_module_entry to their
directory name.
2000-03-06 18:44:01 +00:00
Andreas Karajannis
324391bc30 uodbc now uses zend's reference system. The crashes on request shutdown should be gone. 2000-02-23 16:34:08 +00:00
Egon Schmid
ecb74a01a1 More protos. 2000-02-23 16:26:10 +00:00
Zeev Suraski
86fa2aade2 the pipe is breaking all the time 2000-02-19 23:41:32 +00:00
Andi Gutmans
8c813dbb96 - Make Win32 compile again 2000-02-05 17:58:11 +00:00
Zeev Suraski
ec386cc9fd - Remove the pre-request-shutdown hooks, they should no longer be necessary.
The session module may not work due to an unknown (and until now, IMO, misdiagnosed) problem,
if it does, please report it!
2000-01-16 21:03:49 +00:00