From 7f64d7c2e4a38870eb225e6dcb15f60a7af63bfc Mon Sep 17 00:00:00 2001 From: Thomas Bruederli <thomas@roundcube.net> Date: Thu, 04 Oct 2012 04:03:09 -0400 Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail --- program/include/rcube_db_sqlite.php | 2 ++ program/include/rcube_db_mssql.php | 2 ++ program/include/rcube_db_sqlsrv.php | 2 ++ program/include/rcube_db_mysql.php | 2 ++ program/include/rcube_db.php | 2 ++ program/include/rcube_db_pgsql.php | 2 ++ 6 files changed, 12 insertions(+), 0 deletions(-) diff --git a/program/include/rcube_db.php b/program/include/rcube_db.php index eb1ad31..b066101 100644 --- a/program/include/rcube_db.php +++ b/program/include/rcube_db.php @@ -30,6 +30,8 @@ */ class rcube_db { + public $db_provider; + protected $db_dsnw; // DSN for write operations protected $db_dsnr; // DSN for read operations protected $db_connected = false; // Already connected ? diff --git a/program/include/rcube_db_mssql.php b/program/include/rcube_db_mssql.php index 5cbcfab..119647d 100644 --- a/program/include/rcube_db_mssql.php +++ b/program/include/rcube_db_mssql.php @@ -31,6 +31,8 @@ */ class rcube_db_mssql extends rcube_db { + public $db_provider = 'mssql'; + /** * Driver initialization */ diff --git a/program/include/rcube_db_mysql.php b/program/include/rcube_db_mysql.php index 3606ec1..2cdcf30 100644 --- a/program/include/rcube_db_mysql.php +++ b/program/include/rcube_db_mysql.php @@ -31,6 +31,8 @@ */ class rcube_db_mysql extends rcube_db { + public $db_provider = 'mysql'; + /** * Driver initialization/configuration */ diff --git a/program/include/rcube_db_pgsql.php b/program/include/rcube_db_pgsql.php index 285b8e2..0d0caad 100644 --- a/program/include/rcube_db_pgsql.php +++ b/program/include/rcube_db_pgsql.php @@ -31,6 +31,8 @@ */ class rcube_db_pgsql extends rcube_db { + public $db_provider = 'postgres'; + /** * Get last inserted record ID * diff --git a/program/include/rcube_db_sqlite.php b/program/include/rcube_db_sqlite.php index a9774cd..a739767 100644 --- a/program/include/rcube_db_sqlite.php +++ b/program/include/rcube_db_sqlite.php @@ -31,6 +31,8 @@ */ class rcube_db_sqlite extends rcube_db { + public $db_provider = 'sqlite'; + /** * Database character set */ diff --git a/program/include/rcube_db_sqlsrv.php b/program/include/rcube_db_sqlsrv.php index feddbe7..e58bf07 100644 --- a/program/include/rcube_db_sqlsrv.php +++ b/program/include/rcube_db_sqlsrv.php @@ -31,6 +31,8 @@ */ class rcube_db_sqlsrv extends rcube_db { + public $db_provider = 'mssql'; + /** * Driver initialization */ -- Gitblit v1.9.1