jani Fri Aug 10 13:28:12 2007 UTC
Modified files:
/php-src/ext/sybase_ct/tests bug22403.phpt bug26407.phpt
bug27843.phpt bug28354.phpt
bug30312.phpt test.inc
test_fetch_object.phpt
test_fields.phpt test_long.phpt
test_msghandler.phpt
test_msghandler_handled.phpt
test_unbuffered_query.phpt
Log:
MFB: sync
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/bug22403.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/sybase_ct/tests/bug22403.phpt
diff -u php-src/ext/sybase_ct/tests/bug22403.phpt:1.2
php-src/ext/sybase_ct/tests/bug22403.phpt:1.3
--- php-src/ext/sybase_ct/tests/bug22403.phpt:1.2 Sun Feb 6 12:59:03 2005
+++ php-src/ext/sybase_ct/tests/bug22403.phpt Fri Aug 10 13:28:11 2007
@@ -6,7 +6,7 @@
<?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: bug22403.phpt,v 1.2 2005/02/06 12:59:03 thekid Exp $
+ * $Id: bug22403.phpt,v 1.3 2007/08/10 13:28:11 jani Exp $
*/
require('test.inc');
@@ -17,7 +17,7 @@
// Check if stored procedure already exists
$sp_name= 'phpt_bug22403';
- var_dump(sybase_select_db('tempdb', $db));
+ var_dump(sybase_select_db(TEMPDB, $db));
if (!sybase_select_single($db, 'select object_id("'.$sp_name.'")')) {
echo "Stored procedure {$sp_name} not found, creating\n";
var_dump(sybase_query('
@@ -63,7 +63,7 @@
<<< Return: boolean
bool(false)
>>> Query: exec does_not_exist
-*** Caught Sybase Server Message #2812 [Severity 16, state 4] at line 1
+*** Caught Sybase Server Message #2812 [Severity 16, state %d] at line 1
%s
<<< Return: boolean
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/bug26407.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/sybase_ct/tests/bug26407.phpt
diff -u php-src/ext/sybase_ct/tests/bug26407.phpt:1.2
php-src/ext/sybase_ct/tests/bug26407.phpt:1.3
--- php-src/ext/sybase_ct/tests/bug26407.phpt:1.2 Sun Feb 6 12:59:03 2005
+++ php-src/ext/sybase_ct/tests/bug26407.phpt Fri Aug 10 13:28:11 2007
@@ -6,7 +6,7 @@
<?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: bug26407.phpt,v 1.2 2005/02/06 12:59:03 thekid Exp $
+ * $Id: bug26407.phpt,v 1.3 2007/08/10 13:28:11 jani Exp $
*/
require('test.inc');
@@ -80,7 +80,7 @@
select "bar"
-Notice: sybase_query(): Sybase: Unexpected results, cancelling current in
%s/test.inc on line %d
+Notice: sybase_query(): Sybase: Unexpected results, cancelling current in
%stest.inc on line %d
<<< Return: resource
array(1) {
[0]=>
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/bug27843.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/sybase_ct/tests/bug27843.phpt
diff -u php-src/ext/sybase_ct/tests/bug27843.phpt:1.3
php-src/ext/sybase_ct/tests/bug27843.phpt:1.4
--- php-src/ext/sybase_ct/tests/bug27843.phpt:1.3 Sun Feb 6 12:59:03 2005
+++ php-src/ext/sybase_ct/tests/bug27843.phpt Fri Aug 10 13:28:11 2007
@@ -6,7 +6,7 @@
<?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: bug27843.phpt,v 1.3 2005/02/06 12:59:03 thekid Exp $
+ * $Id: bug27843.phpt,v 1.4 2007/08/10 13:28:11 jani Exp $
*/
require('test.inc');
@@ -15,7 +15,7 @@
// Check if stored procedure already exists
$sp_name= 'phpt_bug27843';
- var_dump(sybase_select_db('tempdb', $db));
+ var_dump(sybase_select_db(TEMPDB, $db));
if (!sybase_select_single($db, 'select object_id("'.$sp_name.'")')) {
echo "Stored procedure {$sp_name} not found, creating\n";
var_dump(sybase_query('
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/bug28354.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/sybase_ct/tests/bug28354.phpt
diff -u php-src/ext/sybase_ct/tests/bug28354.phpt:1.3
php-src/ext/sybase_ct/tests/bug28354.phpt:1.4
--- php-src/ext/sybase_ct/tests/bug28354.phpt:1.3 Sun Feb 6 12:59:03 2005
+++ php-src/ext/sybase_ct/tests/bug28354.phpt Fri Aug 10 13:28:11 2007
@@ -6,7 +6,7 @@
<?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: bug28354.phpt,v 1.3 2005/02/06 12:59:03 thekid Exp $
+ * $Id: bug28354.phpt,v 1.4 2007/08/10 13:28:11 jani Exp $
*/
require('test.inc');
@@ -17,7 +17,7 @@
// Check if stored procedure already exists
$sp_name= 'phpt_bug28354';
- var_dump(sybase_select_db('tempdb', $db));
+ var_dump(sybase_select_db(TEMPDB, $db));
if (!sybase_select_single($db, 'select object_id("'.$sp_name.'")')) {
echo "Stored procedure {$sp_name} not found, creating\n";
var_dump(sybase_query('
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/bug30312.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/sybase_ct/tests/bug30312.phpt
diff -u php-src/ext/sybase_ct/tests/bug30312.phpt:1.2
php-src/ext/sybase_ct/tests/bug30312.phpt:1.3
--- php-src/ext/sybase_ct/tests/bug30312.phpt:1.2 Wed Mar 14 12:01:21 2007
+++ php-src/ext/sybase_ct/tests/bug30312.phpt Fri Aug 10 13:28:11 2007
@@ -6,7 +6,7 @@
<?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: bug30312.phpt,v 1.2 2007/03/14 12:01:21 thekid Exp $
+ * $Id: bug30312.phpt,v 1.3 2007/08/10 13:28:11 jani Exp $
*/
require('test.inc');
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test.inc?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/sybase_ct/tests/test.inc
diff -u php-src/ext/sybase_ct/tests/test.inc:1.6
php-src/ext/sybase_ct/tests/test.inc:1.7
--- php-src/ext/sybase_ct/tests/test.inc:1.6 Sun Mar 11 12:56:38 2007
+++ php-src/ext/sybase_ct/tests/test.inc Fri Aug 10 13:28:11 2007
@@ -1,13 +1,14 @@
<?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: test.inc,v 1.6 2007/03/11 12:56:38 tony2001 Exp $
+ * $Id: test.inc,v 1.7 2007/08/10 13:28:11 jani Exp $
*/
// Change if needed
define('HOST', '****');
define('USER', '****');
define('PASSWORD', '****');
+ define('TEMPDB', 'tempdb');
// {{{ bool sybase_msg_handler(int msgnumber, int severity, int state, int
line, string text)
// Handles server messages
@@ -78,8 +79,8 @@
// {{{ mixed sybase_select_single(resource dbh, string query)
// Fires an SQL query and returns the first value from the first row
function sybase_select_single($dbh, $query) {
- $a = sybase_fetch_row(sybase_query($query, $dbh));
- return array_shift($a);
+ $a = sybase_fetch_row(sybase_query($query, $dbh));
+ return array_shift($a);
}
// }}}
?>
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_fetch_object.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/sybase_ct/tests/test_fetch_object.phpt
diff -u php-src/ext/sybase_ct/tests/test_fetch_object.phpt:1.2
php-src/ext/sybase_ct/tests/test_fetch_object.phpt:1.3
--- php-src/ext/sybase_ct/tests/test_fetch_object.phpt:1.2 Wed Mar 14
12:00:35 2007
+++ php-src/ext/sybase_ct/tests/test_fetch_object.phpt Fri Aug 10 13:28:11 2007
@@ -8,7 +8,7 @@
<?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: test_fetch_object.phpt,v 1.2 2007/03/14 12:00:35 thekid Exp $
+ * $Id: test_fetch_object.phpt,v 1.3 2007/08/10 13:28:11 jani Exp $
*/
require('test.inc');
@@ -65,7 +65,7 @@
'lastchange' => '%s',
))
-Notice: sybase_fetch_object(): Sybase: Class *** has not been declared in
%s/test_fetch_object.php on line %d
+Notice: sybase_fetch_object(): Sybase: Class *** has not been declared in
%stest_fetch_object.php on line %d
stdClass::__set_state(array(
'id' => 1,
'caption' => 'Hello',
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_fields.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/sybase_ct/tests/test_fields.phpt
diff -u php-src/ext/sybase_ct/tests/test_fields.phpt:1.2
php-src/ext/sybase_ct/tests/test_fields.phpt:1.3
--- php-src/ext/sybase_ct/tests/test_fields.phpt:1.2 Wed Mar 14 12:00:35 2007
+++ php-src/ext/sybase_ct/tests/test_fields.phpt Fri Aug 10 13:28:11 2007
@@ -6,7 +6,7 @@
<?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: test_fields.phpt,v 1.2 2007/03/14 12:00:35 thekid Exp $
+ * $Id: test_fields.phpt,v 1.3 2007/08/10 13:28:11 jani Exp $
*/
require('test.inc');
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_long.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/sybase_ct/tests/test_long.phpt
diff -u php-src/ext/sybase_ct/tests/test_long.phpt:1.1
php-src/ext/sybase_ct/tests/test_long.phpt:1.2
--- php-src/ext/sybase_ct/tests/test_long.phpt:1.1 Sun May 16 20:28:31 2004
+++ php-src/ext/sybase_ct/tests/test_long.phpt Fri Aug 10 13:28:11 2007
@@ -6,7 +6,7 @@
<?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: test_long.phpt,v 1.1 2004/05/16 20:28:31 thekid Exp $
+ * $Id: test_long.phpt,v 1.2 2007/08/10 13:28:11 jani Exp $
*/
require('test.inc');
@@ -15,7 +15,7 @@
define('LONG_MIN', -LONG_MAX - 1);
$db= sybase_connect_ex();
- var_dump(sybase_select_db('tempdb', $db));
+ var_dump(sybase_select_db(TEMPDB, $db));
// Create table and insert some values
var_dump(sybase_query('create table test_long (value numeric(20, 0))'));
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_msghandler.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/sybase_ct/tests/test_msghandler.phpt
diff -u php-src/ext/sybase_ct/tests/test_msghandler.phpt:1.2
php-src/ext/sybase_ct/tests/test_msghandler.phpt:1.3
--- php-src/ext/sybase_ct/tests/test_msghandler.phpt:1.2 Sun Jan 25
20:04:08 2004
+++ php-src/ext/sybase_ct/tests/test_msghandler.phpt Fri Aug 10 13:28:11 2007
@@ -6,7 +6,7 @@
<?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: test_msghandler.phpt,v 1.2 2004/01/25 20:04:08 thekid Exp $
+ * $Id: test_msghandler.phpt,v 1.3 2007/08/10 13:28:11 jani Exp $
*/
require('test.inc');
@@ -26,14 +26,14 @@
?>
--EXPECTF--
Nonexistant:
-Warning: sybase_set_message_handler(): First argumented is expected to be a
valid callback, 'function_does_not_exist' was given in %s/test.inc on line %d
+Warning: sybase_set_message_handler(): First argumented is expected to be a
valid callback, 'function_does_not_exist' was given in %stest.inc on line %d
bool(false)
Static method: bool(true)
Instance method: bool(true)
Lambda function: bool(true)
Unset: bool(true)
Incorrect type:
-Warning: sybase_set_message_handler(): First argumented is expected to be
either NULL, an array or string, integer given in %s/test.inc on line %d
+Warning: sybase_set_message_handler(): First argumented is expected to be
either NULL, an array or string, integer given in %stest.inc on line %d
bool(false)
Function: bool(true)
>>> Query: select getdate(NULL)
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_msghandler_handled.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/sybase_ct/tests/test_msghandler_handled.phpt
diff -u php-src/ext/sybase_ct/tests/test_msghandler_handled.phpt:1.2
php-src/ext/sybase_ct/tests/test_msghandler_handled.phpt:1.3
--- php-src/ext/sybase_ct/tests/test_msghandler_handled.phpt:1.2 Wed Mar
14 12:00:08 2007
+++ php-src/ext/sybase_ct/tests/test_msghandler_handled.phpt Fri Aug 10
13:28:11 2007
@@ -6,7 +6,7 @@
<?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: test_msghandler_handled.phpt,v 1.2 2007/03/14 12:00:08 thekid Exp $
+ * $Id: test_msghandler_handled.phpt,v 1.3 2007/08/10 13:28:11 jani Exp $
*/
require('test.inc');
@@ -65,6 +65,5 @@
Warning: sybase_query(): Sybase: Server message: Syntax error during
explicit conversion of VARCHAR value 'notadate' to a DATETIME field.
(severity 16, procedure N/A) in %s on line %d
-<<< Return: resource
-array(0) {
-}
+<<< Return: boolean
+bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_unbuffered_query.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/sybase_ct/tests/test_unbuffered_query.phpt
diff -u php-src/ext/sybase_ct/tests/test_unbuffered_query.phpt:1.3
php-src/ext/sybase_ct/tests/test_unbuffered_query.phpt:1.4
--- php-src/ext/sybase_ct/tests/test_unbuffered_query.phpt:1.3 Fri May 21
21:01:21 2004
+++ php-src/ext/sybase_ct/tests/test_unbuffered_query.phpt Fri Aug 10
13:28:12 2007
@@ -6,7 +6,7 @@
<?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: test_unbuffered_query.phpt,v 1.3 2004/05/21 21:01:21 thekid Exp $
+ * $Id: test_unbuffered_query.phpt,v 1.4 2007/08/10 13:28:12 jani Exp $
*/
require('test.inc');
@@ -49,7 +49,7 @@
resource(%d) of type (sybase-ct result)
resource(%d) of type (Unknown)
-Warning: sybase_num_rows(): %d is not a valid Sybase result resource in
%s/test_unbuffered_query.php on line %d
+Warning: sybase_num_rows(): %d is not a valid Sybase result resource in
%stest_unbuffered_query.php on line %d
bool(true)
resource(%d) of type (sybase-ct result)
int(%d)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
