Skip to content

Commit a883de2

Browse files
committed
changes from review
1 parent b5ea009 commit a883de2

File tree

5 files changed

+24
-14
lines changed

5 files changed

+24
-14
lines changed

UPGRADING

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,9 @@ PHP 8.5 UPGRADE NOTES
424424
- PCRE:
425425
. Upgraded to pcre2lib from 10.44 to 10.45.
426426

427+
- PDO_Sqlite:
428+
. Increased minimum release version support from 3.7.7 to 3.7.17.
429+
427430
- Readline:
428431
. The return types of readline_add_history(), readline_clear_history(), and
429432
readline_callback_handler_install() have been changed to true, rather

ext/pdo_sqlite/pdo_sqlite.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,6 @@ PHP_MINIT_FUNCTION(pdo_sqlite)
417417
REGISTER_PDO_CLASS_CONST_LONG("SQLITE_OPEN_CREATE", (zend_long)SQLITE_OPEN_CREATE);
418418
REGISTER_PDO_CLASS_CONST_LONG("SQLITE_ATTR_READONLY_STATEMENT", (zend_long)PDO_SQLITE_ATTR_READONLY_STATEMENT);
419419
REGISTER_PDO_CLASS_CONST_LONG("SQLITE_ATTR_EXTENDED_RESULT_CODES", (zend_long)PDO_SQLITE_ATTR_EXTENDED_RESULT_CODES);
420-
REGISTER_PDO_CLASS_CONST_LONG("SQLITE_ATTR_BUSY_STATEMENT", (zend_long)PDO_SQLITE_ATTR_BUSY_STATEMENT);
421420

422421
pdosqlite_ce = register_class_Pdo_Sqlite(pdo_dbh_ce);
423422
pdosqlite_ce->create_object = pdo_dbh_new;

ext/pdo_sqlite/tests/pdo_sqlite_statement_getattribute.phpt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,7 @@ var_dump($st->getAttribute(PDO::SQLITE_ATTR_READONLY_STATEMENT));
1414
$st = $db->prepare('CREATE TABLE test_sqlite_stmt_getattribute (a TEXT);');
1515

1616
var_dump($st->getAttribute(PDO::SQLITE_ATTR_READONLY_STATEMENT));
17-
18-
$st->execute();
19-
20-
$db->prepare("INSERT INTO test_sqlite_stmt_getattribute VALUES ('interleaved'), ('statements')")->execute();
21-
$st = $db->prepare("SELECT * FROM test_sqlite_stmt_getattribute");
22-
23-
var_dump($st->getAttribute(PDO::SQLITE_ATTR_BUSY_STATEMENT));
24-
25-
$st->execute();
26-
27-
var_dump($st->getAttribute(PDO::SQLITE_ATTR_BUSY_STATEMENT));
2817
?>
2918
--EXPECT--
3019
bool(true)
3120
bool(false)
32-
bool(false)
33-
bool(true)

ext/pdo_sqlite/tests/subclasses/pdo_sqlite_constants.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ var_dump(Pdo\Sqlite::OPEN_READWRITE);
1313
var_dump(Pdo\Sqlite::OPEN_CREATE);
1414
var_dump(Pdo\Sqlite::ATTR_READONLY_STATEMENT);
1515
var_dump(Pdo\Sqlite::ATTR_EXTENDED_RESULT_CODES);
16+
var_dump(Pdo\Sqlite::ATTR_BUSY_STATEMENT);
1617

1718
?>
1819
--EXPECTF--
@@ -24,3 +25,4 @@ int(%d)
2425
int(%d)
2526
int(%d)
2627
int(%d)
28+
int(%d)
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
--TEST--
2+
Pdo\Sqlite::ATTR_BUSY_STATEMENT usage
3+
--EXTENSIONS--
4+
pdo_sqlite
5+
--FILE--
6+
<?php
7+
8+
$db = new Pdo\Sqlite('sqlite::memory:');
9+
10+
$db->query('CREATE TABLE test_busy (a string);');
11+
$db->query('INSERT INTO test_busy VALUES ("interleaved"), ("statements")');
12+
$st = $db->prepare('SELECT a FROM test_busy');
13+
var_dump($st->getAttribute(Pdo\Sqlite::ATTR_BUSY_STATEMENT));
14+
$st->execute();
15+
var_dump($st->getAttribute(Pdo\Sqlite::ATTR_BUSY_STATEMENT));
16+
?>
17+
--EXPECTF--
18+
bool(false)
19+
bool(true)

0 commit comments

Comments
 (0)