Changeset:
e7cb8d0d5281
https://sourceforge.net/p/mrbs/hg-code/ci/e7cb8d0d52813aada1f14d5d3480afc6bd9fc6b5
Author:
Campbell Morrison <[email protected]>
Date:
Mon Sep 26 13:18:39 2016 +0100
Log message:
Made the standard name for the MySQL driver 'mysql' instead of 'mysqli', though
'mysqli' will still be accepted.
diffstat:
INSTALL | 2 +-
README.sqlapi | 4 ++--
web/config.inc.php | 4 ++--
web/internalconfig.inc.php | 8 --------
web/systemdefaults.inc.php | 11 ++++++-----
5 files changed, 11 insertions(+), 18 deletions(-)
diffs (95 lines):
diff -r 871ef6c75fd0 -r e7cb8d0d5281 INSTALL
--- a/INSTALL Mon Sep 26 13:05:13 2016 +0100
+++ b/INSTALL Mon Sep 26 13:18:39 2016 +0100
@@ -354,7 +354,7 @@
First, select your database system. Define one of the following:
- $dbsys = "mysqli";
+ $dbsys = "mysql";
$dbsys = "pgsql";
Then define your database connection parameters. Set the values for:
diff -r 871ef6c75fd0 -r e7cb8d0d5281 README.sqlapi
--- a/README.sqlapi Mon Sep 26 13:05:13 2016 +0100
+++ b/README.sqlapi Mon Sep 26 13:18:39 2016 +0100
@@ -26,7 +26,7 @@
To use this package, include "dbsys.inc" after defining the following
variables:
- $dbsys = The database abstraction to use, 'mysqli' or 'pgsql'
+ $dbsys = The database abstraction to use, 'mysql' or 'pgsql'
$db_host = The hostname of the database server, or "localhost"
$db_login = The username to use when connecting to the database
$db_password = The database account password
@@ -50,7 +50,7 @@
The way MRBS uses this is to define a configuration file config.inc.php with
the above variables plus:
- $dbsys = "pgsql"; // or: $dbsys = "mysqli";
+ $dbsys = "pgsql"; // or: $dbsys = "mysql";
Then, each PHP script which wants to connect to the database starts with:
include "config.inc.php";
include "dbsys.inc";
diff -r 871ef6c75fd0 -r e7cb8d0d5281 web/config.inc.php
--- a/web/config.inc.php Mon Sep 26 13:05:13 2016 +0100
+++ b/web/config.inc.php Mon Sep 26 13:18:39 2016 +0100
@@ -40,8 +40,8 @@
/*******************
* Database settings
******************/
-// Which database system: "pgsql"=PostgreSQL, "mysqli"=MySQL
-$dbsys = "mysqli";
+// Which database system: "pgsql"=PostgreSQL, "mysql"=MySQL
+$dbsys = "mysql";
// Hostname of database server. For pgsql, can use "" instead of localhost
// to use Unix Domain Sockets instead of TCP/IP. For mysql/mysqli "localhost"
// tells the system to use Unix Domain Sockets, and $db_port will be ignored;
diff -r 871ef6c75fd0 -r e7cb8d0d5281 web/internalconfig.inc.php
--- a/web/internalconfig.inc.php Mon Sep 26 13:05:13 2016 +0100
+++ b/web/internalconfig.inc.php Mon Sep 26 13:18:39 2016 +0100
@@ -122,14 +122,6 @@
trigger_error($message, E_USER_NOTICE);
}
-if ($dbsys == 'mysql')
-{
- $dbsys = 'mysqli';
- $message = "Please check your config file. The 'mysql' option for " .
- '$dbsys has been removed and you should now use ' . "'mysqli'";
- trigger_error($message, E_USER_NOTICE);
-}
-
// Variables no longer used in versions of MRBS > 1.5.0
if (isset($db_nopersist))
{
diff -r 871ef6c75fd0 -r e7cb8d0d5281 web/systemdefaults.inc.php
--- a/web/systemdefaults.inc.php Mon Sep 26 13:05:13 2016 +0100
+++ b/web/systemdefaults.inc.php Mon Sep 26 13:18:39 2016 +0100
@@ -57,10 +57,11 @@
/*******************
* Database settings
******************/
-// Which database system: "pgsql"=PostgreSQL, "mysqli"=MySQL
-$dbsys = "mysqli";
+// Which database system: "pgsql"=PostgreSQL, "mysql"=MySQL
+// ("mysqli" is also supported for historical reasons and is mapped to "mysql")
+$dbsys = "mysql";
// Hostname of database server. For pgsql, can use "" instead of localhost
-// to use Unix Domain Sockets instead of TCP/IP. For mysqli "localhost"
+// to use Unix Domain Sockets instead of TCP/IP. For mysql "localhost"
// tells the system to use Unix Domain Sockets, and $db_port will be ignored;
// if you want to force TCP connection you can use "127.0.0.1".
$db_host = "localhost";
@@ -726,9 +727,9 @@
// The 'db_system' variable is equivalent to the core MRBS $dbsys variable,
// and allows you to use any of MRBS's database abstraction layers for
// db_ext authentication.
-$auth['db_ext']['db_system'] = 'mysqli';
+$auth['db_ext']['db_system'] = 'mysql';
// Hostname of external database server. For pgsql, can use "" instead of
localhost
-// to use Unix Domain Sockets instead of TCP/IP. For mysqli "localhost"
+// to use Unix Domain Sockets instead of TCP/IP. For mysql "localhost"
// tells the system to use Unix Domain Sockets, and $db_port will be ignored;
// if you want to force TCP connection you can use "127.0.0.1".
$auth['db_ext']['db_host'] = 'localhost';
------------------------------------------------------------------------------
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
