dprevot/php-sqlsrv
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

made changes as per review

Browse source
This commit is contained in:
Jenny Tam 2017-12-05 09:26:54 -08:00
parent 581a98085f
commit 69793cdafc
8 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/functional/sqlsrv/0069.phpt
View file

@ -43,7 +43,6 @@ Variety of connection parameters.
$conn = AE\connect();
$tableName = 'php_table_SERIL1_1';
dropTable($conn, $tableName);
if (AE\isColEncrypted()) {
// With AE enabled, the sql types and SQLSRV SQLTYPES have to match exactly when binding
// Since SQLSRV SQLTYPES with datetime columns have no options for precision/scale,
@ -53,6 +52,7 @@ Variety of connection parameters.
new AE\ColumnMeta('time', 'c3_time'));
$stmt = AE\createTable($conn, $tableName, $columns);
} else {
dropTable($conn, $tableName);
$stmt = sqlsrv_query($conn, "CREATE TABLE $tableName ([c1_datetime2] datetime2(0), [c2_datetimeoffset] datetimeoffset(0), [c3_time] time(0))");
}
if (!$stmt) {

4
test/functional/sqlsrv/0074.phpt
View file

@ -17,7 +17,7 @@ require_once('MsCommon.inc');
$conn = AE\connect();
// drop the procedure if exists
$stmt = sqlsrv_query($conn, "IF OBJECT_ID('sp_MakeSubject', 'P') IS NOT NULL DROP PROCEDURE sp_MakeSubject");
dropProc($conn, 'sp_MakeSubject');
// Create Table 'Subjects' but do not encrypt the first column because in the stored procedure
// we rely on the server to get the current date time. With Column Encryption, all input values
@ -79,7 +79,7 @@ if ($stmt === false) {
$tsql_callSP = "{call sp_MakeSubject(?,?,?,?)}";
$introText="X";
// With AE, the sql type has to match the column definition
// With AE, the sql type has to match the stored procedure parameter definition
$outSQLType = AE\isColEncrypted() ? SQLSRV_SQLTYPE_NVARCHAR('max') : SQLSRV_SQLTYPE_NVARCHAR(256);
$params = array(
array( 1, SQLSRV_PARAM_IN, SQLSRV_PHPTYPE_INT, SQLSRV_SQLTYPE_INT ),

3
test/functional/sqlsrv/skipif_not_ksp.inc
View file

@ -5,8 +5,9 @@ if (!extension_loaded("sqlsrv"))
require_once('MsCommon.inc');
if ($keystore != AE\KEYSTORE_KSP)
if ($keystore != AE\KEYSTORE_KSP) {
die('skip - this test requires a custom keystore provider.');
}
$conn = AE\connect();
if (! $conn) {

2
test/functional/sqlsrv/sqlsrv_bind_param_out_string.phpt
View file

@ -344,8 +344,6 @@ $actualValue = $return;
$actualLength = strlen($return);
compareResults($expectedLength, $expectedValue, $actualLength, $actualValue);
// sqlsrv_query($conn, "DROP TABLE BindStringTest");
// sqlsrv_query($conn, "DROP PROCEDURE uspPerson");
dropTable($conn, $tableName);
dropProc($conn, 'uspPerson');

4
test/functional/sqlsrv/sqlsrv_bug_boolean_cast_inout_bit.phpt
View file

@ -14,7 +14,7 @@ require_once('MsCommon.inc');
$conn = AE\connect();
$stmt = sqlsrv_query($conn, "IF OBJECT_ID('testBoolean', 'P') IS NOT NULL DROP PROCEDURE testBoolean");
dropProc($conn, 'testBoolean');
$createSP = <<<SQL
CREATE PROCEDURE testBoolean
@ -51,7 +51,7 @@ var_dump($bit_false);
var_dump($bit_cast_true);
var_dump($int_true);
$stmt = sqlsrv_query($conn, "DROP PROCEDURE testBoolean");
dropProc($conn, 'testBoolean');
sqlsrv_free_stmt($stmt);
sqlsrv_close($conn);

4
test/functional/sqlsrv/sqlsrv_bug_boolean_cast_inout_bool.phpt
View file

@ -14,7 +14,7 @@ require_once('MsCommon.inc');
$conn = AE\connect();
$stmt = sqlsrv_query($conn, "IF OBJECT_ID('testBoolean', 'P') IS NOT NULL DROP PROCEDURE testBoolean");
dropProc($conn, 'testBoolean');
$createSP = <<<SQL
CREATE PROCEDURE testBoolean
@ -52,7 +52,7 @@ var_dump($bit_false);
var_dump($bit_cast_true);
var_dump($int_true);
$stmt = sqlsrv_query($conn, "DROP PROCEDURE testBoolean");
dropProc($conn, 'testBoolean');
sqlsrv_free_stmt($stmt);
sqlsrv_close($conn);

4
test/functional/sqlsrv/sqlsrv_bug_boolean_cast_out_bit.phpt
View file

@ -14,7 +14,7 @@ require_once('MsCommon.inc');
$conn = AE\connect();
$stmt = sqlsrv_query($conn, "IF OBJECT_ID('testBoolean', 'P') IS NOT NULL DROP PROCEDURE testBoolean");
dropProc($conn, 'testBoolean');
$createSP = <<<SQL
CREATE PROCEDURE testBoolean
@ -52,7 +52,7 @@ var_dump($bit_false);
var_dump($bit_cast_true);
var_dump($int_true);
$stmt = sqlsrv_query($conn, "DROP PROCEDURE testBoolean");
dropProc($conn, 'testBoolean');
sqlsrv_free_stmt($stmt);
sqlsrv_close($conn);

4
test/functional/sqlsrv/sqlsrv_bug_boolean_cast_out_bool.phpt
View file

@ -14,7 +14,7 @@ require_once('MsCommon.inc');
$conn = AE\connect();
$stmt = sqlsrv_query($conn, "IF OBJECT_ID('testBoolean', 'P') IS NOT NULL DROP PROCEDURE testBoolean");
dropProc($conn, 'testBoolean');
$createSP = <<<SQL
CREATE PROCEDURE testBoolean
@ -52,7 +52,7 @@ var_dump($bit_false);
var_dump($bit_cast_true);
var_dump($int_true);
$stmt = sqlsrv_query($conn, "DROP PROCEDURE testBoolean");
dropProc($conn, 'testBoolean');
sqlsrv_free_stmt($stmt);
sqlsrv_close($conn);