Skip to content

Commit 60abaac

Browse files
kocsismatekocsismate
committed
Address code review comments
1 parent bcb3c8b commit 60abaac

26 files changed

+102
-102
lines changed

‎ext/odbc/tests/CONFLICTS

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎ext/odbc/tests/bug44618.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ Bug #44618 (Fetching may rely on uninitialized data)
44
odbc
55
--SKIPIF--
66
<?php
7-
include 'skipif.inc';
7+
include 'skipif.inc';
88

9-
if (ODBC_TYPE === "unixODBC") {
10-
die("skip Fails with unixODBC");
11-
}
9+
if (ODBC_TYPE === "unixODBC") {
10+
die("skip Fails with unixODBC");
11+
}
1212
?>
1313
--FILE--
1414
<?php

‎ext/odbc/tests/bug47803.phpt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ odbc
99

1010
include __DIR__ . "/config.inc";
1111

12-
$create_table = "CREATE TABLE FOO(
12+
$create_table = "CREATE TABLE bug47803(
1313
[PAR_ID] [int] NOT NULL,
1414
[PAR_INT] [int] NULL,
1515
[PAR_CHR] [varchar](500) NULL
1616
)";
1717

18-
$inserts = "INSERT INTO FOO
18+
$inserts = "INSERT INTO bug47803
1919
([PAR_ID]
2020
,[PAR_INT]
2121
,[PAR_CHR])
@@ -37,7 +37,6 @@ date_default_timezone_set('Europe/Warsaw');
3737

3838
$link = odbc_connect($dsn, $user, $pass);
3939

40-
odbc_exec($link, 'CREATE DATABASE odbcTEST');
4140
odbc_exec($link, $create_table);
4241
odbc_exec($link, $inserts);
4342

@@ -53,7 +52,7 @@ $upd_params = array(
5352
array('id'=>7, 'name'=>'test 7'),
5453
array('id'=>6, 'name'=>'test 6'),
5554
);
56-
$sql = "UPDATE FOO
55+
$sql = "UPDATE bug47803
5756
SET [PAR_CHR] = ?
5857
WHERE [PAR_ID] = ?";
5958
$result = odbc_prepare($link, $sql);
@@ -69,7 +68,7 @@ foreach ($upd_params as &$k) {
6968
}
7069
odbc_free_result($result);
7170

