Skip to content

Commit f23df0c

Browse files
laurentjlaurentj
committed
Fix Sqlite3 jDb driver: it must not free results if connection is already closed
When closing connection, it seems PHP closes also all existing result sets. New method AbstractConnection::isClosed()
1 parent 4805a7e commit f23df0c

File tree

8 files changed

+50
-20
lines changed

8 files changed

+50
-20
lines changed

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
Changelog
22
=========
33

4+
Version 1.3.2
5+
-------------
6+
7+
- Fix Sqlite3 jDb driver: it must not free results if connection is already closed
8+
9+
410
Version 1.3.1
511
-------------
612

‎src/AbstractConnection.php

+12-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @author Laurent Jouanneau, Gerald Croes
44
* @contributor Julien Issler
55
*
6-
* @copyright 2005-2023 Laurent Jouanneau
6+
* @copyright 2005-2024 Laurent Jouanneau
77
* @copyright 2007-2009 Julien Issler
88
* @copyright 2001-2005 CopixTeam
99
* This class was get originally from the Copix project (CopixDbConnection, Copix 2.3dev20050901, http://www.copix.org)
@@ -83,9 +83,7 @@ public function __construct($profile, LoggerInterface $logger = null)
8383

8484
public function __destruct()
8585
{
86-
if ($this->_connection !== null) {
87-
$this->_disconnect();
88-
}
86+
$this->close();
8987
}
9088

9189
/**
@@ -97,9 +95,19 @@ public function close()
9795
{
9896
if ($this->_connection !== null) {
9997
$this->_disconnect();
98+
$this->_connection = null;
10099
}
101100
}
102101

102+
/**
103+
* @since 1.8.8
104+
* @return bool
105+
*/
106+
public function isClosed()
107+
{
108+
return ($this->_connection == null) ;
109+
}
110+
103111
/**
104112
* Support of old previous public properties to keep compatibility with Jelix 1.x
105113
* @param string $name

‎src/Connection.php

-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ public static function getTools($dbType, $connection = null)
7878
$tools = new Schema\Oci\SQLTools($connection);
7979
break;
8080
default:
81-
$tools = null;
8281
throw new Exception("not implemented");
8382
}
8483
return $tools;

‎src/Connector/Mysqli/Connection.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* @contributor Sylvain de Vathaire, Julien Issler
77
* @contributor Florian Lonqueu-Brochard
88
*
9-
* @copyright 2001-2005 CopixTeam, 2005-2023 Laurent Jouanneau, 2009 Julien Issler, 2012 Florian Lonqueu-Brochard
9+
* @copyright 2001-2005 CopixTeam, 2005-2024 Laurent Jouanneau, 2009 Julien Issler, 2012 Florian Lonqueu-Brochard
1010
*
1111
* @see https://jelix.org
1212
* @licence http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file
@@ -155,7 +155,7 @@ protected function _doQuery($query)
155155

156156
protected function _doExec($query)
157157
{
158-
if ($qI = $this->_connection->query($query)) {
158+
if ($this->_connection->query($query)) {
159159
return $this->_connection->affected_rows;
160160
}
161161

‎src/Connector/SQLite3/Connection.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @author Loic Mathaud
44
* @contributor Laurent Jouanneau
55
*
6-
* @copyright 2006 Loic Mathaud, 2007-2023 Laurent Jouanneau
6+
* @copyright 2006 Loic Mathaud, 2007-2024 Laurent Jouanneau
77
*
88
* @see https://jelix.org
99
* @licence http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file
@@ -57,7 +57,7 @@ public function prepare($query, $driverOptions = [])
5757
{
5858
$res = $this->_connection->prepare($query);
5959
if ($res) {
60-
$rs = new ResultSet(null, $res);
60+
$rs = new ResultSet(null, $res, $this);
6161
} else {
6262
throw new Exception('invalid query: '.$this->_connection->error.'('.$query.')', 403);
6363
}
@@ -115,14 +115,14 @@ protected function _disconnect()
115115
protected function _doQuery($query)
116116
{
117117
if ($qI = $this->_connection->query($query)) {
118-
return new ResultSet($qI);
118+
return new ResultSet($qI, null, $this);
119119
}
120120
throw new Exception('invalid query: '.$this->_connection->lastErrorMsg().' ('.$query.')', 403);
121121
}
122122

123123
protected function _doExec($query)
124124
{
125-
if ($qI = $this->_connection->exec($query)) {
125+
if ($this->_connection->exec($query)) {
126126
return $this->_connection->changes();
127127
}
128128

‎src/Connector/SQLite3/ResultSet.php

+17-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @author Loic Mathaud
44
* @contributor Laurent Jouanneau
55
*
6-
* @copyright 2006 Loic Mathaud, 2008-2023 Laurent Jouanneau
6+
* @copyright 2006 Loic Mathaud, 2008-2024 Laurent Jouanneau
77
*
88
* @see http://www.jelix.org
99
* @licence http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file
@@ -28,6 +28,11 @@ class ResultSet extends AbstractResultSet
2828
*/
2929
protected $_idResult;
3030

31+
/**
32+
* @var Connection
33+
*/
34+
protected $_conn;
35+
3136
/**
3237
* number of rows.
3338
*/
@@ -46,15 +51,16 @@ class ResultSet extends AbstractResultSet
4651
*/
4752
protected $buffer = array();
4853

49-
5054
/**
51-
* @param \SQLite3Result $result
52-
* @param \SQLite3Stmt $stmt
55+
* @param \SQLite3Result|null $result
56+
* @param \SQLite3Stmt|null $stmt
57+
* @param Connection
5358
*/
54-
public function __construct($result, $stmt = null)
59+
public function __construct($result, $stmt, $conn)
5560
{
5661
parent::__construct($result);
5762
$this->_stmt = $stmt;
63+
$this->_conn = $conn;
5864
}
5965

6066
protected function _fetch()
@@ -100,7 +106,12 @@ protected function _free()
100106
$this->numRows = 0;
101107
$this->buffer = array();
102108
$this->ended = false;
103-
$this->_idResult->finalize();
109+
// finalize may lead to an error if connection has been closed before
110+
// the resultset object destruction.
111+
if ($this->_conn && !$this->_conn->isClosed()) {
112+
$this->_idResult->finalize();
113+
}
114+
$this->_conn = null;
104115
}
105116

