Update the mSQL module with the latest tech

1 files changed, 1310 insertions, 0 deletions

diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c
new file mode 100644
index 0000000000..7971567a24
--- /dev/null
+++ b/ext/msql/php_msql.c
@@ -0,0 +1,1310 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP version 4.0                                                      |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997, 1998, 1999 The PHP Group                         |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.0 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_0.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: Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+ */
+ 
+/* $Id$ */
+
+#include "php.h"
+#if COMPILE_DL
+#include "dl/phpdl.h"
+#include "functions/dl.h"
+#endif
+#include "php_msql.h"
+#include "ext/standard/php3_standard.h"
+#include "php_globals.h"
+
+#if HAVE_MSQL
+
+#define OS_UNIX 1
+
+#if defined(WIN32) && defined(MSQL1)
+#include <msql1.h>
+#else
+#include <msql.h>
+#endif
+
+#define MSQL_ASSOC		1<<0
+#define MSQL_NUM		1<<1
+#define MSQL_BOTH		(MSQL_ASSOC|MSQL_NUM)
+
+
+function_entry msql_functions[] = {
+	PHP_FE(msql_connect,							NULL)
+	PHP_FE(msql_pconnect,							NULL)
+	PHP_FE(msql_close,								NULL)
+	PHP_FE(msql_select_db,							NULL)
+	PHP_FE(msql_create_db,							NULL)
+	PHP_FE(msql_drop_db,							NULL)
+	PHP_FE(msql_query,								NULL)
+	PHP_FE(msql_db_query,							NULL)
+	PHP_FE(msql_list_dbs,							NULL)
+	PHP_FE(msql_list_tables,						NULL)
+	PHP_FE(msql_list_fields,						NULL)
+	PHP_FE(msql_error,								NULL)
+	PHP_FE(msql_result,								NULL)
+	PHP_FE(msql_num_rows,							NULL)
+	PHP_FE(msql_num_fields,							NULL)
+	PHP_FE(msql_fetch_row,							NULL)
+	PHP_FE(msql_fetch_array,						NULL)
+	PHP_FE(msql_fetch_object,						NULL)
+	PHP_FE(msql_data_seek,							NULL)
+	PHP_FE(msql_fetch_field,						NULL)
+	PHP_FE(msql_field_seek,							NULL)
+	PHP_FE(msql_free_result,						NULL)
+	PHP_FE(msql_field_name,							NULL)
+	PHP_FE(msql_field_table,						NULL)
+	PHP_FE(msql_field_len,							NULL)
+	PHP_FE(msql_field_type,							NULL)
+	PHP_FE(msql_field_flags,						NULL)
+	
+	PHP_FALIAS(msql_fieldname,		msql_field_name,		NULL)
+	PHP_FALIAS(msql_fieldtable,		msql_field_table,		NULL)
+	PHP_FALIAS(msql_fieldlen,		msql_field_len,			NULL)
+	PHP_FALIAS(msql_fieldtype,		msql_field_type,		NULL)
+	PHP_FALIAS(msql_fieldflags,		msql_field_flags,		NULL)
+	
+	PHP_FALIAS(msql_regcase,		sql_regcase,			NULL)
+	
+	PHP_FALIAS(msql_affected_rows,	msql_affected_rows,		NULL)
+	
+	/* for downwards compatability */
+	PHP_FALIAS(msql,				msql_db_query,			NULL)
+	PHP_FALIAS(msql_selectdb,		msql_select_db,			NULL)
+	PHP_FALIAS(msql_createdb,		msql_create_db,			NULL)
+	PHP_FALIAS(msql_dropdb,			msql_drop_db,			NULL)
+	PHP_FALIAS(msql_freeresult,		msql_free_result,		NULL)
+	PHP_FALIAS(msql_numfields,		msql_num_fields,		NULL)
+	PHP_FALIAS(msql_numrows,		msql_num_rows,			NULL)
+	PHP_FALIAS(msql_listdbs,		msql_list_dbs,			NULL)
+	PHP_FALIAS(msql_listtables,		msql_list_tables,		NULL)
+	PHP_FALIAS(msql_listfields,		msql_list_fields,		NULL)
+	PHP_FALIAS(msql_dbname,			msql_result,			NULL)
+	PHP_FALIAS(msql_tablename,		msql_result,			NULL)
+	{NULL, NULL, NULL}
+};
+
+
+zend_module_entry msql_module_entry = {
+	"mSQL", msql_functions, PHP_MINIT(msql), NULL, PHP_RINIT(msql), NULL,
+			PHP_MINFO(msql), STANDARD_MODULE_PROPERTIES
+};
+
+
+#if COMPILE_DL
+DLEXPORT zend_module_entry *get_module(void) { return &msql_module_entry; }
+#endif
+
+typedef struct {
+	m_result *result;
+	int af_rows;
+} m_query;
+
+#define MSQL_GET_QUERY(res)																			\
+	ZEND_FETCH_RESOURCE(msql_query, m_query *, res, -1, "mSQL result", php_msql_module.le_query);	\
+	msql_result = msql_query->result
+
+static void _delete_query(void *arg)
+{
+	m_query *query = (m_query *) arg;
+
+	if(query->result) msqlFreeResult(query->result);
+	efree(arg);
+}
+
+static m_query *php_msql_query_wrapper(m_result *res, int af_rows)
+{
+	m_query *query = (m_query *) emalloc(sizeof(m_query));
+	
+	query->result = res;
+	query->af_rows = af_rows;
+	
+	return query;
+}
+
+static void _close_msql_link(int link)
+{
+	msqlClose(link);
+	php_msql_module.num_links--;
+}
+
+
+static void _close_msql_plink(int link)
+{
+	msqlClose(link);
+	php_msql_module.num_persistent--;
+	php_msql_module.num_links--;
+}
+
+DLEXPORT PHP_MINIT_FUNCTION(msql)
+{
+	if (cfg_get_long("msql.allow_persistent",&php_msql_module.allow_persistent)==FAILURE) {
+		php_msql_module.allow_persistent=1;
+	}
+	if (cfg_get_long("msql.max_persistent",&php_msql_module.max_persistent)==FAILURE) {
+		php_msql_module.max_persistent=-1;
+	}
+	if (cfg_get_long("msql.max_links",&php_msql_module.max_links)==FAILURE) {
+		php_msql_module.max_links=-1;
+	}
+	php_msql_module.num_persistent=0;
+	php_msql_module.le_query = register_list_destructors(_delete_query,NULL);
+	php_msql_module.le_link = register_list_destructors(_close_msql_link,NULL);
+	php_msql_module.le_plink = register_list_destructors(NULL,_close_msql_plink);
+	
+	msql_module_entry.type = type;
+
+	REGISTER_LONG_CONSTANT("MSQL_ASSOC", MSQL_ASSOC, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MSQL_NUM", MSQL_NUM, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MSQL_BOTH", MSQL_BOTH, CONST_CS | CONST_PERSISTENT);
+
+	return SUCCESS;
+}
+
+DLEXPORT PHP_RINIT_FUNCTION(msql)
+{
+	php_msql_module.default_link=-1;
+	php_msql_module.num_links = php_msql_module.num_persistent;
+	msqlErrMsg[0]=0;
+	return SUCCESS;
+}
+
+DLEXPORT PHP_MINFO_FUNCTION(msql)
+{
+	char maxp[16],maxl[16];
+
+	if (php_msql_module.max_persistent==-1) {
+		strcpy(maxp,"Unlimited");
+	} else {
+		snprintf(maxp,15,"%ld",php_msql_module.max_persistent);
+		maxp[15]=0;
+	}
+	if (php_msql_module.max_links==-1) {
+		strcpy(maxl,"Unlimited");
+	} else {
+		snprintf(maxl,15,"%ld",php_msql_module.max_links);
+		maxl[15]=0;
+	}
+	php_printf("<table>"
+				"<tr><td>Allow persistent links:</td><td>%s</td></tr>\n"
+				"<tr><td>Persistent links:</td><td>%d/%s</td></tr>\n"
+				"<tr><td>Total links:</td><td>%d/%s</td></tr>\n"
+				"</table>\n",
+				(php_msql_module.allow_persistent?"Yes":"No"),
+				php_msql_module.num_persistent,maxp,
+				php_msql_module.num_links,maxl);
+}
+
+
+static void php_msql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
+{
+	char *host;
+	char *hashed_details;
+	int hashed_details_length;
+	int msql;
+	
+	switch(ARG_COUNT(ht)) {
+		case 0: /* defaults */
+			host=NULL;
+			hashed_details=estrndup("msql_",5);
+			hashed_details_length=4+1;
+			break;
+		case 1: {
+				pval *yyhost;
+			
+				if (getParameters(ht, 1, &yyhost) == FAILURE) {
+					RETURN_FALSE;
+				}
+				convert_to_string(yyhost);
+				host = yyhost->value.str.val;
+				hashed_details_length = yyhost->value.str.len+4+1;
+				hashed_details = emalloc(hashed_details_length+1);
+				sprintf(hashed_details,"msql_%s",yyhost->value.str.val); /* SAFE */
+			}
+			break;
+		default:
+			WRONG_PARAM_COUNT;
+			break;
+	}
+	
+	if (!php_msql_module.allow_persistent) {
+		persistent=0;
+	}
+	if (persistent) {
+		list_entry *le;
+		
+		if (php_msql_module.max_links!=-1 && php_msql_module.num_links>=php_msql_module.max_links) {
+			php_error(E_WARNING,"mSQL:  Too many open links (%d)",php_msql_module.num_links);
+			efree(hashed_details);
+			RETURN_FALSE;
+		}
+		if (php_msql_module.max_persistent!=-1 && php_msql_module.num_persistent>=php_msql_module.max_persistent) {
+			php_error(E_WARNING,"mSQL:  Too many open persistent links (%d)",php_msql_module.num_persistent);
+			efree(hashed_details);
+			RETURN_FALSE;
+		}
+		
+		/* try to find if we already have this link in our persistent list */
+		if (zend_hash_find(plist, hashed_details, hashed_details_length+1, (void **) &le)==FAILURE) {  /* we don't */
+			list_entry new_le;
+			
+			/* create the link */
+			if ((msql=msqlConnect(host))==-1) {
+				efree(hashed_details);
+				RETURN_FALSE;
+			}
+			
+			/* hash it up */
+			new_le.type = php_msql_module.le_plink;
+			new_le.ptr = (void *) msql;
+			if (zend_hash_update(plist, hashed_details, hashed_details_length+1, (void *) &new_le, sizeof(list_entry), NULL)==FAILURE) {
+				efree(hashed_details);
+				RETURN_FALSE;
+			}
+			php_msql_module.num_persistent++;
+			php_msql_module.num_links++;
+		} else {  /* we do */
+			if (le->type != php_msql_module.le_plink) {
+				efree(hashed_details);
+				RETURN_FALSE;
+			}
+#if 0
+			/* ensure that the link did not die */
+			/* still have to find a way to do this nicely with mSQL */
+			if (msql_stat(le->ptr)==NULL) { /* the link died */
+				if (msql_connect(le->ptr,host,user,passwd)==NULL) {
+					php_error(E_WARNING,"mSQL link lost, unable to reconnect");
+					zend_hash_del(plist,hashed_details,hashed_details_length+1);
+					efree(hashed_details);
+					RETURN_FALSE;
+				}
+			}
+#endif
+			msql = (int) le->ptr;
+		}
+		ZEND_REGISTER_RESOURCE(return_value, (void *) msql, php_msql_module.le_plink);
+	} else {
+		list_entry *index_ptr,new_index_ptr;
+		
+		/* first we check the hash for the hashed_details key.  if it exists,
+		 * it should point us to the right offset where the actual msql link sits.
+		 * if it doesn't, open a new msql link, add it to the resource list,
+		 * and add a pointer to it with hashed_details as the key.
+		 */
+		if (zend_hash_find(list,hashed_details,hashed_details_length+1,(void **) &index_ptr)==SUCCESS) {
+			int type,link;
+			void *ptr;
+
+			if (index_ptr->type != le_index_ptr) {
+				RETURN_FALSE;
+			}
+			link = (int) index_ptr->ptr;
+			ptr = zend_list_find(link,&type);   /* check if the link is still there */
+			if (ptr && (type==php_msql_module.le_link || type==php_msql_module.le_plink)) {
+				return_value->value.lval = php_msql_module.default_link = link;
+				return_value->type = IS_LONG;
+				efree(hashed_details);
+				return;
+			} else {
+				zend_hash_del(list,hashed_details,hashed_details_length+1);
+			}
+		}
+		if (php_msql_module.max_links!=-1 && php_msql_module.num_links>=php_msql_module.max_links) {
+			php_error(E_WARNING,"mSQL:  Too many open links (%d)",php_msql_module.num_links);
+			efree(hashed_details);
+			RETURN_FALSE;
+		}
+		if ((msql=msqlConnect(host))==-1) {
+			efree(hashed_details);
+			RETURN_FALSE;
+		}
+
+		/* add it to the list */
+		ZEND_REGISTER_RESOURCE(return_value, (void *) msql, php_msql_module.le_plink);
+		
+		/* add it to the hash */
+		new_index_ptr.ptr = (void *) return_value->value.lval;
+		new_index_ptr.type = le_index_ptr;
+		if (zend_hash_update(list,hashed_details,hashed_details_length+1,(void *) &new_index_ptr, sizeof(list_entry), NULL)==FAILURE) {
+			efree(hashed_details);
+			RETURN_FALSE;
+		}
+		php_msql_module.num_links++;
+	}
+	efree(hashed_details);
+	php_msql_module.default_link=return_value->value.lval;
+}
+
+
+static int php_msql_get_default_link(INTERNAL_FUNCTION_PARAMETERS)
+{
+	if (php_msql_module.default_link==-1) { /* no link opened yet, implicitly open one */
+		ht = 0;
+		php_msql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
+	}
+	return php_msql_module.default_link;
+}
+
+
+/* {{{ proto int msql_connect([string hostname[:port]] [, string username] [, string password])
+   Open a connection to an mSQL Server */
+DLEXPORT PHP_FUNCTION(msql_connect)
+{
+	php_msql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,0);
+}
+/* }}} */
+
+
+/* {{{ proto int msql_pconnect([string hostname[:port]] [, string username] [, string password])
+   Open a persistent connection to an mSQL Server */
+DLEXPORT PHP_FUNCTION(msql_pconnect)
+{
+	php_msql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,1);
+}
+/* }}} */
+
+
+/* {{{ proto int msql_close([int link_identifier])
+   Close an mSQL connection */
+DLEXPORT PHP_FUNCTION(msql_close)
+{
+	pval *msql_link;
+	int id;
+	int msql;
+	
+	switch (ARG_COUNT(ht)) {
+		case 0:
+			id = php_msql_module.default_link;
+			break;
+		case 1:
+			if (getParameters(ht, 1, &msql_link)==FAILURE) {
+				RETURN_FALSE;
+			}
+			id = -1;
+			break;
+		default:
+			WRONG_PARAM_COUNT;
+			break;
+	}
+	
+	msql = (int) zend_fetch_resource_ex(msql_link, id, "mSQL link", 2, php_msql_module.le_link, php_msql_module.le_plink);
+	ZEND_VERIFY_RESOURCE(msql);
+	
+	zend_list_delete(id);
+	RETURN_TRUE;
+}
+/* }}} */
+
+
+/* {{{ proto int msql_select_db(string database_name [, int link_identifier])
+   Select an mSQL database */
+DLEXPORT PHP_FUNCTION(msql_select_db)
+{
+	pval *db,*msql_link;
+	int id;
+	int msql;
+	
+	switch(ARG_COUNT(ht)) {
+		case 1:
+			if (getParameters(ht, 1, &db)==FAILURE) {
+				RETURN_FALSE;
+			}
+			id = php_msql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+			break;
+		case 2:
+			if (getParameters(ht, 2, &db, &msql_link)==FAILURE) {
+				RETURN_FALSE;
+			}
+			id = -1;
+			break;
+		default:
+			WRONG_PARAM_COUNT;
+			break;
+	}
+	
+
+	msql = (int) zend_fetch_resource_ex(msql_link, id, "mSQL link", 2, php_msql_module.le_link, php_msql_module.le_plink);
+	ZEND_VERIFY_RESOURCE(msql);
+
+	convert_to_string(db);
+	
+	if (msqlSelectDB(msql,db->value.str.val)==-1) {
+		RETURN_FALSE;
+	} else {
+		RETURN_TRUE;
+	}
+}
+/* }}} */
+
+
+/* {{{ proto int msql_create_db(string database_name [, int link_identifier])
+   Create an mSQL database */
+DLEXPORT PHP_FUNCTION(msql_create_db)
+{
+	pval *db,*msql_link;
+	int id;
+	int msql;
+	
+	switch(ARG_COUNT(ht)) {
+		case 1:
+			if (getParameters(ht, 1, &db)==FAILURE) {
+				WRONG_PARAM_COUNT;
+			}
+			id = php_msql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+			break;
+		case 2:
+			if (getParameters(ht, 2, &db, &msql_link)==FAILURE) {
+				WRONG_PARAM_COUNT;
+			}
+			id = -1;
+			break;
+		default:
+			WRONG_PARAM_COUNT;
+			break;
+	}
+	
+	msql = (int) zend_fetch_resource_ex(msql_link, id, "mSQL link", 2, php_msql_module.le_link, php_msql_module.le_plink);
+	ZEND_VERIFY_RESOURCE(msql);
+	
+	convert_to_string(db);
+	if (msqlCreateDB(msql,db->value.str.val)<0) {
+		RETURN_FALSE;
+	} else {
+		RETURN_TRUE;
+	}
+}
+/* }}} */
+
+
+/* {{{ proto int msql_drop_db(string database_name [, int link_identifier])
+   Drop (delete) an mSQL database */
+DLEXPORT PHP_FUNCTION(msql_drop_db)
+{
+	pval *db,*msql_link;
+	int id;
+	int msql;
+	
+	switch(ARG_COUNT(ht)) {
+		case 1:
+			if (getParameters(ht, 1, &db)==FAILURE) {
+				WRONG_PARAM_COUNT;
+			}
+			id = php_msql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+			break;
+		case 2:
+			if (getParameters(ht, 2, &db, &msql_link)==FAILURE) {
+				WRONG_PARAM_COUNT;
+			}
+			id = -1;
+			break;
+		default:
+			WRONG_PARAM_COUNT;
+			break;
+	}
+	
+	msql = (int) zend_fetch_resource_ex(msql_link, id, "mSQL link", 2, php_msql_module.le_link, php_msql_module.le_plink);
+	ZEND_VERIFY_RESOURCE(msql);
+	
+	convert_to_string(db);
+	if (msqlDropDB(msql,db->value.str.val)<0) {
+		RETURN_FALSE;
+	} else {
+		RETURN_TRUE;
+	}
+}
+/* }}} */
+
+
+/* {{{ proto int msql_query(string query [, int link_identifier])
+   Send an SQL query to mSQL */
+DLEXPORT PHP_FUNCTION(msql_query)
+{
+	pval *query,*msql_link;
+	int id;
+	int msql;
+	int af_rows;
+	
+	switch(ARG_COUNT(ht)) {
+		case 1:
+			if (getParameters(ht, 1, &query)==FAILURE) {
+				WRONG_PARAM_COUNT;
+			}
+			id = php_msql_module.default_link;
+			break;
+		case 2:
+			if (getParameters(ht, 2, &query, &msql_link)==FAILURE) {
+				WRONG_PARAM_COUNT;
+			}
+			id = -1;
+			break;
+		default:
+			WRONG_PARAM_COUNT;
+			break;
+	}
+	
+	msql = (int) zend_fetch_resource_ex(msql_link, id, "mSQL link", 2, php_msql_module.le_link, php_msql_module.le_plink);
+	ZEND_VERIFY_RESOURCE(msql);
+	
+	convert_to_string(query);
+	if ((af_rows = msqlQuery(msql,query->value.str.val))==-1) {
+		RETURN_FALSE;
+	}
+	ZEND_REGISTER_RESOURCE(return_value, php_msql_query_wrapper(msqlStoreResult(), af_rows), php_msql_module.le_query);
+}
+/* }}} */
+
+
+/* {{{ proto int msql_db_query(string database_name, string query [, int link_identifier])
+   Send an SQL query to mSQL */
+DLEXPORT PHP_FUNCTION(msql_db_query)
+{
+	pval *db,*query,*msql_link;
+	int id;
+	int msql;
+	int af_rows;
+	
+	switch(ARG_COUNT(ht)) {
+		case 2:
+			if (getParameters(ht, 2, &db, &query)==FAILURE) {
+				RETURN_FALSE;
+			}
+			id = php_msql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+			break;
+		case 3:
+			if (getParameters(ht, 3, &db, &query, &msql_link)==FAILURE) {
+				RETURN_FALSE;
+			}
+			id = -1;
+			break;
+		default:
+			WRONG_PARAM_COUNT;
+			break;
+	}
+	
+	msql = (int) zend_fetch_resource_ex(msql_link, id, "mSQL link", 2, php_msql_module.le_link, php_msql_module.le_plink);
+	ZEND_VERIFY_RESOURCE(msql);
+	
+	convert_to_string(db);
+	if (msqlSelectDB(msql,db->value.str.val)==-1) {
+		RETURN_FALSE;
+	}
+	
+	convert_to_string(query);
+	if ((af_rows = msqlQuery(msql,query->value.str.val))==-1) {
+		RETURN_FALSE;
+	}
+	ZEND_REGISTER_RESOURCE(return_value, php_msql_query_wrapper(msqlStoreResult(), af_rows), php_msql_module.le_query);
+}
+/* }}} */
+
+
+/* {{{ proto int msql_list_dbs([int link_identifier])
+   List databases available on an mSQL server */
+DLEXPORT PHP_FUNCTION(msql_list_dbs)
+{
+	pval *msql_link;
+	int id;
+	int msql;
+	m_result *msql_result;
+	
+	switch(ARG_COUNT(ht)) {
+		case 0:
+			id = php_msql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+			break;
+		case 1:
+			if (getParameters(ht, 1, &msql_link)==FAILURE) {
+				RETURN_FALSE;
+			}
+			id = -1;
+			break;
+		default:
+			WRONG_PARAM_COUNT;
+			break;
+	}
+	
+	msql = (int) zend_fetch_resource_ex(msql_link, id, "mSQL link", 2, php_msql_module.le_link, php_msql_module.le_plink);
+	ZEND_VERIFY_RESOURCE(msql);
+
+	if ((msql_result=msqlListDBs(msql))==NULL) {
+		php_error(E_WARNING,"Unable to save mSQL query result");
+		RETURN_FALSE;
+	}
+	ZEND_REGISTER_RESOURCE(return_value, php_msql_query_wrapper(msql_result, 0), php_msql_module.le_query);
+}
+/* }}} */
+
+
+/* {{{ proto int msql_list_tables(string database_name [, int link_identifier])
+   List tables in an mSQL database */
+DLEXPORT PHP_FUNCTION(msql_list_tables)
+{
+	pval *db,*msql_link;
+	int id;
+	int msql;
+	m_result *msql_result;
+	
+	switch(ARG_COUNT(ht)) {
+		case 1:
+			if (getParameters(ht, 1, &db)==FAILURE) {
+				RETURN_FALSE;
+			}
+			id = php_msql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+			break;
+		case 2:
+			if (getParameters(ht, 2, &db, &msql_link)==FAILURE) {
+				RETURN_FALSE;
+			}
+			id = -1;
+			break;
+		default:
+			WRONG_PARAM_COUNT;
+			break;
+	}
+	
+	msql = (int) zend_fetch_resource_ex(msql_link, id, "mSQL link", 2, php_msql_module.le_link, php_msql_module.le_plink);
+	ZEND_VERIFY_RESOURCE(msql);
+	
+	convert_to_string(db);
+	if (msqlSelectDB(msql,db->value.str.val)==-1) {
+		RETURN_FALSE;
+	}
+	if ((msql_result=msqlListTables(msql))==NULL) {
+		php_error(E_WARNING,"Unable to save mSQL query result");
+		RETURN_FALSE;
+	}
+	ZEND_REGISTER_RESOURCE(return_value, php_msql_query_wrapper(msql_result, 0), php_msql_module.le_query);
+}
+/* }}} */
+
+
+/* {{{ proto int msql_list_fields(string database_name, string table_name [, int link_identifier])
+   List mSQL result fields */
+DLEXPORT PHP_FUNCTION(msql_list_fields)
+{
+	pval *db,*table,*msql_link;
+	int id;
+	int msql;
+	m_result *msql_result;
+	
+	switch(ARG_COUNT(ht)) {
+		case 2:
+			if (getParameters(ht, 2, &db, &table)==FAILURE) {
+				RETURN_FALSE;
+			}
+			id = php_msql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+			break;
+		case 3:
+			if (getParameters(ht, 3, &db, &table, &msql_link)==FAILURE) {
+				RETURN_FALSE;
+			}
+			id = -1;
+			break;
+		default:
+			WRONG_PARAM_COUNT;
+			break;
+	}
+	
+	msql = (int) zend_fetch_resource_ex(msql_link, id, "mSQL link", 2, php_msql_module.le_link, php_msql_module.le_plink);
+	ZEND_VERIFY_RESOURCE(msql);
+	
+	convert_to_string(db);
+	if (msqlSelectDB(msql,db->value.str.val)==-1) {
+		RETURN_FALSE;
+	}
+	convert_to_string(table);
+	if ((msql_result=msqlListFields(msql,table->value.str.val))==NULL) {
+		php_error(E_WARNING,"Unable to save mSQL query result");
+		RETURN_FALSE;
+	}
+	ZEND_REGISTER_RESOURCE(return_value, php_msql_query_wrapper(msql_result, 0), php_msql_module.le_query);
+}
+/* }}} */
+
+
+/* {{{ proto string msql_error([int link_identifier])
+   Returns the text of the error message from previous mSQL operation */
+PHP_FUNCTION(msql_error)
+{
+	if (ARG_COUNT(ht)) {
+		WRONG_PARAM_COUNT;
+	}
+	RETURN_STRING(msqlErrMsg,1);
+}
+/* }}} */
+
+/* {{{ proto int msql_result(int query, int row [, mixed field])
+   Get result data */
+DLEXPORT PHP_FUNCTION(msql_result)
+{
+	pval *result, *row, *field=NULL;
+	m_result *msql_result;
+	m_query *msql_query;
+	m_row sql_row;
+	int field_offset=0;
+	PLS_FETCH();
+	
+	switch (ARG_COUNT(ht)) {
+		case 2:
+			if (getParameters(ht, 2, &result, &row)==FAILURE) {
+				RETURN_FALSE;
+			}
+			break;
+		case 3:
+			if (getParameters(ht, 3, &result, &row, &field)==FAILURE) {
+				RETURN_FALSE;
+			}
+			break;
+		default:
+			WRONG_PARAM_COUNT;
+			break;
+	}
+	
+	MSQL_GET_QUERY(result);
+	
+	convert_to_long(row);
+	if (row->value.lval<0 || row->value.lval>=msqlNumRows(msql_result)) {
+		php_error(E_WARNING,"Unable to jump to row %d on mSQL query index %d",row->value.lval,result->value.lval);
+		RETURN_FALSE;
+	}
+	msqlDataSeek(msql_result,row->value.lval);
+	if ((sql_row=msqlFetchRow(msql_result))==NULL) { /* shouldn't happen? */
+		RETURN_FALSE;
+	}
+
+	if (field) {
+		switch(field->type) {
+			case IS_STRING: {
+					int i=0;
+					m_field *tmp_field;
+					char *table_name,*field_name,*tmp;
+					
+					if ((tmp=strchr(field->value.str.val,'.'))) {
+						*tmp = 0;
+						table_name = estrdup(field->value.str.val);
+						field_name = estrdup(tmp+1);
+					} else {
+						table_name = NULL;
+						field_name = estrndup(field->value.str.val,field->value.str.len);
+					}
+					msqlFieldSeek(msql_result,0);
+					while ((tmp_field=msqlFetchField(msql_result))) {
+						if ((!table_name || !strcasecmp(tmp_field->table,table_name)) && !strcasecmp(tmp_field->name,field_name)) {
+							field_offset = i;
+							break;
+						}
+						i++;
+					}
+					if (!tmp_field) { /* no match found */
+						php_error(E_WARNING,"%s%s%s not found in mSQL query index %d",
+									(table_name?table_name:""), (table_name?".":""), field_name, result->value.lval);
+						efree(field_name);
+						if (table_name) {
+							efree(table_name);
+						}
+						RETURN_FALSE;
+					}
+					efree(field_name);
+					if (table_name) {
+						efree(table_name);
+					}
+				}
+				break;
+			default:
+				convert_to_long(field);
+				field_offset = field->value.lval;
+				if (field_offset<0 || field_offset>=msqlNumFields(msql_result)) {
+					php_error(E_WARNING,"Bad column offset specified");
+					RETURN_FALSE;
+				}
+				break;
+		}
+	}
+	
+	if (sql_row[field_offset]) {
+		if (PG(magic_quotes_runtime)) {
+			return_value->value.str.val = _php3_addslashes(sql_row[field_offset],0,&return_value->value.str.len,0);
+		} else {	
+			return_value->value.str.len = (sql_row[field_offset]?strlen(sql_row[field_offset]):0);
+			return_value->value.str.val = (char *) safe_estrndup(sql_row[field_offset],return_value->value.str.len);
+		}
+	} else {
+		var_reset(return_value);
+	}
+	
+	return_value->type = IS_STRING;
+}
+/* }}} */
+
+
+/* {{{ proto int msql_num_rows(int query)
+   Get number of rows in a result */
+DLEXPORT PHP_FUNCTION(msql_num_rows)
+{
+	pval *result;
+	m_result *msql_result;
+	m_query *msql_query;
+	
+	if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &result)==FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+	
+	MSQL_GET_QUERY(result);
+	RETVAL_LONG(msql_result ? msqlNumRows(msql_result) : 0);
+}
+/* }}} */
+
+
+/* {{{ proto int msql_num_fields(int query)
+   Get number of fields in a result */
+DLEXPORT PHP_FUNCTION(msql_num_fields)
+{
+	pval *result;
+	m_result *msql_result;
+	m_query *msql_query;
+	
+	if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &result)==FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+	
+	MSQL_GET_QUERY(result);
+	RETVAL_LONG(msql_result ? msqlNumFields(msql_result) : 0);
+}
+/* }}} */
+
+
+static void php_msql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
+{
+	pval *result, *arg2;
+	m_result *msql_result;
+	m_row msql_row;
+	m_field *msql_field;
+	m_query *msql_query;
+	int num_fields;
+	int i;
+	PLS_FETCH();
+	
+	switch (ARG_COUNT(ht)) {
+		case 1:
+			if (getParameters(ht, 1, &result)==FAILURE) {
+				RETURN_FALSE;
+			}
+			if (!result_type) {
+				result_type = MSQL_BOTH;
+			}
+			break;
+		case 2:
+			if (getParameters(ht, 2, &result, &arg2)==FAILURE) {
+				RETURN_FALSE;
+			}
+			convert_to_long(arg2);
+			result_type = arg2->value.lval;
+			break;
+		default:
+			WRONG_PARAM_COUNT;
+			break;
+	}
+	
+	MSQL_GET_QUERY(result);
+	if (!msql_result || (msql_row=msqlFetchRow(msql_result))==NULL) {
+		RETURN_FALSE;
+	}
+
+	num_fields = msqlNumFields(msql_result);
+	
+	if (array_init(return_value)==FAILURE) {
+		RETURN_FALSE;
+	}
+	
+	msqlFieldSeek(msql_result,0);
+	for (msql_field=msqlFetchField(msql_result),i=0; msql_field; msql_field=msqlFetchField(msql_result),i++) {
+		if (msql_row[i]) {
+			char *data;
+			int data_len;
+			int should_copy;
+
+			if (PG(magic_quotes_runtime)) {
+				data = _php3_addslashes(msql_row[i], 0, &data_len, 0);
+				should_copy = 0;
+			} else {
+				data = msql_row[i];
+				data_len = strlen(data);
+				should_copy = 1;
+			}
+			
+			if (result_type & MSQL_NUM) {
+				add_index_stringl(return_value, i, data, data_len, should_copy);
+				should_copy = 1;
+			}
+			
+			if (result_type & MSQL_ASSOC) {
+				add_assoc_stringl(return_value, msql_field->name, data, data_len, should_copy);
+			}
+		} else {
+			//add_get_index_stringl(return_value, i, empty_string, 0, (void **) &pval_ptr, 1);
+		}
+	}
+}
+
+
+/* {{{ proto array msql_fetch_row(int query)
+   Get a result row as an enumerated array */
+DLEXPORT PHP_FUNCTION(msql_fetch_row)
+{
+	php_msql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSQL_NUM);
+}
+/* }}} */
+
+
+/* {{{ proto object msql_fetch_object(int query [, int result_type])
+   Fetch a result row as an object */
+DLEXPORT PHP_FUNCTION(msql_fetch_object)
+{
+	php_msql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
+	if (return_value->type==IS_ARRAY) {
+		return_value->type=IS_OBJECT;
+		return_value->value.obj.properties = return_value->value.ht;
+		return_value->value.obj.ce = &zend_standard_class_def;
+	}
+}
+/* }}} */
+
+/* {{{ proto array msql_fetch_array(int query [, int result_type])
+   Fetch a result row as an associative array */
+DLEXPORT PHP_FUNCTION(msql_fetch_array)
+{
+	php_msql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
+}
+/* }}} */
+
+/* {{{ proto int msql_data_seek(int query, int row_number)
+   Move internal result pointer */
+DLEXPORT PHP_FUNCTION(msql_data_seek)
+{
+	pval *result,*offset;
+	m_result *msql_result;
+	m_query *msql_query;
+	
+	if (ARG_COUNT(ht)!=2 || getParameters(ht, 2, &result, &offset)==FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+	
+	MSQL_GET_QUERY(result);
+	convert_to_long(offset);
+	if (!msql_result ||
+			offset->value.lval<0 || 
+			offset->value.lval>=msqlNumRows(msql_result)) {
+		php_error(E_WARNING,"Offset %d is invalid for mSQL query index %d",offset->value.lval,result->value.lval);
+		RETURN_FALSE;
+	}
+	msqlDataSeek(msql_result,offset->value.lval);
+	RETURN_TRUE;
+}
+/* }}} */
+
+static char *php_msql_get_field_name(int field_type)
+{
+	switch (field_type) {
+#if MSQL1
+		case INT_TYPE:
+			return "int";
+			break;
+		case CHAR_TYPE:
+			return "char";
+			break;
+		case REAL_TYPE:
+			return "real";
+			break;
+		case IDENT_TYPE:
+			return "ident";
+			break;
+		case NULL_TYPE:
+			return "null";
+			break;
+#else
+		case INT_TYPE:
+		case UINT_TYPE:
+		case CHAR_TYPE:
+		case TEXT_TYPE:
+		case REAL_TYPE:
+		case NULL_TYPE:
+		case DATE_TYPE:
+		case TIME_TYPE:
+		case MONEY_TYPE:
+			return msqlTypeNames[field_type];
+			break;
+#endif
+		default:
+			return "unknown";
+			break;
+	}
+}
+
+/* {{{ proto object msql_fetch_field(int query [, int field_offset])
+   Get column information from a result and return as an object */
+DLEXPORT PHP_FUNCTION(msql_fetch_field)
+{
+	pval *result, *field=NULL;
+	m_result *msql_result;
+	m_field *msql_field;
+	m_query *msql_query;
+	
+	switch (ARG_COUNT(ht)) {
+		case 1:
+			if (getParameters(ht, 1, &result)==FAILURE) {
+				RETURN_FALSE;
+			}
+			break;
+		case 2:
+			if (getParameters(ht, 2, &result, &field)==FAILURE) {
+				RETURN_FALSE;
+			}
+			convert_to_long(field);
+		default:
+			WRONG_PARAM_COUNT;
+	}
+	
+	MSQL_GET_QUERY(result);
+	
+	if (field) {
+		if (field->value.lval<0 || field->value.lval>=msqlNumRows(msql_result)) {
+			php_error(E_NOTICE,"mSQL:  Bad field offset specified");
+			RETURN_FALSE;
+		}
+		msqlFieldSeek(msql_result,field->value.lval);
+	}
+	if (!msql_result || (msql_field=msqlFetchField(msql_result))==NULL) {
+		RETURN_FALSE;
+	}
+	if (object_init(return_value)==FAILURE) {
+		RETURN_FALSE;
+	}
+
+	add_property_string(return_value, "name",(msql_field->name?msql_field->name:empty_string), 1);
+	add_property_string(return_value, "table",(msql_field->table?msql_field->table:empty_string), 1);
+	add_property_long(return_value, "not_null",IS_NOT_NULL(msql_field->flags));
+#if MSQL1
+	add_property_long(return_value, "primary_key",(msql_field->flags&PRI_KEY_FLAG?1:0));
+#else
+	add_property_long(return_value, "unique",(msql_field->flags&UNIQUE_FLAG?1:0));
+#endif
+
+	add_property_string(return_value, "type",php_msql_get_field_name(msql_field->type), 1);
+}
+/* }}} */
+
+/* {{{ proto int msql_field_seek(int query, int field_offset)
+   Set result pointer to a specific field offset */
+DLEXPORT PHP_FUNCTION(msql_field_seek)
+{
+	pval *result, *offset;
+	m_result *msql_result;
+	m_query *msql_query;
+	
+	if (ARG_COUNT(ht)!=2 || getParameters(ht, 2, &result, &offset)==FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+	
+	MSQL_GET_QUERY(result);
+	convert_to_long(offset);
+	if(!msql_result) {
+		RETURN_FALSE;
+	}
+	if (offset->value.lval<0 || offset->value.lval>=msqlNumFields(msql_result)) {
+		php_error(E_WARNING,"Field %d is invalid for mSQL query index %d",
+				offset->value.lval,result->value.lval);
+		RETURN_FALSE;
+	}
+	msqlFieldSeek(msql_result,offset->value.lval);
+	RETURN_TRUE;
+}
+/* }}} */
+
+#define PHP3_MSQL_FIELD_NAME 1
+#define PHP3_MSQL_FIELD_TABLE 2
+#define PHP3_MSQL_FIELD_LEN 3
+#define PHP3_MSQL_FIELD_TYPE 4
+#define PHP3_MSQL_FIELD_FLAGS 5
+ 
+static void php_msql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type)
+{
+	pval *result, *field;
+	m_result *msql_result;
+	m_field *msql_field;
+	m_query *msql_query;
+	
+	if (ARG_COUNT(ht)!=2 || getParameters(ht, 2, &result, &field)==FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+	
+	MSQL_GET_QUERY(result);
+	if(!msql_result) {
+		RETURN_FALSE;
+	}
+	convert_to_long(field);
+	if (field->value.lval<0 || field->value.lval>=msqlNumFields(msql_result)) {
+		php_error(E_WARNING,"Field %d is invalid for mSQL query index %d",field->value.lval,result->value.lval);
+		RETURN_FALSE;
+	}
+	msqlFieldSeek(msql_result,field->value.lval);
+	if ((msql_field=msqlFetchField(msql_result))==NULL) {
+		RETURN_FALSE;
+	}
+	
+	switch (entry_type) {
+		case PHP3_MSQL_FIELD_NAME:
+			return_value->value.str.len = strlen(msql_field->name);
+			return_value->value.str.val = estrndup(msql_field->name,return_value->value.str.len);
+			return_value->type = IS_STRING;
+			break;
+		case PHP3_MSQL_FIELD_TABLE:
+			return_value->value.str.len = strlen(msql_field->table);
+			return_value->value.str.val = estrndup(msql_field->table,return_value->value.str.len);
+			return_value->type = IS_STRING;
+			break;
+		case PHP3_MSQL_FIELD_LEN:
+			return_value->value.lval = msql_field->length;
+			return_value->type = IS_LONG;
+			break;
+		case PHP3_MSQL_FIELD_TYPE:
+			return_value->value.str.val = estrdup(php_msql_get_field_name(msql_field->type));
+			return_value->value.str.len = strlen(return_value->value.str.val);
+			return_value->type = IS_STRING;
+			break;
+		case PHP3_MSQL_FIELD_FLAGS:
+#if MSQL1
+			if ((msql_field->flags&NOT_NULL_FLAG) && (msql_field->flags&PRI_KEY_FLAG)) {
+				return_value->value.str.val = estrndup("primary key not null",20);
+				return_value->value.str.len = 20;
+				return_value->type = IS_STRING;
+			} else if (msql_field->flags&NOT_NULL_FLAG) {
+				return_value->value.str.val = estrndup("not null",8);
+				return_value->value.str.len = 8;
+				return_value->type = IS_STRING;
+			} else if (msql_field->flags&PRI_KEY_FLAG) {
+				return_value->value.str.val = estrndup("primary key",11);
+				return_value->value.str.len = 11;
+				return_value->type = IS_STRING;
+			} else {
+				var_reset(return_value);
+			}
+#else
+			if ((msql_field->flags&NOT_NULL_FLAG) && (msql_field->flags&UNIQUE_FLAG)) {
+				return_value->value.str.val = estrndup("unique not null",15);
+				return_value->value.str.len = 15;
+				return_value->type = IS_STRING;
+			} else if (msql_field->flags&NOT_NULL_FLAG) {
+				return_value->value.str.val = estrndup("not null",8);
+				return_value->value.str.len = 8;
+				return_value->type = IS_STRING;
+			} else if (msql_field->flags&UNIQUE_FLAG) {
+				return_value->value.str.val = estrndup("unique",6);
+				return_value->value.str.len = 6;
+				return_value->type = IS_STRING;
+			} else {
+				var_reset(return_value);
+			}
+#endif
+			break;
+		default:
+			RETURN_FALSE;
+	}
+}
+
+/* {{{ proto string msql_field_name(int query, int field_index)
+   Get the name of the specified field in a result */
+DLEXPORT PHP_FUNCTION(msql_field_name)
+{
+	php_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MSQL_FIELD_NAME);
+}
+/* }}} */
+
+/* {{{ proto string msql_field_table(int query, int field_offset)
+   Get name of the table the specified field is in */
+DLEXPORT PHP_FUNCTION(msql_field_table)
+{
+	php_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MSQL_FIELD_TABLE);
+}
+/* }}} */
+
+/* {{{ proto int msql_field_len(int query, int field_offet)
+   Returns the length of the specified field */
+DLEXPORT PHP_FUNCTION(msql_field_len)
+{
+	php_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MSQL_FIELD_LEN);
+}
+/* }}} */
+
+/* {{{ proto string msql_field_type(int query, int field_offset)
+   Get the type of the specified field in a result */
+DLEXPORT PHP_FUNCTION(msql_field_type)
+{
+	php_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MSQL_FIELD_TYPE);
+}
+/* }}} */
+
+/* {{{ proto string msql_field_flags(int query, int field_offset)
+   Get the flags associated with the specified field in a result */
+DLEXPORT PHP_FUNCTION(msql_field_flags)
+{
+	php_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MSQL_FIELD_FLAGS);
+}
+/* }}} */
+
+
+/* {{{ proto int msql_free_result(int query)
+   Free result memory */
+DLEXPORT PHP_FUNCTION(msql_free_result)
+{
+	pval *result;
+	m_result *msql_result;
+	m_query *msql_query;
+	
+	if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &result)==FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+
+	MSQL_GET_QUERY(result);
+	zend_list_delete(result->value.lval);
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto int msql_affected_rows(int query)
+   Return number of affected rows */
+DLEXPORT PHP_FUNCTION(msql_affected_rows) 
+{
+	pval *result;
+	m_result *msql_result;
+	m_query *msql_query;
+
+	if(ARG_COUNT(ht) != 1 || getParameters(ht, 1, &result) == FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+	MSQL_GET_QUERY(result);
+	RETVAL_LONG(msql_query->af_rows);
+}
+/* }}} */
+
+#endif
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
+