From 8d7f1853a45f01d19fcc74e80a1c043fa0bd4b87 Mon Sep 17 00:00:00 2001
From: yitam <v-yitam@microsoft.com>
Date: Wed, 12 Jul 2017 13:39:02 -0700
Subject: [PATCH] Temporary entity names to ensure uniqueness

---
 test/functional/sqlsrv/MsCommon.inc          | 8 ++++----
 test/functional/sqlsrv/srv_073_database.phpt | 8 +-------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/test/functional/sqlsrv/MsCommon.inc b/test/functional/sqlsrv/MsCommon.inc
index e87e8018..ae32bee6 100644
--- a/test/functional/sqlsrv/MsCommon.inc
+++ b/test/functional/sqlsrv/MsCommon.inc
@@ -165,7 +165,7 @@ function GetTempTableName($table = '', $temporary = true)
     // dropped once the connection is closed. Otherwise, the caller 
     // should take care of dropping the temp table afterwards.
     
-    $timestamp = round(microtime(true)*1000);
+    $someNumber = rand(0, 1000);
     
     $prefix = '';
     if ($temporary)
@@ -174,7 +174,7 @@ function GetTempTableName($table = '', $temporary = true)
     if (strlen($table) == 0)
         $table = 'php_test_table';
         
-    return $prefix . $table . '_' . $timestamp;
+    return $prefix . $table . '_' . $someNumber;
 }
 
 function GetTempProcName($proc = '', $temporary = true)
@@ -183,7 +183,7 @@ function GetTempProcName($proc = '', $temporary = true)
     // automatically dropped once the connection is closed. Otherwise, 
     // the caller should take care of dropping the temp procedure afterwards.    
     
-    $timestamp = round(microtime(true)*1000);
+    $someNumber = rand(0, 1000);
 
     $prefix = '';
     if ($temporary)
@@ -192,7 +192,7 @@ function GetTempProcName($proc = '', $temporary = true)
     if (strlen($proc) == 0)
         $proc = 'php_test_proc'; 
 
-    return $prefix . $proc . '_' . $timestamp;
+    return $prefix . $proc . '_' . $someNumber;
 }
 
 function ExecuteQuery($conn, $query)
diff --git a/test/functional/sqlsrv/srv_073_database.phpt b/test/functional/sqlsrv/srv_073_database.phpt
index 3277bc86..f5759a5c 100644
--- a/test/functional/sqlsrv/srv_073_database.phpt
+++ b/test/functional/sqlsrv/srv_073_database.phpt
@@ -12,13 +12,7 @@ if( !$conn ) {
 }
 
 // Set database name
-$dbUniqueName = "php_uniqueDB01";
-
-// DROP database if exists
-$stmt = sqlsrv_query($conn,"IF EXISTS(SELECT name FROM sys.databases WHERE name = '"
-    .$dbUniqueName."') DROP DATABASE ".$dbUniqueName);
-if($stmt === false){ die( print_r( sqlsrv_errors(), true )); }
-sqlsrv_free_stmt($stmt);
+$dbUniqueName = "php_uniqueDB_" . rand(0, 1000);
 
 // CREATE database
 $stmt = sqlsrv_query($conn,"CREATE DATABASE ". $dbUniqueName);