Skip to content

Fix dba tests wrt resource to object conversion #15716

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 1 commit into from
Sep 3, 2024
Merged

Fix dba tests wrt resource to object conversion #15716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions ext/dba/tests/dba015.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,23 @@ echo dba_fetch("key1", $db_file1), "\n";
echo "Test 2\n";
$db_file2 = dba_popen($db_filename, 'n', 'flatfile');
if ($db_file1 === $db_file2) {
echo "resources are the same\n";
echo "objects are the same\n";
} else {
echo "resources are different\n";
echo "objects are different\n";
}


echo "Test 3 - fetch both rows from second resource\n";
echo "Test 3 - fetch both rows from second object\n";
dba_insert("key2", "This is a test insert 2", $db_file2);
echo dba_fetch("key1", $db_file2), "\n";
echo dba_fetch("key2", $db_file2), "\n";


echo "Test 4 - fetch both rows from first resource\n";
echo "Test 4 - fetch both rows from first object\n";
echo dba_fetch("key1", $db_file1), "\n";
echo dba_fetch("key2", $db_file1), "\n";

echo "Test 5 - close 2nd resource\n";
echo "Test 5 - close 2nd object\n";
dba_close($db_file2);
var_dump($db_file1);
try {
Expand All @@ -51,7 +51,7 @@ try {
echo $e->getMessage() . "\n";
}

echo "Test 6 - query after closing 2nd resource\n";
echo "Test 6 - query after closing 2nd object\n";
echo dba_fetch("key1", $db_file1), "\n";
echo dba_fetch("key2", $db_file1), "\n";

Expand All @@ -65,17 +65,17 @@ database handler: flatfile
Test 1
This is a test insert 1
Test 2
resources are different
Test 3 - fetch both rows from second resource
objects are different
Test 3 - fetch both rows from second object
This is a test insert 1
This is a test insert 2
Test 4 - fetch both rows from first resource
Test 4 - fetch both rows from first object
This is a test insert 1
This is a test insert 2
Test 5 - close 2nd resource
Test 5 - close 2nd object
object(Dba\Connection)#%d (%d) {
}
DBA connection has already been closed
Test 6 - query after closing 2nd resource
Test 6 - query after closing 2nd object
This is a test insert 1
This is a test insert 2
22 changes: 11 additions & 11 deletions ext/dba/tests/dba_db4_018.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,23 @@ echo dba_fetch("key1", $db_file1), "\n";
echo "Test 2\n";
$db_file2 = dba_popen($db_filename, 'n', 'flatfile');
if ($db_file1 === $db_file2) {
echo "resources are the same\n";
echo "objects are the same\n";
} else {
echo "resources are different\n";
echo "object are different\n";
}


echo "Test 3 - fetch both rows from second resource\n";
echo "Test 3 - fetch both rows from second object\n";
dba_insert("key2", "This is a test insert 2", $db_file2);
echo dba_fetch("key1", $db_file2), "\n";
echo dba_fetch("key2", $db_file2), "\n";


echo "Test 4 - fetch both rows from first resource\n";
echo "Test 4 - fetch both rows from first object\n";
echo dba_fetch("key1", $db_file1), "\n";
echo dba_fetch("key2", $db_file1), "\n";

echo "Test 5 - close 2nd resource\n";
echo "Test 5 - close 2nd object\n";
dba_close($db_file2);
var_dump($db_file1);
try {
Expand All @@ -51,7 +51,7 @@ try {
echo $e->getMessage() . "\n";
}

echo "Test 6 - query after closing 2nd resource\n";
echo "Test 6 - query after closing 2nd object\n";
echo dba_fetch("key1", $db_file1), "\n";
echo dba_fetch("key2", $db_file1), "\n";

Expand All @@ -65,17 +65,17 @@ database handler: db4
Test 1
This is a test insert 1
Test 2
resources are different
Test 3 - fetch both rows from second resource
objects are different
Test 3 - fetch both rows from second object
This is a test insert 1
This is a test insert 2
Test 4 - fetch both rows from first resource
Test 4 - fetch both rows from first object
This is a test insert 1
This is a test insert 2
Test 5 - close 2nd resource
Test 5 - close 2nd object
object(Dba\Connection)#%d (%d) {
}
DBA connection has already been closed
Test 6 - query after closing 2nd resource
Test 6 - query after closing 2nd object
This is a test insert 1
This is a test insert 2
Loading