Skip to content

Commit ef03a2d

Browse files
kocsismatekocsismate
committed
fixup! Fix ext/odbc tests
1 parent 0f0fa63 commit ef03a2d

15 files changed

+106
-74
lines changed

‎ext/odbc/tests/bug47803.phpt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,17 @@ out:
8888
if ($result) odbc_free_result($result);
8989
odbc_close($link);
9090

91+
?>
92+
--CLEAN--
93+
<?php
94+
include 'config.inc';
95+
96+
$conn = odbc_connect($dsn, $user, $pass);
97+
98+
odbc_exec($conn, 'DROP TABLE bug47803');
99+
100+
odbc_close($conn);
101+
91102
?>
92103
--EXPECT--
93104
array(3) {
@@ -170,14 +181,3 @@ array(3) {
170181
["PAR_CHR"]=>
171182
string(6) "test 7"
172183
}
173-
--CLEAN--
174-
<?php
175-
include 'config.inc';
176-
177-
$conn = odbc_connect($dsn, $user, $pass);
178-
179-
odbc_exec($conn, 'DROP TABLE bug47803');
180-
181-
odbc_close($conn);
182-
183-
?>

‎ext/odbc/tests/bug60616.phpt

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,9 @@ ini_set("odbc.defaultlrl", 4); // Set artificially low
3535
$conn = odbc_connect($dsn, $user, $pass);
3636

3737
odbc_exec($conn, 'CREATE DATABASE bug60616Test ENCODING=\'EUC_JP\'');
38-
38+
odbc_exec($conn, 'USE bug60616Test');
3939
odbc_exec($conn, 'CREATE TABLE bug60616 (ID INT, CHAR_COL CHAR(200), VARCHAR_COL VARCHAR(200), TEXT_COL TEXT)');
40-
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')");
40+
odbc_exec($conn, "INSERT INTO bug60616(ID, CHAR_COL, VARCHAR_COL, TEXT_COL) VALUES (1, '$euc_jp', '$euc_jp', '$euc_jp'), (2, '$ascii', '$ascii', '$ascii')");
4341

4442
$res = odbc_exec($conn, 'SELECT * FROM bug60616 ORDER BY ID ASC');
4543

@@ -72,16 +70,17 @@ while(odbc_fetch_row($res)) {
7270
}
7371

7472
?>
75-
--EXPECT--
76-
EUC-JP matched
77-
ASCII matched
7873
--CLEAN--
7974
<?php
8075
include 'config.inc';
8176

8277
$conn = odbc_connect($dsn, $user, $pass);
8378

79+
odbc_exec($conn, 'USE bug60616Test');
8480
odbc_exec($conn, 'DROP TABLE bug60616');
8581
odbc_exec($conn, 'DROP DATABASE bug60616Test');
86-
8782
?>
83+
--EXPECT--
84+
EUC-JP matched
85+
ASCII matched
86+

‎ext/odbc/tests/bug68087.phpt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ $conn = odbc_connect($dsn, $user, $pass);
1616

1717
odbc_exec($conn, 'CREATE TABLE bug68087 (ID INT, VARCHAR_COL VARCHAR(100), DATE_COL DATE)');
1818

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')");
19+
odbc_exec($conn, "INSERT INTO bug68087(ID, VARCHAR_COL, DATE_COL) VALUES (1, 'hello', '$id_1_date'), (2, 'helloagain', '$id_2_date')");
2120

2221
$res = odbc_exec($conn, 'SELECT * FROM bug68087 ORDER BY ID ASC');
2322

@@ -42,9 +41,6 @@ while(odbc_fetch_row($res)) {
4241
}
4342

4443
?>
45-
--EXPECT--
46-
Date_1 matched
47-
Date_2 matched
4844
--CLEAN--
4945
<?php
5046
include 'config.inc';
@@ -54,3 +50,6 @@ $conn = odbc_connect($dsn, $user, $pass);
5450
odbc_exec($conn, 'DROP TABLE bug68087');
5551

5652
?>
53+
--EXPECT--
54+
Date_1 matched
55+
Date_2 matched

‎ext/odbc/tests/bug69354.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ if ($res) {
2525
}
2626
}
2727
?>
28-
--EXPECT--
29-
100
30-
a
31-
a
3228
--CLEAN--
3329
<?php
3430
include 'config.inc';
@@ -38,3 +34,7 @@ $conn = odbc_connect($dsn, $user, $pass);
3834
odbc_exec($conn, 'DROP TABLE bug69354');
3935

4036
?>
37+
--EXPECT--
38+
100
39+
a
40+
a

‎ext/odbc/tests/bug69975.phpt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,17 @@ var_dump(odbc_fetch_array($result));
1717

1818
echo "ready";
1919
?>
20-
--EXPECT--
21-
array(1) {
22-
["VARCHAR_COL"]=>
23-
string(3) "foo"
24-
}
25-
ready
2620
--CLEAN--
2721
<?php
2822
include 'config.inc';
2923

3024
$conn = odbc_connect($dsn, $user, $pass);
3125
odbc_exec($conn, 'DROP TABLE bug69975');
3226
?>
27+
--EXPECT--
28+
array(1) {
29+
["VARCHAR_COL"]=>
30+
string(3) "foo"
31+
}
32+
ready
33+

