unsigned int index; /* The index in the list */
PHPFBLink* link; /* A pointer to the corresponding link object, may be NULL if no link were used */
char* databaseName; /* The name of the database */
- char* databasePassword; /* The database password */
FBCDatabaseConnection* connection; /* The connection to the database */
unsigned int errorNo; /* The latest error on the connection, 0 is ok. */
char* errorText; /* The error text */
char* hostName; /* Host name */
char* userName; /* User name */
char* userPassword; /* User password */
+ char* databasePassword; /* Database password */
FBCExecHandler* execHandler; /* The exechandler, can be used for database operations */
unsigned int affectedRows;
long autoCommit; /* Enable or disable autoCommit */
void phpfbReleaseResult (PHPFBResult* result);
void phpfbReleaseDatabase (PHPFBDatabase* database);
void phpfbReleaseLink (PHPFBLink* link);
+void phpfbReleasePLink (PHPFBLink* link);
PHPFBResult* phpfbRetainResult (PHPFBResult* result)
{
}
if (result->rowHandler) fbcrhRelease(result->rowHandler);
if (result->ResultmetaData) fbcmdRelease(result->ResultmetaData);
-/* if (result->metaData) fbcmdRelease(result->metaData); */
if (result->list) fbcplRelease(result->list);
if (result->array) fbaRelease(result->array);
if (result->database)
break;
}
}
- phpfbReleaseDatabase(result->database);
+// phpfbReleaseDatabase(result->database);
}
if (result->link)
{
break;
}
}
- phpfbReleaseLink(result->link);
+// phpfbReleaseLink(result->link);
}
result->link = 0;
result->database = 0;
result->row = NULL;
result->array = NULL;
result->list = NULL;
- free(result);
+ efree(result);
}
}
}
break;
}
}
- phpfbReleaseLink(database->link);
+// phpfbReleaseLink(database->link);
}
fbcdcClose(database->connection);
fbcdcRelease(database->connection);
- free(database->databaseName);
- free(database->databasePassword);
- free(database->results);
- free(database);
+ if (database->databaseName) efree(database->databaseName);
+ if (database->results) efree(database->results);
+ efree(database);
}
}
}
if (link->retainCount == 0)
{
if (link->index == FB_SQL_G(linkIndex)) FB_SQL_G(linkIndex)--;
- free(link->hostName);
- free(link->userName);
- free(link->userPassword);
- if (link->results) free(link->results);
- if (link->databases) free(link->databases);
- free(link);
+ if (link->hostName) efree(link->hostName);
+ if (link->userName) efree(link->userName);
+ if (link->userPassword) efree(link->userPassword);
+ if (link->databasePassword) efree(link->databasePassword);
+ if (link->results) efree(link->results);
+ if (link->databases) efree(link->databases);
+ efree(link);
+ FB_SQL_G(linkCount)--;
+ }
+ }
+}
+
+void phpfbReleasePLink (PHPFBLink* link)
+{
+ FBSQLLS_FETCH();
+ if (link)
+ {
+ link->retainCount--;
+ if (link->retainCount == 0)
+ {
+ if (link->index == FB_SQL_G(linkIndex)) FB_SQL_G(linkIndex)--;
+ if (link->hostName) efree(link->hostName);
+ if (link->userName) efree(link->userName);
+ if (link->userPassword) efree(link->userPassword);
+ if (link->databasePassword) efree(link->databasePassword);
+ if (link->results) efree(link->results);
+ if (link->databases) efree(link->databases);
+ efree(link);
+ FB_SQL_G(linkCount)--;
+ FB_SQL_G(persistantCount)--;
}
}
}
le_result = register_list_destructors(phpfbReleaseResult,NULL);
le_link = register_list_destructors(phpfbReleaseLink,NULL);
+ le_plink = register_list_destructors(NULL, phpfbReleasePLink);
le_dba = register_list_destructors(phpfbReleaseDatabase,NULL);
REGISTER_LONG_CONSTANT("FBSQL_ASSOC", FBSQL_ASSOC, CONST_CS | CONST_PERSISTENT);
{
FBCExecHandler* execHandler = fbcehHandlerForHost(hostName,128);
list_entry le;
- result = malloc(sizeof(PHPFBLink));
- result->retainCount = 1;
- result->persistant = persistant;
- result->hostName = estrdup(hostName);
- result->userName = estrdup(userName);
- result->userPassword = estrdup(userPassword);
- result->execHandler = execHandler;
- result->affectedRows = 0;
- result->autoCommit = FB_SQL_G(autoCommit);
- result->currentDatabase = NULL;
- result->databaseCount = 0;
- result->databases = NULL;
- result->resultCount = 0;
- result->results = NULL;
+ result = emalloc(sizeof(PHPFBLink));
+ result->retainCount = 1;
+ result->persistant = persistant;
+ result->hostName = estrdup(hostName);
+ result->userName = estrdup(userName);
+ result->userPassword = estrdup(userPassword);
+ result->databasePassword = estrdup(FB_SQL_G(databasePassword));
+ result->execHandler = execHandler;
+ result->affectedRows = 0;
+ result->autoCommit = FB_SQL_G(autoCommit);
+ result->currentDatabase = NULL;
+ result->databaseCount = 0;
+ result->databases = NULL;
+ result->resultCount = 0;
+ result->results = NULL;
le.ptr = result;
le.type = le_link;
}
result->index = zend_list_insert (phpfbRetainLink(result), le_link);
FB_SQL_G(linkCount)++;
-/* printf(" new %x %d \n",result,result->index); */
-/* printf("Ny connection %x %x\n",result,result->execHandler); */
}
return result;
}
result = phpfbConnect(INTERNAL_FUNCTION_PARAM_PASSTHRU,hostName,userName,userPassword,persistant);
if (result == NULL) RETURN_FALSE;
FB_SQL_G(linkIndex) = result->index;
- return_value->value.lval = result->index;
- return_value->type = IS_LONG;
+ RETURN_LONG(result->index);
}
/* {{{ proto int fbsql_connect([string hostname [, string username [, string password]]]);
port = atoi(databaseName);
if (port>0 && port<65535)
- c = fbcdcConnectToDatabaseUsingPort(link->hostName, port,FB_SQL_G(databasePassword));
+ c = fbcdcConnectToDatabaseUsingPort(link->hostName, port, link->databasePassword);
else
- c = fbcdcConnectToDatabase(databaseName,link->hostName,FB_SQL_G(databasePassword));
+ c = fbcdcConnectToDatabase(databaseName, link->hostName, link->databasePassword);
if (c == NULL)
{
php_error(E_WARNING, fbcdcClassErrorMessage());
return NULL;
}
- md = fbcdcCreateSession(c,"PHP",link->userName,link->userPassword,link->userName);
+ md = fbcdcCreateSession(c,"PHP",link->userName, link->userPassword, link->userName);
if (fbcmdErrorsFound(md))
{
FBCErrorMetaData* emd = fbcdcErrorMetaData(c,md);
php_error(E_WARNING, emg);
else
php_error(E_WARNING,"No message");
- free(emg);
+ efree(emg);
fbcemdRelease(emd);
fbcmdRelease(md);
fbcdcClose(c);
fbcdcSetInputCharacterSet(c,FBC_ISO8859_1);
le.type = le_dba;
- le.ptr = result = malloc(sizeof(PHPFBDatabase));
+ le.ptr = result = emalloc(sizeof(PHPFBDatabase));
if (zend_hash_update(link->persistant?&EG(persistent_list):&EG(regular_list), name, strlen(name), &le, sizeof(le), NULL)==FAILURE)
{
fbcdcClose(c);
fbcdcRelease(c);
- free(result);
+ efree(result);
return NULL;
}
result->retainCount = 2;
result->index = zend_list_insert((PHPFBDatabase*)(le.ptr), le_dba);
result->link = phpfbRetainLink(link);
result->databaseName = estrdup(databaseName);
- result->databasePassword = estrdup(FB_SQL_G(databasePassword));
result->connection = c;
result->errorNo = 0;
result->errorText = NULL;
FB_SQL_G(databaseCount)++;
}
link->currentDatabase = result;
+ FB_SQL_G(databaseIndex) = result->index;
return_value->value.lval = result->index;
return_value->type = IS_LONG;
- FB_SQL_G(databaseIndex) = result->index;
return result;
}
*length = l;
}
-/* {{{ proto bool fbsql_list_autocommit(int link_identifier [, bool OnOff])
+/* {{{ proto bool fbsql_autocommit(int link_identifier [, bool OnOff])
*/
PHP_FUNCTION(fbsql_autocommit)
{
}
/* }}} */
-/* {{{ proto int fbsql_list_commit([int link_identifier])
+/* {{{ proto int fbsql_commit([int link_identifier])
*/
PHP_FUNCTION(fbsql_commit)
{
}
/* }}} */
-/* {{{ proto int fbsql_list_rollback([int link_identifier])
+/* {{{ proto int fbsql_rollback([int link_identifier])
*/
PHP_FUNCTION(fbsql_rollback)
{
if (argc == 1)
{
convert_to_long_ex(argv[0]);
- link = (*argv[0])->value.lval;
+ link = Z_LVAL_PP(argv[0]);
}
phpLink = phpfbGetLink(link);
if (zend_get_parameters_ex(argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
convert_to_long_ex(argv[0]);
- phpLink = phpfbGetLink((*argv[0])->value.lval);
+ phpLink = phpfbGetLink(Z_LVAL_PP(argv[0]));
if (phpLink == NULL) RETURN_FALSE;
- phpfbestrdup(phpLink->hostName, &return_value->value.str.len, &return_value->value.str.val);
- return_value->type = IS_STRING;
if (argc == 2)
{
convert_to_string_ex(argv[1]);
- if (phpLink->hostName) free(phpLink->hostName);
- phpLink->hostName = estrdup((*argv[1])->value.str.val);
+ if (phpLink->hostName) efree(phpLink->hostName);
+ phpLink->hostName = estrndup(Z_STRVAL_PP(argv[1]), Z_STRLEN_PP(argv[1]));
}
+ RETURN_STRING(phpLink->hostName, 1);
}
/* }}} */
if (zend_get_parameters_ex(argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
convert_to_long_ex(argv[0]);
- phpLink = phpfbGetLink((*argv[0])->value.lval);
+ phpLink = phpfbGetLink(Z_LVAL_PP(argv[0]));
if (phpLink == NULL) RETURN_FALSE;
- phpfbestrdup(phpLink->currentDatabase->databaseName, &return_value->value.str.len, &return_value->value.str.val);
- return_value->type = IS_STRING;
if (argc == 2)
{
convert_to_string_ex(argv[1]);
- if (phpLink->currentDatabase->databaseName) free(phpLink->currentDatabase->databaseName);
- phpLink->currentDatabase->databaseName = strdup((*argv[1])->value.str.val);
+ if (phpLink->currentDatabase->databaseName) efree(phpLink->currentDatabase->databaseName);
+ phpLink->currentDatabase->databaseName = estrndup(Z_STRVAL_PP(argv[1]), Z_STRLEN_PP(argv[1]));
}
+ RETURN_STRING(phpLink->currentDatabase->databaseName, 1);
}
/* }}} */
PHP_FUNCTION(fbsql_database_password)
{
int argc = ARG_COUNT(ht);
- zval **argv[1];
+ zval **argv[2];
PHPFBLink* phpLink = NULL;
FBSQLLS_FETCH();
- if ((argc < 0) || (argc > 1)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(argc,&argv[0])==FAILURE) RETURN_FALSE;
+ if ((argc < 1) || (argc > 2)) WRONG_PARAM_COUNT;
+ if (zend_get_parameters_ex(argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
- if (argc >= 1)
+ convert_to_long_ex(argv[0]);
+ phpLink = phpfbGetLink(Z_LVAL_PP(argv[0]));
+ if (phpLink == NULL) RETURN_FALSE;
+
+ if (argc == 2)
{
- convert_to_string_ex(argv[0]);
- if (FB_SQL_G(databasePassword)) free(FB_SQL_G(databasePassword));
- FB_SQL_G(databasePassword) = estrdup((*argv[0])->value.str.val);
+ convert_to_string_ex(argv[1]);
+ if (phpLink->databasePassword) efree(phpLink->databasePassword);
+ phpLink->databasePassword = estrndup(Z_STRVAL_PP(argv[1]), Z_STRLEN_PP(argv[1]));
}
- phpfbestrdup(phpLink->currentDatabase->databasePassword, &return_value->value.str.len, &return_value->value.str.val);
- return_value->type = IS_STRING;
+ RETURN_STRING(phpLink->databasePassword, 1);
}
/* }}} */
-/* {{{ proto string fbsql_username([string username])
+/* {{{ proto string fbsql_username(int link_identifier [, string username])
*/
PHP_FUNCTION(fbsql_username)
{
int argc = ARG_COUNT(ht);
- zval **argv[1];
+ zval **argv[2];
+ PHPFBLink* phpLink = NULL;
FBSQLLS_FETCH();
- if ((argc < 0) || (argc > 1)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(argc, &argv[0])==FAILURE) RETURN_FALSE;
+ if ((argc < 1) || (argc > 2)) WRONG_PARAM_COUNT;
+ if (zend_get_parameters_ex(argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
- if (argc >= 1)
+ convert_to_long_ex(argv[0]);
+ phpLink = phpfbGetLink(Z_LVAL_PP(argv[0]));
+ if (phpLink == NULL) RETURN_FALSE;
+
+ if (argc == 2)
{
- convert_to_string_ex(argv[0]);
- if (FB_SQL_G(userName)) free(FB_SQL_G(userName));
- FB_SQL_G(userName) = strdup((*argv[0])->value.str.val);
+ convert_to_string_ex(argv[1]);
+ if (phpLink->userName) efree(phpLink->userName);
+ phpLink->userName = estrndup(Z_STRVAL_PP(argv[1]), Z_STRLEN_PP(argv[1]));
}
- phpfbestrdup(FB_SQL_G(userName), &return_value->value.str.len, &return_value->value.str.val);
- return_value->type = IS_STRING;
+ RETURN_STRING(phpLink->userName, 1);
}
/* }}} */
-/* {{{ proto fbsql_password([string password])
+/* {{{ proto string fbsql_password(int link_identifier [, string password])
*/
PHP_FUNCTION(fbsql_password)
{
int argc = ARG_COUNT(ht);
zval **argv[1];
+ PHPFBLink* phpLink = NULL;
FBSQLLS_FETCH();
- if ((argc < 0) || (argc > 1)) WRONG_PARAM_COUNT;
- if (zend_get_parameters_ex(argc, &argv[0])==FAILURE) RETURN_FALSE;
- if (argc >= 1)
+ if ((argc < 1) || (argc > 2)) WRONG_PARAM_COUNT;
+ if (zend_get_parameters_ex(argc,&argv[0],&argv[1])==FAILURE) RETURN_FALSE;
+
+ convert_to_long_ex(argv[0]);
+ phpLink = phpfbGetLink(Z_LVAL_PP(argv[0]));
+ if (phpLink == NULL) RETURN_FALSE;
+
+ if (argc == 2)
{
- convert_to_string_ex(argv[0]);
- if (FB_SQL_G(userPassword)) free(FB_SQL_G(userPassword));
- FB_SQL_G(userPassword) = strdup((*argv[0])->value.str.val);
+ convert_to_string_ex(argv[1]);
+ if (phpLink->userPassword) efree(phpLink->userPassword);
+ phpLink->userPassword = estrndup(Z_STRVAL_PP(argv[1]), Z_STRLEN_PP(argv[1]));
}
+ RETURN_STRING(phpLink->userPassword, 1);
}
/* }}} */
if (argc >= 1)
{
convert_to_string_ex(argv[0]);
- name = (*argv[0])->value.str.val;
+ name = Z_STRVAL_PP(argv[0]);
}
if (argc >= 2)
{
convert_to_long_ex(argv[1]);
- phpLink = phpfbGetLink((*argv[1])->value.lval);
+ phpLink = phpfbGetLink(Z_LVAL_PP(argv[1]));
}
else if (FB_SQL_G(linkIndex) == 0)
{
}
}
- database = phpfbSelectDB(INTERNAL_FUNCTION_PARAM_PASSTHRU,name,phpLink);
+ database = phpfbSelectDB(INTERNAL_FUNCTION_PARAM_PASSTHRU,name, phpLink);
if (database == NULL) RETURN_FALSE;
phpLink->currentDatabase = database;
- FB_SQL_G(linkIndex) = phpLink->index;
+ FB_SQL_G(linkIndex) = phpLink->index;
- return_value->value.lval = database->index;
- return_value->type = IS_LONG;
+ RETURN_LONG(database->index);
}
/* }}} */
if (argc >= 4)
{
convert_to_long_ex(argv[3]);
- link = (*argv[3])->value.lval;
+ link = Z_LVAL_PP(argv[3]);
}
if ((phpLink = phpfbGetLink(link))==NULL) RETURN_FALSE;
- if ((phpDatabase = phpfbSelectDB(INTERNAL_FUNCTION_PARAM_PASSTHRU,databaseName,phpLink)) == NULL) RETURN_FALSE;
+ if ((phpDatabase = phpfbSelectDB(INTERNAL_FUNCTION_PARAM_PASSTHRU, databaseName, phpLink)) == NULL) RETURN_FALSE;
{
char buffer[1024];
sprintf(buffer,"SET AUTHORIZATION %s;",userName);
phpfbQuery(INTERNAL_FUNCTION_PARAM_PASSTHRU,buffer, phpDatabase);
if (return_value->value.lval)
{
- free(phpLink->userName);
+ efree(phpLink->userName);
phpLink->userName = estrdup(userName);
}
}
if (argc == 2)
{
convert_to_long_ex(argv[1]);
- link = (*argv[1])->value.lval;
+ link = Z_LVAL_PP(argv[1]);
phpLink = phpfbGetLink(link);
if (phpLink == NULL) RETURN_FALSE;
}
if (argc == 2)
{
convert_to_long_ex(argv[1]);
- phpLink = phpfbGetLink((*argv[1])->value.lval);
+ phpLink = phpfbGetLink(Z_LVAL_PP(argv[1]));
if (phpLink == NULL) RETURN_FALSE;
}
else
if (argc == 2)
{
convert_to_long_ex(argv[1]);
- link = (*argv[1])->value.lval;
+ link = Z_LVAL_PP(argv[1]);
phpLink = phpfbGetLink(link);
if (phpLink == NULL) RETURN_FALSE;
}
if (phpLink == NULL) RETURN_FALSE;
}
- phpDatabase = phpfbSelectDB(INTERNAL_FUNCTION_PARAM_PASSTHRU, databaseName,phpLink);
+ phpDatabase = phpfbSelectDB(INTERNAL_FUNCTION_PARAM_PASSTHRU, databaseName, phpLink);
if (phpDatabase == NULL) RETURN_FALSE;
/* printf("Stop db %x\n",phpDatabase->connection); */
if (argc >= 2)
{
convert_to_long_ex(argv[1]);
- phpLink = phpfbGetLink((*argv[1])->value.lval);
+ phpLink = phpfbGetLink(Z_LVAL_PP(argv[1]));
}
else if (FB_SQL_G(linkIndex) == 0)
{
database->errorNo = 0;
if (database->errorText)
{
- free(database->errorText);
+ efree(database->errorText);
database->errorText = NULL;
}
if (md == NULL)
else if (fh || (tp[0] == 'E'))
{
unsigned i;
- result = malloc(sizeof(PHPFBResult));
+ result = emalloc(sizeof(PHPFBResult));
result->retainCount = 1;
result->index = zend_list_insert(result,le_result);
result->link = NULL;
if (argc >= 2)
{
convert_to_long_ex(argv[1]);
- phpLink = phpfbGetLink((*argv[1])->value.lval);
+ phpLink = phpfbGetLink(Z_LVAL_PP(argv[1]));
}
else if (FB_SQL_G(linkIndex) == 0)
{
}
if (phpLink == NULL) RETURN_FALSE;
/* printf("Query db at link %s@%s\n",phpLink->hostName,phpLink->userName); */
- phpDatabase = phpfbSelectDB(INTERNAL_FUNCTION_PARAM_PASSTHRU, databaseName,phpLink);
+ phpDatabase = phpfbSelectDB(INTERNAL_FUNCTION_PARAM_PASSTHRU, databaseName, phpLink);
if (phpDatabase == NULL) RETURN_FALSE;
phpResult = phpfbQuery(INTERNAL_FUNCTION_PARAM_PASSTHRU,sql,phpDatabase);
php_error(E_WARNING,"FrontBase result set limit %d exceeded",FB_SQL_G(maxResults));
RETURN_FALSE
}
- phpResult = malloc(sizeof(PHPFBResult));
+ phpResult = emalloc(sizeof(PHPFBResult));
phpResult->retainCount = 1;
phpResult->index = zend_list_insert(phpResult, le_result);
phpResult->link = phpfbRetainLink(phpLink);
for (j=i; j < phpLink->resultCount ; j++)phpLink->results[j] = NULL;
}
phpLink->results[i] = phpResult;
- return_value->value.lval = phpResult->index;
- return_value->type = IS_LONG;
+ RETURN_LONG(phpResult->index);
FB_SQL_G(resultIndex) = phpResult->index;
FB_SQL_G(linkIndex) = phpLink->index;
}
if (argc >= 2)
{
convert_to_long_ex(argv[1]);
- phpLink = phpfbGetLink((*argv[1])->value.lval);
+ phpLink = phpfbGetLink(Z_LVAL_PP(argv[1]));
}
else if (FB_SQL_G(linkIndex) == 0)
{
}
else
{
- phpLink->currentDatabase = phpfbSelectDB(INTERNAL_FUNCTION_PARAM_PASSTHRU, databaseName,phpLink);
+ phpLink->currentDatabase = phpfbSelectDB(INTERNAL_FUNCTION_PARAM_PASSTHRU, databaseName, phpLink);
}
phpDatabase = phpLink->currentDatabase;
if (phpDatabase == NULL) RETURN_FALSE;
/* printf("Query db at link %s@%s\n",phpLink->hostName,phpLink->userName); */
phpDatabase = phpLink->currentDatabase;
if ((phpDatabase == NULL) || (phpDatabase->errorText == NULL)) RETURN_FALSE;
- phpfbestrdup(phpDatabase->errorText,&return_value->value.str.len,&return_value->value.str.val);
- return_value->type = IS_STRING;
+ RETURN_STRING(phpDatabase->errorText, 1);
}
/* }}} */
/* printf("Query db at link %s@%s\n",phpLink->hostName,phpLink->userName); */
phpDatabase = phpLink->currentDatabase;
if (phpDatabase == NULL) RETURN_FALSE;
- return_value->value.lval = phpDatabase->errorNo;
- return_value->type = IS_LONG;
+ RETURN_LONG(phpDatabase->errorNo);
}
/* }}} */
}
phpLink = phpfbGetLink(link);
if (phpLink == NULL) RETURN_FALSE;
- return_value->value.lval = phpLink->affectedRows;
- return_value->type = IS_LONG;
+ RETURN_LONG(phpLink->affectedRows);
}
/* }}} */
phpDatabase = phpLink->currentDatabase;
if (phpDatabase == NULL) RETURN_FALSE;
- return_value->value.lval = phpDatabase->rowIndex;
- return_value->type = IS_LONG;
+ RETURN_LONG(phpDatabase->rowIndex);
FB_SQL_G(linkIndex) = phpLink->index;
}
/* }}} */
if (columnIndex == 0)
{ /* Name */
FBCPList* name = (FBCPList*)fbcplValueForKey(column,"NAME");
- return_value->type = IS_STRING;
- phpfbestrdup(fbcplString((FBCPList*)name), &return_value->value.str.len, &return_value->value.str.val);
+ RETURN_STRING((char *)fbcplString((FBCPList*)name), 1);
}
else if (columnIndex == 2)
{ /* Length */
FBCPList* name = (FBCPList*)fbcplValueForKey(column,"WIDTH");
- return_value->type = IS_STRING;
- phpfbestrdup((const char*)fbcplString(name), &return_value->value.str.len, &return_value->value.str.val);
+ RETURN_STRING((char *)fbcplString((FBCPList*)name), 1);
}
else if (columnIndex == 1)
{ /* Type */
FBCPList* name = (FBCPList*)fbcplValueForKey(column,"DATATYPE");
- return_value->type = IS_STRING;
- phpfbestrdup((const char*)fbcplString(name), &return_value->value.str.len, &return_value->value.str.val);
+ RETURN_STRING((char *)fbcplString((FBCPList*)name), 1);
}
else if (columnIndex == 3)
{ /* Flags */
- return_value->type = IS_STRING;
- phpfbestrdup("", &return_value->value.str.len, &return_value->value.str.val);
+ RETURN_STRING("", 1);
}
else
{
- return_value->type = IS_STRING;
- phpfbestrdup("", &return_value->value.str.len, &return_value->value.str.val);
+ RETURN_STRING("", 1);
}
}
else if (result->array)
{ /* Special case for get dbs */
- phpfbestrdup((char*)fbaObjectAtIndex(result->array,rowIndex), &return_value->value.str.len, &return_value->value.str.val);
- return_value->type = IS_STRING;
+ RETURN_STRING(fbaObjectAtIndex(result->array,rowIndex), 1);
}
else if (!phpfbFetchRow(result,rowIndex))
{
-/* php_error(E_WARNING,"No such row %d in result set %d",resultIndex+1,rowIndex); */
+ php_error(E_WARNING,"No such row %d in result set %d",rowIndex,rowIndex);
RETURN_FALSE;
}
else if (columnIndex >= result->columnCount)
}
else
{
- return_value->type = IS_NULL;
+ RETURN_NULL();
}
}
}
if (argc >= 2)
{
convert_to_long_ex(argv[1]);
- rowIndex = (*argv[1])->value.lval;
+ rowIndex = Z_LVAL_PP(argv[1]);
}
columnIndex = result->columnIndex;
rowCount = result->rowCount;
}
}
- return_value->value.lval = rowCount;
- return_value->type = IS_LONG;
+ RETURN_LONG(rowCount);
}
/* }}} */
result = phpfbGetResult(resultIndex);
if (result == NULL) RETURN_FALSE;
- return_value->value.lval = result->columnCount;
- return_value->type = IS_LONG;
-
+ RETURN_LONG(result->columnCount);
FB_SQL_G(resultIndex) = resultIndex;
}
/* }}} */
if (argc == 2)
{
convert_to_long_ex(argv[1]);
- result_type = (*argv[1])->value.lval;
+ result_type = Z_LVAL_PP(argv[1]);
if (((result_type & FBSQL_NUM) != FBSQL_NUM) && ((result_type & FBSQL_ASSOC) != FBSQL_ASSOC))
{
php_error(E_WARNING,"Illegal result type use FBSQL_NUM, FBSQL_ASSOC, or FBSQL_BOTH.");
RETURN_FALSE;
}
}
- if (result->fetchHandle == NULL)
+ if (array_init(return_value)==FAILURE)
{
RETURN_FALSE;
}
- if (result->rowCount == 0) {
- RETURN_FALSE;
- }
- if (result->rowCount == 0x7fffffff)
+ if (result->fetchHandle == NULL)
{
- if (!phpfbFetchRow(result,result->rowIndex)) {
+ unsigned int c = 0;
+ if (result->array == NULL)
+ {
RETURN_FALSE;
}
+ if (result->rowIndex >= result->rowCount)
+ {
+ RETURN_FALSE;
+ }
+ if (result_type & FBSQL_NUM)
+ {
+ add_index_string(return_value,0,estrdup(fbaObjectAtIndex(result->array,result->rowIndex)),c);
+ c = 1;
+ }
+ if (result_type & FBSQL_ASSOC)
+ {
+ add_assoc_string(return_value, "Database", estrdup(fbaObjectAtIndex(result->array,result->rowIndex)), c);
+ }
}
- row = fbcrhRowAtIndex(result->rowHandler,rowIndex);
- if (row == NULL)
- {
- RETURN_FALSE;
- }
- if (array_init(return_value)==FAILURE)
- {
- RETURN_FALSE;
- }
- for (i=0; i < result->columnCount; i++)
- {
- if (row[i])
+ else {
+ if (result->rowCount == 0) {
+ RETURN_FALSE;
+ }
+ if (result->rowCount == 0x7fffffff)
{
- char* value;
- unsigned int length;
- unsigned int c = 0;
- phpfbColumnAsString(result,i,row[i],&length,&value);
- if (result_type & FBSQL_NUM)
- {
- add_index_stringl(return_value,i,value,length,c);
- c = 1;
- }
- if (result_type & FBSQL_ASSOC)
- {
- char* key = (char*)fbccmdLabelName(fbcmdColumnMetaDataAtIndex(result->metaData, i));
- add_assoc_stringl(return_value,key, value, length, c);
+ if (!phpfbFetchRow(result,result->rowIndex)) {
+ RETURN_FALSE;
}
}
- else
+ row = fbcrhRowAtIndex(result->rowHandler,rowIndex);
+ if (row == NULL)
{
- if (result_type & FBSQL_NUM)
+ RETURN_FALSE;
+ }
+ for (i=0; i < result->columnCount; i++)
+ {
+ if (row[i])
{
- add_index_unset(return_value,i);
+ char* value;
+ unsigned int length;
+ unsigned int c = 0;
+ phpfbColumnAsString(result,i,row[i],&length,&value);
+ if (result_type & FBSQL_NUM)
+ {
+ add_index_stringl(return_value,i,value,length,c);
+ c = 1;
+ }
+ if (result_type & FBSQL_ASSOC)
+ {
+ char* key = (char*)fbccmdLabelName(fbcmdColumnMetaDataAtIndex(result->metaData, i));
+ add_assoc_stringl(return_value,key, value, length, c);
+ }
}
- if (result_type & FBSQL_ASSOC)
+ else
{
- char* key = (char*)fbccmdLabelName(fbcmdColumnMetaDataAtIndex(result->metaData, i));
- add_assoc_unset(return_value,key);
+ if (result_type & FBSQL_NUM)
+ {
+ add_index_unset(return_value,i);
+ }
+ if (result_type & FBSQL_ASSOC)
+ {
+ char* key = (char*)fbccmdLabelName(fbcmdColumnMetaDataAtIndex(result->metaData, i));
+ add_assoc_unset(return_value,key);
+ }
}
}
}
if (result == NULL) RETURN_FALSE;
convert_to_long_ex(argv[1]);
- rowIndex = (*argv[1])->value.lval;
+ rowIndex = Z_LVAL_PP(argv[1]);
if (rowIndex < 0)
{
php_error(E_WARNING,"Illegal index",resultIndex+1);
if (argc >= 2)
{
convert_to_long_ex(argv[1]);
- column = (*argv[1])->value.lval;
+ column = Z_LVAL_PP(argv[1]);
if (column < 0)
{
php_error(E_WARNING,"Illegal index",resultIndex+1);
if (argc>=2)
{
convert_to_long_ex(argv[1]);
- column = (*argv[1])->value.lval;
+ column = Z_LVAL_PP(argv[1]);
}
if (column < 0)
{
if (argc >= 2)
{
convert_to_long_ex(argv[1]);
- column = (*argv[1])->value.lval;
+ column = Z_LVAL_PP(argv[1]);
if (column < 0)
{
php_error(E_WARNING,"Illegal index",resultIndex+1);
}
else if (result->metaData)
{
- phpfbestrdup(fbccmdLabelName(fbcmdColumnMetaDataAtIndex(result->metaData, column)),
- &return_value->value.str.len,
- &return_value->value.str.val);
- return_value->type = IS_STRING;
+ RETURN_STRING((char *)fbccmdLabelName(fbcmdColumnMetaDataAtIndex(result->metaData, column)), 1);
FB_SQL_G(resultIndex) = resultIndex;
result->columnIndex = column;
}
if (argc >= 2)
{
convert_to_long_ex(argv[1]);
- column = (*argv[1])->value.lval;
+ column = Z_LVAL_PP(argv[1]);
if (column < 0)
{
php_error(E_WARNING,"Illegal index",resultIndex+1);
RETURN_FALSE;
}
}
- phpfbestrdup(fbccmdTableName(fbcmdColumnMetaDataAtIndex(result->metaData,column)),
- &return_value->value.str.len,
- &return_value->value.str.val);
- return_value->type = IS_STRING;
+ RETURN_STRING((char *)fbccmdTableName(fbcmdColumnMetaDataAtIndex(result->metaData,column)), 1);
}
/* }}} */
if (argc >= 2)
{
convert_to_long_ex(argv[1]);
- column = (*argv[1])->value.lval;
+ column = Z_LVAL_PP(argv[1]);
if (column < 0)
{
php_error(E_WARNING,"Illegal index",resultIndex+1);
unsigned int length = fbcdmdLength(fbccmdDatatype(fbcmdColumnMetaDataAtIndex(result->metaData,column)));
char buffer[50];
sprintf(buffer,"%d",length);
- phpfbestrdup(buffer,
- &return_value->value.str.len,
- &return_value->value.str.val);
- return_value->type = IS_STRING;
+ RETURN_STRING(buffer, 1);
}
else
{
if (argc >= 2)
{
convert_to_long_ex(argv[1]);
- column = (*argv[1])->value.lval;
+ column = Z_LVAL_PP(argv[1]);
if (column < 0)
{
php_error(E_WARNING,"Illegal index",resultIndex+1);
}
else if (result->metaData)
{
- phpfbestrdup(fbcdmdDatatypeString (fbcmdDatatypeMetaDataAtIndex(result->metaData, column)),
- &return_value->value.str.len,
- &return_value->value.str.val);
- return_value->type = IS_STRING;
+ RETURN_STRING((char *)fbcdmdDatatypeString (fbcmdDatatypeMetaDataAtIndex(result->metaData, column)), 1);
}
else
{
if (argc >= 2)
{
convert_to_long_ex(argv[1]);
- column = (*argv[1])->value.lval;
+ column = Z_LVAL_PP(argv[1]);
if (column < 0)
{
php_error(E_WARNING,"Illegal index",resultIndex+1);
buf[len-1] = 0;
len--;
}
- return_value->value.str.len = len;
- return_value->value.str.val = estrndup(buf, len);
- return_value->type = IS_STRING;
+ RETURN_STRING(buf, 1);
}
/* }}} */
projects / php / commitdiff