summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/dbplus/CREDITS2
-rw-r--r--ext/dbplus/EXPERIMENTAL5
-rw-r--r--ext/dbplus/Makefile.in8
-rw-r--r--ext/dbplus/README3
-rw-r--r--ext/dbplus/config.m447
-rw-r--r--ext/dbplus/nonimp_dbplus.c141
-rw-r--r--ext/dbplus/php_dbplus.c1279
-rw-r--r--ext/dbplus/php_dbplus.h131
-rw-r--r--ext/dbplus/tests/001.phpt23
9 files changed, 1639 insertions, 0 deletions
diff --git a/ext/dbplus/CREDITS b/ext/dbplus/CREDITS
new file mode 100644
index 0000000000..ad7e7425a3
--- /dev/null
+++ b/ext/dbplus/CREDITS
@@ -0,0 +1,2 @@
+dbplus
+Hartmut Holzgraefe
diff --git a/ext/dbplus/EXPERIMENTAL b/ext/dbplus/EXPERIMENTAL
new file mode 100644
index 0000000000..6443e99646
--- /dev/null
+++ b/ext/dbplus/EXPERIMENTAL
@@ -0,0 +1,5 @@
+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/Makefile.in b/ext/dbplus/Makefile.in
new file mode 100644
index 0000000000..77219dcbc2
--- /dev/null
+++ b/ext/dbplus/Makefile.in
@@ -0,0 +1,8 @@
+# $Id$
+
+LTLIBRARY_NAME = libdbplus.la
+LTLIBRARY_SOURCES = dbplus.c php_dbplus.c
+LTLIBRARY_SHARED_NAME = dbplus.la
+LTLIBRARY_SHARED_LIBADD = $(DBPLUS_SHARED_LIBADD)
+
+include $(top_srcdir)/build/dynlib.mk
diff --git a/ext/dbplus/README b/ext/dbplus/README
new file mode 100644
index 0000000000..e313a10377
--- /dev/null
+++ b/ext/dbplus/README
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000000..f815ca9159
--- /dev/null
+++ b/ext/dbplus/config.m4
@@ -0,0 +1,47 @@
+dnl $Id$
+dnl config.m4 for extension dbplus
+
+
+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"
+ 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
+ AC_ADD_INCLUDE($DBPLUS_DIR/include)
+
+ # --with-dbplus -> chech for lib and symbol presence
+ LIBNAME=Ddb
+ LIBSYMBOL=Db_Init
+ old_LIBS=$LIBS
+ LIBS="$LIBS -L$DBPLUS_DIR/lib -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)
+ AC_ADD_LIBRARY_WITH_PATH($LIBNAME, $DBPLUS_DIR/lib, DBPLUS_SHARED_LIBADD)
+ AC_ADD_LIBRARY_WITH_PATH(Dmacc, $DBPLUS_DIR/lib, DBPLUS_SHARED_LIBADD)
+ AC_ADD_LIBRARY_WITH_PATH(Dracc, $DBPLUS_DIR/lib, DBPLUS_SHARED_LIBADD)
+
+ PHP_EXTENSION(dbplus, $ext_shared)
+fi
diff --git a/ext/dbplus/nonimp_dbplus.c b/ext/dbplus/nonimp_dbplus.c
new file mode 100644
index 0000000000..4dbb413208
--- /dev/null
+++ b/ext/dbplus/nonimp_dbplus.c
@@ -0,0 +1,141 @@
+/*
+ +----------------------------------------------------------------------+
+ | PHP version 4.0 |
+ +----------------------------------------------------------------------+
+ | Copyright (c) 1997, 1998, 1999, 2000, 2001 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. |
+ +----------------------------------------------------------------------+
+ | Authors: Hartmut Holzgraefe <hartmut@six.de> |
+ | |
+ +----------------------------------------------------------------------+
+ */
+
+#include "php.h"
+#include "php_ini.h"
+#include "php_dbplus.h"
+
+
+/* {{{ proto int dbplus_change(int handle, string domain)
+ */
+PHP_FUNCTION(dbplus_change)
+{
+ zval **handle, **domain;
+ if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &handle, &domain) == FAILURE){
+ WRONG_PARAM_COUNT;
+ }
+
+ convert_to_long_ex(handle);
+ convert_to_string_ex(domain);
+
+
+ php_error(E_WARNING, "dbplus_change: not yet implemented");
+}
+/* }}} */
+
+
+
+
+
+/* {{{ proto int dbplus_rcreate(string name, string domlist, int flag)
+ */
+PHP_FUNCTION(dbplus_rcreate)
+{
+ zval **name, **domlist, **flag;
+ if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &name, &domlist, &flag) == FAILURE){
+ WRONG_PARAM_COUNT;
+ }
+
+ convert_to_string_ex(name);
+ convert_to_string_ex(domlist);
+ convert_to_long_ex(flag);
+
+
+ php_error(E_WARNING, "dbplus_rcreate: not yet implemented");
+}
+/* }}} */
+
+/* {{{ proto int dbplus_rcrtexact(string name, int handle, int flag)
+ */
+PHP_FUNCTION(dbplus_rcrtexact)
+{
+ zval **name, **handle, **flag;
+ if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &name, &handle, &flag) == FAILURE){
+ WRONG_PARAM_COUNT;
+ }
+
+ convert_to_string_ex(name);
+ convert_to_long_ex(handle);
+ convert_to_long_ex(flag);
+
+
+ php_error(E_WARNING, "dbplus_rcrtexact: not yet implemented");
+}
+/* }}} */
+
+/* {{{ proto int dbplus_rcrtlike(string name, int handle, int flag)
+ */
+PHP_FUNCTION(dbplus_rcrtlike)
+{
+ zval **name, **handle, **flag;
+ if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &name, &handle, &flag) == FAILURE){
+ WRONG_PARAM_COUNT;
+ }
+
+ convert_to_string_ex(name);
+ convert_to_long_ex(handle);
+ convert_to_long_ex(flag);
+
+
+ php_error(E_WARNING, "dbplus_rcrtlike: not yet implemented");
+}
+/* }}} */
+
+/* {{{ proto int dbplus_resolve(string name, string vname)
+ */
+PHP_FUNCTION(dbplus_resolve)
+{
+ zval **name, **vname;
+ if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &name, &vname) == FAILURE){
+ WRONG_PARAM_COUNT;
+ }
+
+ convert_to_string_ex(name);
+ convert_to_string_ex(vname);
+
+
+ php_error(E_WARNING, "dbplus_resolve: not yet implemented");
+}
+/* }}} */
+
+/* {{{ proto int dbplus_tcl(int sid, string script)
+ */
+PHP_FUNCTION(dbplus_tcl)
+{
+ zval **sid, **script;
+ 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);
+
+
+ php_error(E_WARNING, "dbplus_tcl: not yet implemented");
+}
+/* }}} */
+
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
diff --git a/ext/dbplus/php_dbplus.c b/ext/dbplus/php_dbplus.c
new file mode 100644
index 0000000000..b850f11123
--- /dev/null
+++ b/ext/dbplus/php_dbplus.c
@@ -0,0 +1,1279 @@
+/*
+ +----------------------------------------------------------------------+
+ | PHP version 4.0 |
+ +----------------------------------------------------------------------+
+ | Copyright (c) 1997, 1998, 1999, 2000, 2001 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. |
+ +----------------------------------------------------------------------+
+ | Authors: Hartmut Holzgraefe <hartmut@six.de> |
+ | |
+ +----------------------------------------------------------------------+
+ */
+
+#include "php.h"
+#include "php_ini.h"
+#include "php_dbplus.h"
+
+
+#define _STRING(x) ((*x)->value.str.val)
+#define _INT(x) ((*x)->value.lval)
+#define _HASH(x) ((*x)->value.ht)
+
+#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 ((*zv)->type!=IS_ARRAY)
+ return 1;
+
+ rtupinit(r, t);
+
+ ap = r->r_atts;
+ deg = r->r_rel.rel_deg;
+ do {
+ if(SUCCESS!=zend_hash_find((*zv)->value.ht,ap->att_name,strlen(ap->att_name)+1,(void **)&element))
+ continue;
+
+ if (! *element) return 1;
+
+ switch(ap->att_type) {
+ case FT_SHORT:
+ convert_to_long_ex(element);
+ AFFIX(ap, t)->f_short = (short) (*element)->value.lval;
+ break;
+ case FT_UNSIGNED:
+ convert_to_long_ex(element);
+ AFFIX(ap, t)->f_unsigned = (unsigned) (*element)->value.lval;
+ break;
+ case FT_SEQUENCE:
+ case FT_LONG:
+ convert_to_long_ex(element);
+ AFFIX(ap, t)->f_long = (long) (*element)->value.lval;
+ break;
+ case FT_DATE:
+ convert_to_long_ex(element);
+ AFFIX(ap, t)->f_date = (long) (*element)->value.lval;
+ break;
+ case FT_FLOAT:
+ convert_to_double_ex(element);
+ AFFIX(ap, t)->f_float = (float) (*element)->value.dval;
+ break;
+ case FT_DOUBLE:
+ convert_to_double_ex(element);
+ AFFIX(ap, t)->f_double = (double) (*element)->value.dval;
+ break;
+ case FT_STRING: case FT_DEUTSCH: case FT_CHAR:
+ convert_to_string_ex(element);
+ afput(ap, t, (field *)0, (*element)->value.str.val);
+ break;
+ case FT_TIMESTAMP:
+ /* TODO
+ str2timestamp(SvPV(sv, na), (timestamp *)AFFIX(ap, t));
+ */
+ break;
+ case FT_BINARY:
+ case FT_BLOB:
+ case FT_MEMO:
+ break;
+ }
+ } while (ap++, --deg);
+ return 0;
+}
+
+
+
+static int
+tuple2var(relf * r, tuple * t, zval **zv)
+{
+ register attribute *ap ;
+ unsigned deg ;
+ char buf[20];
+ 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); element->type=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:
+ ZVAL_LONG(element,AFFIX(ap, t)->f_long);
+ 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;
+
+ /*
+ case FT_P_SHORT: return "FT_P_SHORT";
+ case FT_P_LONG: return "FT_P_LONG";
+ case FT_DATE: return "FT_DATE";
+ case FT_TIME: return "FT_TIME";
+ case FT_BINARY: return "FT_BINARY";
+ case FT_BLOB: return "FT_BLOB";
+ case FT_ANSI: return "FT_ANSI";
+ case FT_TIMESTAMP: return "FT_TIMESTAMP";
+ case FT_SEQUENCE: return "FT_SEQUENCE";
+ case FT_MEMO: return "FT_MEMO";
+ case FT_ISO: return "FT_ISO";
+ case FT_ISOL: return "FT_ISOL";
+ case FT_ANON: return "FT_ANON";
+ case FT_TUPID: return "FT_TUPID";
+ case FT_INVALID: return "FT_INVALID";
+ */
+ }
+
+ if(element->type!=IS_NULL)
+ zend_hash_update((*zv)->value.ht
+ ,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;
+ int len;
+ int alen;
+ field *f;
+ enum scalop sop;
+ int n_elems;
+ int n;
+ char * dom;
+ char * val;
+ char * op;
+ zval **zdata;
+
+ /* init first */
+ db_coninit(r, &c);
+
+ if ((*constr)->type != 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((*zdata)->type) {
+ 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(!((*zdata)->type==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)
+ Add a tuple to a relation */
+PHP_FUNCTION(dbplus_add)
+{
+ zval **relation, **data, **element;
+ 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);
+
+ RETURN_LONG(stat);
+}
+/* }}} */
+
+/* {{{ proto int dbplus_aql(string query [, string server [, string dbpath]])
+ Perform 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])
+ Get/Set database virtual current directory */
+PHP_FUNCTION(dbplus_chdir)
+{
+ int argc;
+ zval **newdir;
+
+ argc = ZEND_NUM_ARGS();
+ if (argc > 1 || zend_get_parameters_ex(1, &newdir) == FAILURE){
+ WRONG_PARAM_COUNT;
+ }
+
+ convert_to_string_ex(newdir);
+
+ RETURN_STRING(cdb_chdir((argc==1)?_STRING(newdir):NULL),1);
+}
+/* }}} */
+
+/* {{{ proto int dbplus_close(int relation)
+ Close 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((*relation)->value.lval);
+
+ RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto int dbplus_curr(int relation, array tuple)
+ Get 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)
+ Get 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 string dbplus_errno(void)
+ Get error code for last operation */
+PHP_FUNCTION(dbplus_errno)
+{
+ RETURN_LONG(Acc_error);
+}
+/* }}} */
+
+/* {{{ proto int dbplus_find(int relation, array constr, array tuple)
+ */
+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 ((*constr)->type != 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)
+ Get 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)
+ Free all locks held by this client */
+PHP_FUNCTION(dbplus_freealllocks)
+{
+ RETURN_LONG(cdbFreeAllLocks());
+}
+/* }}} */
+
+
+/* {{{ proto int dbplus_freelock(int relation, array tuple)
+ Give up lock on tuple */
+PHP_FUNCTION(dbplus_freelock)
+{
+ zval **relation, **data, **element;
+ 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)
+ Free 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)
+ Request locking of tuple */
+PHP_FUNCTION(dbplus_getlock)
+{
+ zval **relation, **data, **element;
+ 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, int flush)
+ */
+PHP_FUNCTION(dbplus_getunique)
+{
+ relf *r;
+ zval **relation, **uniqueid, **flush;
+ if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &relation, &uniqueid, &flush) == FAILURE){
+ WRONG_PARAM_COUNT;
+ }
+
+ DBPLUS_FETCH_RESOURCE(r,relation);
+ convert_to_long_ex(uniqueid);
+ convert_to_long_ex(flush);
+
+ RETURN_LONG(cdb_getunique(r,&(_INT(uniqueid)),_INT(flush)));
+}
+/* }}} */
+
+/* {{{ 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",(*key)->value.str.val)) {
+ do {
+ MAKE_STD_ZVAL(element);
+
+ ZVAL_STRING(element,ap->att_name,1);
+
+ zend_hash_update((*result)->value.ht
+ ,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)
+ Get 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)
+ Request read-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)
+ Get next tuple from relation */
+PHP_FUNCTION(dbplus_next)
+{
+ zval **relation, **tname, *element;
+ 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 int dbplus_open(string name)
+ Open 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((*tname)->value.str.val,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)
+ Get 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 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 int dbplus_rkeys(int relation, [string|array] domlist)
+ */
+PHP_FUNCTION(dbplus_rkeys)
+{
+ relf *r,*rnew;
+ zval **relation, **domlist, **zdata;
+ int nkeys=0;
+ char *p, *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);
+
+ if((*domlist)->type == 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((*zdata)->type==IS_STRING)
+ keys[nkeys++] = _STRING(zdata);
+ else {
+ php_error(E_WARNING,"Domlist array contains non-string value(s)");
+ Acc_error = ERR_USER;
+ RETURN_FALSE;
+ }
+ }
+ } else {
+ convert_to_string_ex(domlist);
+ name = estrdup(_STRING(domlist));
+ while (p = strtok(nkeys ? 0 : name, " "))
+ keys[nkeys++] = p;
+ }
+
+ rnew = cdbRkeys(r, nkeys, keys);
+ if(name) efree(name);
+
+ if(rnew) {
+ /* TODO realy delete old relation resource ? */
+ zend_list_delete((*relation)->value.lval);
+
+ ZEND_REGISTER_RESOURCE(return_value,rnew,le_dbplus_relation);
+ } else {
+ /* TODO error reporting */
+ RETURN_FALSE;
+ }
+}
+/* }}} */
+
+/* {{{ proto int dbplus_ropen(string name)
+ Open relation file ... ??? */
+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((*tname)->value.str.val,0,0);
+ if(r == NULL) {
+ /* TODO error handling */
+ RETURN_FALSE;
+ }
+
+ ZEND_REGISTER_RESOURCE(return_value,r,le_dbplus_relation);
+}
+/* }}} */
+
+/* {{{ proto int dbplus_rquery(string name, string dbpath)
+ */
+PHP_FUNCTION(dbplus_rquery)
+{
+ relf *r;
+ zval **name, **dbpath;
+ int argc;
+
+ if (argc <1 || argc>2 || zend_get_parameters_ex(1, &name, &dbpath) == FAILURE){
+ WRONG_PARAM_COUNT;
+ }
+
+ r = aql_exec(_STRING(name),(argc==2)?_STRING(dbpath):NULL);
+
+ if(!r) {
+ /* TODO error handling */
+ RETURN_FALSE;
+ }
+
+ ZEND_REGISTER_RESOURCE(return_value,r,le_dbplus_relation);
+}
+/* }}} */
+
+/* {{{ proto int dbplus_rrename(int relation, string name, int flag)
+ */
+PHP_FUNCTION(dbplus_rrename)
+{
+ relf *r;
+ zval **relation, **name, **flag;
+ if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &relation, &name, &flag) == FAILURE){
+ WRONG_PARAM_COUNT;
+ }
+
+ DBPLUS_FETCH_RESOURCE(r,relation);
+
+ convert_to_string_ex(name);
+ convert_to_long_ex(flag);
+
+ RETURN_LONG(cdbRrename(r,_STRING(name),(*flag)->value.lval));
+}
+/* }}} */
+
+/* {{{ proto int dbplus_rsecindex(int relation, string domlist, int compact)
+ */
+PHP_FUNCTION(dbplus_rsecindex)
+{
+ relf *r,*rnew;
+ zval **relation, **domlist, **compact, **zdata;
+ int nkeys=0;
+ char *p, *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);
+
+ if((*domlist)->type == 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((*zdata)->type==IS_STRING)
+ keys[nkeys++] = _STRING(zdata);
+ else {
+ php_error(E_WARNING,"Domlist array contains non-string value(s)");
+ Acc_error = ERR_USER;
+ RETURN_FALSE;
+ }
+ }
+ } else {
+ convert_to_string_ex(domlist);
+ name = estrdup(_STRING(domlist));
+ while (p = strtok(nkeys ? 0 : name, " "))
+ keys[nkeys++] = p;
+ }
+
+ 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((*relation)->value.lval);
+
+ ZEND_REGISTER_RESOURCE(return_value,rnew,le_dbplus_relation);
+ } else {
+ /* TODO error reporting */
+ RETURN_FALSE;
+ }
+}
+/* }}} */
+
+/* {{{ proto int dbplus_runlink(int relation)
+ Remove 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)
+ Remove all tuples from relation */
+PHP_FUNCTION(dbplus_rzap)
+{
+
+ /* todo: optional argument */
+ relf *r;
+ zval **relation, **truncate;
+ if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &truncate) == FAILURE){
+ WRONG_PARAM_COUNT;
+ }
+
+ convert_to_long_ex(truncate);
+
+ DBPLUS_FETCH_RESOURCE(r,relation);
+
+ RETURN_LONG(cdbRzap(r,(*truncate)->value.lval));
+}
+/* }}} */
+
+/* {{{ 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,(*idx_number)->value.lval));
+}
+/* }}} */
+
+/* {{{ proto int dbplus_sql(string query, string server, string dbpath)
+ Perform 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 int dbplus_tremove(int relation, array old [, array current])
+ Remove 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)
+ Give up read-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)
+ ??? */
+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)
+ Update 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)
+ Request exclusive write 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)
+ Free exclusive write 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
new file mode 100644
index 0000000000..e4f4dc1b7e
--- /dev/null
+++ b/ext/dbplus/php_dbplus.h
@@ -0,0 +1,131 @@
+/*
+ +----------------------------------------------------------------------+
+ | PHP version 4.0 |
+ +----------------------------------------------------------------------+
+ | Copyright (c) 1997, 1998, 1999, 2000, 2001 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. |
+ +----------------------------------------------------------------------+
+ | Authors: |
+ | |
+ +----------------------------------------------------------------------+
+ */
+
+#ifndef PHP_DBPLUS_H
+#define PHP_DBPLUS_H
+
+#include <saccess.h>
+#include <relation.h>
+#include <dblight.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_change);
+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 DBPLUSG(v) (dbplus_globals->v)
+#define DBPLUSLS_FETCH() php_dbplus_globals *dbplus_globals = ts_resource(dbplus_globals_id)
+#else
+#define DBPLUSG(v) (dbplus_globals.v)
+#define DBPLUSLS_FETCH()
+#endif
+
+
+int le_dbplus_relation;
+int le_dbplus_tuple;
+
+void dbplus_destruct_relation(zend_rsrc_list_entry *rsrc);
+void dbplus_destruct_tupel(zend_rsrc_list_entry *rsrc);
+
+
+#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
new file mode 100644
index 0000000000..2c56768952
--- /dev/null
+++ b/ext/dbplus/tests/001.phpt
@@ -0,0 +1,23 @@
+--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