Skip to content

Make CI go on 8.1 #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 23, 2022
Merged

Make CI go on 8.1 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ecabf2a
Make CI go on 8.1
NattyNarwhal Jun 22, 2022
a88e407
Disable skip cache, since skip check uses name
NattyNarwhal Jun 22, 2022
35356b6
Handle deprecation of null to ?string in tests
NattyNarwhal Jun 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
ubuntu:
strategy:
matrix:
version: ['7.3', '7.4', '8.0']
version: ['7.3', '7.4', '8.0', '8.1']
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand Down Expand Up @@ -83,6 +83,7 @@ jobs:
# Note that connection.inc defaults should be mostly sufficient.
run: |
export TEST_PHP_ARGS="-n -d extension=modules/ibm_db2.so"
export DISABLE_SKIP_CACHE=1
export IBM_DB2_TEST_SKIP_CONNECT_FAILURE=0
export DB2CLIINIPATH=$PWD
export REPORT_EXIT_STATUS=1
Expand Down
2 changes: 1 addition & 1 deletion tests/test_023_ColumnPrivileges.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ $conn = db2_connect($database, $user, $password);

if ($conn != 0)
{
$stmt = db2_column_privileges($conn, NULL, NULL, 'ANIMALS');
@$stmt = db2_column_privileges($conn, NULL, NULL, 'ANIMALS');
$row = db2_fetch_array($stmt);
print $row[2] . "\n";
print $row[3] . "\n";
Expand Down
2 changes: 1 addition & 1 deletion tests/test_024_ForeignKeys.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ if ($conn != 0)
$statement = "INSERT INTO test_foreign_keys VALUES (1)";
$result = db2_exec($conn, $statement);

$stmt = db2_foreign_keys($conn, NULL, NULL, 'TEST_PRIMARY_KEYS');
@$stmt = db2_foreign_keys($conn, NULL, NULL, 'TEST_PRIMARY_KEYS');
$row = db2_fetch_array($stmt);
echo $row[2] . "\n";
echo $row[3] . "\n";
Expand Down
2 changes: 1 addition & 1 deletion tests/test_025_PrimaryKeys.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if ($conn != 0)
$statement = "INSERT INTO test_foreign_keys VALUES (1)";
$result = db2_exec($conn, $statement);

$stmt = db2_primary_keys($conn, NULL, NULL, 'TEST_PRIMARY_KEYS');
$stmt = @db2_primary_keys($conn, NULL, NULL, 'TEST_PRIMARY_KEYS');
$row = db2_fetch_array($stmt);
echo $row[2] . "\n";
echo $row[3] . "\n";
Expand Down
2 changes: 1 addition & 1 deletion tests/test_060_Tables_01.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ $result = @db2_exec($conn, $create);

if ($conn)
{
$result = db2_tables($conn,NULL,strtoupper('t'));
$result = @db2_tables($conn,NULL,strtoupper('t'));
$i = 0;
while ($row=db2_fetch_both($result))
{
Expand Down
2 changes: 1 addition & 1 deletion tests/test_061_Tables_02.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ $result = @db2_exec($conn, $create);

if ($conn)
{
$result = db2_tables($conn,NULL,strtoupper('t'));
$result = @db2_tables($conn,NULL,strtoupper('t'));
$i = 0;
while ($row = db2_fetch_both($result))
{
Expand Down
2 changes: 1 addition & 1 deletion tests/test_062_Tables_03.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ $result = @db2_exec($conn, $create);
if ($conn)
{
$schema = strtoupper('t');
$result = db2_tables($conn,NULL,$schema);
@$result = db2_tables($conn,NULL,$schema);
$i = 0;
while ($row = db2_fetch_both($result))
{
Expand Down
2 changes: 1 addition & 1 deletion tests/test_063_Tables_04.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require_once('connection.inc');

$conn = db2_connect($db,$user,$password);

$result = db2_tables($conn, NULL, "SYSIBM", "", "VIEW");
$result = @db2_tables($conn, NULL, "SYSIBM", "", "VIEW");

print_r ($result);

Expand Down
2 changes: 1 addition & 1 deletion tests/test_064_Tables_05.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ $result = @db2_exec($conn, $create);
$create = 'CREATE TABLE t.t4( c1 integer, c2 varchar(40))';
$result = @db2_exec($conn, $create);

$result = db2_tables($conn, NULL, "T");
$result = @db2_tables($conn, NULL, "T");

for ($i=0; $i<db2_num_fields($result); $i++)
{
Expand Down
2 changes: 1 addition & 1 deletion tests/test_065_FilterTableName.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ $result = @db2_exec($conn, $create);
$create = 'CREATE TABLE t.t4( c1 integer, c2 varchar(40))';
$result = @db2_exec($conn, $create);

$result = db2_tables($conn, NULL, '%', "T3");
$result = @db2_tables($conn, NULL, '%', "T3");

$columns = db2_num_fields($result);

Expand Down
2 changes: 1 addition & 1 deletion tests/test_066_TableObjects.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ $conn = db2_connect($database, $user, $password);

$server = db2_server_info( $conn );

$result = db2_tables($conn, NULL, strtoupper($user), 'ANIM%');
$result = @db2_tables($conn, NULL, strtoupper($user), 'ANIM%');

$t[0]=""; $t[1]=""; $t[2]=""; $t[3]="";
while ($row = db2_fetch_object($result)) {
Expand Down
2 changes: 1 addition & 1 deletion tests/test_10931_LcaseTableName.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if ($conn) {
$sql = "create table \"TEST\".\"test_10931\" ( \"id\" INTEGER not null generated BY DEFAULT AS identity (NOCACHE, INCREMENT BY 1), \"title\" VARCHAR(50), \"created\" TIMESTAMP DEFAULT CURRENT TIMESTAMP, constraint P_USERS_U1 primary key (\"id\"))";
db2_exec($conn, $sql);

$stmt = db2_columns ($conn ,null , 'TEST' , 'test_10931' , '%' );
$stmt = @db2_columns ($conn ,null , 'TEST' , 'test_10931' , '%' );
if ( $stmt )
{
while ($rowC = db2_fetch_assoc($stmt))
Expand Down
2 changes: 1 addition & 1 deletion tests/test_190_ColumnsTable_01.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ $conn = db2_connect($db,$username,$password);

if ($conn)
{
$result = db2_columns($conn,NULL,NULL,"EMPLOYEE");
$result = @db2_columns($conn,NULL,NULL,"EMPLOYEE");
while ($row = db2_fetch_array($result))
{
$str = $row[1] ."/". $row[3];
Expand Down
2 changes: 1 addition & 1 deletion tests/test_191_ColumnsTable_02.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require_once('connection.inc');
$conn = db2_connect($db,$username,$password);

if ($conn) {
$result = db2_columns($conn,NULL,NULL,"EMP_PHOTO");
$result = @db2_columns($conn,NULL,NULL,"EMP_PHOTO");
$i = 0;
while ($row = db2_fetch_both($result)) {
if ($row['COLUMN_NAME'] != 'EMP_ROWID' && $i < 3) {
Expand Down
2 changes: 1 addition & 1 deletion tests/test_192_ColumnsTable_03.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require_once('connection.inc');
$conn = db2_connect($db,$username,$password);

if ($conn) {
$result = db2_columns($conn,NULL,strtoupper($username),"EMP_RESUME");
$result = @db2_columns($conn,NULL,strtoupper($username),"EMP_RESUME");
$i = 0;
while ($row = db2_fetch_both($result)) {
if ($row['COLUMN_NAME'] != 'EMP_ROWID' && $i < 3) {
Expand Down
6 changes: 3 additions & 3 deletions tests/test_197_StatisticsIndexes.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if ($conn) {
$rc = db2_exec($conn, "CREATE INDEX index1 ON index_test (id)");

echo "Test first index table:\n";
$result = db2_statistics($conn,NULL,NULL,"INDEX_TEST",1);
$result = @db2_statistics($conn,NULL,NULL,"INDEX_TEST",1);
$row = db2_fetch_array($result);
echo $row[2] . "\n"; // TABLE_NAME
echo $row[3] . "\n"; // NON_UNIQUE
Expand All @@ -28,15 +28,15 @@ if ($conn) {
$rc = db2_exec($conn, "CREATE INDEX index2 ON index_test2 (data)");

echo "Test second index table:\n";
$result = db2_statistics($conn,NULL,NULL,"INDEX_TEST2",1);
$result = @db2_statistics($conn,NULL,NULL,"INDEX_TEST2",1);
$row = db2_fetch_array($result);
echo $row[2] . "\n"; // TABLE_NAME
echo $row[3] . "\n"; // NON_UNIQUE
echo $row[5] . "\n"; // INDEX_NAME
echo $row[8] . "\n"; // COLUMN_NAME

echo "Test non-existent table:\n";
$result = db2_statistics($conn,NULL,NULL,"NON_EXISTENT_TABLE",1);
$result = @db2_statistics($conn,NULL,NULL,"NON_EXISTENT_TABLE",1);
$row = db2_fetch_array($result);
if ($row) {
echo "Non-Empty\n";
Expand Down
2 changes: 1 addition & 1 deletion tests/test_9173_ProcedurePersistentConn.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require_once('connection.inc');
$conn = db2_pconnect($database, $user, $password);

if ($conn) {
$stmt = db2_procedures($conn, NULL, 'SYS%', '%%');
$stmt = @db2_procedures($conn, NULL, 'SYS%', '%%');

$row = db2_fetch_assoc($stmt);
var_dump($row);
Expand Down