diff options
| author | SVN Migration <svn@php.net> | 2003-03-12 22:18:23 +0000 |
|---|---|---|
| committer | SVN Migration <svn@php.net> | 2003-03-12 22:18:23 +0000 |
| commit | 3cae24d4d11652d34f41d025ae2c28eec27eaffe (patch) | |
| tree | 3b904225d978af2a28be60803734744d683f6bf3 | |
| parent | 9ea0fff51d45b6fcdb1069d22d70c92083246f04 (diff) | |
| download | php-git-3cae24d4d11652d34f41d025ae2c28eec27eaffe.tar.gz | |
This commit was manufactured by cvs2svn to create tag 'php_4_3_2RC1'.php-4.3.2RC1
57 files changed, 0 insertions, 3162 deletions
diff --git a/ext/dba/dba_inifile.c b/ext/dba/dba_inifile.c deleted file mode 100644 index 2a12179e78..0000000000 --- a/ext/dba/dba_inifile.c +++ /dev/null @@ -1,186 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 4 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2003 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 2.02 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available at through the world-wide-web at | - | http://www.php.net/license/2_02.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Marcus Boerger <helly@php.net> | - +----------------------------------------------------------------------+ - */ - -/* $Id$ */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "php.h" - -#if DBA_INIFILE -#include "php_inifile.h" - -#include "libinifile/inifile.h" - -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> - -#define INIFILE_DATA \ - inifile *dba = info->dbf - -#define INIFILE_GKEY \ - key_type ini_key = inifile_key_split((char*)key) /* keylen not needed here */ - -#define INIFILE_DONE \ - inifile_key_free(&ini_key) - -DBA_OPEN_FUNC(inifile) -{ - info->dbf = inifile_alloc(info->fp, info->mode == DBA_READER, info->flags&DBA_PERSISTENT TSRMLS_CC); - - return info->dbf ? SUCCESS : FAILURE; -} - -DBA_CLOSE_FUNC(inifile) -{ - INIFILE_DATA; - - inifile_free(dba, info->flags&DBA_PERSISTENT); -} - -DBA_FETCH_FUNC(inifile) -{ - val_type ini_val; - - INIFILE_DATA; - INIFILE_GKEY; - - ini_val = inifile_fetch(dba, &ini_key, skip TSRMLS_CC); - *newlen = ini_val.value ? strlen(ini_val.value) : 0; - INIFILE_DONE; - return ini_val.value; -} - -DBA_UPDATE_FUNC(inifile) -{ - val_type ini_val; - int res; - - INIFILE_DATA; - INIFILE_GKEY; - - ini_val.value = val; - - if (mode == 1) { - res = inifile_append(dba, &ini_key, &ini_val TSRMLS_CC); - } else { - res = inifile_replace(dba, &ini_key, &ini_val TSRMLS_CC); - } - INIFILE_DONE; - switch(res) { - case -1: - php_error_docref1(NULL TSRMLS_CC, key, E_WARNING, "Operation not possible"); - return FAILURE; - default: - case 0: - return SUCCESS; - case 1: - php_error_docref1(NULL TSRMLS_CC, key, E_WARNING, "Key already exists"); - return SUCCESS; - } -} - -DBA_EXISTS_FUNC(inifile) -{ - val_type ini_val; - - INIFILE_DATA; - INIFILE_GKEY; - - ini_val = inifile_fetch(dba, &ini_key, 0 TSRMLS_CC); - INIFILE_DONE; - if (ini_val.value) { - inifile_val_free(&ini_val); - return SUCCESS; - } - return FAILURE; -} - -DBA_DELETE_FUNC(inifile) -{ - INIFILE_DATA; - INIFILE_GKEY; - int res = inifile_delete(dba, &ini_key TSRMLS_CC); - - INIFILE_DONE; - return (res == -1 ? FAILURE : SUCCESS); -} - -DBA_FIRSTKEY_FUNC(inifile) -{ - INIFILE_DATA; - - if (inifile_firstkey(dba TSRMLS_CC)) { - char *result = inifile_key_string(&dba->curr.key); - *newlen = strlen(result); - return result; - } else { - return NULL; - } -} - -DBA_NEXTKEY_FUNC(inifile) -{ - INIFILE_DATA; - - if (!dba->curr.key.group && !dba->curr.key.name) { - return NULL; - } - - if (inifile_nextkey(dba TSRMLS_CC)) { - char *result = inifile_key_string(&dba->curr.key); - *newlen = strlen(result); - return result; - } else { - return NULL; - } -} - -DBA_OPTIMIZE_FUNC(inifile) -{ - /* dummy */ - return SUCCESS; -} - -DBA_SYNC_FUNC(inifile) -{ - /* dummy */ - return SUCCESS; -} - -DBA_INFO_FUNC(inifile) -{ - return estrdup(inifile_version()); -} - -#endif - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: sw=4 ts=4 fdm=marker - * vim<600: sw=4 ts=4 - */ diff --git a/ext/dba/libinifile/inifile.c b/ext/dba/libinifile/inifile.c deleted file mode 100644 index 6e3d94dc4a..0000000000 --- a/ext/dba/libinifile/inifile.c +++ /dev/null @@ -1,598 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 4 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2003 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 2.02 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available at through the world-wide-web at | - | http://www.php.net/license/2_02.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Marcus Boerger <helly@php.net> | - +----------------------------------------------------------------------+ - */ - -/* $Id$ */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "php.h" -#include "php_globals.h" -#include "safe_mode.h" -#include "php_network.h" - -#include <stdlib.h> -#include <string.h> -#include <errno.h> -#if HAVE_UNISTD_H -#include <unistd.h> -#endif - -#include "inifile.h" - -/* ret = -1 means that database was opened for read-only - * ret = 0 success - * ret = 1 key already exists - nothing done - */ - -/* {{{ inifile_version */ -char *inifile_version() -{ - return "1.0, $Revision$"; -} -/* }}} */ - -/* {{{ inifile_free_key */ -void inifile_key_free(key_type *key) -{ - if (key->group) { - efree(key->group); - } - if (key->name) { - efree(key->name); - } - memset(key, 0, sizeof(key_type)); -} -/* }}} */ - -/* {{{ inifile_free_val */ -void inifile_val_free(val_type *val) -{ - if (val->value) { - efree(val->value); - } - memset(val, 0, sizeof(val_type)); -} -/* }}} */ - -/* {{{ inifile_free_val */ -void inifile_line_free(line_type *ln) -{ - inifile_key_free(&ln->key); - inifile_val_free(&ln->val); - ln->pos = 0; -} -/* }}} */ - -/* {{{ inifile_alloc */ -inifile * inifile_alloc(php_stream *fp, int readonly, int persistent TSRMLS_DC) -{ - inifile *dba; - int fd = 0; - - if (!readonly) { - if (!php_stream_truncate_supported(fp)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can't truncate this stream"); - return NULL; - } - if (SUCCESS != php_stream_cast(fp, PHP_STREAM_AS_FD, (void*)&fd, 1)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not cast stream"); - return NULL; - } - } - dba = pemalloc(sizeof(inifile), persistent); - memset(dba, 0, sizeof(inifile)); - dba->fp = fp; - dba->fd = fd; - dba->readonly = readonly; - return dba; -} -/* }}} */ - -/* {{{ inifile_free */ -void inifile_free(inifile *dba, int persistent) -{ - if (dba) { - inifile_line_free(&dba->curr); - inifile_line_free(&dba->next); - pefree(dba, persistent); - } -} -/* }}} */ - -/* {{{ inifile_key_split */ -key_type inifile_key_split(const char *group_name) -{ - key_type key; - char *name; - - if (group_name[0] == '[' && (name = strchr(group_name, ']')) != NULL) { - key.group = estrndup(group_name+1, name - (group_name + 1)); - key.name = estrdup(name+1); - } else { - key.group = estrdup(""); - key.name = estrdup(group_name); - } - return key; -} -/* }}} */ - -/* {{{ inifile_key_string */ -char * inifile_key_string(const key_type *key) -{ - if (key->group && *key->group) { - char *result; - spprintf(&result, 0, "[%s]%s", key->group, key->name ? key->name : ""); - return result; - } else if (key->name) { - return estrdup(key->name); - } else { - return NULL; - } -} -/* }}} */ - -/* {{{ etrim */ -static char *etrim(const char *str) -{ - char *val; - size_t l; - - if (!str) { - return NULL; - } - val = (char*)str; - while (strchr(" \t\r\n", *val)) { - val++; - } - l = strlen(val); - while (l && (strchr(" \t\r\n", val[l-1]))) { - l--; - } - return estrndup(val, l); -} -/* }}} */ - -/* {{{ inifile_findkey - */ -static int inifile_read(inifile *dba, line_type *ln TSRMLS_DC) { - char *fline; - char *pos; - - inifile_val_free(&ln->val); - while ((fline = php_stream_gets(dba->fp, NULL, 0)) != NULL) { - if (fline) { - if (fline[0] == '[') { - /* A value name cannot start with '[' - * So either we find a ']' or we found an error - */ - pos = strchr(fline+1, ']'); - if (pos) { - *pos = '\0'; - inifile_key_free(&ln->key); - ln->key.group = etrim(fline+1); - ln->key.name = estrdup(""); - ln->pos = php_stream_tell(dba->fp); - efree(fline); - return 1; - } else { - efree(fline); - continue; - } - } else { - pos = strchr(fline, '='); - if (pos) { - *pos = '\0'; - /* keep group or make empty if not existent */ - if (!ln->key.group) { - ln->key.group = estrdup(""); - } - if (ln->key.name) { - efree(ln->key.name); - } - ln->key.name = etrim(fline); - ln->val.value = etrim(pos+1); - ln->pos = php_stream_tell(dba->fp); - efree(fline); - return 1; - } else { - /* simply ignore lines without '=' - * those should be comments - */ - efree(fline); - continue; - } - } - } - } - inifile_line_free(ln); - return 0; -} -/* }}} */ - -/* {{{ inifile_key_cmp */ -/* 0 = EQUAL - * 1 = GROUP-EQUAL,NAME-DIFFERENT - * 2 = DIFFERENT - */ -static int inifile_key_cmp(const key_type *k1, const key_type *k2 TSRMLS_DC) -{ - assert(k1->group && k1->name && k2->group && k2->name); - - if (!strcasecmp(k1->group, k2->group)) { - if (!strcasecmp(k1->name, k2->name)) { - return 0; - } else { - return 1; - } - } else { - return 2; - } -} -/* }}} */ - -/* {{{ inifile_fetch - */ -val_type inifile_fetch(inifile *dba, const key_type *key, int skip TSRMLS_DC) { - line_type ln = {{NULL,NULL},{NULL}}; - val_type val; - int res, grp_eq = 0; - - if (skip == -1 && dba->next.key.group && dba->next.key.name && !inifile_key_cmp(&dba->next.key, key TSRMLS_CC)) { - /* we got position already from last fetch */ - php_stream_seek(dba->fp, dba->next.pos, SEEK_SET); - } else { - /* specific instance or not same key -> restart search */ - /* the slow way: restart and seacrch */ - php_stream_rewind(dba->fp); - inifile_line_free(&dba->next); - } - if (skip == -1) { - skip = 0; - } - while(inifile_read(dba, &ln TSRMLS_CC)) { - if (!(res=inifile_key_cmp(&ln.key, key TSRMLS_CC))) { - if (!skip) { - val.value = estrdup(ln.val.value ? ln.val.value : ""); - /* allow faster access by updating key read into next */ - inifile_line_free(&dba->next); - dba->next = ln; - dba->next.pos = php_stream_tell(dba->fp); - return val; - } - skip--; - } else if (res == 1) { - grp_eq = 1; - } else if (grp_eq) { - /* we are leaving group now: that means we cannot find the key */ - break; - } - } - inifile_line_free(&ln); - dba->next.pos = php_stream_tell(dba->fp); - return ln.val; -} -/* }}} */ - -/* {{{ inifile_firstkey - */ -int inifile_firstkey(inifile *dba TSRMLS_DC) { - inifile_line_free(&dba->curr); - dba->curr.pos = 0; - return inifile_nextkey(dba TSRMLS_CC); -} -/* }}} */ - -/* {{{ inifile_nextkey - */ -int inifile_nextkey(inifile *dba TSRMLS_DC) { - line_type ln = {{NULL,NULL},{NULL}}; - - /*inifile_line_free(&dba->next); ??? */ - php_stream_seek(dba->fp, dba->curr.pos, SEEK_SET); - ln.key.group = estrdup(dba->curr.key.group ? dba->curr.key.group : ""); - inifile_read(dba, &ln TSRMLS_CC); - inifile_line_free(&dba->curr); - dba->curr = ln; - return ln.key.group || ln.key.name; -} -/* }}} */ - -/* {{{ inifile_truncate - */ -static int inifile_truncate(inifile *dba, size_t size TSRMLS_DC) -{ - int res; - - if ((res=php_stream_truncate_set_size(dba->fp, size)) != 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error in ftruncate: %d", res); - return FAILURE; - } - php_stream_seek(dba->fp, size, SEEK_SET); - return SUCCESS; -} -/* }}} */ - -/* {{{ inifile_find_group - * if found pos_grp_start points to "[group_name]" - */ -static int inifile_find_group(inifile *dba, const key_type *key, size_t *pos_grp_start TSRMLS_DC) -{ - int ret = FAILURE; - - php_stream_flush(dba->fp); - php_stream_seek(dba->fp, 0, SEEK_SET); - inifile_line_free(&dba->curr); - inifile_line_free(&dba->next); - - if (key->group && strlen(key->group)) { - int res; - line_type ln = {{NULL,NULL},{NULL}}; - - res = 1; - while(inifile_read(dba, &ln TSRMLS_CC)) { - if ((res=inifile_key_cmp(&ln.key, key TSRMLS_CC)) < 2) { - ret = SUCCESS; - break; - } - *pos_grp_start = php_stream_tell(dba->fp); - } - inifile_line_free(&ln); - } else { - *pos_grp_start = 0; - ret = SUCCESS; - } - if (ret == FAILURE) { - *pos_grp_start = php_stream_tell(dba->fp); - } - return ret; -} -/* }}} */ - -/* {{{ inifile_next_group - * only valid after a call to inifile_find_group - * if any next group is found pos_grp_start points to "[group_name]" or whitespace before that - */ -static int inifile_next_group(inifile *dba, const key_type *key, size_t *pos_grp_start TSRMLS_DC) -{ - int ret = FAILURE; - line_type ln = {{NULL,NULL},{NULL}}; - - *pos_grp_start = php_stream_tell(dba->fp); - ln.key.group = estrdup(key->group); - while(inifile_read(dba, &ln TSRMLS_CC)) { - if (inifile_key_cmp(&ln.key, key TSRMLS_CC) == 2) { - ret = SUCCESS; - break; - } - *pos_grp_start = php_stream_tell(dba->fp); - } - inifile_line_free(&ln); - return ret; -} -/* }}} */ - -/* {{{ inifile_copy_to - */ -static int inifile_copy_to(inifile *dba, size_t pos_start, size_t pos_end, inifile **ini_copy TSRMLS_DC) -{ - php_stream *fp; - - if (pos_start == pos_end) { - *ini_copy = NULL; - return SUCCESS; - } - if ((fp = php_stream_temp_create(0, 64 * 1024)) == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not create temporary stream"); - *ini_copy = NULL; - return FAILURE; - } - - if ((*ini_copy = inifile_alloc(fp, 1, 0 TSRMLS_CC)) == NULL) { - /* writes error */ - return FAILURE; - } - php_stream_seek(dba->fp, pos_start, SEEK_SET); - if (!php_stream_copy_to_stream(dba->fp, fp, pos_end - pos_start)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not copy group [%d - %d] to temporary stream", pos_start, pos_end); - return FAILURE; - } - return SUCCESS; -} -/* }}} */ - -/* {{{ inifile_filter - * copy from to dba while ignoring key name (group must equal) - */ -static int inifile_filter(inifile *dba, inifile *from, const key_type *key TSRMLS_DC) -{ - size_t pos_start = 0, pos_next = 0, pos_curr; - int ret = SUCCESS; - line_type ln = {{NULL,NULL},{NULL}}; - - php_stream_seek(from->fp, 0, SEEK_SET); - php_stream_seek(dba->fp, 0, SEEK_END); - while(inifile_read(from, &ln TSRMLS_CC)) { - switch(inifile_key_cmp(&ln.key, key TSRMLS_CC)) { - case 0: - pos_curr = php_stream_tell(from->fp); - if (pos_start != pos_next) { - php_stream_seek(from->fp, pos_start, SEEK_SET); - if (!php_stream_copy_to_stream(from->fp, dba->fp, pos_next - pos_start)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not copy [%d - %d] from temporary stream", pos_next, pos_start); - ret = FAILURE; - } - php_stream_seek(from->fp, pos_curr, SEEK_SET); - } - pos_next = pos_start = pos_curr; - break; - case 1: - pos_next = php_stream_tell(from->fp); - break; - case 2: - /* the function is meant to process only entries from same group */ - assert(0); - break; - } - } - if (pos_start != pos_next) { - php_stream_seek(from->fp, pos_start, SEEK_SET); - if (!php_stream_copy_to_stream(from->fp, dba->fp, pos_next - pos_start)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not copy [%d - %d] from temporary stream", pos_next, pos_start); - ret = FAILURE; - } - } - inifile_line_free(&ln); - return SUCCESS; -} -/* }}} */ - -/* {{{ inifile_delete_replace_append - */ -static int inifile_delete_replace_append(inifile *dba, const key_type *key, const val_type *value, int append TSRMLS_DC) -{ - size_t pos_grp_start, pos_grp_next; - inifile *ini_tmp = NULL; - php_stream *fp_tmp = NULL; - int ret; - - /* 1) Search group start - * 2) Search next group - * 3) If not append: Copy group to ini_tmp - * 4) Open temp_stream and copy remainder - * 5) Truncate stream - * 6) If not append AND key.name given: Filtered copy back from ini_tmp - * to stream. Otherwise the user wanted to delete the group. - * 7) Append value if given - * 8) Append temporary stream - */ - - assert(!append || (key->name && value)); /* missuse */ - - /* 1 - 3 */ - inifile_find_group(dba, key, &pos_grp_start TSRMLS_CC); - inifile_next_group(dba, key, &pos_grp_next TSRMLS_CC); - if (append) { - ret = SUCCESS; - } else { - ret = inifile_copy_to(dba, pos_grp_start, pos_grp_next, &ini_tmp TSRMLS_CC); - } - - /* 4 */ - if (ret == SUCCESS) { - fp_tmp = php_stream_temp_create(0, 64 * 1024); - if (!fp_tmp) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not create temporary stream"); - ret = FAILURE; - } else { - php_stream_seek(dba->fp, 0, SEEK_END); - if (pos_grp_next != php_stream_tell(dba->fp)) { - php_stream_seek(dba->fp, pos_grp_next, SEEK_SET); - if (!php_stream_copy_to_stream(dba->fp, fp_tmp, PHP_STREAM_COPY_ALL)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not copy remainder to temporary stream"); - ret = FAILURE; - } - } - } - } - - /* 5 */ - if (ret == SUCCESS) { - ret = inifile_truncate(dba, append ? pos_grp_next : pos_grp_start TSRMLS_CC); /* writes error on fail */ - } - - if (ret == SUCCESS) { - if (key->name && strlen(key->name)) { - /* 6 */ - if (!append && ini_tmp) { - ret = inifile_filter(dba, ini_tmp, key TSRMLS_CC); - } - - /* 7 */ - /* important: do not query ret==SUCCESS again: inifile_filter might fail but - * however next operation must be done. - */ - if (value) { - if (pos_grp_start == pos_grp_next && key->group && strlen(key->group)) { - php_stream_printf(dba->fp TSRMLS_CC, "[%s]\n", key->group); - } - php_stream_printf(dba->fp TSRMLS_CC, "%s=%s\n", key->name, value->value ? value->value : ""); - } - } - - /* 8 */ - /* important: do not query ret==SUCCESS again: inifile_filter might fail but - * however next operation must be done. - */ - if (fp_tmp && php_stream_tell(fp_tmp)) { - php_stream_seek(fp_tmp, 0, SEEK_SET); - php_stream_seek(dba->fp, 0, SEEK_END); - if (!php_stream_copy_to_stream(fp_tmp, dba->fp, PHP_STREAM_COPY_ALL)) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not copy from temporary stream - ini file truncated"); - ret = FAILURE; - } - } - } - - if (ini_tmp) { - php_stream_close(ini_tmp->fp); - inifile_free(ini_tmp, 0); - } - if (fp_tmp) { - php_stream_close(fp_tmp); - } - php_stream_flush(dba->fp); - php_stream_seek(dba->fp, 0, SEEK_SET); - - return ret; -} -/* }}} */ - -/* {{{ inifile_delete - */ -int inifile_delete(inifile *dba, const key_type *key TSRMLS_DC) -{ - return inifile_delete_replace_append(dba, key, NULL, 0 TSRMLS_CC); -} -/* }}} */ - -/* {{{ inifile_relace - */ -int inifile_replace(inifile *dba, const key_type *key, const val_type *value TSRMLS_DC) -{ - return inifile_delete_replace_append(dba, key, value, 0 TSRMLS_CC); -} -/* }}} */ - -/* {{{ inifile_append - */ -int inifile_append(inifile *dba, const key_type *key, const val_type *value TSRMLS_DC) -{ - return inifile_delete_replace_append(dba, key, value, 1 TSRMLS_CC); -} -/* }}} */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: sw=4 ts=4 fdm=marker - * vim<600: sw=4 ts=4 - */ diff --git a/ext/dba/libinifile/inifile.h b/ext/dba/libinifile/inifile.h deleted file mode 100644 index f0c17c369c..0000000000 --- a/ext/dba/libinifile/inifile.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 4 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2003 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 2.02 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available at through the world-wide-web at | - | http://www.php.net/license/2_02.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Marcus Boerger <helly@php.net> | - +----------------------------------------------------------------------+ - */ - -/* $Id$ */ - -#ifndef PHP_LIB_INIFILE_H -#define PHP_LIB_INIFILE_H - -typedef struct { - char *group; - char *name; -} key_type; - -typedef struct { - char *value; -} val_type; - -typedef struct { - key_type key; - val_type val; - size_t pos; -} line_type; - -typedef struct { - char *lockfn; - int lockfd; - php_stream *fp; - int fd; - int readonly; - line_type curr; - line_type next; -} inifile; - -val_type inifile_fetch(inifile *dba, const key_type *key, int skip TSRMLS_DC); -int inifile_firstkey(inifile *dba TSRMLS_DC); -int inifile_nextkey(inifile *dba TSRMLS_DC); -int inifile_delete(inifile *dba, const key_type *key TSRMLS_DC); -int inifile_replace(inifile *dba, const key_type *key, const val_type *val TSRMLS_DC); -int inifile_append(inifile *dba, const key_type *key, const val_type *val TSRMLS_DC); -char *inifile_version(); - -key_type inifile_key_split(const char *group_name); -char * inifile_key_string(const key_type *key); - -void inifile_key_free(key_type *key); -void inifile_val_free(val_type *val); -void inifile_line_free(line_type *ln); - -inifile * inifile_alloc(php_stream *fp, int readonly, int persistent TSRMLS_DC); -void inifile_free(inifile *dba, int persistent); - -#endif diff --git a/ext/dba/php_inifile.h b/ext/dba/php_inifile.h deleted file mode 100644 index 69444df3c6..0000000000 --- a/ext/dba/php_inifile.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef PHP_INIFILE_H -#define PHP_INIFILE_H - -#if DBA_INIFILE - -#include "php_dba.h" - -DBA_FUNCS(inifile); - -#endif - -#endif diff --git a/ext/dba/tests/dba_inifile.phpt b/ext/dba/tests/dba_inifile.phpt deleted file mode 100644 index 11ca19e3b6..0000000000 --- a/ext/dba/tests/dba_inifile.phpt +++ /dev/null @@ -1,29 +0,0 @@ ---TEST-- -DBA INIFILE handler test ---SKIPIF-- -<?php - $handler = 'inifile'; - require_once('skipif.inc'); -?> ---FILE-- -<?php - $handler = 'inifile'; - require_once('test.inc'); - require_once('dba_handler.inc'); -?> ---EXPECT-- -database handler: inifile -3NYNYY -Content String 2 -Content 2 replaced -Read during write: not allowed -Content 2 replaced 2nd time -The 6th value -array(3) { - ["key number 6"]=> - string(13) "The 6th value" - ["key2"]=> - string(27) "Content 2 replaced 2nd time" - ["key5"]=> - string(23) "The last content string" -}
\ No newline at end of file diff --git a/ext/mysqli/php_mysqli.h b/ext/mysqli/php_mysqli.h deleted file mode 100644 index c823e64527..0000000000 --- a/ext/mysqli/php_mysqli.h +++ /dev/null @@ -1,304 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 5 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2003 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 2.02 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available at through the world-wide-web at | - | http://www.php.net/license/2_02.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Georg Richter <georg@php.net> | - +----------------------------------------------------------------------+ - - $Id$ -*/ - -/* A little hack to prevent build break, when mysql is used together with - * c-client, which also defines LIST. - */ -#ifdef LIST -#undef LIST -#endif - -#include <mysql.h> -#include "mysqli_profiler.h" - -#ifndef PHP_MYSQLI_H -#define PHP_MYSQLI_H - - -typedef struct { - ulong buflen; - char *buffer; - ulong type; -} BIND_BUFFER; - -typedef struct { - MYSQL_STMT *stmt; - unsigned int var_cnt; - zval **vars; - BIND_BUFFER *bind; - char *is_null; - char type; -} STMT; - -typedef struct { - void *prinfo; /* profiler info */ - void *ptr; /* resource: (mysql, result, stmt) */ -} MYSQLI_RESOURCE; - -typedef struct _mysqli_object { - zend_object zo; - void *ptr; -} mysqli_object; /* extends zend_object */ - -#define MYSQLI_PR_MAIN 0 -#define MYSQLI_PR_MYSQL 1 -#define MYSQLI_PR_QUERY 2 -#define MYSQLI_PR_QUERY_RESULT 3 -#define MYSQLI_PR_STMT 4 -#define MYSQLI_PR_STMT_RESULT 5 -#define MYSQLI_PR_RESULT 6 -#define MYSQLI_PR_COMMAND 7 - - -#define phpext_mysqli_ptr &mysqli_module_entry - -#ifdef PHP_WIN32 -#define PHP_MYSQLI_API __declspec(dllexport) -#else -#define PHP_MYSQLI_API -#endif - -#ifdef ZTS -#include "TSRM.h" -#endif - -#define PHP_MYSQLI_EXPORT(__type) PHP_MYSQLI_API __type - -extern zend_module_entry mysqli_module_entry; -extern function_entry mysqli_functions[]; -extern function_entry mysqli_link_methods[]; -extern function_entry mysqli_stmt_methods[]; -extern function_entry mysqli_result_methods[]; -extern void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int flag); -extern void php_clear_stmt_bind(STMT *stmt); - -zend_class_entry *mysqli_link_class_entry; -zend_class_entry *mysqli_stmt_class_entry; -zend_class_entry *mysqli_result_class_entry; - -zend_class_entry _mysqli_link_class_entry; -zend_class_entry _mysqli_stmt_class_entry; -zend_class_entry _mysqli_result_class_entry; - -PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry * TSRMLS_DC); - -#define REGISTER_MYSQLI_CLASS_ENTRY(name, mysqli_entry, class_functions) { \ - INIT_CLASS_ENTRY(_##mysqli_entry,name,class_functions); \ - _##mysqli_entry.create_object = mysqli_objects_new; \ - mysqli_entry = zend_register_internal_class(&_##mysqli_entry TSRMLS_CC); \ -} \ - -#define MYSQLI_REGISTER_RESOURCE_EX(__ptr, __zval, __ce) \ - ((mysqli_object *) zend_object_store_get_object(__zval TSRMLS_CC))->ptr = __ptr; - -#define MYSQLI_RETURN_RESOURCE(__ptr, __ce) \ - Z_TYPE_P(return_value) = IS_OBJECT; \ - (return_value)->value.obj = mysqli_objects_new(__ce TSRMLS_CC); \ - MYSQLI_REGISTER_RESOURCE_EX(__ptr, return_value, __ce) - -#define MYSQLI_REGISTER_RESOURCE(__ptr, __ce) \ -{\ - zval *object = getThis();\ - if (!object) {\ - object = return_value;\ - Z_TYPE_P(object) = IS_OBJECT;\ - (object)->value.obj = mysqli_objects_new(__ce TSRMLS_CC);\ - }\ - MYSQLI_REGISTER_RESOURCE_EX(__ptr, object, __ce)\ -} - -#define MYSQLI_FETCH_RESOURCE(__ptr, __type, __prptr, __prtype, __id, __name) \ -{ \ - MYSQLI_RESOURCE *my_res; \ - mysqli_object *intern = (mysqli_object *)zend_object_store_get_object(*(__id) TSRMLS_CC);\ - if (!(my_res = (MYSQLI_RESOURCE *)intern->ptr)) {\ - php_error(E_WARNING, "Couldn't fetch %s", intern->zo.ce->name);\ - RETURN_NULL();\ - }\ - __ptr = (__type)my_res->ptr; \ - __prptr = (__prtype)my_res->prinfo; \ - if (!strcmp((char *)__name, "mysqli_stmt")) {\ - if (!((STMT *)__ptr)->stmt->mysql) {\ - php_error(E_WARNING, "Statement isn't valid anymore");\ - RETURN_NULL();\ - }\ - }\ -} - -#define MYSQLI_CLEAR_RESOURCE(__id) \ -{ \ - mysqli_object *intern = (mysqli_object *)zend_object_store_get_object(*(__id) TSRMLS_CC);\ - efree(intern->ptr); \ - intern->ptr = NULL; \ -} - -#define MYSQLI_RETURN_LONG_LONG(__val) \ -{ \ - if ((__val) < LONG_MAX) { \ - RETURN_LONG((__val)); \ - } else { \ - char ret[40]; \ - sprintf(ret, "%llu", (__val)); \ - RETURN_STRING(ret,1); \ - } \ -} - -#define MYSQLI_STORE_RESULT 0 -#define MYSQLI_USE_RESULT 1 - -/* for mysqli_fetch_assoc */ -#define MYSQLI_ASSOC 1 -#define MYSQLI_NUM 2 -#define MYSQLI_BOTH 3 - -/* for mysqli_bind_param */ -#define MYSQLI_BIND_INT 1 -#define MYSQLI_BIND_DOUBLE 2 -#define MYSQLI_BIND_STRING 3 -#define MYSQLI_BIND_SEND_DATA 4 - -/* fetch types */ -#define FETCH_SIMPLE 1 -#define FETCH_RESULT 2 - -PHP_MYSQLI_API void mysqli_register_link(zval *return_value, void *link TSRMLS_DC); -PHP_MYSQLI_API void mysqli_register_stmt(zval *return_value, void *stmt TSRMLS_DC); -PHP_MYSQLI_API void mysqli_register_result(zval *return_value, void *result TSRMLS_DC); -PHP_MYSQLI_API void php_mysqli_set_error(long mysql_errno, char *mysql_err TSRMLS_DC); - -PHP_MINIT_FUNCTION(mysqli); -PHP_MSHUTDOWN_FUNCTION(mysqli); -PHP_RINIT_FUNCTION(mysqli); -PHP_RSHUTDOWN_FUNCTION(mysqli); -PHP_MINFO_FUNCTION(mysqli); - -PHP_FUNCTION(mysqli_affected_rows); -PHP_FUNCTION(mysqli_autocommit); -PHP_FUNCTION(mysqli_bind_param); -PHP_FUNCTION(mysqli_bind_result); -PHP_FUNCTION(mysqli_change_user); -PHP_FUNCTION(mysqli_character_set_name); -PHP_FUNCTION(mysqli_close); -PHP_FUNCTION(mysqli_commit); -PHP_FUNCTION(mysqli_connect); -PHP_FUNCTION(mysqli_data_seek); -PHP_FUNCTION(mysqli_debug); -PHP_FUNCTION(mysqli_disable_reads_from_master); -PHP_FUNCTION(mysqli_disable_rpl_parse); -PHP_FUNCTION(mysqli_dump_debug_info); -PHP_FUNCTION(mysqli_enable_reads_from_master); -PHP_FUNCTION(mysqli_enable_rpl_parse); -PHP_FUNCTION(mysqli_errno); -PHP_FUNCTION(mysqli_error); -PHP_FUNCTION(mysqli_execute); -PHP_FUNCTION(mysqli_fetch); -PHP_FUNCTION(mysqli_fetch_array); -PHP_FUNCTION(mysqli_fetch_assoc); -PHP_FUNCTION(mysqli_fetch_object); -PHP_FUNCTION(mysqli_fetch_field); -PHP_FUNCTION(mysqli_fetch_fields); -PHP_FUNCTION(mysqli_fetch_field_direct); -PHP_FUNCTION(mysqli_fetch_lengths); -PHP_FUNCTION(mysqli_fetch_row); -PHP_FUNCTION(mysqli_field_count); -PHP_FUNCTION(mysqli_field_seek); -PHP_FUNCTION(mysqli_field_tell); -PHP_FUNCTION(mysqli_free_result); -PHP_FUNCTION(mysqli_get_client_info); -PHP_FUNCTION(mysqli_get_host_info); -PHP_FUNCTION(mysqli_get_proto_info); -PHP_FUNCTION(mysqli_get_server_info); -PHP_FUNCTION(mysqli_get_server_version); -PHP_FUNCTION(mysqli_info); -PHP_FUNCTION(mysqli_insert_id); -PHP_FUNCTION(mysqli_init); -PHP_FUNCTION(mysqli_kill); -PHP_FUNCTION(mysqli_master_query); -PHP_FUNCTION(mysqli_num_fields); -PHP_FUNCTION(mysqli_num_rows); -PHP_FUNCTION(mysqli_options); -PHP_FUNCTION(mysqli_param_count); -PHP_FUNCTION(mysqli_ping); -PHP_FUNCTION(mysqli_prepare); -PHP_FUNCTION(mysqli_query); -PHP_FUNCTION(mysqli_prepare_result); -PHP_FUNCTION(mysqli_profiler); -PHP_FUNCTION(mysqli_read_query_result); -PHP_FUNCTION(mysqli_real_connect); -PHP_FUNCTION(mysqli_real_query); -PHP_FUNCTION(mysqli_real_escape_string); -PHP_FUNCTION(mysqli_reload); -PHP_FUNCTION(mysqli_rollback); -PHP_FUNCTION(mysqli_row_seek); -PHP_FUNCTION(mysqli_rpl_parse_enabled); -PHP_FUNCTION(mysqli_rpl_probe); -PHP_FUNCTION(mysqli_rpl_query_type); -PHP_FUNCTION(mysqli_select_db); -PHP_FUNCTION(mysqli_send_long_data); -PHP_FUNCTION(mysqli_send_query); -PHP_FUNCTION(mysqli_slave_query); -PHP_FUNCTION(mysqli_ssl_set); -PHP_FUNCTION(mysqli_stat); -PHP_FUNCTION(mysqli_stmt_affected_rows); -PHP_FUNCTION(mysqli_stmt_close); -PHP_FUNCTION(mysqli_stmt_errno); -PHP_FUNCTION(mysqli_stmt_error); -PHP_FUNCTION(mysqli_stmt_store_result); -PHP_FUNCTION(mysqli_store_result); -PHP_FUNCTION(mysqli_thread_id); -PHP_FUNCTION(mysqli_thread_safe); -PHP_FUNCTION(mysqli_use_result); -PHP_FUNCTION(mysqli_warning_count); - -ZEND_BEGIN_MODULE_GLOBALS(mysqli) - long default_link; - long num_links; - long max_links; - unsigned int default_port; - char *default_host; - char *default_user; - char *default_pw; - char *default_socket; - long error_no; - char *error_msg; - unsigned int profiler; -ZEND_END_MODULE_GLOBALS(mysqli) - -#ifdef ZTS -#define MyG(v) TSRMG(mysqli_globals_id, zend_mysqli_globals *, v) -#else -#define MyG(v) (mysqli_globals.v) -#endif - -#define my_estrdup(x) (x) ? estrdup(x) : NULL -#define my_efree(x) if (x) efree(x) - -ZEND_EXTERN_MODULE_GLOBALS(mysqli); - -#endif /* PHP_MYSQLI.H */ - - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * indent-tabs-mode: t - * End: - */ diff --git a/ext/mysqli/tests/001.phpt b/ext/mysqli/tests/001.phpt deleted file mode 100644 index fca937cf5d..0000000000 --- a/ext/mysqli/tests/001.phpt +++ /dev/null @@ -1,54 +0,0 @@ ---TEST-- -mysqli connect ---FILE-- -<? - $user = "root"; - $passwd = ""; - $dbname = "test"; - $test = ""; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("127.0.0.1", $user, $passwd); - $test .= ($link) ? "1" : "0"; - mysqli_close($link); - - /*** test mysqli_connect localhost ***/ - $link = mysqli_connect("localhost", $user, $passwd); - $test .= ($link) ? "1" : "0"; - mysqli_close($link); - - /*** test mysqli_connect localhost:port ***/ - $link = mysqli_connect("localhost", $user, $passwd, "", 3306); - $test .= ($link) ? "1" : "0"; - mysqli_close($link); - - /*** test mysqli_real_connect ***/ - $link = mysqli_init(); - $test.= (mysqli_real_connect($link, "localhost", $user, $passwd)) - ? "1" : "0"; - mysqli_close($link); - - /*** test mysqli_real_connect with db ***/ - $link = mysqli_init(); - $test .= (mysqli_real_connect($link, "localhost", $user, $passwd, $dbname)) - ? "1" : "0"; - mysqli_close($link); - - /*** test mysqli_real_connect with port ***/ - $link = mysqli_init(); - $test .= (mysqli_real_connect($link, "localhost", $user, $passwd, $dbname, 3306)) - ? "1":"0"; - mysqli_close($link); - - /*** test mysqli_real_connect compressed ***/ - $link = mysqli_init(); - $test .= (mysqli_real_connect($link, "localhost", $user, $passwd, $dbname, 0, NULL, MYSQLI_CLIENT_COMPRESS)) - ? "1" : "0"; - mysqli_close($link); - - /* todo ssl connections */ - - var_dump($test); -?> ---EXPECT-- -string(7) "1111111" diff --git a/ext/mysqli/tests/002.phpt b/ext/mysqli/tests/002.phpt deleted file mode 100644 index bbf5808641..0000000000 --- a/ext/mysqli/tests/002.phpt +++ /dev/null @@ -1,60 +0,0 @@ ---TEST-- -mysqli bind_result 1 ---FILE-- -<?php - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - $rc = mysqli_query($link,"DROP TABLE IF EXISTS test_fetch_null"); - - $rc = mysqli_query($link,"CREATE TABLE test_fetch_null(col1 tinyint, col2 smallint, - col3 int, col4 bigint, - col5 float, col6 double, - col7 date, col8 time, - col9 varbinary(10), - col10 varchar(50), - col11 char(20))"); - - $rc = mysqli_query($link,"INSERT INTO test_fetch_null(col1,col10, col11) VALUES(1,'foo1', 1000),(2,'foo2', 88),(3,'foo3', 389789)"); - - $stmt = mysqli_prepare($link, "SELECT col1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11 from test_fetch_null"); - mysqli_bind_result($stmt, &$c1, &$c2, &$c3, &$c4, &$c5, &$c6, &$c7, &$c8, &$c9, &$c10, &$c11); - mysqli_execute($stmt); - - mysqli_fetch($stmt); - - $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7,$c8,$c9,$c10,$c11); - - var_dump($test); - - mysqli_stmt_close($stmt); - mysqli_close($link); -?> ---EXPECT-- -array(11) { - [0]=> - int(1) - [1]=> - NULL - [2]=> - NULL - [3]=> - NULL - [4]=> - NULL - [5]=> - NULL - [6]=> - NULL - [7]=> - NULL - [8]=> - NULL - [9]=> - string(4) "foo1" - [10]=> - string(4) "1000" -} diff --git a/ext/mysqli/tests/003.phpt b/ext/mysqli/tests/003.phpt deleted file mode 100644 index 6baae8a481..0000000000 --- a/ext/mysqli/tests/003.phpt +++ /dev/null @@ -1,56 +0,0 @@ ---TEST-- -mysqli connect ---FILE-- -<?php - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link,"DROP TABLE IF EXISTS test_bind_result"); - mysqli_query($link,"CREATE TABLE test_bind_result(c1 date, c2 time, - c3 timestamp(14), - c4 year, - c5 datetime, - c6 timestamp(4), - c7 timestamp(6))"); - - mysqli_query($link,"INSERT INTO test_bind_result VALUES('2002-01-02', - '12:49:00', - '2002-01-02 17:46:59', - 2010, - '2010-07-10', - '2020','1999-12-29')"); - - $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_result"); - - mysqli_bind_result($stmt,&$c1, &$c2, &$c3, &$c4, &$c5, &$c6, &$c7); - mysqli_execute($stmt); - mysqli_fetch($stmt); - - $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7); - - var_dump($test); - - mysqli_stmt_close($stmt); - mysqli_close($link); -?> ---EXPECT-- -array(7) { - [0]=> - string(10) "2002-01-02" - [1]=> - string(8) "12:49:00" - [2]=> - string(19) "2002-01-02 17:46:59" - [3]=> - int(2010) - [4]=> - string(19) "2010-07-10 00:00:00" - [5]=> - string(0) "" - [6]=> - string(19) "1999-12-29 00:00:00" -} diff --git a/ext/mysqli/tests/004.phpt b/ext/mysqli/tests/004.phpt deleted file mode 100644 index 1469bb566f..0000000000 --- a/ext/mysqli/tests/004.phpt +++ /dev/null @@ -1,35 +0,0 @@ ---TEST-- -mysqli fetch char/text ---FILE-- -<?php - include ("connect.inc"); - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch"); - mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 char(10), c2 text)"); - - mysqli_query($link, "INSERT INTO test_bind_fetch VALUES ('1234567890', 'this is a test')"); - - $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch"); - mysqli_bind_result($stmt, &$c1, &$c2); - mysqli_execute($stmt); - mysqli_fetch($stmt); - - $test = array($c1,$c2); - - var_dump($test); - - mysqli_stmt_close($stmt); - mysqli_close($link); -?> ---EXPECT-- -array(2) { - [0]=> - string(10) "1234567890" - [1]=> - string(14) "this is a test" -} diff --git a/ext/mysqli/tests/005.phpt b/ext/mysqli/tests/005.phpt deleted file mode 100644 index 5688770fe0..0000000000 --- a/ext/mysqli/tests/005.phpt +++ /dev/null @@ -1,38 +0,0 @@ ---TEST-- -mysqli fetch char/text long ---FILE-- -<?php - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch"); - mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 char(10), c2 text)"); - - $a = str_repeat("A1", 32000); - - mysqli_query($link, "INSERT INTO test_bind_fetch VALUES ('1234567890', '$a')"); - - $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch"); - mysqli_bind_result($stmt, &$c1, &$c2); - mysqli_execute($stmt); - mysqli_fetch($stmt); - - $test[] = $c1; - $test[] = ($a == $c2) ? "32K String ok" : "32K String failed"; - - var_dump($test); - - mysqli_stmt_close($stmt); - mysqli_close($link); -?> ---EXPECT-- -array(2) { - [0]=> - string(10) "1234567890" - [1]=> - string(13) "32K String ok" -} diff --git a/ext/mysqli/tests/006.phpt b/ext/mysqli/tests/006.phpt deleted file mode 100644 index 059ce147a7..0000000000 --- a/ext/mysqli/tests/006.phpt +++ /dev/null @@ -1,51 +0,0 @@ ---TEST-- -mysqli fetch long values ---FILE-- -<?php - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch"); - mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 int unsigned, - c2 int unsigned, - c3 int, - c4 int, - c5 int, - c6 int unsigned, - c7 int)"); - - mysqli_query($link, "INSERT INTO test_bind_fetch VALUES (-23,35999,NULL,-500,-9999999,-0,0)"); - - $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch"); - mysqli_bind_result($stmt, &$c1, &$c2, &$c3, &$c4, &$c5, &$c6, &$c7); - mysqli_execute($stmt); - mysqli_fetch($stmt); - - $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7); - - var_dump($test); - - mysqli_stmt_close($stmt); - mysqli_close($link); -?> ---EXPECT-- -array(7) { - [0]=> - int(0) - [1]=> - int(35999) - [2]=> - NULL - [3]=> - int(-500) - [4]=> - int(-9999999) - [5]=> - int(0) - [6]=> - int(0) -} diff --git a/ext/mysqli/tests/007.phpt b/ext/mysqli/tests/007.phpt deleted file mode 100644 index 89d1959752..0000000000 --- a/ext/mysqli/tests/007.phpt +++ /dev/null @@ -1,51 +0,0 @@ ---TEST-- -mysqli fetch short values ---FILE-- -<?php - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch"); - mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 smallint unsigned, - c2 smallint unsigned, - c3 smallint, - c4 smallint, - c5 smallint, - c6 smallint unsigned, - c7 smallint)"); - - mysqli_query($link, "INSERT INTO test_bind_fetch VALUES (-23,35999,NULL,-500,-9999999,+30,0)"); - - $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch"); - mysqli_bind_result($stmt, &$c1, &$c2, &$c3, &$c4, &$c5, &$c6, &$c7); - mysqli_execute($stmt); - mysqli_fetch($stmt); - - $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7); - - var_dump($test); - - mysqli_stmt_close($stmt); - mysqli_close($link); -?> ---EXPECT-- -array(7) { - [0]=> - int(0) - [1]=> - int(35999) - [2]=> - NULL - [3]=> - int(-500) - [4]=> - int(-32768) - [5]=> - int(30) - [6]=> - int(0) -} diff --git a/ext/mysqli/tests/008.phpt b/ext/mysqli/tests/008.phpt deleted file mode 100644 index 92498da44c..0000000000 --- a/ext/mysqli/tests/008.phpt +++ /dev/null @@ -1,53 +0,0 @@ ---TEST-- -mysqli fetch tinyint values ---FILE-- -<?php - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch"); - mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 tinyint, - c2 tinyint unsigned, - c3 tinyint not NULL, - c4 tinyint, - c5 tinyint, - c6 tinyint unsigned, - c7 tinyint)"); - - mysqli_query($link, "INSERT INTO test_bind_fetch VALUES (-23,300,0,-100,-127,+30,0)"); - - $c1 = $c2 = $c3 = $c4 = $c5 = $c6 = $c7 = NULL; - - $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch"); - mysqli_bind_result($stmt, &$c1, &$c2, &$c3, &$c4, &$c5, &$c6, &$c7); - mysqli_execute($stmt); - mysqli_fetch($stmt); - - $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7); - - var_dump($test); - - mysqli_stmt_close($stmt); - mysqli_close($link); -?> ---EXPECT-- -array(7) { - [0]=> - int(-23) - [1]=> - int(255) - [2]=> - int(0) - [3]=> - int(-100) - [4]=> - int(-127) - [5]=> - int(30) - [6]=> - int(0) -} diff --git a/ext/mysqli/tests/009.phpt b/ext/mysqli/tests/009.phpt deleted file mode 100644 index 942b443ebb..0000000000 --- a/ext/mysqli/tests/009.phpt +++ /dev/null @@ -1,51 +0,0 @@ ---TEST-- -mysqli fetch bigint values ---FILE-- -<?php - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch"); - mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 bigint default 5, - c2 bigint, - c3 bigint not NULL, - c4 bigint unsigned, - c5 bigint unsigned, - c6 bigint unsigned, - c7 bigint unsigned)"); - - mysqli_query($link, "INSERT INTO test_bind_fetch (c2,c3,c4,c5,c6,c7) VALUES (-23,4.0,33333333333333,0,-333333333333,99.9)"); - - $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch"); - mysqli_bind_result($stmt, &$c1, &$c2, &$c3, &$c4, &$c5, &$c6, &$c7); - mysqli_execute($stmt); - mysqli_fetch($stmt); - - $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7); - - var_dump($test); - - mysqli_stmt_close($stmt); - mysqli_close($link); -?> ---EXPECT-- -array(7) { - [0]=> - int(5) - [1]=> - int(-23) - [2]=> - int(4) - [3]=> - string(14) "33333333333333" - [4]=> - int(0) - [5]=> - string(13) "-333333333333" - [6]=> - int(100) -} diff --git a/ext/mysqli/tests/010.phpt b/ext/mysqli/tests/010.phpt deleted file mode 100644 index 2986277fb4..0000000000 --- a/ext/mysqli/tests/010.phpt +++ /dev/null @@ -1,54 +0,0 @@ ---TEST-- -mysqli fetch float values ---FILE-- -<?php - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch"); - - mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 float(3), - c2 float, - c3 float unsigned, - c4 float, - c5 float, - c6 float, - c7 float(10) unsigned)"); - - - mysqli_query($link, "INSERT INTO test_bind_fetch (c1,c2,c3,c4,c5,c6,c7) VALUES (3.1415926535,-0.000001, -5, 999999999999, - sin(0.6), 1.00000000000001, 888888888888888)"); - - $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch"); - mysqli_bind_result($stmt, &$c1, &$c2, &$c3, &$c4, &$c5, &$c6, &$c7); - mysqli_execute($stmt); - mysqli_fetch($stmt); - - $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7); - - var_dump($test); - - mysqli_stmt_close($stmt); - mysqli_close($link); -?> ---EXPECT-- -array(7) { - [0]=> - float(3.1415927410126) - [1]=> - float(-9.9999999747524E-7) - [2]=> - float(0) - [3]=> - float(999999995904) - [4]=> - float(0.56464248895645) - [5]=> - float(1) - [6]=> - float(888888914608130) -} diff --git a/ext/mysqli/tests/011.phpt b/ext/mysqli/tests/011.phpt deleted file mode 100644 index 5735e2f1dd..0000000000 --- a/ext/mysqli/tests/011.phpt +++ /dev/null @@ -1,53 +0,0 @@ ---TEST-- -mysqli fetch mixed values ---FILE-- -<?php - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link,"DROP TABLE IF EXISTS test_bind_result"); - - mysqli_query($link,"CREATE TABLE test_bind_result(c1 tinyint, c2 smallint, - c3 int, c4 bigint, - c5 float, c6 double, - c7 varbinary(10), - c8 varchar(50))"); - - mysqli_query($link,"INSERT INTO test_bind_result VALUES(19,2999,3999,4999999, - 2345.6,5678.89563, - 'foobar','mysql rulez')"); - $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_result"); - mysqli_bind_result($stmt, &$c1, &$c2, &$c3, &$c4, &$c5, &$c6, &$c7, &$c8); - mysqli_execute($stmt); - mysqli_fetch($stmt); - - $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7,$c8); - - var_dump($test); - - mysqli_stmt_close($stmt); - mysqli_close($link); -?> ---EXPECT-- -array(8) { - [0]=> - int(19) - [1]=> - int(2999) - [2]=> - int(3999) - [3]=> - int(4999999) - [4]=> - float(2345.6000976563) - [5]=> - float(5678.89563) - [6]=> - string(6) "foobar" - [7]=> - string(11) "mysql rulez" -} diff --git a/ext/mysqli/tests/012.phpt b/ext/mysqli/tests/012.phpt deleted file mode 100644 index 38ef311d59..0000000000 --- a/ext/mysqli/tests/012.phpt +++ /dev/null @@ -1,54 +0,0 @@ ---TEST-- -mysqli fetch mixed values 2 ---FILE-- -<?php - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link,"DROP TABLE IF EXISTS test_bind_result"); - - mysqli_query($link,"CREATE TABLE test_bind_result(c1 tinyint, c2 smallint, - c3 int, c4 bigint, - c5 float, c6 double, - c7 varbinary(10), - c8 varchar(10))"); - - mysqli_query($link,"INSERT INTO test_bind_result VALUES(120,2999,3999,54, - 2.6,58.89, - '206','6.7')"); - - $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_result"); - mysqli_bind_result($stmt, &$c1, &$c2, &$c3, &$c4, &$c5, &$c6, &$c7, &$c8); - mysqli_execute($stmt); - mysqli_fetch($stmt); - - $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7,$c8); - - var_dump($test); - - mysqli_stmt_close($stmt); - mysqli_close($link); -?> ---EXPECT-- -array(8) { - [0]=> - int(120) - [1]=> - int(2999) - [2]=> - int(3999) - [3]=> - int(54) - [4]=> - float(2.5999999046326) - [5]=> - float(58.89) - [6]=> - string(3) "206" - [7]=> - string(3) "6.7" -} diff --git a/ext/mysqli/tests/013.phpt b/ext/mysqli/tests/013.phpt deleted file mode 100644 index dafc9bba9b..0000000000 --- a/ext/mysqli/tests/013.phpt +++ /dev/null @@ -1,45 +0,0 @@ ---TEST-- -mysqli fetch mixed / mysql_query ---FILE-- -<?php - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link,"DROP TABLE IF EXISTS test_bind_result"); - - mysqli_query($link,"CREATE TABLE test_bind_result(c1 tinyint, c2 smallint, - c3 int, c4 bigint, - c5 decimal(4,2), c6 double, - c7 varbinary(10), - c8 varchar(10))"); - - mysqli_query($link,"INSERT INTO test_bind_result VALUES(120,2999,3999,54, - 2.6,58.89, - '206','6.7')"); - $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_result"); - - $c = array(0,0,0,0,0,0,0,0); - mysqli_bind_result($stmt, &$c[0], &$c[1], &$c[2], &$c[3], &$c[4], &$c[5], &$c[6], &$c[7]); - mysqli_execute($stmt); - mysqli_fetch($stmt); - mysqli_fetch($stmt); - mysqli_stmt_close($stmt); - - $result = mysqli_query($link, "select * from test_bind_result"); - $d = mysqli_fetch_row($result); - mysqli_free_result($result); - - $test = ""; - for ($i=0; $i < count($c); $i++) - $test .= ($c[0] == $d[0]) ? "1" : "0"; - - var_dump($test); - - mysqli_close($link); -?> ---EXPECT-- -string(8) "11111111" diff --git a/ext/mysqli/tests/014.phpt b/ext/mysqli/tests/014.phpt deleted file mode 100644 index 8a72c42c7f..0000000000 --- a/ext/mysqli/tests/014.phpt +++ /dev/null @@ -1,66 +0,0 @@ ---TEST-- -mysqli autocommit/commit/rollback ---SKIPIF-- -<?php - include "connect.inc"; - $link = mysqli_connect("localhost", $user, $passwd); - $result = mysqli_query($link, "SHOW VARIABLES LIKE 'have_innodb'"); - $row = mysqli_fetch_row($result); - mysqli_free_result($result); - mysqli_close($link); - - if ($row[1] == "DISABLED" || $row[1] == "NO") { - printf ("skip innodb support is not installed or enabled."); - } -?> ---FILE-- -<?php - include "connect.inc"; - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_autocommit($link, TRUE); - - mysqli_query($link,"DROP TABLE IF EXISTS ac_01"); - - mysqli_query($link,"CREATE TABLE ac_01(a int, b varchar(10)) type=InnoDB"); - - mysqli_query($link, "INSERT INTO ac_01 VALUES (1, 'foobar')"); - mysqli_autocommit($link, FALSE); - mysqli_query($link, "DELETE FROM ac_01"); - mysqli_query($link, "INSERT INTO ac_01 VALUES (2, 'egon')"); - - mysqli_rollback($link); - - $result = mysqli_query($link, "SELECT * FROM ac_01"); - $row = mysqli_fetch_row($result); - mysqli_free_result($result); - - var_dump($row); - - mysqli_query($link, "DELETE FROM ac_01"); - mysqli_query($link, "INSERT INTO ac_01 VALUES (2, 'egon')"); - mysqli_commit($link); - - $result = mysqli_query($link, "SELECT * FROM ac_01"); - $row = mysqli_fetch_row($result); - mysqli_free_result($result); - - var_dump($row); - - mysqli_close($link); -?> ---EXPECT-- -array(2) { - [0]=> - string(1) "1" - [1]=> - string(6) "foobar" -} -array(2) { - [0]=> - string(1) "2" - [1]=> - string(4) "egon" -} diff --git a/ext/mysqli/tests/015.phpt b/ext/mysqli/tests/015.phpt deleted file mode 100644 index 96864e8854..0000000000 --- a/ext/mysqli/tests/015.phpt +++ /dev/null @@ -1,68 +0,0 @@ ---TEST-- -mysqli autocommit/commit/rollback with myisam ---SKIPIF-- -<?php - include "connect.inc"; - $link = mysqli_connect("localhost", $user, $passwd); - $result = mysqli_query($link, "SHOW VARIABLES LIKE 'have_innodb'"); - $row = mysqli_fetch_row($result); - mysqli_free_result($result); - mysqli_close($link); - - if ($row[1] == "NO") { - printf ("skip innodb support not installed."); - } -?> ---FILE-- -<?php - include "connect.inc"; - - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_autocommit($link, TRUE); - - mysqli_query($link,"DROP TABLE IF EXISTS ac_01"); - - mysqli_query($link,"CREATE TABLE ac_01(a int, b varchar(10))"); - - mysqli_query($link, "INSERT INTO ac_01 VALUES (1, 'foobar')"); - mysqli_autocommit($link, FALSE); - - mysqli_query($link, "DELETE FROM ac_01"); - mysqli_query($link, "INSERT INTO ac_01 VALUES (2, 'egon')"); - - mysqli_rollback($link); - - $result = mysqli_query($link, "SELECT * FROM ac_01"); - $row = mysqli_fetch_row($result); - mysqli_free_result($result); - - var_dump($row); - - mysqli_query($link, "DELETE FROM ac_01"); - mysqli_query($link, "INSERT INTO ac_01 VALUES (2, 'egon')"); - mysqli_commit($link); - - $result = mysqli_query($link, "SELECT * FROM ac_01"); - $row = mysqli_fetch_row($result); - mysqli_free_result($result); - - var_dump($row); - - mysqli_close($link); -?> ---EXPECT-- -array(2) { - [0]=> - string(1) "2" - [1]=> - string(4) "egon" -} -array(2) { - [0]=> - string(1) "2" - [1]=> - string(4) "egon" -} diff --git a/ext/mysqli/tests/016.phpt b/ext/mysqli/tests/016.phpt deleted file mode 100644 index 7d84c29655..0000000000 --- a/ext/mysqli/tests/016.phpt +++ /dev/null @@ -1,25 +0,0 @@ ---TEST-- -mysqli fetch user variable ---FILE-- -<?php - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link, "SET @dummy='foobar'"); - - $stmt = mysqli_prepare($link, "SELECT @dummy"); - mysqli_bind_result($stmt, &$dummy); - mysqli_execute($stmt); - mysqli_fetch($stmt); - - var_dump($dummy); - - mysqli_stmt_close($stmt); - mysqli_close($link); -?> ---EXPECT-- -string(6) "foobar" diff --git a/ext/mysqli/tests/017.phpt b/ext/mysqli/tests/017.phpt deleted file mode 100644 index e7aaf746cf..0000000000 --- a/ext/mysqli/tests/017.phpt +++ /dev/null @@ -1,30 +0,0 @@ ---TEST-- -mysqli fetch functions ---FILE-- -<?php - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - $stmt = mysqli_prepare($link, "SELECT current_user(), database()"); - mysqli_bind_result($stmt, &$c0, &$c1); - mysqli_execute($stmt); - - mysqli_fetch($stmt); - - $test = array($c0, $c1); - - var_dump($test); - - mysqli_close($link); -?> ---EXPECT-- -array(2) { - [0]=> - string(14) "root@localhost" - [1]=> - string(4) "test" -} diff --git a/ext/mysqli/tests/018.phpt b/ext/mysqli/tests/018.phpt deleted file mode 100644 index 8fb0d44dc5..0000000000 --- a/ext/mysqli/tests/018.phpt +++ /dev/null @@ -1,25 +0,0 @@ ---TEST-- -mysqli fetch system variables ---FILE-- -<?php - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link, "SET AUTOCOMMIT=0"); - - $stmt = mysqli_prepare($link, "SELECT @@autocommit"); - mysqli_bind_result($stmt, &$c0); - mysqli_execute($stmt); - - mysqli_fetch($stmt); - - var_dump($c0); - - mysqli_close($link); -?> ---EXPECT-- -int(0) diff --git a/ext/mysqli/tests/019.phpt b/ext/mysqli/tests/019.phpt deleted file mode 100644 index 0e13f7520a..0000000000 --- a/ext/mysqli/tests/019.phpt +++ /dev/null @@ -1,68 +0,0 @@ ---TEST-- -mysqli fetch (bind_param + bind_result) ---FILE-- -<?php - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - $rc = mysqli_query($link,"DROP TABLE IF EXISTS insert_read"); - - $rc = mysqli_query($link,"CREATE TABLE insert_read(col1 tinyint, col2 smallint, - col3 int, col4 bigint, - col5 float, col6 double, - col7 date, col8 time, - col9 varbinary(10), - col10 varchar(50), - col11 char(20))"); - - $stmt= mysqli_prepare($link,"INSERT INTO insert_read(col1,col10, col11) VALUES(?,?,?)"); - mysqli_bind_param($stmt, &$c1, MYSQLI_BIND_INT, &$c2, MYSQLI_BIND_STRING, &$c3, MYSQLI_BIND_STRING); - - $c1 = 1; - $c2 = "foo"; - $c3 = "foobar"; - - mysqli_execute($stmt); - mysqli_stmt_close($stmt); - - $stmt = mysqli_prepare($link, "SELECT col1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11 from insert_read"); - mysqli_bind_result($stmt, &$c1, &$c2, &$c3, &$c4, &$c5, &$c6, &$c7, &$c8, &$c9, &$c10, &$c11); - mysqli_execute($stmt); - - mysqli_fetch($stmt); - - $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7,$c8,$c9,$c10,$c11); - - var_dump($test); - - mysqli_stmt_close($stmt); - mysqli_close($link); -?> ---EXPECT-- -array(11) { - [0]=> - int(1) - [1]=> - NULL - [2]=> - NULL - [3]=> - NULL - [4]=> - NULL - [5]=> - NULL - [6]=> - NULL - [7]=> - NULL - [8]=> - NULL - [9]=> - string(3) "foo" - [10]=> - string(6) "foobar" -} diff --git a/ext/mysqli/tests/020.phpt b/ext/mysqli/tests/020.phpt deleted file mode 100644 index 53827d0be3..0000000000 --- a/ext/mysqli/tests/020.phpt +++ /dev/null @@ -1,70 +0,0 @@ ---TEST-- -mysqli bind_param/bind_result date ---FILE-- -<?php - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link,"DROP TABLE IF EXISTS test_bind_result"); - mysqli_query($link,"CREATE TABLE test_bind_result(c1 date, c2 time, - c3 timestamp(14), - c4 year, - c5 datetime, - c6 timestamp(4), - c7 timestamp(6))"); - - $stmt = mysqli_prepare($link, "INSERT INTO test_bind_result VALUES (?,?,?,?,?,?,?)"); - mysqli_bind_param($stmt, &$d1, MYSQLI_BIND_STRING, - &$d2, MYSQLI_BIND_STRING, - &$d3, MYSQLI_BIND_STRING, - &$d4, MYSQLI_BIND_STRING, - &$d5, MYSQLI_BIND_STRING, - &$d6, MYSQLI_BIND_STRING, - &$d7, MYSQLI_BIND_STRING); - - $d1 = '2002-01-02'; - $d2 = '12:49:00'; - $d3 = '2002-01-02 17:46:59'; - $d4 = 2010; - $d5 ='2010-07-10'; - $d6 = '2020'; - $d7 = '1999-12-29'; - - mysqli_execute($stmt); - mysqli_stmt_close($stmt); - - $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_result"); - - mysqli_bind_result($stmt,&$c1, &$c2, &$c3, &$c4, &$c5, &$c6, &$c7); - - mysqli_execute($stmt); - mysqli_fetch($stmt); - - $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7); - - var_dump($test); - - mysqli_stmt_close($stmt); - mysqli_close($link); -?> ---EXPECT-- -array(7) { - [0]=> - string(10) "2002-01-02" - [1]=> - string(8) "12:49:00" - [2]=> - string(19) "2002-01-02 17:46:59" - [3]=> - int(2010) - [4]=> - string(19) "2010-07-10 00:00:00" - [5]=> - string(0) "" - [6]=> - string(19) "1999-12-29 00:00:00" -} diff --git a/ext/mysqli/tests/021.phpt b/ext/mysqli/tests/021.phpt deleted file mode 100644 index deabef6933..0000000000 --- a/ext/mysqli/tests/021.phpt +++ /dev/null @@ -1,40 +0,0 @@ ---TEST-- -mysqli bind_param+bind_result char/text ---FILE-- -<?php - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch"); - mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 char(10), c2 text)"); - - $stmt = mysqli_prepare($link, "INSERT INTO test_bind_fetch VALUES (?,?)"); - mysqli_bind_param($stmt, &$q1, MYSQLI_BIND_STRING, &$q2, MYSQLI_BIND_STRING); - $q1 = "1234567890"; - $q2 = "this is a test"; - mysqli_execute($stmt); - mysqli_stmt_close($stmt); - - $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch"); - mysqli_bind_result($stmt, &$c1, &$c2); - mysqli_execute($stmt); - mysqli_fetch($stmt); - - $test = array($c1,$c2); - - var_dump($test); - - mysqli_stmt_close($stmt); - mysqli_close($link); -?> ---EXPECT-- -array(2) { - [0]=> - string(10) "1234567890" - [1]=> - string(14) "this is a test" -} diff --git a/ext/mysqli/tests/022.phpt b/ext/mysqli/tests/022.phpt deleted file mode 100644 index efd2fef8bd..0000000000 --- a/ext/mysqli/tests/022.phpt +++ /dev/null @@ -1,44 +0,0 @@ ---TEST-- -mysqli bind_param/bind_result char/text long ---FILE-- -<?php - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch"); - mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 char(10), c2 text)"); - - - $stmt = mysqli_prepare($link, "INSERT INTO test_bind_fetch VALUES (?,?)"); - mysqli_bind_param($stmt, &$a1, MYSQLI_BIND_STRING, &$a2, MYSQLI_BIND_STRING); - - $a1 = "1234567890"; - $a2 = str_repeat("A1", 32000); - - mysqli_execute($stmt); - mysqli_stmt_close($stmt); - - $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch"); - mysqli_bind_result($stmt, &$c1, &$c2); - mysqli_execute($stmt); - mysqli_fetch($stmt); - - $test[] = $c1; - $test[] = ($a2 == $c2) ? "32K String ok" : "32K String failed"; - - var_dump($test); - - mysqli_stmt_close($stmt); - mysqli_close($link); -?> ---EXPECT-- -array(2) { - [0]=> - string(10) "1234567890" - [1]=> - string(13) "32K String ok" -} diff --git a/ext/mysqli/tests/023.phpt b/ext/mysqli/tests/023.phpt deleted file mode 100644 index fcbd4b2cfc..0000000000 --- a/ext/mysqli/tests/023.phpt +++ /dev/null @@ -1,64 +0,0 @@ ---TEST-- -mysqli bind_param/bind_prepare fetch long values ---FILE-- -<?php - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch"); - mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 int unsigned, - c2 int unsigned, - c3 int, - c4 int, - c5 int, - c6 int unsigned, - c7 int)"); - - $stmt = mysqli_prepare($link, "INSERT INTO test_bind_fetch VALUES (?,?,?,?,?,?,?)"); - mysqli_bind_param($stmt, &$c1,MYSQLI_BIND_INT,&$c2,MYSQLI_BIND_INT,&$c3,MYSQLI_BIND_INT, - &$c4,MYSQLI_BIND_INT,&$c5,MYSQLI_BIND_INT,&$c6,MYSQLI_BIND_INT, - &$c7, MYSQLI_BIND_INT); - $c1 = -23; - $c2 = 35999; - $c3 = NULL; - $c4 = -500; - $c5 = -9999999; - $c6 = -0; - $c7 = 0; - - mysqli_execute($stmt); - mysqli_stmt_close($stmt); - - $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch"); - mysqli_bind_result($stmt, &$c1, &$c2, &$c3, &$c4, &$c5, &$c6, &$c7); - mysqli_execute($stmt); - mysqli_fetch($stmt); - - $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7); - - var_dump($test); - - mysqli_stmt_close($stmt); - mysqli_close($link); -?> ---EXPECT-- -array(7) { - [0]=> - int(0) - [1]=> - int(35999) - [2]=> - NULL - [3]=> - int(-500) - [4]=> - int(-9999999) - [5]=> - int(0) - [6]=> - int(0) -} diff --git a/ext/mysqli/tests/024.phpt b/ext/mysqli/tests/024.phpt deleted file mode 100644 index e31064a02a..0000000000 --- a/ext/mysqli/tests/024.phpt +++ /dev/null @@ -1,65 +0,0 @@ ---TEST-- -mysqli bind_param/bind_result short values ---FILE-- -<?php - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch"); - mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 smallint unsigned, - c2 smallint unsigned, - c3 smallint, - c4 smallint, - c5 smallint, - c6 smallint unsigned, - c7 smallint)"); - - $stmt = mysqli_prepare($link, "INSERT INTO test_bind_fetch VALUES (?,?,?,?,?,?,?)"); - mysqli_bind_param($stmt, &$c1,MYSQLI_BIND_INT,&$c2,MYSQLI_BIND_INT,&$c3,MYSQLI_BIND_INT, - &$c4,MYSQLI_BIND_INT,&$c5,MYSQLI_BIND_INT,&$c6,MYSQLI_BIND_INT, - &$c7, MYSQLI_BIND_INT); - - $c1 = -23; - $c2 = 35999; - $c3 = NULL; - $c4 = -500; - $c5 = -9999999; - $c6 = -0; - $c7 = 0; - - mysqli_execute($stmt); - mysqli_stmt_close($stmt); - - $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch"); - mysqli_bind_result($stmt, &$c1, &$c2, &$c3, &$c4, &$c5, &$c6, &$c7); - mysqli_execute($stmt); - mysqli_fetch($stmt); - - $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7); - - var_dump($test); - - mysqli_stmt_close($stmt); - mysqli_close($link); -?> ---EXPECT-- -array(7) { - [0]=> - int(0) - [1]=> - int(35999) - [2]=> - NULL - [3]=> - int(-500) - [4]=> - int(-32768) - [5]=> - int(0) - [6]=> - int(0) -} diff --git a/ext/mysqli/tests/025.phpt b/ext/mysqli/tests/025.phpt deleted file mode 100644 index f32ef143f2..0000000000 --- a/ext/mysqli/tests/025.phpt +++ /dev/null @@ -1,68 +0,0 @@ ---TEST-- -mysqli bind_param/bind_result tinyint values ---FILE-- -<?php - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch"); - mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 tinyint, - c2 tinyint unsigned, - c3 tinyint not NULL, - c4 tinyint, - c5 tinyint, - c6 tinyint unsigned, - c7 tinyint)"); - - $stmt = mysqli_prepare ($link, "INSERT INTO test_bind_fetch VALUES(?,?,?,?,?,?,?)"); - mysqli_bind_param($stmt,&$c1, MYSQLI_BIND_INT,&$c2, MYSQLI_BIND_INT,&$c3, MYSQLI_BIND_INT,&$c4, MYSQLI_BIND_INT, - &$c5, MYSQLI_BIND_INT,&$c6, MYSQLI_BIND_INT,&$c7, MYSQLI_BIND_INT); - - $c1 = -23; - $c2 = 300; - $c3 = 0; - $c4 = -100; - $c5 = -127; - $c6 = 30; - $c7 = 0; - - mysqli_execute($stmt); - mysqli_stmt_close($stmt); - - mysqli_query($link, "INSERT INTO test_bind_fetch VALUES (-23,300,0,-100,-127,+30,0)"); - - $c1 = $c2 = $c3 = $c4 = $c5 = $c6 = $c7 = NULL; - - $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch"); - mysqli_bind_result($stmt, &$c1, &$c2, &$c3, &$c4, &$c5, &$c6, &$c7); - mysqli_execute($stmt); - mysqli_fetch($stmt); - - $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7); - - var_dump($test); - - mysqli_stmt_close($stmt); - mysqli_close($link); -?> ---EXPECT-- -array(7) { - [0]=> - int(-23) - [1]=> - int(255) - [2]=> - int(0) - [3]=> - int(-100) - [4]=> - int(-127) - [5]=> - int(30) - [6]=> - int(0) -} diff --git a/ext/mysqli/tests/026.phpt b/ext/mysqli/tests/026.phpt deleted file mode 100644 index ef1b66862d..0000000000 --- a/ext/mysqli/tests/026.phpt +++ /dev/null @@ -1,48 +0,0 @@ ---TEST-- -mysqli bind_param/bind_result with send_long_data ---FILE-- -<?php - $user = "root"; - $passwd = ""; - - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch"); - mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 varchar(10), c2 text)"); - - $stmt = mysqli_prepare ($link, "INSERT INTO test_bind_fetch VALUES (?,?)"); - mysqli_bind_param($stmt,&$c1, MYSQLI_BIND_STRING, &$c2, MYSQLI_BIND_SEND_DATA); - - $c1 = "Hello World"; - - mysqli_send_long_data($stmt, 2, "This is the first sentence."); - mysqli_send_long_data($stmt, 2, " And this is the second sentence."); - mysqli_send_long_data($stmt, 2, " And finally this is the last sentence."); - - mysqli_execute($stmt); - mysqli_stmt_close($stmt); - - $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch"); - mysqli_bind_result($stmt, &$d1, &$d2); - mysqli_execute($stmt); - mysqli_fetch($stmt); - - $test = array($d1,$d2); - - var_dump($test); - - mysqli_stmt_close($stmt); - - mysqli_close($link); -?> ---EXPECT-- -array(2) { - [0]=> - string(10) "Hello Worl" - [1]=> - string(99) "This is the first sentence. And this is the second sentence. And finally this is the last sentence." -} diff --git a/ext/mysqli/tests/029.phpt b/ext/mysqli/tests/029.phpt deleted file mode 100644 index 7680b228e9..0000000000 --- a/ext/mysqli/tests/029.phpt +++ /dev/null @@ -1,25 +0,0 @@ ---TEST-- -function test: mysqli_affected_rows ---FILE-- -<?php - $user = "root"; - $passwd = ""; - - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link, "drop table if exists general_test"); - mysqli_query($link, "create table general_test (a int)"); - mysqli_query($link, "insert into general_test values (1),(2),(3)"); - - $afc = mysqli_affected_rows($link); - - var_dump($afc); - - mysqli_close($link); -?> ---EXPECT-- -int(3) diff --git a/ext/mysqli/tests/030.phpt b/ext/mysqli/tests/030.phpt deleted file mode 100644 index da87218627..0000000000 --- a/ext/mysqli/tests/030.phpt +++ /dev/null @@ -1,24 +0,0 @@ ---TEST-- -function test: mysqli_errno ---FILE-- -<?php - $user = "root"; - $passwd = ""; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - $errno = mysqli_errno($link); - var_dump($errno); - - mysqli_select_db($link, "test"); - - mysqli_query($link, "select * from non_exisiting_table"); - $errno = mysqli_errno($link); - - var_dump($errno); - - mysqli_close($link); -?> ---EXPECT-- -int(0) -int(1146) diff --git a/ext/mysqli/tests/031.phpt b/ext/mysqli/tests/031.phpt deleted file mode 100644 index 61bfb5bb32..0000000000 --- a/ext/mysqli/tests/031.phpt +++ /dev/null @@ -1,24 +0,0 @@ ---TEST-- -function test: mysqli_error ---FILE-- -<?php - $user = "root"; - $passwd = ""; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - $error = mysqli_error($link); - var_dump($error); - - mysqli_select_db($link, "test"); - - mysqli_query($link, "select * from non_exisiting_table"); - $error = mysqli_error($link); - - var_dump($error); - - mysqli_close($link); -?> ---EXPECT-- -string(0) "" -string(46) "Table 'test.non_exisiting_table' doesn't exist" diff --git a/ext/mysqli/tests/032.phpt b/ext/mysqli/tests/032.phpt deleted file mode 100644 index 02564834d8..0000000000 --- a/ext/mysqli/tests/032.phpt +++ /dev/null @@ -1,25 +0,0 @@ ---TEST-- -function test: mysqli_info ---FILE-- -<?php - $user = "root"; - $passwd = ""; - - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link, "drop table if exists general_test"); - mysqli_query($link, "create table general_test (a int)"); - mysqli_query($link, "insert into general_test values (1),(2),(3)"); - - $afc = mysqli_info($link); - - var_dump($afc); - - mysqli_close($link); -?> ---EXPECT-- -string(38) "Records: 3 Duplicates: 0 Warnings: 0" diff --git a/ext/mysqli/tests/033.phpt b/ext/mysqli/tests/033.phpt deleted file mode 100644 index e3d8d159d0..0000000000 --- a/ext/mysqli/tests/033.phpt +++ /dev/null @@ -1,19 +0,0 @@ ---TEST-- -function test: mysqli_get_host_info ---FILE-- -<?php - $user = "root"; - $passwd = ""; - - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - $hinfo = mysqli_get_host_info($link); - - var_dump($hinfo); - - mysqli_close($link); -?> ---EXPECT-- -string(25) "Localhost via UNIX socket" diff --git a/ext/mysqli/tests/034.phpt b/ext/mysqli/tests/034.phpt deleted file mode 100644 index e347586a36..0000000000 --- a/ext/mysqli/tests/034.phpt +++ /dev/null @@ -1,19 +0,0 @@ ---TEST-- -function test: mysqli_get_proto_info ---FILE-- -<?php - $user = "root"; - $passwd = ""; - - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - $pinfo = mysqli_get_proto_info($link); - - var_dump($pinfo); - - mysqli_close($link); -?> ---EXPECT-- -int(10) diff --git a/ext/mysqli/tests/035.phpt b/ext/mysqli/tests/035.phpt deleted file mode 100644 index 34af7c0a56..0000000000 --- a/ext/mysqli/tests/035.phpt +++ /dev/null @@ -1,19 +0,0 @@ ---TEST-- -function test: mysqli_get_server_info ---FILE-- -<?php - $user = "root"; - $passwd = ""; - - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - $sinfo = substr(mysqli_get_server_info($link),0,1); - - var_dump($sinfo); - - mysqli_close($link); -?> ---EXPECT-- -string(1) "4" diff --git a/ext/mysqli/tests/036.phpt b/ext/mysqli/tests/036.phpt deleted file mode 100644 index 080c6e32e4..0000000000 --- a/ext/mysqli/tests/036.phpt +++ /dev/null @@ -1,43 +0,0 @@ ---TEST-- -function test: mysqli_insert_id() ---FILE-- -<?php - - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link, "DROP TABLE IF EXISTS t036"); - - mysqli_query($link, "CREATE TABLE t036 (a bigint not null auto_increment primary key, b varchar(10))"); - - - mysqli_query($link, "INSERT INTO t036 (b) VALUES ('foo1')"); - $test[] = mysqli_insert_id($link); - - /* we have to insert more values, cause lexer sets auto_increment to max_int - see mysql bug #54. So we don't check for the value, only for type (which must - be type string) - */ - - mysqli_query($link, "ALTER TABLE t036 AUTO_INCREMENT=9999999999999998"); - mysqli_query($link, "INSERT INTO t036 (b) VALUES ('foo2')"); - mysqli_query($link, "INSERT INTO t036 (b) VALUES ('foo3')"); - mysqli_query($link, "INSERT INTO t036 (b) VALUES ('foo4')"); - $x = mysqli_insert_id($link); - $test[] = is_string($x); - - var_dump($test); - - mysqli_close($link); -?> ---EXPECT-- -array(2) { - [0]=> - int(1) - [1]=> - bool(true) -} diff --git a/ext/mysqli/tests/037.phpt b/ext/mysqli/tests/037.phpt deleted file mode 100644 index f8b8a13f1a..0000000000 --- a/ext/mysqli/tests/037.phpt +++ /dev/null @@ -1,34 +0,0 @@ ---TEST-- -function test: mysqli_field_count() ---FILE-- -<?php - - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link, "DROP TABLE IF EXISTS test_result"); - - mysqli_query($link, "CREATE TABLE test_result (a int, b varchar(10))"); - - mysqli_query($link, "INSERT INTO test_result VALUES (1, 'foo')"); - $ir[] = mysqli_field_count($link); - - mysqli_real_query($link, "SELECT * FROM test_result"); - $ir[] = mysqli_field_count($link); - - - var_dump($ir); - - mysqli_close($link); -?> ---EXPECT-- -array(2) { - [0]=> - int(0) - [1]=> - int(2) -} diff --git a/ext/mysqli/tests/038.phpt b/ext/mysqli/tests/038.phpt deleted file mode 100644 index 858b3e3393..0000000000 --- a/ext/mysqli/tests/038.phpt +++ /dev/null @@ -1,31 +0,0 @@ ---TEST-- -function test: mysqli_num_fields() ---FILE-- -<?php - - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link, "DROP TABLE IF EXISTS test_result"); - - mysqli_query($link, "CREATE TABLE test_result (a int, b varchar(10))"); - - mysqli_query($link, "INSERT INTO test_result VALUES (1, 'foo')"); - - mysqli_real_query($link, "SELECT * FROM test_result"); - if (mysqli_field_count($link)) { - $result = mysqli_store_result($link); - $num = mysqli_num_fields($result); - mysqli_free_result($result); - } - - var_dump($num); - - mysqli_close($link); -?> ---EXPECT-- -int(2) diff --git a/ext/mysqli/tests/039.phpt b/ext/mysqli/tests/039.phpt deleted file mode 100644 index 6ddb37bc5f..0000000000 --- a/ext/mysqli/tests/039.phpt +++ /dev/null @@ -1,24 +0,0 @@ ---TEST-- -function test: mysqli_num_fields() 2 ---FILE-- -<?php - - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_real_query($link, "SHOW VARIABLES"); - - if (mysqli_field_count($link)) { - $result = mysqli_store_result($link); - $num = mysqli_num_fields($result); - mysqli_free_result($result); - } - - var_dump($num); - - mysqli_close($link); -?> ---EXPECT-- -int(2) diff --git a/ext/mysqli/tests/040.phpt b/ext/mysqli/tests/040.phpt deleted file mode 100644 index 477e2a5274..0000000000 --- a/ext/mysqli/tests/040.phpt +++ /dev/null @@ -1,31 +0,0 @@ ---TEST-- -function test: mysqli_num_rows() ---FILE-- -<?php - - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link, "DROP TABLE IF EXISTS test_result"); - - mysqli_query($link, "CREATE TABLE test_result (a int, b varchar(10))"); - - mysqli_query($link, "INSERT INTO test_result VALUES (1, 'foo')"); - - mysqli_real_query($link, "SELECT * FROM test_result"); - if (mysqli_field_count($link)) { - $result = mysqli_store_result($link); - $num = mysqli_num_rows($result); - mysqli_free_result($result); - } - - var_dump($num); - - mysqli_close($link); -?> ---EXPECT-- -int(1) diff --git a/ext/mysqli/tests/041.phpt b/ext/mysqli/tests/041.phpt deleted file mode 100644 index 6fb8ee7e3f..0000000000 --- a/ext/mysqli/tests/041.phpt +++ /dev/null @@ -1,24 +0,0 @@ ---TEST-- -function test: mysqli_warning_count() ---FILE-- -<?php - - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link, "DROP TABLE IF EXISTS test_warnings"); - - mysqli_query($link, "CREATE TABLE test_warnings (a int not null"); - - mysqli_query($link, "INSERT INTO test_warnings VALUES (1),(2),(NULL)"); - $num = mysqli_warning_count($link); - var_dump($num); - - mysqli_close($link); -?> ---EXPECT-- -int(1) diff --git a/ext/mysqli/tests/043.phpt b/ext/mysqli/tests/043.phpt deleted file mode 100644 index 9c02c32c1a..0000000000 --- a/ext/mysqli/tests/043.phpt +++ /dev/null @@ -1,40 +0,0 @@ ---TEST-- -mysqli_bind_param (UPDATE) ---FILE-- -<?php - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link,"DROP TABLE IF EXISTS test_update"); - mysqli_query($link,"CREATE TABLE test_update(a varchar(10), - b int)"); - - mysqli_query($link, "INSERT INTO test_update VALUES ('foo', 2)"); - - $stmt = mysqli_prepare($link, "UPDATE test_update SET a=?,b=? WHERE b=?"); - mysqli_bind_param($stmt, &$c1,MYSQLI_BIND_STRING,&$c2,MYSQLI_BIND_INT, &$c3, MYSQLI_BIND_INT); - - $c1 = "Rasmus"; - $c2 = 1; - $c3 = 2; - - mysqli_execute($stmt); - mysqli_stmt_close($stmt); - - $result = mysqli_query($link, "SELECT concat(a, ' is No. ', b) FROM test_update"); - $test = mysqli_fetch_row($result); - mysqli_free_result($result); - - var_dump($test); - - mysqli_close($link); -?> ---EXPECT-- -array(1) { - [0]=> - string(15) "Rasmus is No. 1" -} diff --git a/ext/mysqli/tests/044.phpt b/ext/mysqli/tests/044.phpt deleted file mode 100644 index 5f72f65e38..0000000000 --- a/ext/mysqli/tests/044.phpt +++ /dev/null @@ -1,19 +0,0 @@ ---TEST-- -mysqli_get_server_version ---FILE-- -<?php - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - $i = mysqli_get_server_version($link); - - $test = $i / $i; - - var_dump($test); - - mysqli_close($link); -?> ---EXPECT-- -int(1) diff --git a/ext/mysqli/tests/045.phpt b/ext/mysqli/tests/045.phpt deleted file mode 100644 index 5ca0f2ae02..0000000000 --- a/ext/mysqli/tests/045.phpt +++ /dev/null @@ -1,28 +0,0 @@ ---TEST-- -mysqli_bind_result (SHOW) ---FILE-- -<?php - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - $stmt = mysqli_prepare($link, "SHOW VARIABLES LIKE 'port'"); - - mysqli_execute($stmt); - mysqli_bind_result($stmt, &$c1, &$c2); - mysqli_fetch($stmt); - mysqli_stmt_close($stmt); - $test = array ($c1,$c2); - - var_dump($test); - - mysqli_close($link); -?> ---EXPECT-- -array(2) { - [0]=> - string(4) "port" - [1]=> - string(4) "3306" -} diff --git a/ext/mysqli/tests/046.phpt b/ext/mysqli/tests/046.phpt deleted file mode 100644 index d4a93ca277..0000000000 --- a/ext/mysqli/tests/046.phpt +++ /dev/null @@ -1,31 +0,0 @@ ---TEST-- -mysqli_stmt_affected_rows (delete) ---FILE-- -<?php - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link, "DROP TABLE IF EXISTS test_affected"); - mysqli_query($link, "CREATE TABLE test_affected (foo int)"); - - mysqli_query($link, "INSERT INTO test_affected VALUES (1),(2),(3),(4),(5)"); - - $stmt = mysqli_prepare($link, "DELETE FROM test_affected WHERE foo=?"); - mysqli_bind_param($stmt, &$c1, MYSQLI_BIND_INT); - - $c1 = 2; - - mysqli_execute($stmt); - $x = mysqli_stmt_affected_rows($stmt); - - mysqli_stmt_close($stmt); - var_dump($x==1); - - mysqli_close($link); -?> ---EXPECT-- -bool(true) diff --git a/ext/mysqli/tests/050.phpt b/ext/mysqli/tests/050.phpt deleted file mode 100644 index 9ab5d346f8..0000000000 --- a/ext/mysqli/tests/050.phpt +++ /dev/null @@ -1,19 +0,0 @@ ---TEST-- -non freed statement test ---FILE-- -<?php - include "connect.inc"; - - /************************ - * non freed stamement - ************************/ - $link = mysqli_connect("localhost", $user, $passwd); - - $stmt = mysqli_prepare($link, "SELECT CURRENT_USER()"); - mysqli_execute($stmt); - - mysqli_close($link); - printf("Ok\n"); -?> ---EXPECT-- -Ok diff --git a/ext/mysqli/tests/051.phpt b/ext/mysqli/tests/051.phpt deleted file mode 100644 index dde734a1e0..0000000000 --- a/ext/mysqli/tests/051.phpt +++ /dev/null @@ -1,20 +0,0 @@ ---TEST-- -free statement after close ---FILE-- -<?php - include "connect.inc"; - - /************************ - * free statement after close - ************************/ - $link = mysqli_connect("localhost", $user, $passwd); - - $stmt1 = mysqli_prepare($link, "SELECT CURRENT_USER()"); - mysqli_execute($stmt1); - - mysqli_close($link); - @mysqli_stmt_close($stmt1); - printf("Ok\n"); -?> ---EXPECT-- -Ok diff --git a/ext/mysqli/tests/052.phpt b/ext/mysqli/tests/052.phpt deleted file mode 100644 index 4ae9b12c50..0000000000 --- a/ext/mysqli/tests/052.phpt +++ /dev/null @@ -1,20 +0,0 @@ ---TEST-- -call statement after close ---FILE-- -<?php - include "connect.inc"; - - /************************ - * statement call after close - ************************/ - $link = mysqli_connect("localhost", $user, $passwd); - - $stmt2 = mysqli_prepare($link, "SELECT CURRENT_USER()"); - - mysqli_close($link); - @mysqli_execute($stmt2); - @mysqli_stmt_close($stmt2); - printf("Ok\n"); -?> ---EXPECT-- -Ok diff --git a/ext/mysqli/tests/053.phpt b/ext/mysqli/tests/053.phpt deleted file mode 100644 index f542d0f099..0000000000 --- a/ext/mysqli/tests/053.phpt +++ /dev/null @@ -1,18 +0,0 @@ ---TEST-- -not freed resultset ---FILE-- -<?php - include "connect.inc"; - - /************************ - * non freed resultset - ************************/ - $link = mysqli_connect("localhost", $user, $passwd); - - $result = mysqli_query($link, "SELECT CURRENT_USER()"); - mysqli_close($link); - printf("Ok\n"); - -?> ---EXPECT-- -Ok diff --git a/ext/mysqli/tests/054.phpt b/ext/mysqli/tests/054.phpt deleted file mode 100644 index eab207db4d..0000000000 --- a/ext/mysqli/tests/054.phpt +++ /dev/null @@ -1,18 +0,0 @@ ---TEST-- -free resultset after close ---FILE-- -<?php - include "connect.inc"; - - /************************ - * free resultset after close - ************************/ - $link = mysqli_connect("localhost", $user, $passwd); - - $result1 = mysqli_query($link, "SELECT CURRENT_USER()"); - mysqli_close($link); - mysqli_free_result($result1); - printf("Ok\n"); -?> ---EXPECT-- -Ok diff --git a/ext/mysqli/tests/055.phpt b/ext/mysqli/tests/055.phpt deleted file mode 100644 index e777bcfc99..0000000000 --- a/ext/mysqli/tests/055.phpt +++ /dev/null @@ -1,17 +0,0 @@ ---TEST-- -free nothing ---FILE-- -<?php - include "connect.inc"; - - /************************ - * don't free anything - ************************/ - $link = mysqli_connect("localhost", $user, $passwd); - - $result2 = mysqli_query($link, "SELECT CURRENT_USER()"); - $stmt2 = mysqli_prepare($link, "SELECT CURRENT_USER()"); - printf("Ok\n"); -?> ---EXPECT-- -Ok diff --git a/ext/mysqli/tests/057.phpt b/ext/mysqli/tests/057.phpt deleted file mode 100644 index a7333a0d93..0000000000 --- a/ext/mysqli/tests/057.phpt +++ /dev/null @@ -1,52 +0,0 @@ ---TEST-- -mysqli_prepare_result ---FILE-- -<?php - include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link,"DROP TABLE IF EXISTS test_store_result"); - mysqli_query($link,"CREATE TABLE test_store_result (a int)"); - - mysqli_query($link, "INSERT INTO test_store_result VALUES (1),(2),(3)"); - - $stmt = mysqli_prepare($link, "SELECT * FROM test_store_result"); - mysqli_execute($stmt); - - /* this should produce an out of sync error */ - if ($result = mysqli_query($link, "SELECT * FROM test_store_result")) { - mysqli_free_result($result); - printf ("Query ok\n"); - } - mysqli_stmt_close($stmt); - - $stmt = mysqli_prepare($link, "SELECT * FROM test_store_result"); - mysqli_execute($stmt); - $result1 = mysqli_prepare_result($stmt); - mysqli_stmt_store_result($stmt); - - printf ("Rows: %d\n", mysqli_stmt_affected_rows($stmt)); - - /* this should show an error, cause results are not buffered */ - if ($result = mysqli_query($link, "SELECT * FROM test_store_result")) { - $row = mysqli_fetch_row($result); - mysqli_free_result($result); - } - - - var_dump($row); - - mysqli_free_result($result1); - mysqli_stmt_close($stmt); - mysqli_close($link); -?> ---EXPECT-- -Rows: 3 -array(1) { - [0]=> - string(1) "1" -} diff --git a/pear/tests/osguess.php b/pear/tests/osguess.php deleted file mode 100644 index b8356a53a8..0000000000 --- a/pear/tests/osguess.php +++ /dev/null @@ -1,6 +0,0 @@ -<?php - -include dirname(__FILE__)."/../OS/Guess.php"; -$os =& new OS_Guess; -print $os->getSignature() . "\n"; - |