106117
protected function _rewind()

‎tests/docker-conf/php/Dockerfile

+7-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ ARG msphpsql_version=5.12.0-beta1
88
ARG DEBIAN_FRONTEND=noninteractive
99
ENV PHP_VERSION=${php_version}
1010

11+
RUN apt-get update; apt-get upgrade; \
12+
apt-get install \
13+
php${PHP_VERSION}-xdebug \
14+
; apt-get clean;
15+
1116
# Install drivers to access to SQL server
1217
# see https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver15#debian17
1318
# see https://github.com/microsoft/msphpsql/releases
@@ -25,7 +30,8 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -; \
2530
printf "; priority=30\nextension=php_pdo_sqlsrv_${shrinkphpversion}_nts.so\n" > /etc/php/${PHP_VERSION}/mods-available/pdo_sqlsrv.ini; \
2631
phpenmod sqlsrv; \
2732
phpenmod pdo_sqlsrv; \
28-
rm -rf /tmp/msodbcsql.deb /tmp/debsqlsrv.tar /tmp/Debian${debian_version_num}-${PHP_VERSION};
33+
rm -rf /tmp/msodbcsql.deb /tmp/debsqlsrv.tar /tmp/Debian${debian_version_num}-${PHP_VERSION}; \
34+
apt-get clean;
2935

3036
COPY database-entrypoint.sh /bin/entrypoint.d/
3137
COPY appctl.sh /bin/

‎tests/run-docker

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ fi
1414

1515
if [ "$CMD" == "reset" ]; then
1616
# Stop/Remove containers
17-
docker-compose -p jdb-tests rm -sf || true
17+
docker compose -p jdb-tests rm -sf || true
1818
# Clean postgres volume
1919
docker volume rm "jdb_test_pg_data" || true
2020
exit 0
2121
fi
2222

23-
docker-compose -p jdb-tests $CMD
23+
docker compose -p jdb-tests $CMD

0 commit comments

Comments
 (0)