From 88107d6cf54f62ec23daf94d68700fc000394c35 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Wed, 3 Oct 2012 23:22:32 +0200 Subject: Define public property 'db_provider' in pdo classes. That is used in various places, especially the installer --- program/include/rcube_db.php | 2 ++ program/include/rcube_db_mssql.php | 2 ++ program/include/rcube_db_mysql.php | 2 ++ program/include/rcube_db_pgsql.php | 2 ++ program/include/rcube_db_sqlite.php | 2 ++ program/include/rcube_db_sqlsrv.php | 2 ++ 6 files changed, 12 insertions(+) diff --git a/program/include/rcube_db.php b/program/include/rcube_db.php index eb1ad31b2..b066101b3 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 5cbcfab36..119647d95 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 3606ec102..2cdcf3021 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 285b8e2d4..0d0caadde 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 a9774cd51..a7397674b 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 feddbe73f..e58bf0704 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 */ -- cgit v1.2.3