- Changed hardcoded "tempdb" database name to a constant

# This constant is defined in test.inc and defaults to "tempdb"
# In certain setups, create procedure permissions may not be granted
# in tempdb

diff --git a/ext/sybase_ct/tests/bug22403.phpt b/ext/sybase_ct/tests/bug22403.phpt
index 2088595d33c8f58ff40fb5708055a41fb124b4fe..20d5248ff42a24dc5878c40b74121f030047e115 100644 (file)
--- a/ext/sybase_ct/tests/bug22403.phpt
+++ b/ext/sybase_ct/tests/bug22403.phpt
@@ -17,7 +17,7 @@ Sybase-CT bug #22403 (crash when executing a stored procedure without parameters
 
   // 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 @@ bool(false)
 <<< 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)

diff --git a/ext/sybase_ct/tests/bug27843.phpt b/ext/sybase_ct/tests/bug27843.phpt
index 2de4dbb2ff210b13413cbd144cd4e5e6afd85fac..861d1f95e7da35d019a348841e9ed1ebcedf5b44 100644 (file)
--- a/ext/sybase_ct/tests/bug27843.phpt
+++ b/ext/sybase_ct/tests/bug27843.phpt
@@ -15,7 +15,7 @@ Sybase-CT bug #27843 (notices when query is a stored procedure)
 
   // 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('

diff --git a/ext/sybase_ct/tests/bug28354.phpt b/ext/sybase_ct/tests/bug28354.phpt
index 3ef374469a7197e8b4ce5bfb9eea245415c44889..018f7bddec6aad3d11f6cef991f17ec2635e944b 100644 (file)
--- a/ext/sybase_ct/tests/bug28354.phpt
+++ b/ext/sybase_ct/tests/bug28354.phpt
@@ -17,7 +17,7 @@ Sybase-CT bug #28354 (sybase_free_result crash)
 
   // 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('