abies Tue Jun 1 04:38:33 2004 EDT
Modified files:
/php-src/ext/interbase interbase.c ibase_query.c
php_ibase_includes.h
/php-src/ext/interbase/tests interbase.inc
Log:
Use constant IBASE_CREATE instead of just 0
http://cvs.php.net/diff.php/php-src/ext/interbase/interbase.c?r1=1.220&r2=1.221&ty=u
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.220 php-src/ext/interbase/interbase.c:1.221
--- php-src/ext/interbase/interbase.c:1.220 Sun May 30 16:24:46 2004
+++ php-src/ext/interbase/interbase.c Tue Jun 1 04:38:33 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interbase.c,v 1.220 2004/05/30 20:24:46 abies Exp $ */
+/* $Id: interbase.c,v 1.221 2004/06/01 08:38:33 abies Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -465,6 +465,7 @@
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);
http://cvs.php.net/diff.php/php-src/ext/interbase/ibase_query.c?r1=1.13&r2=1.14&ty=u
Index: php-src/ext/interbase/ibase_query.c
diff -u php-src/ext/interbase/ibase_query.c:1.13
php-src/ext/interbase/ibase_query.c:1.14
--- php-src/ext/interbase/ibase_query.c:1.13 Mon May 31 09:43:06 2004
+++ php-src/ext/interbase/ibase_query.c Tue Jun 1 04:38:33 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ibase_query.c,v 1.13 2004/05/31 13:43:06 abies Exp $ */
+/* $Id: ibase_query.c,v 1.14 2004/06/01 08:38:33 abies Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1049,6 +1049,7 @@
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 @@
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;
http://cvs.php.net/diff.php/php-src/ext/interbase/php_ibase_includes.h?r1=1.13&r2=1.14&ty=u
Index: php-src/ext/interbase/php_ibase_includes.h
diff -u php-src/ext/interbase/php_ibase_includes.h:1.13
php-src/ext/interbase/php_ibase_includes.h:1.14
--- php-src/ext/interbase/php_ibase_includes.h:1.13 Mon May 31 09:40:24 2004
+++ php-src/ext/interbase/php_ibase_includes.h Tue Jun 1 04:38:33 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ibase_includes.h,v 1.13 2004/05/31 13:40:24 abies Exp $ */
+/* $Id: php_ibase_includes.h,v 1.14 2004/06/01 08:38:33 abies Exp $ */
#ifndef PHP_IBASE_INCLUDES_H
#define PHP_IBASE_INCLUDES_H
@@ -114,6 +114,7 @@
enum php_interbase_option {
PHP_IBASE_DEFAULT = 0,
+ PHP_IBASE_CREATE = 0,
/* fetch flags */
PHP_IBASE_FETCH_BLOBS = 1,
PHP_IBASE_FETCH_ARRAYS = 2,
http://cvs.php.net/diff.php/php-src/ext/interbase/tests/interbase.inc?r1=1.9&r2=1.10&ty=u
Index: php-src/ext/interbase/tests/interbase.inc
diff -u php-src/ext/interbase/tests/interbase.inc:1.9
php-src/ext/interbase/tests/interbase.inc:1.10
--- php-src/ext/interbase/tests/interbase.inc:1.9 Mon May 31 09:40:25 2004
+++ php-src/ext/interbase/tests/interbase.inc Tue Jun 1 04:38:33 2004
@@ -1,4 +1,4 @@
-<?php /* $Id: interbase.inc,v 1.9 2004/05/31 13:40:25 abies Exp $ */
+<?php /* $Id: interbase.inc,v 1.10 2004/06/01 08:38:33 abies Exp $ */
srand((double)microtime()*1000000);
@@ -14,8 +14,9 @@
{
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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
