Skip to content

Two bug fixes for sqlite3 database connector #31

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

Open
dm-coding wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Two bug fixes for sqlite3 database connector #31

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b7ca41
Bugfix where an invalid database configuration file results in a fata…
Mar 26, 2012
8c7b18d
Fixed bug in which SQL views are ignored
Mar 26, 2012
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
78 changes: 53 additions & 25 deletions models/datasources/dbo/dbo_sqlite3.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@
*
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
* Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
*
* If you have a problem using this connector, the most likely explanation is your
* database config file. Check that it looks something like this:
*
* var $default = array(
* 'driver' => 'Datasources.DboSqlite3',
* 'persistent' => false,
* 'database' => '/path/to/database/file.sqlite', // (or a relative
* 'prefix' => '' // Your table prefix (default is none)
* );
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
Expand Down Expand Up @@ -194,32 +204,44 @@ function disconnect() {
* @access protected
*/
function _execute($sql) {
if (strncmp($sql,"CREATE",6) === 0) {
$statements = explode(";",$sql);
if (count($statements) > 1) {
foreach($statements as $st) {
$this->_execute($st);
if($this->connected) { // See bugfix, line 231.
if (strncmp($sql,"CREATE",6) === 0) {
$statements = explode(";",$sql);
if (count($statements) > 1) {
foreach($statements as $st) {
$this->_execute($st);
}
return false;
}
return false;
}
}
for ($i = 0; $i < 2; $i++) {
try {
$this->last_error = NULL;
$this->pdo_statement = $this->connection->query($sql);
if (is_object($this->pdo_statement)) {
$this->rows = $this->pdo_statement->fetchAll(PDO::FETCH_NUM);
$this->row_count = count($this->rows);
return $this->pdo_statement;
}
}
catch(PDOException $e) {
// Schema change; re-run query
if ($e->errorInfo[1] === 17) {
$this->last_error = $e->getMessage();
}
continue;
}

for ($i = 0; $i < 2; $i++) {
try {
$this->last_error = NULL;
$this->pdo_statement = $this->connection->query($sql);
if (is_object($this->pdo_statement)) {
$this->rows = $this->pdo_statement->fetchAll(PDO::FETCH_NUM);
$this->row_count = count($this->rows);
return $this->pdo_statement;
}
}
catch(PDOException $e) {
// Schema change; re-run query
if ($e->errorInfo[1] === 17) {
$this->last_error = $e->getMessage();
}
continue;
}
}
} else {
/** Bug fix in which an incorrect database configuration throws the fatal error "Call to a member function query() on a non-object on line x." (now line 221)
* Reported here: http://stackoverflow.com/questions/4779007/cakephp-and-sqlite-fatal-error-call-to-a-member-function-query-on-a-non-obje
* here: http://stackoverflow.com/questions/7107996/fatal-error-call-to-a-member-function-query-on-a-non-object-in-var-www-likes
* and here: http://stackoverflow.com/questions/7572091/error-while-trying-to-connect-to-sqlite3-database-from-cakephp
* To reproduce: set $config['connect'] to an invalid value.
Copy link
Member

@AD7six AD7six Feb 17, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A test case is easier to read than an inline comment, and would help prevent a future regression.

* System tested on: OSX 10.6, php 5.3.4, cake 1.3.12.
*/
$this->last_error = "Unable to connect to database. Check your configuration settings are correct.";
}
return false;
}
Expand All @@ -239,7 +261,13 @@ function listSources() {
return $cache;
}

$result = $this->fetchAll("SELECT name FROM sqlite_master WHERE type='table' ORDER BY name;", false);
/**
Copy link
Member

@AD7six AD7six Feb 17, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment doesn't seem necessary, the change looks good though (perhaps PR just this change as it's visually easy to verify what it does, and why).

* Bug fix in which SQL views are ignored
* To reproduce: create a new SQL view in the usual way. Then try to use it with your model.
* Result: Cakephp complains that there is no table for the selected model.
* System tested on: OSX 10.6, php 5.3.4, cake 1.3.12.
*/
$result = $this->fetchAll("SELECT name FROM sqlite_master WHERE type='table' OR type='view' ORDER BY name;", false);

if (!$result || empty($result)) {
return array();
Expand Down