From 90c82ebf13a1058727f7277a2466c9c4fcfeccdc Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 25 Sep 2015 13:03:54 -0400
Subject: [PATCH] Clarify DSN for SQLite on Windows (#1490547)

---
 INSTALL                      |    1 +
 config/config.inc.php.sample |    5 +++--
 config/defaults.inc.php      |    5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/INSTALL b/INSTALL
index fd62a10..0f47d17 100644
--- a/INSTALL
+++ b/INSTALL
@@ -83,6 +83,7 @@
 ==============
 
 Note: Database for Roundcube must use UTF-8 character set.
+Note: See defaults.inc.php file for examples of DSN configuration.
 
 * MySQL
 -------
diff --git a/config/config.inc.php.sample b/config/config.inc.php.sample
index 9f218be..2b72cc6 100644
--- a/config/config.inc.php.sample
+++ b/config/config.inc.php.sample
@@ -21,9 +21,10 @@
 
 // Database connection string (DSN) for read+write operations
 // Format (compatible with PEAR MDB2): db_provider://user:password@host/database
-// Currently supported db_providers: mysql, pgsql, sqlite, mssql or sqlsrv
+// Currently supported db_providers: mysql, pgsql, sqlite, mssql, sqlsrv, oracle
 // For examples see http://pear.php.net/manual/en/package.database.mdb2.intro-dsn.php
-// NOTE: for SQLite use absolute path: 'sqlite:////full/path/to/sqlite.db?mode=0646'
+// NOTE: for SQLite use absolute path (Linux): 'sqlite:////full/path/to/sqlite.db?mode=0646'
+//       or (Windows): 'sqlite:///C:/full/path/to/sqlite.db'
 $config['db_dsnw'] = 'mysql://roundcube:pass@localhost/roundcubemail';
 
 // The mail host chosen to perform the log-in.
diff --git a/config/defaults.inc.php b/config/defaults.inc.php
index 6e441cd..161eee6 100644
--- a/config/defaults.inc.php
+++ b/config/defaults.inc.php
@@ -21,9 +21,10 @@
 
 // Database connection string (DSN) for read+write operations
 // Format (compatible with PEAR MDB2): db_provider://user:password@host/database
-// Currently supported db_providers: mysql, pgsql, sqlite, mssql or sqlsrv
+// Currently supported db_providers: mysql, pgsql, sqlite, mssql, sqlsrv, oracle
 // For examples see http://pear.php.net/manual/en/package.database.mdb2.intro-dsn.php
-// NOTE: for SQLite use absolute path: 'sqlite:////full/path/to/sqlite.db?mode=0646'
+// NOTE: for SQLite use absolute path (Linux): 'sqlite:////full/path/to/sqlite.db?mode=0646'
+//       or (Windows): 'sqlite:///C:/full/path/to/sqlite.db'
 $config['db_dsnw'] = 'mysql://roundcube:@localhost/roundcubemail';
 
 // Database DSN for read-only operations (if empty write database will be used)

--
Gitblit v1.9.1