‎ext/odbc/tests/bug71171.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ if ($res) {
2222

2323
odbc_close($conn);
2424
?>
25-
--EXPECT--
26-
array(1) {
27-
["ID"]=>
28-
string(1) "1"
29-
}
3025
--CLEAN--
3126
<?php
3227
include 'config.inc';
@@ -38,3 +33,8 @@ odbc_exec($conn, 'DROP TABLE bug71171');
3833
odbc_close($conn);
3934

4035
?>
36+
--EXPECT--
37+
array(1) {
38+
["ID"]=>
39+
string(1) "1"
40+
}

‎ext/odbc/tests/bug73725.phpt

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ $conn = odbc_connect($dsn, $user, $pass);
1313

1414
odbc_do($conn, "CREATE TABLE bug73725(i int, txt varchar(max), k int)");
1515

16-
odbc_do($conn, "INSERT INTO bug73725 VALUES(101,'Any text', 33)");
17-
odbc_do($conn, "INSERT INTO bug73725 VALUES(102,'Lorem ipsum dolor', 34)");
16+
odbc_do($conn, "INSERT INTO bug73725 VALUES(101,'Any text', 33), (102,'Lorem ipsum dolor', 34)");
1817

1918
$rc = odbc_do($conn, "SELECT i, txt, k FROM bug73725");
2019

@@ -24,6 +23,17 @@ var_dump($r);
2423
$r = odbc_fetch_array($rc);
2524
var_dump($r);
2625

26+
?>
27+
--CLEAN--
28+
<?php
29+
include 'config.inc';
30+
31+
$conn = odbc_connect($dsn, $user, $pass);
32+
33+
odbc_exec($conn, 'DROP TABLE bug73725');
34+
35+
odbc_close($conn);
36+
2737
?>
2838
--EXPECT--
2939
array(3) {
@@ -42,14 +52,3 @@ array(3) {
4252
["k"]=>
4353
string(2) "34"
4454
}
45-
--CLEAN--
46-
<?php
47-
include 'config.inc';
48-
49-
$conn = odbc_connect($dsn, $user, $pass);
50-
51-
odbc_exec($conn, 'DROP TABLE bug73725');
52-
53-
odbc_close($conn);
54-
55-
?>

‎ext/odbc/tests/odbc_exec_002.phpt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ include 'config.inc';
1212
$conn = odbc_connect($dsn, $user, $pass);
1313

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

1917
$res = odbc_exec($conn, 'SELECT * FROM exec2');
2018

‎ext/odbc/tests/odbc_fetch_array_001.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ include 'config.inc';
1212
$conn = odbc_connect($dsn, $user, $pass);
1313

1414
odbc_exec($conn, 'CREATE TABLE fetch_array (foo INT)');
15-
odbc_exec($conn, 'INSERT INTO fetch_array VALUES (1)');
16-
odbc_exec($conn, 'INSERT INTO fetch_array VALUES (2)');
15+
odbc_exec($conn, 'INSERT INTO fetch_array VALUES (1), (2)');
1716

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

‎ext/odbc/tests/odbc_fetch_into_001.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ include 'config.inc';
1212
$conn = odbc_connect($dsn, $user, $pass);
1313

1414
odbc_exec($conn, 'CREATE TABLE fetch_into (foo INT)');
15-
odbc_exec($conn, 'INSERT INTO fetch_into VALUES (1)');
16-
odbc_exec($conn, 'INSERT INTO fetch_into VALUES (2)');
15+
odbc_exec($conn, 'INSERT INTO fetch_into VALUES (1), (2)');
1716

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

‎ext/odbc/tests/odbc_fetch_object_001.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ include 'config.inc';
1212
$conn = odbc_connect($dsn, $user, $pass);
1313

1414
odbc_exec($conn, 'CREATE TABLE fetch_object (foo INT)');
15-
odbc_exec($conn, 'INSERT INTO fetch_object VALUES (1)');
16-
odbc_exec($conn, 'INSERT INTO fetch_object VALUES (2)');
15+
odbc_exec($conn, 'INSERT INTO fetch_object VALUES (1), (2)');
1716

1817
$res = odbc_exec($conn, 'SELECT * FROM fetch_object');
1918

‎ext/odbc/tests/odbc_fetch_row_001.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ $conn = odbc_connect($dsn, $user, $pass);
1313

1414
odbc_exec($conn, 'CREATE TABLE fetch_row (test INT)');
1515

16-
odbc_exec($conn, 'INSERT INTO fetch_row VALUES (1)');
17-
odbc_exec($conn, 'INSERT INTO fetch_row VALUES (2)');
16+
odbc_exec($conn, 'INSERT INTO fetch_row VALUES (1), (2)');
1817

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

‎ext/odbc/tests/odbc_free_result_001.phpt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ include 'config.inc';
1212
$conn = odbc_connect($dsn, $user, $pass);
1313

1414
odbc_exec($conn, 'CREATE TABLE free_result (TEST INT NOT NULL)');
15-
odbc_exec($conn, 'ALTER TABLE free_result ADD PRIMARY KEY (TEST)');
1615

17-
odbc_exec($conn, 'INSERT INTO free_result VALUES (1)');
18-
odbc_exec($conn, 'INSERT INTO free_result VALUES (2)');
16+
odbc_exec($conn, 'INSERT INTO free_result VALUES (1), (2)');
1917

2018
$res = odbc_exec($conn, 'SELECT * FROM free_result');
2119

‎ext/odbc/tests/odbc_num_rows_001.phpt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ include 'config.inc';
1212
$conn = odbc_connect($dsn, $user, $pass);
1313

1414
odbc_exec($conn, 'CREATE TABLE num_rows (test INT)');
15-
odbc_exec($conn, 'INSERT INTO num_rows VALUES (1)');
16-
odbc_exec($conn, 'INSERT INTO num_rows VALUES (2)');
17-
odbc_exec($conn, 'INSERT INTO num_rows VALUES (3)');
15+
odbc_exec($conn, 'INSERT INTO num_rows VALUES (1), (2), (3)');
1816

1917
$res = odbc_exec($conn, 'SELECT * FROM num_rows');
2018
var_dump(odbc_num_rows($res));

‎ext/odbc/tests/odbc_primarykeys_001.phpt

Lines changed: 49 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ $result = @odbc_exec($conn, "SELECT @@Version");
1111
if ($result) {
1212
$array = odbc_fetch_array($result);
1313
$info = (string) reset($array);
14-
if (str_contains($info, "Microsoft SQL Server")) {
15-
echo "skip Doesn't work with MS SQL";
14+
if (!str_contains($info, "Microsoft SQL Server")) {
15+
echo "skip MS SQL specific test";
1616
}
1717
}
1818

@@ -24,15 +24,28 @@ include 'config.inc';
2424

2525
$conn = odbc_connect($dsn, $user, $pass);
2626
odbc_exec($conn, 'CREATE DATABASE PrimarykeysTest');
27+
odbc_exec($conn, 'USE PrimarykeysTest');
2728
odbc_exec($conn, 'CREATE TABLE primarykeys (test INT NOT NULL)');
2829

29-
$res = odbc_primarykeys($conn, "", "PrimarykeysTest", "primarykeys");
30+
$res = odbc_primarykeys($conn, "PrimarykeysTest", "dbo", "primarykeys");
3031
var_dump(odbc_fetch_array($res));
3132
odbc_free_result($res);
3233

3334
odbc_exec($conn, 'ALTER TABLE primarykeys ADD CONSTRAINT primarykeys_pk PRIMARY KEY (test)');
3435

35-
$res = odbc_primarykeys($conn, "", "PrimarykeysTest", "primarykeys");
36+
$res = odbc_primarykeys($conn, "PrimarykeysTest", "dbo", "");
37+
var_dump(odbc_fetch_array($res));
38+
odbc_free_result($res);
39+
40+
$res = odbc_primarykeys($conn, "PrimarykeysTest", "", "primarykeys");
41+
var_dump(odbc_fetch_array($res));
42+
odbc_free_result($res);
43+
44+
$res = odbc_primarykeys($conn, null, "dbo", "primarykeys");
45+
var_dump(odbc_fetch_array($res));
46+
odbc_free_result($res);
47+
48+
$res = odbc_primarykeys($conn, "PrimarykeysTest", "dbo", "primarykeys");
3649
var_dump(odbc_fetch_array($res));
3750
odbc_free_result($res);
3851

@@ -41,8 +54,39 @@ odbc_free_result($res);
4154
<?php
4255
require 'config.inc';
4356
$conn = odbc_connect($dsn, $user, $pass);
57+
odbc_exec($conn, 'USE PrimarykeysTest');
4458
odbc_exec($conn, 'DROP TABLE primarykeys');
4559
odbc_exec($conn, 'DROP DATABASE PrimarykeysTest');
4660
?>
47-
--EXPECT--
61+
--EXPECTF--
62+
bool(false)
4863
bool(false)
64+
bool(false)
65+
array(%d) {
66+
["TABLE_CAT"]=>
67+
string(%d) "PrimarykeysTest"
68+
["TABLE_SCHEM"]=>
69+
string(%d) "dbo"
70+
["TABLE_NAME"]=>
71+
string(%d) "primarykeys"
72+
["COLUMN_NAME"]=>
73+
string(%d) "test"
74+
["KEY_SEQ"]=>
75+
string(%d) "1"
76+
["PK_NAME"]=>
77+
string(%d) "primarykeys_pk"
78+
}
79+
array(%d) {
80+
["TABLE_CAT"]=>
81+
string(%d) "PrimarykeysTest"
82+
["TABLE_SCHEM"]=>
83+
string(%d) "dbo"
84+
["TABLE_NAME"]=>
85+
string(%d) "primarykeys"
86+
["COLUMN_NAME"]=>
87+
string(%d) "test"
88+
["KEY_SEQ"]=>
89+
string(%d) "1"
90+
["PK_NAME"]=>
91+
string(%d) "primarykeys_pk"
92+
}

0 commit comments

Comments
 (0)