archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use constant IBASE_CREATE instead of just 0

Browse source
This commit is contained in:
Ard Biesheuvel 2004-06-01 08:38:33 +00:00
parent 302fd9a77f
commit ff3a363d7a
4 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ext/interbase/ibase_query.c
View file

@ -1049,6 +1049,7 @@ PHP_FUNCTION(ibase_query)
switch (ZEND_NUM_ARGS()) {
long l;
zval *z;
default:
if (SUCCESS == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, 3 TSRMLS_CC, "rrs",
@ -1073,9 +1074,9 @@ PHP_FUNCTION(ibase_query)
break;
}
/* assume the statement is 'CREATE DATABASE ...' if the link argument is int(0) */
/* the statement is 'CREATE DATABASE ...' if the link argument is IBASE_CREATE */
if (SUCCESS == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS()
TSRMLS_CC, "ls", &l, &query, &query_len) && l == 0) {
TSRMLS_CC, "zs", &z, &query, &query_len) ) {//&& l == PHP_IBASE_CREATE) {
isc_db_handle db = NULL;
isc_tr_handle trans = NULL;

1
ext/interbase/interbase.c
View file

@ -465,6 +465,7 @@ PHP_MINIT_FUNCTION(ibase)
le_trans = zend_register_list_destructors_ex(_php_ibase_free_trans, NULL, "interbase transaction", module_number);
REGISTER_LONG_CONSTANT("IBASE_DEFAULT", PHP_IBASE_DEFAULT, CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IBASE_CREATE", PHP_IBASE_CREATE, CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IBASE_TEXT", PHP_IBASE_FETCH_BLOBS, CONST_PERSISTENT); /* deprecated, for BC only */
REGISTER_LONG_CONSTANT("IBASE_FETCH_BLOBS", PHP_IBASE_FETCH_BLOBS, CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IBASE_FETCH_ARRAYS", PHP_IBASE_FETCH_ARRAYS, CONST_PERSISTENT);

1
ext/interbase/php_ibase_includes.h
View file

@ -114,6 +114,7 @@ typedef struct event {
enum php_interbase_option {
PHP_IBASE_DEFAULT = 0,
PHP_IBASE_CREATE = 0,
/* fetch flags */
PHP_IBASE_FETCH_BLOBS = 1,
PHP_IBASE_FETCH_ARRAYS = 2,

5
ext/interbase/tests/interbase.inc
View file

@ -14,8 +14,9 @@ function init_db()
{
global $test_base, $user, $password;
$test_db = ibase_query(0, sprintf(" create Schema '%s' USER '%s' PASSWORD '%s' DEFAULT CHARACTER SET %s",
$test_base, $user, $password, ($charset = ini_get('ibase.default_charset')) ? $charset : 'NONE'));
$test_db = ibase_query(IBASE_CREATE,
sprintf("CREATE SCHEMA '%s' USER '%s' PASSWORD '%s' DEFAULT CHARACTER SET %s",$test_base,
$user, $password, ($charset = ini_get('ibase.default_charset')) ? $charset : 'NONE'));
$tr = ibase_trans($test_db);
ibase_query($tr,"create table test1 (i integer, c varchar(100))");
ibase_commit_ret($tr);