summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/dbplus/CREDITS2
-rw-r--r--ext/dbplus/EXPERIMENTAL5
-rw-r--r--ext/dbplus/README3
-rw-r--r--ext/dbplus/config.m447
-rw-r--r--ext/dbplus/dbplus.c247
-rw-r--r--ext/dbplus/php_dbplus.c1557
-rw-r--r--ext/dbplus/php_dbplus.h122
-rw-r--r--ext/dbplus/tests/001.phpt23
8 files changed, 0 insertions, 2006 deletions
diff --git a/ext/dbplus/CREDITS b/ext/dbplus/CREDITS
deleted file mode 100644
index ad7e7425a3..0000000000
--- a/ext/dbplus/CREDITS
+++ /dev/null
@@ -1,2 +0,0 @@
-dbplus
-Hartmut Holzgraefe
diff --git a/ext/dbplus/EXPERIMENTAL b/ext/dbplus/EXPERIMENTAL
deleted file mode 100644
index 6443e99646..0000000000
--- a/ext/dbplus/EXPERIMENTAL
+++ /dev/null
@@ -1,5 +0,0 @@
-this extension is experimental,
-its functions may change their names
-or move to extension all together
-so do not rely to much on them
-you have been warned!
diff --git a/ext/dbplus/README b/ext/dbplus/README
deleted file mode 100644
index e313a10377..0000000000
--- a/ext/dbplus/README
+++ /dev/null
@@ -1,3 +0,0 @@
-experimental db++ extension
-for more information on db++ see
-http://www.concept-asa.de
diff --git a/ext/dbplus/config.m4 b/ext/dbplus/config.m4
deleted file mode 100644
index c2322a1174..0000000000
--- a/ext/dbplus/config.m4
+++ /dev/null
@@ -1,47 +0,0 @@
-dnl
-dnl $Id$
-dnl
-
-PHP_ARG_WITH(dbplus, for dbplus support,
-[ --with-dbplus Include dbplus support])
-
-if test "$PHP_DBPLUS" != "no"; then
- # --with-dbplus -> check with-path
- SEARCH_PATH="/usr/dbplus /usr/local/dbplus /opt/dbplus"
- SEARCH_FOR="/include/dbconfig.h"
- if test -r $PHP_DBPLUS/; then # path given as parameter
- DBPLUS_DIR=$PHP_DBPLUS
- else # search default path list
- AC_MSG_CHECKING(for dbplus files in default path)
- for i in $SEARCH_PATH ; do
- if test -r $i/$SEARCH_FOR; then
- DBPLUS_DIR=$i
- AC_MSG_RESULT(found in $i)
- fi
- done
- fi
-
- if test -z "$DBPLUS_DIR"; then
- AC_MSG_RESULT(not found)
- AC_MSG_ERROR(Please reinstall the dbplus distribution)
- fi
-
- # --with-dbplus -> add include path
- PHP_ADD_INCLUDE($DBPLUS_DIR/include)
-
- # --with-dbplus -> chech for lib and symbol presence
- LIBNAME=Ddb
- LIBSYMBOL=Db_Init
- old_LIBS=$LIBS
- LIBS="-L$DBPLUS_DIR/lib -lm -ldl -lDmacc -lDracc"
- AC_CHECK_LIB($LIBNAME, $LIBSYMBOL, [AC_DEFINE(HAVE_DBPLUSLIB,1,[ ])],
- [AC_MSG_ERROR(wrong dbplus lib version or lib not found)])
- LIBS=$old_LIBS
-
- PHP_SUBST(DBPLUS_SHARED_LIBADD)
- PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $DBPLUS_DIR/lib, DBPLUS_SHARED_LIBADD)
- PHP_ADD_LIBRARY_WITH_PATH(Dmacc, $DBPLUS_DIR/lib, DBPLUS_SHARED_LIBADD)
- PHP_ADD_LIBRARY_WITH_PATH(Dracc, $DBPLUS_DIR/lib, DBPLUS_SHARED_LIBADD)
-
- PHP_NEW_EXTENSION(dbplus, dbplus.c php_dbplus.c , $ext_shared)
-fi
diff --git a/ext/dbplus/dbplus.c b/ext/dbplus/dbplus.c
deleted file mode 100644
index 5783528178..0000000000
--- a/ext/dbplus/dbplus.c
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP Version 4 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997-2002 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: Hartmut Holzgraefe <hartmut@six.de> |
- +----------------------------------------------------------------------+
- */
-
-#include "php.h"
-#include "ext/standard/info.h"
-#include "php_ini.h"
-#include "php_dbplus.h"
-
-#include <saccess.h>
-#include <relation.h>
-#include <dblight.h>
-
-
-/* If you declare any globals in php_dbplus.h uncomment this:
-ZEND_DECLARE_MODULE_GLOBALS(dbplus)
-*/
-
-#ifdef COMPILE_DL_DBPLUS
-ZEND_GET_MODULE(dbplus)
-#endif
-
-
-/* {{{ Resource handling */
-
-/* True global resources - no need for thread safety here */
-int le_dbplus_relation;
-int le_dbplus_tupel;
-
-void dbplus_destruct_relation(zend_rsrc_list_entry *rsrc TSRMLS_DC)
-{
- relf *conn = (relf *)(rsrc->ptr);
-
- cdb_close(conn);
-}
-
-
-void dbplus_destruct_tupel(zend_rsrc_list_entry *rsrc TSRMLS_DC)
-{
- tuple *t = (tuple *)(rsrc->ptr);
-
- efree(t);
-}
-
-/* }}} */
-
-/* {{{ function table */
-
-/* Every user visible function must have an entry in dbplus_functions[].
-*/
-function_entry dbplus_functions[] = {
- PHP_FE(dbplus_add, NULL)
- PHP_FE(dbplus_aql, NULL)
- PHP_FE(dbplus_chdir, NULL)
- PHP_FE(dbplus_close, NULL)
- PHP_FE(dbplus_curr, NULL)
- PHP_FE(dbplus_errno, NULL)
- PHP_FE(dbplus_errcode, NULL)
- PHP_FE(dbplus_find, NULL)
- PHP_FE(dbplus_first, NULL)
- PHP_FE(dbplus_flush, NULL)
- PHP_FE(dbplus_freealllocks, NULL)
- PHP_FE(dbplus_freelock, NULL)
- PHP_FE(dbplus_freerlocks, NULL)
- PHP_FE(dbplus_getlock, NULL)
- PHP_FE(dbplus_getunique, NULL)
- PHP_FE(dbplus_info, NULL)
- PHP_FE(dbplus_last, NULL)
- PHP_FE(dbplus_next, NULL)
- PHP_FE(dbplus_open, NULL)
- PHP_FE(dbplus_prev, NULL)
- PHP_FE(dbplus_rchperm, NULL)
- PHP_FE(dbplus_rcreate, NULL)
- PHP_FE(dbplus_rcrtexact, NULL)
- PHP_FE(dbplus_rcrtlike, NULL)
- PHP_FE(dbplus_resolve, NULL)
- PHP_FE(dbplus_restorepos, NULL)
- PHP_FE(dbplus_rkeys, NULL)
- PHP_FE(dbplus_ropen, NULL)
- PHP_FE(dbplus_rquery, NULL)
- PHP_FE(dbplus_rrename, NULL)
- PHP_FE(dbplus_rsecindex, NULL)
- PHP_FE(dbplus_runlink, NULL)
- PHP_FE(dbplus_rzap, NULL)
- PHP_FE(dbplus_savepos, NULL)
- PHP_FE(dbplus_setindex, NULL)
- PHP_FE(dbplus_setindexbynumber, NULL)
- PHP_FE(dbplus_sql, NULL)
- PHP_FE(dbplus_tcl, NULL)
- PHP_FE(dbplus_tremove, NULL)
- PHP_FE(dbplus_undo, NULL)
- PHP_FE(dbplus_undoprepare, NULL)
- PHP_FE(dbplus_unlockrel, NULL)
- PHP_FE(dbplus_unselect, NULL)
- PHP_FE(dbplus_update, NULL)
- PHP_FE(dbplus_xlockrel, NULL)
- PHP_FE(dbplus_xunlockrel, NULL)
- {NULL, NULL, NULL} /* Must be the last line in dbplus_functions[] */
-};
-
-/* }}} */
-
-/* {{{ module entry */
-
-zend_module_entry dbplus_module_entry = {
- STANDARD_MODULE_HEADER,
- "dbplus",
- dbplus_functions,
- PHP_MINIT(dbplus),
- PHP_MSHUTDOWN(dbplus),
- PHP_RINIT(dbplus), /* Replace with NULL if there's nothing to do at request start */
- PHP_RSHUTDOWN(dbplus), /* Replace with NULL if there's nothing to do at request end */
- PHP_MINFO(dbplus),
- NO_VERSION_YET,
- STANDARD_MODULE_PROPERTIES
-};
-
-/* }}} */
-
-/* {{{ ini parameters */
-
-/* Remove comments and fill if you need to have entries in php.ini
-PHP_INI_BEGIN()
-PHP_INI_END()
-*/
-
-/* }}} */
-
-/* {{{ module init */
-
-PHP_MINIT_FUNCTION(dbplus)
-{
- /* resource id for cdb connections */
- le_dbplus_relation = zend_register_list_destructors_ex(dbplus_destruct_relation, NULL, "dbplus_relation", module_number);
- le_dbplus_tupel = zend_register_list_destructors_ex(dbplus_destruct_tupel , NULL, "dbplus_tuple" , module_number);
-
- /* constants for DBPLUS error codes */
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_NOERR", ERR_NOERR, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_DUPLICATE", ERR_DUPLICATE, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_EOSCAN", ERR_EOSCAN, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_EMPTY", ERR_EMPTY, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_CLOSE", ERR_CLOSE, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_WLOCKED", ERR_WLOCKED, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_LOCKED", ERR_LOCKED, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_NOLOCK", ERR_NOLOCK, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_READ", ERR_READ, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_WRITE", ERR_WRITE, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_CREATE", ERR_CREATE, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_LSEEK", ERR_LSEEK, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_LENGTH", ERR_LENGTH, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_OPEN", ERR_OPEN, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_WOPEN", ERR_WOPEN, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_MAGIC", ERR_MAGIC, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_VERSION", ERR_VERSION, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_PGSIZE", ERR_PGSIZE, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_CRC", ERR_CRC, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_PIPE", ERR_PIPE, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_NIDX", ERR_NIDX, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_MALLOC", ERR_MALLOC, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_NUSERS", ERR_NUSERS, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_PREEXIT", ERR_PREEXIT, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_ONTRAP", ERR_ONTRAP, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_PREPROC", ERR_PREPROC, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_DBPARSE", ERR_DBPARSE, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_DBRUNERR", ERR_DBRUNERR, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_DBPREEXIT", ERR_DBPREEXIT, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_WAIT", ERR_WAIT, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_CORRUPT_TUPLE", ERR_CORRUPT_TUPLE, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_WARNING0", ERR_WARNING0, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_PANIC", ERR_PANIC, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_FIFO", ERR_FIFO, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_PERM", ERR_PERM, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_TCL", ERR_TCL, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_RESTRICTED", ERR_RESTRICTED, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_USER", ERR_USER, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("DBPLUS_ERR_UNKNOWN", ERR_UNKNOWN, CONST_CS | CONST_PERSISTENT);
-
- return SUCCESS;
-}
-
-/* }}} */
-
-/* {{{ module shutdown */
-
-PHP_MSHUTDOWN_FUNCTION(dbplus)
-{
- return SUCCESS;
-}
-
-/* }}} */
-
-/* {{{ request init */
-
-/* Remove if there's nothing to do at request start */
-PHP_RINIT_FUNCTION(dbplus)
-{
- return SUCCESS;
-}
-
-/* }}} */
-
-/* {{{ request shutdown */
-
-/* Remove if there's nothing to do at request end */
-PHP_RSHUTDOWN_FUNCTION(dbplus)
-{
- return SUCCESS;
-}
-
-/* }}} */
-
-/* {{{ module information */
-
-PHP_MINFO_FUNCTION(dbplus)
-{
- php_info_print_table_start();
- php_info_print_table_header(2, "dbplus support", "enabled");
- php_info_print_table_end();
-
- /* Remove comments if you have entries in php.ini
- DISPLAY_INI_ENTRIES();
- */
-}
-
-/* }}} */
-
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/ext/dbplus/php_dbplus.c b/ext/dbplus/php_dbplus.c
deleted file mode 100644
index 241b990c30..0000000000
--- a/ext/dbplus/php_dbplus.c
+++ /dev/null
@@ -1,1557 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP Version 4 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997-2002 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: Hartmut Holzgraefe <hartmut@six.de> |
- +----------------------------------------------------------------------+
- */
-
-#include "php.h"
-#include "php_ini.h"
-#include "php_dbplus.h"
-
-#include "ext/standard/php_string.h"
-
-#include <saccess.h>
-#include <relation.h>
-#include <dblight.h>
-
-/* missing prototypes in dbplus header files */
-void string_to_scalop(char *op, enum scalop *sop);
-field * string_to_field(char *val, attribute *ap, int flags);
-void cdb_tcl(int,char *,char **, int *);
-relf * aql_exec(char *, char *);
-tuple *rnext(relf *);
-
-
-#define _STRING(x) (Z_STRVAL_PP(x))
-#define _INT(x) (Z_LVAL_PP(x))
-#define _HASH(x) (Z_ARRVAL_PP(x))
-
-#define DBPLUS_FETCH_RESOURCE(r, z) ZEND_FETCH_RESOURCE(r, relf *, z, -1, "dbplus_relation", le_dbplus_relation); \
- if(!r) RETURN_LONG(ERR_UNKNOWN);
-
-
-static int
-var2tuple(relf *r, zval **zv, tuple *t)
-{
- register attribute *ap ;
- unsigned deg ;
- zval **element;
-
- if (Z_TYPE_PP(zv)!=IS_ARRAY)
- return 1;
-
- rtupinit(r, t);
-
- ap = r->r_atts;
- deg = r->r_rel.rel_deg;
- do {
- if(SUCCESS!=zend_hash_find(Z_ARRVAL_PP(zv), ap->att_name, strlen(ap->att_name)+1, (void **)&element)) {
- continue;
- }
-
- if (! *element) {
- return 1;
- }
-
- switch(ap->att_type) {
-
- case FT_SHORT:
- /* short integer */
- convert_to_long_ex(element);
- AFFIX(ap, t)->f_short = (short) Z_LVAL_PP(element);
- break;
-
- case FT_UNSIGNED:
- /* unsigned short integer */
- convert_to_long_ex(element);
- AFFIX(ap, t)->f_unsigned = (unsigned) Z_LVAL_PP(element);
- break;
-
- case FT_LONG:
- /* 32bit signed long */
- case FT_SEQUENCE:
- /* unique sequence number -> just a long to outsiders */
- convert_to_long_ex(element);
- AFFIX(ap, t)->f_long = (long4) Z_LVAL_PP(element);
- break;
-
- case FT_DATE:
- /* date -> long containing YYYYMMDD */
- convert_to_long_ex(element);
- AFFIX(ap, t)->f_date = (long4) Z_LVAL_PP(element);
- break;
-
- case FT_TIME:
- /* time as unix timestamp */
- convert_to_long_ex(element);
- AFFIX(ap, t)->f_time = (long4) Z_LVAL_PP(element);
- break;
-
- case FT_FLOAT:
- /* single prec. floating point */
- convert_to_double_ex(element);
- AFFIX(ap, t)->f_float = (float) Z_DVAL_PP(element);
- break;
-
- case FT_DOUBLE:
- /* double prec. floating point */
- convert_to_double_ex(element);
- AFFIX(ap, t)->f_double = (double) Z_DVAL_PP(element);
- break;
-
- case FT_STRING:
- case FT_DEUTSCH:
- case FT_CHAR:
- case FT_ANSI:
- case FT_ISO:
- case FT_ISOL:
- /* different variants of Strings */
- convert_to_string_ex(element);
- afput(ap, t, (field *)0, Z_STRVAL_PP(element));
- break;
-
- default:
- php_error(E_WARNING,"%s is of yet unsupported type %d",ap->att_name,ap->att_type);
- break;
- }
- } while (ap++, --deg);
- return 0;
-}
-
-
-
-static int
-tuple2var(relf * r, tuple * t, zval **zv)
-{
- register attribute *ap ;
- unsigned deg ;
- zval *element;
-
- zval_dtor(*zv);
- if (array_init(*zv) == FAILURE) {
- return 1;
- }
-
- ap = r->r_atts;
- deg = r->r_rel.rel_deg;
- do {
- MAKE_STD_ZVAL(element); Z_TYPE_P(element)=IS_NULL;
-
- switch(ap->att_type) {
- case FT_SHORT:
- ZVAL_LONG(element, AFFIX(ap, t)->f_short);
- break;
-
- case FT_UNSIGNED:
- ZVAL_LONG(element, AFFIX(ap, t)->f_unsigned);
- break;
-
- case FT_LONG:
- case FT_SEQUENCE:
- ZVAL_LONG(element, AFFIX(ap, t)->f_long);
- break;
-
- case FT_TIME:
- ZVAL_LONG(element, AFFIX(ap, t)->f_time);
- break;
-
- case FT_FLOAT:
- ZVAL_DOUBLE(element, AFFIX(ap, t)->f_float);
- break;
-
- case FT_DOUBLE:
- ZVAL_DOUBLE(element, AFFIX(ap, t)->f_double);
- break;
-
- case FT_STRING:
- case FT_DEUTSCH:
- case FT_CHAR:
- ZVAL_STRING(element, AFVAR(ap, t)->f_string, 1);
- break;
-
- default:
- php_error(E_WARNING,"%s is of yet unsupported type %d",ap->att_name,ap->att_type);
- break;
- }
-
- if(Z_TYPE_P(element)!=IS_NULL)
- zend_hash_update(Z_ARRVAL_PP(zv),
- ap->att_name,
- strlen(ap->att_name)+1,
- (void *)&element,
- sizeof(zval*),
- NULL);
-
- } while (ap++, --deg);
- return 0;
-}
-
-static constraint *
-ary2constr(relf * r, zval** constr)
-{
- attribute *ap;
- static constraint c;
- field *f;
- enum scalop sop;
- char * dom;
- char * val;
- char * op;
- zval **zdata;
-
- /* init first */
- db_coninit(r, &c);
-
- if (Z_TYPE_PP(constr) != IS_ARRAY) {
- php_error(E_WARNING, "Constraint is not an array");
- return NULL;
- }
-
- zend_hash_internal_pointer_reset(_HASH(constr));
- if(zend_hash_get_current_data(_HASH(constr), (void **)&zdata)!=SUCCESS) {
- php_error(E_WARNING, "Constraint array is empty");
- return NULL;
- }
-
- switch(Z_TYPE_PP(zdata)) {
- case IS_STRING: /* constraints in plain string array */
- if (_HASH(constr)->nNumOfElements%3) {
- php_error(E_WARNING, "Constraint array has to have triples of strings");
- return NULL;
- }
-
- do {
- convert_to_string_ex(zdata);
- dom = _STRING(zdata);
- zend_hash_move_forward(_HASH(constr));
- zend_hash_get_current_data(_HASH(constr), (void **)&zdata);
- convert_to_string_ex(zdata);
- op = _STRING(zdata);
- zend_hash_move_forward(_HASH(constr));
- zend_hash_get_current_data(_HASH(constr), (void **)&zdata);
- convert_to_string_ex(zdata);
- val = _STRING(zdata);
- zend_hash_move_forward(_HASH(constr));
-
- if (!(ap = (attribute *) attno (r, dom))) {
- fprintf(stderr, "Invalid domain \"%s\"\n", dom);
- return 0;
- }
-
- /* operator */
- string_to_scalop(op, &sop);
-
- /* value */
- f = string_to_field(val, ap, 0);
-
- (void) db_constrain(r, &c, dom, sop, f ? f : (field *) val);
- } while(SUCCESS==zend_hash_get_current_data(_HASH(constr), (void **)&zdata));
-
- break;
- case IS_ARRAY:
- {
- zval **entry;
- for(zend_hash_internal_pointer_reset(_HASH(constr));
- SUCCESS==zend_hash_get_current_data(_HASH(constr), (void **)&zdata);
- zend_hash_move_forward(_HASH(constr))) {
- if(!(Z_TYPE_PP(zdata)==IS_ARRAY)) {
- php_error(E_WARNING, "Constraint array element not an array");
- return NULL;
- }
- if(_HASH(zdata)->nNumOfElements!=3) {
- php_error(E_WARNING, "Constraint array element not an array of size 3");
- return NULL;
- }
-
- zend_hash_internal_pointer_reset(_HASH(zdata));
- zend_hash_get_current_data(_HASH(zdata), (void **)&entry);
- convert_to_string_ex(entry);
- dom=_STRING(entry);
-
- zend_hash_move_forward(_HASH(zdata));
- zend_hash_get_current_data(_HASH(zdata), (void **)&entry);
- convert_to_string_ex(entry);
- op=_STRING(entry);
-
- zend_hash_move_forward(_HASH(zdata));
- zend_hash_get_current_data(_HASH(zdata), (void **)&entry);
- convert_to_string_ex(entry);
- val=_STRING(entry);
-
- if (!(ap = (attribute *) attno (r, dom))) {
- fprintf(stderr, "Invalid domain \"%s\"\n", dom);
- return 0;
- }
-
- /* operator */
- string_to_scalop(op, &sop);
-
- /* value */
- f = string_to_field(val, ap, 0);
-
- (void) db_constrain(r, &c, dom, sop, f ? f : (field *) val);
- }
-
- }
- break;
- default:
- /* TODO error-handling */
- return NULL;
- }
-
- return &c;
-}
-
-
-/* {{{ proto int dbplus_add(int relation, array tuple)
- Adds a tuple to a relation */
-PHP_FUNCTION(dbplus_add)
-{
- zval **relation, **data;
- enum errorcond stat = ERR_UNKNOWN;
- relf *r;
- tuple t;
-
-
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &data) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
- convert_to_array_ex(data);
-
- if(var2tuple(r, data, &t))
- RETURN_LONG(ERR_UNKNOWN);
-
- stat=cdb_add(r, &t);
- if(stat==ERR_NOERR) {
- tuple2var(r, &t, data);
- }
-
- RETURN_LONG(stat);
-}
-/* }}} */
-
-/* {{{ proto resource dbplus_aql(string query [, string server [, string dbpath]])
- Performs AQL query */
-PHP_FUNCTION(dbplus_aql)
-{
- int argc;
- zval **query, **server, **dbpath;
- relf *r;
-
- argc = ZEND_NUM_ARGS();
- if (argc < 1 || argc > 3 || zend_get_parameters_ex(argc, &query, &server, &dbpath) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- switch (argc) {
- case 3:
- convert_to_string_ex(dbpath);
- php_error(E_WARNING, "Arg dbpath: %s", _STRING(dbpath));
- /* Fall-through. */
- case 2:
- convert_to_string_ex(server);
- php_error(E_WARNING, "Arg server: %s", _STRING(server));
- /* Fall-through. */
- case 1:
- convert_to_string_ex(query);
- php_error(E_WARNING, "Arg query: %s", _STRING(query));
- break;
- }
-
- r = cdb_aql((argc>=2)?_STRING(server):"localhost",
- _STRING(query),
- (argc==3)?_STRING(dbpath):NULL);
- if(r == NULL) {
- /* TODO error handling */
- RETURN_FALSE;
- }
-
- ZEND_REGISTER_RESOURCE(return_value, r, le_dbplus_relation);
-}
-/* }}} */
-
-/* {{{ proto string dbplus_chdir([string newdir])
- Gets/Sets database virtual current directory */
-PHP_FUNCTION(dbplus_chdir)
-{
- int argc;
- char *p;
- zval **newdir;
-
- argc = ZEND_NUM_ARGS();
- switch(argc) {
- case 0:
- break;
- case 1:
- if(zend_get_parameters_ex(1, &newdir) == FAILURE) {
- WRONG_PARAM_COUNT;
- } else {
- convert_to_string_ex(newdir);
- }
- break;
- default:
- WRONG_PARAM_COUNT;
- }
-
- p = cdb_chdir((argc)?_STRING(newdir):NULL);
- if(p) {
- RETURN_STRING(p, 1);
- } else {
- RETURN_FALSE;
- }
-}
-/* }}} */
-
-/* {{{ proto int dbplus_close(int relation)
- Closes a relation */
-PHP_FUNCTION(dbplus_close)
-{
- relf *r;
- zval **relation;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- zend_list_delete(Z_LVAL_PP(relation));
-
- RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto int dbplus_curr(int relation, array tuple)
- Gets current tuple from relation */
-PHP_FUNCTION(dbplus_curr)
-{
- zval **relation, **tname;
- relf *r;
- tuple t;
- int stat;
-
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &tname) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- stat = cdb_current(r, &t);
- if(stat==ERR_NOERR) {
- tuple2var(r, &t, tname);
- }
-
- RETURN_LONG(stat);
-}
-/* }}} */
-
-/* {{{ proto string dbplus_errcode(int err)
- Gets error string for given errorcode or last error */
-PHP_FUNCTION(dbplus_errcode)
-{
- zval **err;
- int errno;
-
- switch (ZEND_NUM_ARGS()) {
- case 0:
- errno=-1;
- break;
- case 1:
- if( zend_get_parameters_ex(1, &err) == FAILURE){
- WRONG_PARAM_COUNT;
- }
- convert_to_long_ex(err);
- errno = _INT(err);
- }
-
- if(errno==-1) errno = Acc_error;
-
- RETURN_STRING(dbErrorMsg(errno, NULL), 1);
-}
-/* }}} */
-
-/* {{{ proto int dbplus_errno(void)
- Gets error code for last operation */
-PHP_FUNCTION(dbplus_errno)
-{
- RETURN_LONG(Acc_error);
-}
-/* }}} */
-
-/* {{{ proto int dbplus_find(int relation, array constr, mixed tuple)
- Sets a constraint on a relation */
-PHP_FUNCTION(dbplus_find)
-{
- relf *r;
- zval **relation, **constr, **data;
- constraint *c;
- tuple t;
- int stat;
-
- if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &relation, &constr, &data) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- if (Z_TYPE_PP(constr) != IS_ARRAY) {
- php_error(E_WARNING, "Constraint is not an array");
- RETURN_LONG(ERR_UNKNOWN);
- }
-
- convert_to_array_ex(data);
-
- c = ary2constr(r, constr);
-
- if (!c){
- RETURN_LONG(ERR_USER);
- }
-
- stat = cdb_find(r, &t, c);
-
- if(stat==ERR_NOERR)
- tuple2var(r, &t, data);
-
- RETURN_LONG(stat);
-}
-/* }}} */
-
-/* {{{ proto int dbplus_first(int relation, array tuple)
- Gets first tuple from relation */
-PHP_FUNCTION(dbplus_first)
-{
- zval **relation, **tname;
- relf *r;
- tuple t;
- int stat;
-
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &tname) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- stat = cdb_first(r, &t);
- if(stat==ERR_NOERR) {
- tuple2var(r, &t, tname);
- }
-
- RETURN_LONG(stat);
-}
-/* }}} */
-
-/* {{{ proto int dbplus_flush(int relation)
- ??? */
-PHP_FUNCTION(dbplus_flush)
-{
- relf *r;
- zval **relation;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- RETURN_LONG(cdb_flush(r));
-}
-/* }}} */
-
-/* {{{ proto int dbplus_freealllocks(void)
- Frees all locks held by this client */
-PHP_FUNCTION(dbplus_freealllocks)
-{
- RETURN_LONG(cdbFreeAllLocks());
-}
-/* }}} */
-
-
-/* {{{ proto int dbplus_freelock(int relation, array tuple)
- Releases write lock on tuple */
-PHP_FUNCTION(dbplus_freelock)
-{
- zval **relation, **data;
- enum errorcond stat = ERR_UNKNOWN;
- relf *r;
- tuple t;
-
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &data) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- convert_to_array_ex(data);
-
- if(var2tuple(r, data, &t))
- RETURN_LONG(ERR_UNKNOWN);
-
- stat=cdb_freelock(r, &t);
-
- RETURN_LONG(stat);
-}
-/* }}} */
-
-/* {{{ proto int dbplus_freerlocks(int relation)
- Frees all locks on given relation */
-PHP_FUNCTION(dbplus_freerlocks)
-{
- relf *r;
- zval **relation;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- RETURN_LONG(cdb_freerlocks(r));
-}
-/* }}} */
-
-/* {{{ proto int dbplus_getlock(int relation, array tuple)
- Requests locking of tuple */
-PHP_FUNCTION(dbplus_getlock)
-{
- zval **relation, **data;
- enum errorcond stat = ERR_UNKNOWN;
- relf *r;
- tuple t;
-
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &data) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- convert_to_array_ex(data);
-
- if(var2tuple(r, data, &t))
- RETURN_LONG(ERR_UNKNOWN);
-
- stat=cdb_getlock(r, &t);
-
- RETURN_LONG(stat);
-}
-/* }}} */
-
-/* {{{ proto int dbplus_getunique(int handle, int uniqueid)
- Gets a id number unique to a relation */
-PHP_FUNCTION(dbplus_getunique)
-{
- relf *r;
- zval **relation, **uniqueid;
- long l;
- int stat;
-
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &uniqueid) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- stat = cdb_getunique(r, &l, 1);
- if(!stat) {
- ZVAL_LONG(*uniqueid,l);
- }
-
- RETURN_LONG(stat);
-}
-/* }}} */
-
-/* {{{ proto int dbplus_info(int relation, string key, array &result)
- ??? */
-PHP_FUNCTION(dbplus_info)
-{
- zval **relation, **key, **result, *element;
- relf *r;
- register attribute *ap;
- unsigned deg;
-
- if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &relation, &key, &result) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- ap = r->r_atts;
- deg = r->r_rel.rel_deg;
-
- convert_to_string_ex(key);
-
- zval_dtor(*result);
- if (array_init(*result) == FAILURE)
- RETURN_LONG(ERR_USER);
-
- if(!strcmp("atts", Z_STRVAL_PP(key))) {
- do {
- MAKE_STD_ZVAL(element);
-
- ZVAL_STRING(element, ap->att_name, 1);
-
- zend_hash_update(Z_ARRVAL_PP(result),
- ap->att_name,
- strlen(ap->att_name)+1,
- (void *)&element,
- sizeof(zval*),
- NULL);
- } while (ap++, deg--);
- RETURN_LONG(ERR_NOERR);
- }
-
- RETURN_LONG(ERR_USER);
-}
-/* }}} */
-
-/* {{{ proto int dbplus_last(int relation, array tuple)
- Gets last tuple from relation */
-PHP_FUNCTION(dbplus_last)
-{
- zval **relation, **tname;
- relf *r;
- tuple t;
- int stat;
-
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &tname) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- stat = cdb_last(r, &t);
- if(stat==ERR_NOERR) {
- tuple2var(r, &t, tname);
- }
-
- RETURN_LONG(stat);
-}
-/* }}} */
-
-
-/* {{{ proto int dbplus_lockrel(int relation)
- Requests write lock on relation */
-PHP_FUNCTION(dbplus_lockrel)
-{
- relf *r;
- zval **relation;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- RETURN_LONG(cdb_lockrel(r));
-}
-/* }}} */
-
-/* {{{ proto int dbplus_next(int relation, array &tname)
- Gets next tuple from relation */
-PHP_FUNCTION(dbplus_next)
-{
- zval **relation, **tname;
- relf *r;
- tuple *t;
- int stat;
-
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &tname) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- if(r->r_sid = 9999) {
- t = rnext(r);
- stat = Acc_error;
- } else {
- t = (tuple *) pmalloc(sizeof(tuple));
- stat = cdb_next(r, t);
- }
- if(stat==ERR_NOERR) {
- tuple2var(r, t, tname);
- }
-
- RETURN_LONG(stat);
-}
-/* }}} */
-
-/* {{{ proto resource dbplus_open(string name)
- Opens a relation file */
-PHP_FUNCTION(dbplus_open)
-{
- relf *r;
- zval **tname;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &tname) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- convert_to_string_ex(tname);
-
- r = cdb_open(Z_STRVAL_PP(tname), 1, 1);
- if(r == NULL) {
- /* TODO error handling */
- RETURN_FALSE;
- }
-
- ZEND_REGISTER_RESOURCE(return_value, r, le_dbplus_relation);
-}
-/* }}} */
-
-/* {{{ proto int dbplus_prev(int relation, array tuple)
- Gets previous tuple from relation */
-PHP_FUNCTION(dbplus_prev)
-{
- zval **relation, **tname;
- relf *r;
- tuple t;
- int stat;
-
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &tname) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- stat = cdb_previous(r, &t);
- if(stat==ERR_NOERR) {
- tuple2var(r, &t, tname);
- }
-
- RETURN_LONG(stat);
-}
-/* }}} */
-
-/* {{{ proto int dbplus_rchperm(int relation, int mask, string user, string group)
- ??? */
-PHP_FUNCTION(dbplus_rchperm)
-{
- relf *r;
- zval **relation, **mask, **user, **group;
- if (ZEND_NUM_ARGS() != 4 || zend_get_parameters_ex(4, &relation, &mask, &user, &group) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- convert_to_long_ex(mask);
- convert_to_string_ex(user);
- convert_to_string_ex(group);
-
- RETURN_LONG(cdbRchperm(r, _INT(mask), _STRING(user), _STRING(group)));
-}
-/* }}} */
-
-/* {{{ proto resource dbplus_rcreate(string name, mixed domlist [, int overwrite])
- Creates a new DB++ relation */
-PHP_FUNCTION(dbplus_rcreate)
-{
- zval **name, **domlist, **overwrite;
- relf *r=NULL;
- int flag, ndoms, argc = ZEND_NUM_ARGS();
- attdef *at0;
-
- switch(argc) {
- case 3:
- if(zend_get_parameters_ex(3, &name, &domlist, &overwrite) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
- convert_to_long_ex(overwrite);
- flag=_INT(overwrite);
- break;
- case 2:
- if(zend_get_parameters_ex(3, &name, &domlist) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
- flag=0;
- break;
- default:
- WRONG_PARAM_COUNT;
- break;
- }
-
- convert_to_string_ex(name);
-
- switch ( Z_TYPE_PP(domlist) ) {
- case IS_STRING:
- convert_to_string_ex(domlist);
- break;
-
- case IS_ARRAY:
- {
- zval tmp;
- ZVAL_STRING(&tmp," ",0);
- php_implode(&tmp,*domlist,*domlist);
- }
- break;
-
- default:
- }
-
- at0 = create2att(_STRING(domlist), &ndoms);
- if (at0) {
- r = cdbRcreate(_STRING(name), 0666, 0, ndoms, at0, flag);
- dbxfree((char *) at0);
- }
- if(r == NULL) {
- /* TODO error handling */
- RETURN_FALSE;
- }
-
- ZEND_REGISTER_RESOURCE(return_value, r, le_dbplus_relation);
-}
-/* }}} */
-
-/* {{{ proto resource dbplus_rcrtexact(string name, resource relation [, boolean overwrite])
- Creates an exact but empty copy of a relation including indices */
-PHP_FUNCTION(dbplus_rcrtexact)
-{
- zval **name, **relation, **overwrite;
- relf *r;
- int f,argc = ZEND_NUM_ARGS();
-
- switch(argc) {
- case 3:
- if(zend_get_parameters_ex(3, &name, &relation, &overwrite) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
- convert_to_long_ex(overwrite);
- f=_INT(overwrite);
- break;
- case 2:
- if(zend_get_parameters_ex(3, &name, &relation) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
- f=0;
- break;
- default:
- WRONG_PARAM_COUNT;
- break;
- }
-
- convert_to_string_ex(name);
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- r = cdbRcrtexact(_STRING(name), 0666, r, f);
- if(r == NULL) {
- /* TODO error handling */
- RETURN_FALSE;
- }
-
- ZEND_REGISTER_RESOURCE(return_value, r, le_dbplus_relation);
-}
-/* }}} */
-
-/* {{{ proto resource dbplus_rcrtlike(string name, int handle [, int overwrite])
- Creates an empty copy of a relation with default indices */
-PHP_FUNCTION(dbplus_rcrtlike)
-{
- zval **name, **relation, **overwrite;
- relf *r;
- int f,argc = ZEND_NUM_ARGS();
-
- switch(argc) {
- case 3:
- if(zend_get_parameters_ex(3, &name, &relation, &overwrite) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
- convert_to_long_ex(overwrite);
- f=_INT(overwrite);
- break;
- case 2:
- if(zend_get_parameters_ex(3, &name, &relation) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
- f=0;
- break;
- default:
- WRONG_PARAM_COUNT;
- break;
- }
-
- convert_to_string_ex(name);
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- r = cdbRcrtlike(_STRING(name), 0666, 0, r, f);
- if(r == NULL) {
- /* TODO error handling */
- RETURN_FALSE;
- }
-
- ZEND_REGISTER_RESOURCE(return_value, r, le_dbplus_relation);
-}
-/* }}} */
-
-/* {{{ proto int dbplus_resolve(string name)
- Resolves host information for relation */
-PHP_FUNCTION(dbplus_resolve)
-{
- zval **name, *element;
- char * host;
- char * host_path;
- int sid;
-
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &name) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- convert_to_string_ex(name);
-
- sid = cdb_resolve(_STRING(name), &host, &host_path);
- if (sid <= 0)
- RETURN_FALSE;
-
- if (array_init(return_value) == FAILURE) {
- RETURN_FALSE;
- }
-
-
- MAKE_STD_ZVAL(element); Z_TYPE_P(element)=IS_NULL;
- ZVAL_LONG(element,sid);
- zend_hash_update(Z_ARRVAL_P(return_value), "sid", 4,
- &element, sizeof(zval *), NULL);
-
- MAKE_STD_ZVAL(element); Z_TYPE_P(element)=IS_NULL;
- ZVAL_STRING(element,host,1);
- zend_hash_update(Z_ARRVAL_P(return_value), "host", 5,
- &element, sizeof(zval *), NULL);
-
- MAKE_STD_ZVAL(element); Z_TYPE_P(element)=IS_NULL;
- ZVAL_STRING(element,host_path,1);
- zend_hash_update(Z_ARRVAL_P(return_value), "host_path", 10,
- &element, sizeof(zval *), NULL);
-}
-/* }}} */
-
-/* {{{ proto int dbplus_restorepos(int relation, array tuple)
- ??? */
-PHP_FUNCTION(dbplus_restorepos)
-{
- zval **relation, **tname;
- relf *r;
- tuple t;
- int stat;
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &tname) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- stat = cdb_next(r, &t);
- if(stat==ERR_NOERR) {
- tuple2var(r, &t, tname);
- }
-
- RETURN_LONG(stat);
-}
-/* }}} */
-
-/* {{{ proto resource dbplus_rkeys(resource relation, mixed domlist)
- Defines primary key for relation
-*/
-PHP_FUNCTION(dbplus_rkeys)
-{
- relf *r, *rnew;
- zval **relation, **domlist, **zdata;
- int nkeys=0;
- char *name=NULL, *keys[40]; /* TODO hardcoded magic number ??? */
-
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &domlist) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- switch(Z_TYPE_PP(domlist)) {
- case IS_ARRAY:
- convert_to_array_ex(domlist);
- for(zend_hash_internal_pointer_reset(_HASH(domlist));
- SUCCESS==zend_hash_get_current_data(_HASH(domlist), (void **)&zdata);
- zend_hash_move_forward(_HASH(domlist))) {
- if(Z_TYPE_PP(zdata)==IS_STRING)
- keys[nkeys++] = _STRING(zdata);
- else {
- php_error(E_WARNING, "dbplus_rkeys: domlist array contains non-string value(s)");
- Acc_error = ERR_USER;
- RETURN_FALSE;
- }
- }
- break;
-
- case IS_STRING:
- convert_to_string_ex(domlist);
- keys[0] = _STRING(domlist);
- nkeys = 1;
- break;
-
- default:
- php_error(E_WARNING, "dbplus_rkeys: domlist has to be of type string or an array of strings");
- Acc_error = ERR_USER;
- RETURN_FALSE;
- }
-
- rnew = cdbRkeys(r, nkeys, keys);
- if(name) efree(name);
-
- if(rnew) {
- /* TODO realy delete old relation resource ? */
-#if 0
- zend_list_delete(Z_LVAL_PP(relation));
-#endif
- ZEND_REGISTER_RESOURCE(return_value, rnew, le_dbplus_relation);
- } else {
- /* TODO error reporting */
- RETURN_FALSE;
- }
-}
-/* }}} */
-
-/* {{{ proto resource dbplus_ropen(string name)
- Opens relation file local */
-PHP_FUNCTION(dbplus_ropen)
-{
- relf *r;
- zval **tname;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &tname) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- convert_to_string_ex(tname);
-
- r = ropen(Z_STRVAL_PP(tname), 0, 0);
- if(r == NULL) {
- /* TODO error handling */
- RETURN_FALSE;
- }
-
- r->r_sid = 9999;
-
- ZEND_REGISTER_RESOURCE(return_value, r, le_dbplus_relation);
-}
-/* }}} */
-
-/* {{{ proto resource dbplus_rquery(string name, string dbpath)
- ??? */
-PHP_FUNCTION(dbplus_rquery)
-{
- relf *r;
- zval **name, **dbpath;
- int argc = ZEND_NUM_ARGS();
-
- if ((argc <1) || (argc>2) || (zend_get_parameters_ex(2, &name, &dbpath) == FAILURE)){
- WRONG_PARAM_COUNT;
- }
-
- r = aql_exec(_STRING(name), (argc==2)?_STRING(dbpath):NULL);
-
- if(!r) {
- /* TODO error handling */
- RETURN_FALSE;
- }
-
- r->r_sid = 9999;
-
- ZEND_REGISTER_RESOURCE(return_value, r, le_dbplus_relation);
-}
-/* }}} */
-
-/* {{{ proto int dbplus_rrename(int relation, string name)
- ??? */
-PHP_FUNCTION(dbplus_rrename)
-{
- relf *r;
- zval **relation, **name;
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &name) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- convert_to_string_ex(name);
-
- RETURN_LONG(cdbRrename(r, _STRING(name), 0));
-}
-/* }}} */
-
-/* {{{ proto resource dbplus_rsecindex(resource relation, mixed domlist, int compact)
- Creates an additional index on relation */
-PHP_FUNCTION(dbplus_rsecindex)
-{
- relf *r, *rnew;
- zval **relation, **domlist, **compact, **zdata;
- int nkeys=0;
- char *name=NULL, *keys[40]; /* TODO hardcoded magic number ??? */
-
- if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &relation, &domlist, &compact) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- switch ( Z_TYPE_PP(domlist) ) {
- case IS_ARRAY:
- convert_to_array_ex(domlist);
- for(zend_hash_internal_pointer_reset(_HASH(domlist));
- SUCCESS==zend_hash_get_current_data(_HASH(domlist), (void **)&zdata);
- zend_hash_move_forward(_HASH(domlist))) {
- if(Z_TYPE_PP(zdata)==IS_STRING)
- keys[nkeys++] = _STRING(zdata);
- else {
- php_error(E_WARNING, "dbplus_rsecindex: domlist array contains non-string value(s)");
- Acc_error = ERR_USER;
- RETURN_FALSE;
- }
- }
- break;
-
- case IS_STRING:
- convert_to_string_ex(domlist);
- keys[0] = _STRING(domlist);
- nkeys = 1;
- break;
-
- default:
- php_error(E_WARNING, "dbplus_rsecindex: domlist has to be of type string or an array of strings");
- Acc_error = ERR_USER;
- RETURN_FALSE;
- }
-
- convert_to_long_ex(compact);
-
- rnew = cdbRsecindex(r, nkeys, keys, _INT(compact));
- if(name) efree(name);
-
- if(rnew) {
- /* TODO realy delete old relation resource ? */
- zend_list_delete(Z_LVAL_PP(relation));
-
- ZEND_REGISTER_RESOURCE(return_value, rnew, le_dbplus_relation);
- } else {
- /* TODO error reporting */
- RETURN_FALSE;
- }
-}
-/* }}} */
-
-/* {{{ proto int dbplus_runlink(int relation)
- Removes relation from filesystem */
-PHP_FUNCTION(dbplus_runlink)
-{
- relf *r;
- zval **relation;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- RETURN_LONG(cdbRunlink(&r));
-}
-/* }}} */
-
-/* {{{ proto int dbplus_rzap(int relation, int truncate)
- Removes all tuples from relation */
-PHP_FUNCTION(dbplus_rzap)
-{
-
- /* todo: optional argument */
- relf *r;
- zval **relation;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- RETURN_LONG(cdbRzap(r, 1));
-}
-/* }}} */
-
-/* {{{ proto int dbplus_savepos(int relation)
- ??? */
-PHP_FUNCTION(dbplus_savepos)
-{
- relf *r;
- zval **relation;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- RETURN_LONG(cdb_savepos(r));
-}
-/* }}} */
-
-/* {{{ proto int dbplus_setindex(int relation, string idx_name)
- ??? */
-PHP_FUNCTION(dbplus_setindex)
-{
- relf *r;
- zval **relation, **idx_name;
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &idx_name) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- convert_to_string_ex(idx_name);
-
- RETURN_LONG(cdb_setindex(r, _STRING(idx_name)));
-}
-/* }}} */
-
-/* {{{ proto int dbplus_setindexbynumber(int relation, int idx_number)
- ??? */
-PHP_FUNCTION(dbplus_setindexbynumber)
-{
- relf *r;
- zval **relation, **idx_number;
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &idx_number) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- convert_to_long_ex(idx_number);
-
- RETURN_LONG(cdb_setindexbynumber(r, Z_LVAL_PP(idx_number)));
-}
-/* }}} */
-
-/* {{{ proto resource dbplus_sql(string query, string server, string dbpath)
- Performs SQL query */
-PHP_FUNCTION(dbplus_sql)
-{
- int argc;
- zval **query, **server, **dbpath;
- relf *r;
-
- argc = ZEND_NUM_ARGS();
- if (argc < 1 || argc > 3 || zend_get_parameters_ex(argc, &query, &server, &dbpath) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- switch (argc) {
- case 3:
- convert_to_string_ex(dbpath);
- php_error(E_WARNING, "Arg dbpath: %s", _STRING(dbpath));
- /* Fall-through. */
- case 2:
- convert_to_string_ex(server);
- php_error(E_WARNING, "Arg server: %s", _STRING(server));
- /* Fall-through. */
- case 1:
- convert_to_string_ex(query);
- php_error(E_WARNING, "Arg query: %s", _STRING(query));
- break;
- }
-
- r = cdb_sql((argc>=2)?_STRING(server):"localhost",
- _STRING(query),
- (argc==3)?_STRING(dbpath):NULL);
- if(r == NULL) {
- /* TODO error handling */
- RETURN_FALSE;
- }
-
- ZEND_REGISTER_RESOURCE(return_value, r, le_dbplus_relation);
-}
-/* }}} */
-
-/* {{{ proto string dbplus_tcl(int sid, string script)
- Executes server side TCL code */
-PHP_FUNCTION(dbplus_tcl)
-{
- zval **sid, **script;
- char *ret;
- int result_type;
-
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &sid, &script) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- convert_to_long_ex(sid);
- convert_to_string_ex(script);
-
- cdb_tcl(_INT(sid),_STRING(script),&ret,&result_type);
-
- if(ret) {
- RETURN_STRING(ret,1);
- } else {
- RETURN_FALSE;
- }
-}
-/* }}} */
-
-/* {{{ proto int dbplus_tremove(int relation, array old [, array current])
- Removes tuple and return new current tuple */
-PHP_FUNCTION(dbplus_tremove)
-{
- zval **relation, **old, **current;
- enum errorcond stat = ERR_UNKNOWN;
- relf *r;
- tuple told, tcurr;
- int argc;
-
- argc = ZEND_NUM_ARGS();
- if ( argc<2 || argc>3 || zend_get_parameters_ex(2, &relation, &old, &current) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- convert_to_array_ex(old);
-
- if(var2tuple(r, old, &told))
- RETURN_LONG(ERR_UNKNOWN);
-
- stat=cdbTremove(r, &told, &tcurr);
-
- if((stat==ERR_NOERR) && (argc==3))
- tuple2var(r, &tcurr, current);
-
- RETURN_LONG(stat);
-}
-/* }}} */
-
-/* {{{ proto int dbplus_undo(int relation)
- ??? */
-PHP_FUNCTION(dbplus_undo)
-{
- relf *r;
- zval **relation;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- RETURN_LONG(cdb_undo(r));
-}
-/* }}} */
-
-/* {{{ proto int dbplus_undoprepare(int relation)
- ??? */
-PHP_FUNCTION(dbplus_undoprepare)
-{
- relf *r;
- zval **relation;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- RETURN_LONG(cdb_undoprepare(r));
-}
-/* }}} */
-
-/* {{{ proto int dbplus_unlockrel(int relation)
- Gives up write lock on relation */
-PHP_FUNCTION(dbplus_unlockrel)
-{
- relf *r;
- zval **relation;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- RETURN_LONG(cdb_unlockrel(r));
-}
-/* }}} */
-
-/* {{{ proto int dbplus_unselect(int relation)
- Removes constraint from relation */
-PHP_FUNCTION(dbplus_unselect)
-{
- relf *r;
- zval **relation;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- RETURN_LONG(cdb_unselect(r));
-}
-/* }}} */
-
-/* {{{ proto int dbplus_update(int relation, array old, array new)
- Updates specified tuple in relation */
-PHP_FUNCTION(dbplus_update)
-{
- zval **relation, **old, **new;
- enum errorcond stat = ERR_UNKNOWN;
- relf *r;
- tuple told, tnew;
-
- if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &relation, &old, &new) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- convert_to_array_ex(old);
- convert_to_array_ex(new);
-
- if(var2tuple(r, old, &told))
- RETURN_LONG(ERR_UNKNOWN);
-
- if(var2tuple(r, new, &tnew))
- RETURN_LONG(ERR_UNKNOWN);
-
- stat=cdb_update(r, &told, &tnew);
-
- RETURN_LONG(stat);
-}
-/* }}} */
-
-/* {{{ proto int dbplus_xlockrel(int relation)
- Requests exclusive lock on relation */
-PHP_FUNCTION(dbplus_xlockrel)
-{
- relf *r;
- zval **relation;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- RETURN_LONG(cdb_xlockrel(r));
-}
-/* }}} */
-
-/* {{{ proto int dbplus_xunlockrel(int relation)
- Frees exclusive lock on relation */
-PHP_FUNCTION(dbplus_xunlockrel)
-{
- relf *r;
- zval **relation;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
- WRONG_PARAM_COUNT;
- }
-
- DBPLUS_FETCH_RESOURCE(r, relation);
-
- RETURN_LONG(cdb_xunlockrel(r));
-}
-/* }}} */
-
-/*
- * Local variables:
- * tab-width: 2
- * c-basic-offset: 2
- * End:
- */
diff --git a/ext/dbplus/php_dbplus.h b/ext/dbplus/php_dbplus.h
deleted file mode 100644
index f2b417b9f5..0000000000
--- a/ext/dbplus/php_dbplus.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP Version 4 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997-2002 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. |
- +----------------------------------------------------------------------+
- */
-
-#ifndef PHP_DBPLUS_H
-#define PHP_DBPLUS_H
-
-
-extern zend_module_entry dbplus_module_entry;
-#define phpext_dbplus_ptr &dbplus_module_entry
-
-#ifdef PHP_WIN32
-#define PHP_DBPLUS_API __declspec(dllexport)
-#else
-#define PHP_DBPLUS_API
-#endif
-
-PHP_MINIT_FUNCTION(dbplus);
-PHP_MSHUTDOWN_FUNCTION(dbplus);
-PHP_RINIT_FUNCTION(dbplus);
-PHP_RSHUTDOWN_FUNCTION(dbplus);
-PHP_MINFO_FUNCTION(dbplus);
-
-PHP_FUNCTION(dbplus_add);
-PHP_FUNCTION(dbplus_aql);
-PHP_FUNCTION(dbplus_chdir);
-PHP_FUNCTION(dbplus_close);
-PHP_FUNCTION(dbplus_curr);
-PHP_FUNCTION(dbplus_errno);
-PHP_FUNCTION(dbplus_errcode);
-PHP_FUNCTION(dbplus_find);
-PHP_FUNCTION(dbplus_first);
-PHP_FUNCTION(dbplus_flush);
-PHP_FUNCTION(dbplus_freealllocks);
-PHP_FUNCTION(dbplus_freelock);
-PHP_FUNCTION(dbplus_freerlocks);
-PHP_FUNCTION(dbplus_getlock);
-PHP_FUNCTION(dbplus_getunique);
-PHP_FUNCTION(dbplus_info);
-PHP_FUNCTION(dbplus_last);
-PHP_FUNCTION(dbplus_next);
-PHP_FUNCTION(dbplus_open);
-PHP_FUNCTION(dbplus_prev);
-PHP_FUNCTION(dbplus_rchperm);
-PHP_FUNCTION(dbplus_rcreate);
-PHP_FUNCTION(dbplus_rcrtexact);
-PHP_FUNCTION(dbplus_rcrtlike);
-PHP_FUNCTION(dbplus_resolve);
-PHP_FUNCTION(dbplus_restorepos);
-PHP_FUNCTION(dbplus_rkeys);
-PHP_FUNCTION(dbplus_ropen);
-PHP_FUNCTION(dbplus_rquery);
-PHP_FUNCTION(dbplus_rrename);
-PHP_FUNCTION(dbplus_rsecindex);
-PHP_FUNCTION(dbplus_runlink);
-PHP_FUNCTION(dbplus_rzap);
-PHP_FUNCTION(dbplus_savepos);
-PHP_FUNCTION(dbplus_setindex);
-PHP_FUNCTION(dbplus_setindexbynumber);
-PHP_FUNCTION(dbplus_sql);
-PHP_FUNCTION(dbplus_tcl);
-PHP_FUNCTION(dbplus_tremove);
-PHP_FUNCTION(dbplus_undo);
-PHP_FUNCTION(dbplus_undoprepare);
-PHP_FUNCTION(dbplus_unlockrel);
-PHP_FUNCTION(dbplus_unselect);
-PHP_FUNCTION(dbplus_update);
-PHP_FUNCTION(dbplus_xlockrel);
-PHP_FUNCTION(dbplus_xunlockrel);
-
-
-/*
- Declare any global variables you may need between the BEGIN
- and END macros here:
-
-ZEND_BEGIN_MODULE_GLOBALS(dbplus)
- int global_variable;
-ZEND_END_MODULE_GLOBALS(dbplus)
-*/
-
-/* In every function that needs to use variables in php_dbplus_globals,
- do call DBPLUSLS_FETCH(); after declaring other variables used by
- that function, and always refer to them as DBPLUSG(variable).
- You are encouraged to rename these macros something shorter, see
- examples in any other php module directory.
-*/
-
-#ifdef ZTS
-#define AG(v) TSRMG(dbplus_globals_id, php_dbplus_globals *, v)
-#else
-#define DBPLUSG(v) (dbplus_globals.v)
-#endif
-
-
-int le_dbplus_relation;
-int le_dbplus_tuple;
-
-void dbplus_destruct_relation(zend_rsrc_list_entry *rsrc TSRMLS_DC);
-void dbplus_destruct_tupel(zend_rsrc_list_entry *rsrc TSRMLS_DC);
-
-
-#endif /* PHP_DBPLUS_H */
-
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/ext/dbplus/tests/001.phpt b/ext/dbplus/tests/001.phpt
deleted file mode 100644
index 2c56768952..0000000000
--- a/ext/dbplus/tests/001.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-Check for dbplus presence
---SKIPIF--
-<?php if (!extension_loaded("dbplus")) print "skip"; ?>
---POST--
---GET--
---FILE--
-<?php
-echo "dbplus extension is available";
-/*
- you can add regression tests for your extension here
-
- the output of your test code has to be equal to the
- text in the --EXPECT-- section below for the tests
- to pass, differences between the output and the
- expected text are interpreted as failure
-
- see php4/tests/README for further information on
- writing regression tests
-*/
-?>
---EXPECT--
-dbplus extension is available \ No newline at end of file