fix line endings

This commit is contained in:
v-kaywon 2017-11-30 16:26:39 -08:00
parent f3e31b834d
commit 3b65f26776
6 changed files with 15 additions and 16 deletions

View file

@ -89,4 +89,4 @@ function logInfo($offset, $msg)
?>
--EXPECT--
Test "PDO Statement - Fetch LOB" completed successfully.
Test 'PDO Statement - Fetch LOB' completed successfully.

View file

@ -14,6 +14,7 @@ try {
$conn1 = connect();
// Prepare test table
$tableName = "pdo_test_table";
createTable($conn1, $tableName, array(new ColumnMeta("int", "id", "NOT NULL PRIMARY KEY"), "val1" => "varchar(10)", "val2" => "varchar(10)", "val3" => "varchar(10)"));
$data = array("one", "two", "three");

View file

@ -41,7 +41,7 @@ function katmaiBasicTypes($conn)
$expOutput = array_values($expOutput);
createTable($conn, $tableName, $dataTypes);
insertRow($conn, $tableName, $data);
echo "\nComparing results of Katmai basic fields\n";
echo "Comparing results of Katmai basic fields\n";
$stmt = $conn->query("SELECT * FROM $tableName");
$numFields = $stmt->columnCount();
@ -90,7 +90,7 @@ function katmaiSparseChar($conn)
insertRow($conn, $tableName, array("c1" => 2, "c3" => $input, "c6" => $input));
insertRow($conn, $tableName, array("c1" => 3, "c4" => $input, "c7" => $input));
echo "\nComparing results of Katmai sparse fields\n";
echo "Comparing results of Katmai sparse fields\n";
$stmt = $conn->query("SELECT * FROM $tableName");
while ($row = $stmt->fetch(PDO::FETCH_NUM)) {
@ -139,7 +139,7 @@ function katmaiSparseNumeric($conn)
}
insertRow($conn, $tableName, $data);
echo "\nShowing results of Katmai sparse numeric fields\n";
echo "Showing results of Katmai sparse numeric fields\n";
$stmt = $conn->query("SELECT * FROM $tableName");
$row = $stmt->fetch(PDO::FETCH_NUM);
foreach ($row as $value) {
@ -163,14 +163,11 @@ try {
} catch (Exception $e) {
echo $e->getMessage();
}
?>
--EXPECT--
Comparing results of Katmai basic fields
Comparing results of Katmai basic fields
Comparing results of Katmai sparse fields
Showing results of Katmai sparse numeric fields
string(1) "1"
string(1) "1"

View file

@ -70,7 +70,7 @@ try {
echo "\nDone\n";
?>
--EXPECT--
Number of rows: 1
SQLSTATE[42000]: [Microsoft][ODBC Driver 13 for SQL Server][SQL Server]Implicit conversion from data type sql_variant to nvarchar(max) is not allowed. Use the CONVERT function to run this query.
--EXPECTREGEX--
Number of rows: 1
SQLSTATE\[42000\]: \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Implicit conversion from data type sql_variant to nvarchar\(max\) is not allowed. Use the CONVERT function to run this query.
Done

View file

@ -27,6 +27,7 @@ function testReverse($conn)
// Since SQLDescribeParam is called
if (isColEncrypted() && $string === "987654321") {
echo "Test input output parameter with SQL_VARIANT successfully.\n";
} else {
echo "Does REVERSE work? $string \n";
}
@ -124,8 +125,8 @@ try {
} catch (Exception $e) {
echo $e->getMessage();
}
?>
--EXPECTREGEX--
Test input output parameter with SQL_VARIANT successfully.
--EXPECT--
Test input output parameter with SQL_VARIANT successfully.
Test output parameter with SQL_VARIANT successfully.

View file

@ -139,7 +139,7 @@ try {
?>
--EXPECT--
Added Milk in Diary Products with ID 1.
Added Milk in Diary Products with ID 1.
Added Chicken in Meat with ID 3.
Added Blueberry in Fruits with ID 5.
ID: 1 Milk, Diary Products