error checking

test/setup/exec_sql_scripts.py

@@ -28,8 +28,8 @@ def executeSQLscriptUnix(sqlfile, conn_options, dbname):
     # This is a workaround because sqlcmd in Unix does not support -v option for variables. 
     # It inserts setvar dbname into the beginning of a temp .sql file
     tmpFileName = sqlfile[0:-4] + '_tmp.sql'
-    # redirect_string = '(echo :setvar dbname {0})  > {2}; cat {1} >> {2}; cat {2}; '
-    redirect_string = '(echo :setvar dbname {0})  > {2}; cat {1} >> {2}; '
+    redirect_string = '(echo :setvar dbname {0})  > {2}; cat {1} >> {2}; cat {2}; '
+    # redirect_string = '(echo :setvar dbname {0})  > {2}; cat {1} >> {2}; '
     sqlcmd = 'sqlcmd ' + conn_options + ' -i ' + tmpFileName
 
     # show_cmd = 'sqlcmd ' + conn_options + ' -Q \"select @@Version\" '

test/sqlsrv/srv_031_sqlsrv_field_metadata.phpt

@@ -4,7 +4,7 @@ sqlsrv_field_metadata() VARCHAR(n), NVARCHAR(n), INT
 --FILE--
 <?php
 
-require_once("MsCommon.inc");
+include ("MsCommon.inc");
 
 // Connect
 $conn = Connect();
@@ -12,7 +12,7 @@ if( !$conn ) {
     FatalError("Connection could not be established.\n");
 }
 
-$tableName = GetTempTableName();
+$tableName = GetTempTableName('test_srv_031');
 
 // Create table
 $stmt = sqlsrv_query($conn, "create table $tableName (FirstName VARCHAR(10), LastName NVARCHAR(20), Age INT)");
@@ -32,10 +32,14 @@ sqlsrv_free_stmt($stmt);
 // Prepare the statement
 $query = "SELECT FirstName, LastName, Age FROM $tableName";
 $stmt = sqlsrv_prepare($conn, $query);
-
-// Get field metadata
-$metadata = sqlsrv_field_metadata($stmt);
-var_dump($metadata);
+if ( $stmt === false ) { 
+    PrintErrors(); 
+}
+else {
+    // Get field metadata
+    $metadata = sqlsrv_field_metadata($stmt);
+    var_dump($metadata);
+}
 
 sqlsrv_free_stmt( $stmt);
 sqlsrv_close($conn);

test/sqlsrv/srv_034_field_metadata_unicode.phpt

@@ -4,7 +4,7 @@ Field metadata unicode
 --FILE--
 <?php
 
-require_once("MsCommon.inc");
+include ("MsCommon.inc");
 
 // Connect
 $conn = Connect(array("CharacterSet"=>"UTF-8"));
@@ -12,7 +12,7 @@ if( !$conn ) {
     FatalError("Connection could not be established.\n");
 }
 
-$tableName = GetTempTableName();
+$tableName = GetTempTableName('test_srv_034');
 
 // Create table. Column names: passport
 $sql = "CREATE TABLE $tableName (पासपोर्ट CHAR(2), پاسپورٹ VARCHAR(2), Διαβατήριο VARCHAR(MAX))";
@@ -21,10 +21,14 @@ $stmt = sqlsrv_query($conn, $sql);
 // Prepare the statement
 $sql = "SELECT * FROM $tableName";
 $stmt = sqlsrv_prepare($conn, $sql);
-
-// Get and display field metadata
-$metadata = sqlsrv_field_metadata($stmt);
-var_dump($metadata);
+if ( $stmt === false ) { 
+    PrintErrors(); 
+}
+else {
+    // Get and display field metadata
+    $metadata = sqlsrv_field_metadata($stmt);
+    var_dump($metadata);
+}
 
 // Free statement and connection resources
 sqlsrv_free_stmt($stmt);