Permalink
Browse files

- some hints to use sqlite db (#1485821)

  • Loading branch information...
1 parent aeed58d commit 50d515a7d690f6017d97017f1370705e1a214c27 @alecpl alecpl committed May 2, 2009
Showing with 6 additions and 5 deletions.
  1. +2 −3 INSTALL
  2. +1 −1 installer/config.php
  3. +3 −1 program/include/rcube_mdb2.php
View
5 INSTALL
@@ -70,9 +70,8 @@ RoundCube with utf-8 charset.
* SQLite
--------
-Sqlite requires specifically php5 (sqlite in php4 currently doesn't
-work with roundcube), and you need sqlite 2 (preferably 2.8) to setup
-the sqlite db (sqlite 3.x also doesn't work at the moment). Here is
+You need sqlite 2 (preferably 2.8) to setup the sqlite db
+(sqlite 3.x also doesn't work at the moment). Here is
an example how you can setup the sqlite.db for roundcube:
# sqlite -init SQL/sqlite.initial.sql sqlite.db
View
2 installer/config.php
@@ -269,7 +269,7 @@
echo $input_dbhost->show($RCI->is_post ? $_POST['_dbhost'] : $dsnw['hostspec']);
echo '<label for="cfgdbhost">Database server (omit for sqlite)</label><br />';
echo $input_dbname->show($RCI->is_post ? $_POST['_dbname'] : $dsnw['database']);
-echo '<label for="cfgdbname">Database name</label><br />';
+echo '<label for="cfgdbname">Database name (use a path and filename for sqlite)</label><br />';
echo $input_dbuser->show($RCI->is_post ? $_POST['_dbuser'] : $dsnw['username']);
echo '<label for="cfgdbuser">Database user name (needs write permissions)(omit for sqlite)</label><br />';
echo $input_dbpass->show($RCI->is_post ? $_POST['_dbpass'] : $dsnw['password']);
View
4 program/include/rcube_mdb2.php
@@ -585,7 +585,9 @@ function _sqlite_create_database($dbh, $file_name)
$data = file_get_contents($file_name);
if (strlen($data))
- sqlite_exec($dbh->connection, $data);
+ if (!sqlite_exec($dbh->connection, $data, $error) || MDB2::isError($dbh))
+ raise_error(array('code' => 500, 'type' => 'db',
+ 'line' => __LINE__, 'file' => __FILE__, 'message' => $error), TRUE, FALSE);
}

0 comments on commit 50d515a

Please sign in to comment.