tonyair/silverstripe-sqlite3
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-sqlite3 synced 2024-10-22 17:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7 from halkyon/close_conn_fix

Browse Source 
BUG SQLite database connection not closed properly
This commit is contained in:
Mateusz U 2014-10-28 09:53:23 +13:00
commit 6bb7d5a5f6
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/SQLite3Database.php
View File

@ -106,6 +106,12 @@ class SQLite3Database extends SS_Database {
return true; return true;
} }
public function __destruct() {
if($this->dbConn) {
$this->dbConn->close();
}
}
/** /**
* Not implemented, needed for PDO * Not implemented, needed for PDO
*/ */
@ -1246,7 +1252,9 @@ class SQLite3Query extends SS_Query {
} }
public function __destruct() { public function __destruct() {
if($this->handle) $this->handle->finalize(); if($this->handle) {
$this->handle->finalize();
}
} }
public function seek($row) { public function seek($row) {

8
code/SQLitePDODatabase.php
View File

@ -55,6 +55,14 @@ class SQLitePDODatabase extends SQLite3Database {
return true; return true;
} }
/**
* Overloaded since the parent class tries to call close() on the connection,
* but doing it here won't work as the PDO class has no such method.
*/
public function __destruct() {
// noop
}
public function query($sql, $errorLevel = E_USER_ERROR) { public function query($sql, $errorLevel = E_USER_ERROR) {
if(isset($_REQUEST['previewwrite']) && in_array(strtolower(substr($sql,0,strpos($sql,' '))), array('insert','update','delete','replace'))) { if(isset($_REQUEST['previewwrite']) && in_array(strtolower(substr($sql,0,strpos($sql,' '))), array('insert','update','delete','replace'))) {