72-
$sql = "SELECT * FROM FOO WHERE [PAR_ID] = ?";
71+
$sql = "SELECT * FROM bug47803 WHERE [PAR_ID] = ?";
7372
$result = odbc_prepare($link, $sql);
7473
if (!$result) {
7574
print ('[sql] prep: '.$sql);
@@ -177,8 +176,7 @@ include 'config.inc';
177176

178177
$conn = odbc_connect($dsn, $user, $pass);
179178

180-
odbc_exec($conn, 'DROP TABLE FOO');
181-
odbc_exec($conn, 'DROP DATABASE odbcTEST');
179+
odbc_exec($conn, 'DROP TABLE bug47803');
182180

183181
odbc_close($conn);
184182

‎ext/odbc/tests/bug60616.phpt

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,21 @@ odbc
55
mbstring
66
--SKIPIF--
77
<?php
8-
include 'skipif.inc';
9-
if ("unixODBC" != ODBC_TYPE) {
10-
die("skip ODBC_TYPE != unixODBC");
8+
include 'skipif.inc';
9+
if ("unixODBC" != ODBC_TYPE) {
10+
die("skip ODBC_TYPE != unixODBC");
11+
}
12+
13+
$conn = odbc_connect($dsn, $user, $pass);
14+
$result = @odbc_exec($conn, "SELECT @@Version");
15+
if ($result) {
16+
$array = odbc_fetch_array($result);
17+
$info = (string) reset($array);
18+
if (str_contains($info, "Microsoft SQL Server")) {
19+
echo "skip Doesn't work with MS SQL";
1120
}
21+
}
1222
?>
13-
--XFAIL--
14-
Uses syntax incompatible with MS SQL (CREATE DATABASE ... ENCODING)
1523
--FILE--
1624
<?php
1725

@@ -26,14 +34,14 @@ ini_set("odbc.defaultlrl", 4); // Set artificially low
2634

2735
$conn = odbc_connect($dsn, $user, $pass);
2836

29-
odbc_exec($conn, 'CREATE DATABASE odbcTEST ENCODING=\'EUC_JP\'');
37+
odbc_exec($conn, 'CREATE DATABASE bug60616Test ENCODING=\'EUC_JP\'');
3038

31-
odbc_exec($conn, 'CREATE TABLE FOO (ID INT, CHAR_COL CHAR(200), VARCHAR_COL VARCHAR(200), TEXT_COL TEXT)');
39+
odbc_exec($conn, 'CREATE TABLE bug60616 (ID INT, CHAR_COL CHAR(200), VARCHAR_COL VARCHAR(200), TEXT_COL TEXT)');
3240

33-
odbc_exec($conn, "INSERT INTO FOO(ID, CHAR_COL, VARCHAR_COL, TEXT_COL) VALUES (1, '$euc_jp', '$euc_jp', '$euc_jp')");
34-
odbc_exec($conn, "INSERT INTO FOO(ID, CHAR_COL, VARCHAR_COL, TEXT_COL) VALUES (2, '$ascii', '$ascii', '$ascii')");
41+
odbc_exec($conn, "INSERT INTO bug60616(ID, CHAR_COL, VARCHAR_COL, TEXT_COL) VALUES (1, '$euc_jp', '$euc_jp', '$euc_jp')");
42+
odbc_exec($conn, "INSERT INTO bug60616(ID, CHAR_COL, VARCHAR_COL, TEXT_COL) VALUES (2, '$ascii', '$ascii', '$ascii')");
3543

36-
$res = odbc_exec($conn, 'SELECT * FROM FOO ORDER BY ID ASC');
44+
$res = odbc_exec($conn, 'SELECT * FROM bug60616 ORDER BY ID ASC');
3745

3846
while(odbc_fetch_row($res)) {
3947
$char_col = odbc_result($res, "CHAR_COL");
@@ -73,7 +81,7 @@ include 'config.inc';
7381

7482
$conn = odbc_connect($dsn, $user, $pass);
7583

76-
odbc_exec($conn, 'DROP TABLE FOO');
77-
odbc_exec($conn, 'DROP DATABASE odbcTEST');
84+
odbc_exec($conn, 'DROP TABLE bug60616');
85+
odbc_exec($conn, 'DROP DATABASE bug60616Test');
7886

7987
?>

‎ext/odbc/tests/bug68087.phpt

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,12 @@ $id_2_date = '2014-09-24';
1414

1515
$conn = odbc_connect($dsn, $user, $pass);
1616

17-
@odbc_exec($conn, 'CREATE DATABASE odbcTEST');
17+
odbc_exec($conn, 'CREATE TABLE bug68087 (ID INT, VARCHAR_COL VARCHAR(100), DATE_COL DATE)');
1818

19-
odbc_exec($conn, 'CREATE TABLE FOO (ID INT, VARCHAR_COL VARCHAR(100), DATE_COL DATE)');
19+
odbc_exec($conn, "INSERT INTO bug68087(ID, VARCHAR_COL, DATE_COL) VALUES (1, 'hello', '$id_1_date')");
20+
odbc_exec($conn, "INSERT INTO bug68087(ID, VARCHAR_COL, DATE_COL) VALUES (2, 'helloagain', '$id_2_date')");
2021

21-
odbc_exec($conn, "INSERT INTO FOO(ID, VARCHAR_COL, DATE_COL) VALUES (1, 'hello', '$id_1_date')");
22-
odbc_exec($conn, "INSERT INTO FOO(ID, VARCHAR_COL, DATE_COL) VALUES (2, 'helloagain', '$id_2_date')");
23-
24-
$res = odbc_exec($conn, 'SELECT * FROM FOO ORDER BY ID ASC');
22+
$res = odbc_exec($conn, 'SELECT * FROM bug68087 ORDER BY ID ASC');
2523

2624
while(odbc_fetch_row($res)) {
2725
$id = odbc_result($res, "ID");
@@ -53,7 +51,6 @@ include 'config.inc';
5351

5452
$conn = odbc_connect($dsn, $user, $pass);
5553

56-
odbc_exec($conn, 'DROP TABLE FOO');
57-
odbc_exec($conn, 'DROP DATABASE odbcTEST');
54+
odbc_exec($conn, 'DROP TABLE bug68087');
5855

5956
?>

‎ext/odbc/tests/bug69354.phpt

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@ include 'config.inc';
1111

1212
$conn = odbc_connect($dsn, $user, $pass);
1313

14-
@odbc_exec($conn, 'CREATE DATABASE odbcTEST');
14+
odbc_exec($conn, 'CREATE TABLE bug69354 (ID INT, VARCHAR_COL VARCHAR(100))');
1515

16-
odbc_exec($conn, 'CREATE TABLE FOO (ID INT, VARCHAR_COL VARCHAR(100))');
16+
odbc_exec($conn, "INSERT INTO bug69354(ID, VARCHAR_COL) VALUES (1, '" . str_repeat("a", 100) . "')");
1717

18-
odbc_exec($conn, "INSERT INTO FOO(ID, VARCHAR_COL) VALUES (1, '" . str_repeat("a", 100) . "')");
19-
20-
$res = odbc_exec($conn,"select VARCHAR_COL from FOO");
18+
$res = odbc_exec($conn,"SELECT VARCHAR_COL FROM bug69354");
2119
if ($res) {
2220
if (odbc_fetch_row($res)) {
2321
$ret = odbc_result($res,'varchar_col');
@@ -37,7 +35,6 @@ include 'config.inc';
3735

3836
$conn = odbc_connect($dsn, $user, $pass);
3937

40-
odbc_exec($conn, 'DROP TABLE FOO');
41-
odbc_exec($conn, 'DROP DATABASE odbcTEST');
38+
odbc_exec($conn, 'DROP TABLE bug69354');
4239

4340
?>

‎ext/odbc/tests/bug69975.phpt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ odbc
99
include 'config.inc';
1010

1111
$conn = odbc_connect($dsn, $user, $pass);
12-
@odbc_exec($conn, 'CREATE DATABASE odbcTEST');
13-
odbc_exec($conn, 'CREATE TABLE FOO (ID INT, VARCHAR_COL NVARCHAR(MAX))');
14-
odbc_exec($conn, "INSERT INTO FOO VALUES (1, 'foo')");
12+
odbc_exec($conn, 'CREATE TABLE bug69975 (ID INT, VARCHAR_COL NVARCHAR(MAX))');
13+
odbc_exec($conn, "INSERT INTO bug69975 VALUES (1, 'foo')");
1514

16-
$result = odbc_exec($conn, "SELECT VARCHAR_COL FROM FOO");
15+
$result = odbc_exec($conn, "SELECT VARCHAR_COL FROM bug69975");
1716
var_dump(odbc_fetch_array($result));
1817

1918
echo "ready";
@@ -29,6 +28,5 @@ ready
2928
include 'config.inc';
3029

3130
$conn = odbc_connect($dsn, $user, $pass);
32-
odbc_exec($conn, 'DROP TABLE FOO');
33-
odbc_exec($conn, 'DROP DATABASE odbcTEST');
31+
odbc_exec($conn, 'DROP TABLE bug69975');
3432
?>

‎ext/odbc/tests/bug71171.phpt

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@ include 'config.inc';
1111

1212
$conn = odbc_connect($dsn, $user, $pass);
1313

14-
@odbc_exec($conn, 'CREATE DATABASE odbcTEST');
14+
odbc_exec($conn, 'CREATE TABLE bug71171 (ID INT, VARCHAR_COL NVARCHAR(40))');
1515

16-
odbc_exec($conn, 'CREATE TABLE FOO (ID INT, VARCHAR_COL NVARCHAR(40))');
16+
odbc_exec($conn, "INSERT INTO bug71171(ID, VARCHAR_COL) VALUES (1, '" . chr(0x81) . "')");
1717

18-
odbc_exec($conn, "INSERT INTO FOO(ID, VARCHAR_COL) VALUES (1, '" . chr(0x81) . "')");
19-
20-
$res = odbc_exec($conn,"SELECT ID FROM FOO WHERE VARCHAR_COL = '" . chr(0x81) . "'");
18+
$res = odbc_exec($conn,"SELECT ID FROM bug71171 WHERE VARCHAR_COL = '" . chr(0x81) . "'");
2119
if ($res) {
2220
while($record = odbc_fetch_array($res)) var_dump($record);
2321
}
@@ -35,8 +33,7 @@ include 'config.inc';
3533

3634
$conn = odbc_connect($dsn, $user, $pass);
3735

38-
odbc_exec($conn, 'DROP TABLE FOO');
39-
odbc_exec($conn, 'DROP DATABASE odbcTEST');
36+
odbc_exec($conn, 'DROP TABLE bug71171');
4037

4138
odbc_close($conn);
4239

‎ext/odbc/tests/bug73448.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ Bug #73448 odbc_errormsg returns trash, always 513 bytes
44
odbc
55
--SKIPIF--
66
<?php include 'skipif.inc'; ?>
7+
--CONFLICTS--
8+
odbc
79
--FILE--
810
<?php
911

‎ext/odbc/tests/odbc_columns_001.phpt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ odbc_columns(): Basic test
44
odbc
55
--SKIPIF--
66
<?php include 'skipif.inc'; ?>
7+
--CONFLICTS--
8+
odbc
79
--FILE--
810
<?php
911

@@ -13,6 +15,7 @@ $conn = odbc_connect($dsn, $user, $pass);
1315

1416
var_dump($result = odbc_columns($conn, '', '', '', ''));
1517
var_dump(odbc_fetch_row($result));
18+
odbc_free_result($result);
1619

1720
var_dump($result = odbc_columns($conn));
1821
var_dump(odbc_fetch_row($result));
@@ -24,7 +27,13 @@ var_dump(odbc_free_result($result));
2427

2528
var_dump($result = odbc_columns($conn, 'FOO', 'FOO', 'FOO', 'FOO'));
2629
var_dump(odbc_fetch_row($result));
30+
odbc_free_result($result);
2731

32+
?>
33+
--CLEAN--
34+
<?php
35+
require 'config.inc';
36+
$conn = odbc_connect($dsn, $user, $pass);
2837
?>
2938
--EXPECTF--
3039
resource(%d) of type (odbc result)

‎ext/odbc/tests/odbc_data_source_001.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ odbc_data_source(): Basic test
44
odbc
55
--SKIPIF--
66
<?php
7-
include 'skipif.inc';
8-
if (odbc_data_source($conn, SQL_FETCH_FIRST) === NULL) {
9-
die("skip no data sources defined on this system");
10-
}
7+
include 'skipif.inc';
8+
if (odbc_data_source($conn, SQL_FETCH_FIRST) === NULL) {
9+
die("skip no data sources defined on this system");
10+
}
1111
?>
1212
--FILE--
1313
<?php

‎ext/odbc/tests/odbc_exec_001.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ odbc_exec(): Basic test
33
--EXTENSIONS--
44
odbc
55
--SKIPIF--
6-
<?php include 'skipif.inc'; ?>
76
<?php
8-
if ("unixODBC" != ODBC_TYPE) {
9-
die("skip ODBC_TYPE != unixODBC");
10-
}
7+
include 'skipif.inc';
8+
if ("unixODBC" != ODBC_TYPE) {
9+
die("skip ODBC_TYPE != unixODBC");
10+
}
1111
?>
1212
--FILE--
1313
<?php

‎ext/odbc/tests/odbc_exec_002.phpt

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,12 @@ include 'config.inc';
1111

1212
$conn = odbc_connect($dsn, $user, $pass);
1313

14-
odbc_exec($conn, 'CREATE DATABASE odbcTEST');
14+
odbc_exec($conn, 'CREATE TABLE exec2 (TEST INT)');
1515

16-
odbc_exec($conn, 'CREATE TABLE FOO (TEST INT)');
16+
odbc_exec($conn, 'INSERT INTO exec2 VALUES (1)');
17+
odbc_exec($conn, 'INSERT INTO exec2 VALUES (2)');
1718

18-
odbc_exec($conn, 'INSERT INTO FOO VALUES (1)');
19-
odbc_exec($conn, 'INSERT INTO FOO VALUES (2)');
20-
21-
$res = odbc_exec($conn, 'SELECT * FROM FOO');
19+
$res = odbc_exec($conn, 'SELECT * FROM exec2');
2220

2321
var_dump(odbc_fetch_row($res));
2422
var_dump(odbc_result($res, 'test'));
@@ -28,8 +26,7 @@ var_dump(odbc_fetch_array($res));
2826
<?php
2927
require 'config.inc';
3028
$conn = odbc_connect($dsn, $user, $pass);
31-
odbc_exec($conn, 'DROP TABLE FOO');
32-
odbc_exec($conn, 'DROP DATABASE odbcTEST');
29+
odbc_exec($conn, 'DROP TABLE exec2');
3330
?>
3431
--EXPECT--
3532
bool(true)

‎ext/odbc/tests/odbc_fetch_array_001.phpt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@ $conn = odbc_connect($dsn, $user, $pass);
1414
odbc_exec($conn, 'CREATE TABLE fetch_array (foo INT)');
1515
odbc_exec($conn, 'INSERT INTO fetch_array VALUES (1)');
1616
odbc_exec($conn, 'INSERT INTO fetch_array VALUES (2)');
17-
odbc_exec($conn, 'INSERT INTO fetch_array VALUES (3)');
1817

1918
$res = odbc_exec($conn, 'SELECT * FROM fetch_array');
2019

21-
var_dump(odbc_fetch_array($res, 1));
2220
var_dump(odbc_fetch_array($res));
23-
var_dump(odbc_fetch_array($res, 3));
21+
var_dump(odbc_fetch_array($res, 0));
22+
var_dump(odbc_fetch_array($res, 2));
2423
var_dump(odbc_fetch_array($res, 4));
2524

2625
?>
@@ -41,6 +40,6 @@ array(1) {
4140
}
4241
array(1) {
4342
["foo"]=>
44-
string(1) "3"
43+
string(1) "2"
4544
}
4645
bool(false)

‎ext/odbc/tests/odbc_fetch_into_001.phpt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,19 @@ $conn = odbc_connect($dsn, $user, $pass);
1414
odbc_exec($conn, 'CREATE TABLE fetch_into (foo INT)');
1515
odbc_exec($conn, 'INSERT INTO fetch_into VALUES (1)');
1616
odbc_exec($conn, 'INSERT INTO fetch_into VALUES (2)');
17-
odbc_exec($conn, 'INSERT INTO fetch_into VALUES (3)');
1817

1918
$res = odbc_exec($conn, 'SELECT * FROM fetch_into');
2019

21-
$arr = [];
22-
var_dump(odbc_fetch_into($res, $arr, 1));
23-
var_dump($arr);
2420
$arr = [];
2521
var_dump(odbc_fetch_into($res, $arr));
2622
var_dump($arr);
2723
$arr = [];
2824
var_dump(odbc_fetch_into($res, $arr, 0));
2925
var_dump($arr);
3026
$arr = [];
27+
var_dump(odbc_fetch_into($res, $arr, 2));
28+
var_dump($arr);
29+
$arr = [];
3130
var_dump(odbc_fetch_into($res, $arr, 4));
3231
var_dump($arr);
3332

@@ -52,7 +51,7 @@ array(1) {
5251
int(1)
5352
array(1) {
5453
[0]=>
55-
string(1) "3"
54+
string(1) "2"
5655
}
5756
bool(false)
5857
array(0) {

0 commit comments

Comments
 (0)