6 files changed, 28 insertions, 23 deletions
diff --git a/ext/sybase_ct/tests/bug29064.phpt b/ext/sybase_ct/tests/bug29064.phpt
index df13d28a1d..902fe43358 100644
--- a/ext/sybase_ct/tests/bug29064.phpt
+++ b/ext/sybase_ct/tests/bug29064.phpt
@@ -112,9 +112,9 @@ array(2) {
     ["test_tinyint"]=>
     int(123)
     ["test_real"]=>
-    string(18) "123456789.12345679"
+    string(16) "123456789.123457"
     ["test_double"]=>
-    string(18) "123456789.12345679"
+    string(16) "123456789.123457"
   }
   [1]=>
   array(10) {
@@ -135,9 +135,9 @@ array(2) {
     ["test_tinyint"]=>
     int(255)
     ["test_real"]=>
-    string(19) "-123456789.12345679"
+    string(17) "-123456789.123457"
     ["test_double"]=>
-    string(19) "-123456789.12345679"
+    string(17) "-123456789.123457"
   }
 }
 bool(true)
diff --git a/ext/sybase_ct/tests/bug30312.phpt b/ext/sybase_ct/tests/bug30312.phpt
index 273b579d61..6ea0ebcb72 100644
--- a/ext/sybase_ct/tests/bug30312.phpt
+++ b/ext/sybase_ct/tests/bug30312.phpt
@@ -14,14 +14,14 @@ Sybase-CT bug #30312 (sybase_unbuffered_query calls)
 
   $db= sybase_connect_ex();
 
-  $query= sybase_unbuffered_query('select datepart(yy, getdate())');
+  $query= sybase_unbuffered_query('select getdate()');
   $array= sybase_fetch_array($query);
   var_dump($array[0]);
 
-  $query= sybase_unbuffered_query('select datepart(yy, getdate())');
+  $query= sybase_unbuffered_query('select getdate()');
   $array= sybase_fetch_array($query);
   var_dump($array[0]);
 ?>
 --EXPECTF--
-int(%d)
-int(%d)
+string(%d) "%s %d %d %d:%d%s"
+string(%d) "%s %d %d %d:%d%s"
diff --git a/ext/sybase_ct/tests/skipif.inc b/ext/sybase_ct/tests/skipif.inc
index 55bf53aa77..3bbc1e8a62 100644
--- a/ext/sybase_ct/tests/skipif.inc
+++ b/ext/sybase_ct/tests/skipif.inc
@@ -4,10 +4,5 @@
  * $Id$ 
  */
 
-  require 'test.inc';
-
   if (!extension_loaded('sybase_ct')) die('skip Sybase-CT extension not loaded');
-  
-  sybase_min_server_severity(11);
-  if (!@sybase_connect(HOST, USER, PASSWORD)) die('skip Unable to connect');
 ?>
diff --git a/ext/sybase_ct/tests/test.inc b/ext/sybase_ct/tests/test.inc
index 8dd2f7fadf..d9a587f040 100644
--- a/ext/sybase_ct/tests/test.inc
+++ b/ext/sybase_ct/tests/test.inc
@@ -5,9 +5,9 @@
  */
 
   // Change if needed
-  define('HOST',     getenv('PHP_SYBASE_HOST'));
-  define('USER',     getenv('PHP_SYBASE_USER'));
-  define('PASSWORD', getenv('PHP_SYBASE_PASS'));
+  define('HOST',     '****');
+  define('USER',     '****');
+  define('PASSWORD', '****');
   define('TEMPDB',   'tempdb');
 
   // {{{ bool sybase_msg_handler(int msgnumber, int severity, int state, int line, string text)
@@ -49,11 +49,11 @@
     var_dump(sybase_set_message_handler($handler));
   }
   
-  // {{{ resource sybase_connect_ex(string charset= NULL, string appname= NULL, bool new= FALSE)
+  // {{{ resource sybase_connect_ex(string charset= NULL, string appname= NULL)
   //     Connect to the sybase server using the defines HOST, USER and PASSWORD
-  function sybase_connect_ex($charset= NULL, $appname= NULL, $new= FALSE) {
+  function sybase_connect_ex($charset= NULL, $appname= NULL) {
     sybase_min_server_severity(11);       // Suppress "changed database context"
-    if (!($db= sybase_connect(HOST, USER, PASSWORD, $charset ? $charset : 'iso_1', $appname, $new))) {
+    if (!($db= sybase_connect(HOST, USER, PASSWORD, $charset ? $charset : 'iso_1', $appname))) {
       die('Connect to '.USER.'@'.HOST.' failed (using password: '.(PASSWORD ? 'yes' : 'no').')');
     }
     return $db;
diff --git a/ext/sybase_ct/tests/test_appname.phpt b/ext/sybase_ct/tests/test_appname.phpt
index 71f5c32f4d..c423ff0b52 100644
--- a/ext/sybase_ct/tests/test_appname.phpt
+++ b/ext/sybase_ct/tests/test_appname.phpt
@@ -35,6 +35,7 @@ Sybase-CT application name
   );
   
   var_dump(
+    $r,
     compare_string($program_name, $r[0]['program_name']),
     compare_string($hostname, $r[0]['hostname'])
   );
@@ -51,5 +52,14 @@ Sybase-CT application name
     where
       program_name = "phpt_test"
 <<< Return: resource
+array(1) {
+  [0]=>
+  array(2) {
+    ["hostname"]=>
+    string(10) "php.net%s"
+    ["program_name"]=>
+    string(16) "phpt_test%s"
+  }
+}
 bool(true)
 bool(true)
diff --git a/ext/sybase_ct/tests/test_msghandler.phpt b/ext/sybase_ct/tests/test_msghandler.phpt
index afe97cbef3..d97fe3f76c 100644
--- a/ext/sybase_ct/tests/test_msghandler.phpt
+++ b/ext/sybase_ct/tests/test_msghandler.phpt
@@ -26,15 +26,15 @@ Sybase-CT server message handler
 ?>
 --EXPECTF--
 Nonexistant:     
-Warning: sybase_set_message_handler() expects parameter 1 to be a valid callback, function 'function_does_not_exist' not found or invalid function name in %stest.inc on line %d
-NULL
+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() expects parameter 1 to be a valid callback, no array or string given in %stest.inc on line %d
-NULL
+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)
 *** Caught Sybase Server Message #%d [Severity %d, state %d] at line %d