failing tests

test/setup/exec_sql_scripts.py

@@ -28,13 +28,17 @@ 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\" '
     # executeCommmand(show_cmd)
 
-    inst_command = redirect_string.format(dbname, sqlfile, tmpFileName) + sqlcmd
+    # inst_command = redirect_string.format(dbname, sqlfile, tmpFileName) + sqlcmd
+    inst_command = redirect_string.format(dbname, sqlfile, tmpFileName) 
     executeCommmand(inst_command)
+    
+    executeCommmand(sqlcmd)
+    
     os.remove(tmpFileName)

test/sqlsrv/srv_031_sqlsrv_field_metadata.phpt

@@ -32,14 +32,13 @@ sqlsrv_free_stmt($stmt);
 // Prepare the statement
 $query = "SELECT FirstName, LastName, Age FROM $tableName";
 $stmt = sqlsrv_prepare($conn, $query);
-if ( $stmt === false ) { 
+
+// Get field metadata
+$metadata = sqlsrv_field_metadata($stmt);
+if ( ! $metadata ) 
     PrintErrors(); 
-}
-else {
-    // Get field metadata
-    $metadata = sqlsrv_field_metadata($stmt);
+else
     var_dump($metadata);
-}
 
 sqlsrv_free_stmt( $stmt);
 sqlsrv_close($conn);

test/sqlsrv/srv_034_field_metadata_unicode.phpt

@@ -21,14 +21,13 @@ $stmt = sqlsrv_query($conn, $sql);
 // Prepare the statement
 $sql = "SELECT * FROM $tableName";
 $stmt = sqlsrv_prepare($conn, $sql);
-if ( $stmt === false ) { 
+
+// Get and display field metadata
+$metadata = sqlsrv_field_metadata($stmt);
+if ( ! $metadata ) 
     PrintErrors(); 
-}
-else {
-    // Get and display field metadata
-    $metadata = sqlsrv_field_metadata($stmt);
+else
     var_dump($metadata);
-}
 
 // Free statement and connection resources
 sqlsrv_free_stmt($stmt);