Menu
▾
▴
[mxbb-commits] core/includes/db firebird.php, 1.8.2.2, 1.8.2.3 mssql.php, 1.8.2.2, 1.8.2.3 mssql_odbc.php, 1.8.2.2, 1.8.2.3 mysql.php, 1.8.2.2, 1.8.2.3 mysql4.php, 1.8.2.2, 1.8.2.3 mysqli.php, 1.8.2.2, 1.8.2.3 oracle.php, 1.8.2.2, 1.8.2.3 postgres.php, 1.8.2.2, 1.8.2.3 sqlite.php, 1.8.2.2, 1.8.2.3
|
From: Jon O. <jon...@us...> - 2008-02-10 20:56:43
|
Update of /cvsroot/mxbb/core/includes/db In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30446 Modified Files: Tag: core28x firebird.php mssql.php mssql_odbc.php mysql.php mysql4.php mysqli.php oracle.php postgres.php sqlite.php Log Message: Updated DBAL, to be working with our installation. Please, check this out. Should not affect core. But i've left old code uncommented, in case... Index: mysqli.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mysqli.php,v retrieving revision 1.8.2.2 retrieving revision 1.8.2.3 diff -C2 -d -r1.8.2.2 -r1.8.2.3 *** mysqli.php 3 Feb 2008 19:23:03 -0000 1.8.2.2 --- mysqli.php 10 Feb 2008 20:56:39 -0000 1.8.2.3 *************** *** 21,29 **** * @ignore */ ! if (!defined('SQL_LAYER')) { - define('SQL_LAYER', 'mysqli'); - include($mx_root_path . 'includes/db/dbal.' . $phpEx); /** --- 21,31 ---- * @ignore */ ! //if (!defined('SQL_LAYER')) ! if (!is_object('dbal_mysqli')) { + //define('SQL_LAYER', 'mysqli'); + include_once($mx_root_path . 'includes/db/dbal.' . $phpEx); + $sql_db = 'dbal_' . $dbms; // Repopulated for multiple db connections /** Index: sqlite.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/sqlite.php,v retrieving revision 1.8.2.2 retrieving revision 1.8.2.3 diff -C2 -d -r1.8.2.2 -r1.8.2.3 *** sqlite.php 3 Feb 2008 19:23:05 -0000 1.8.2.2 --- sqlite.php 10 Feb 2008 20:56:39 -0000 1.8.2.3 *************** *** 21,29 **** * @ignore */ ! if (!defined('SQL_LAYER')) { - define('SQL_LAYER', 'sqlite'); - include($mx_root_path . 'includes/db/dbal.' . $phpEx); /** --- 21,31 ---- * @ignore */ ! //if (!defined('SQL_LAYER')) ! if (!is_object('dbal_sqlite')) { + //define('SQL_LAYER', 'sqlite'); + include_once($mx_root_path . 'includes/db/dbal.' . $phpEx); + $sql_db = 'dbal_' . $dbms; // Repopulated for multiple db connections /** Index: postgres.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/postgres.php,v retrieving revision 1.8.2.2 retrieving revision 1.8.2.3 diff -C2 -d -r1.8.2.2 -r1.8.2.3 *** postgres.php 3 Feb 2008 19:23:05 -0000 1.8.2.2 --- postgres.php 10 Feb 2008 20:56:39 -0000 1.8.2.3 *************** *** 21,29 **** * @ignore */ ! if (!defined('SQL_LAYER')) { - define('SQL_LAYER', 'postgres'); - include($mx_root_path . 'includes/db/dbal.' . $phpEx); /** --- 21,31 ---- * @ignore */ ! //if (!defined('SQL_LAYER')) ! if (!is_object('dbal_postgres')) { + //define('SQL_LAYER', 'postgres'); + include_once($mx_root_path . 'includes/db/dbal.' . $phpEx); + $sql_db = 'dbal_' . $dbms; // Repopulated for multiple db connections /** Index: mysql4.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mysql4.php,v retrieving revision 1.8.2.2 retrieving revision 1.8.2.3 diff -C2 -d -r1.8.2.2 -r1.8.2.3 *** mysql4.php 3 Feb 2008 19:23:03 -0000 1.8.2.2 --- mysql4.php 10 Feb 2008 20:56:39 -0000 1.8.2.3 *************** *** 21,29 **** * @ignore */ ! if (!defined('SQL_LAYER')) { ! ! define('SQL_LAYER', 'mysql4'); ! include($mx_root_path . 'includes/db/dbal.' . $phpEx); /** --- 21,30 ---- * @ignore */ ! //if (!defined('SQL_LAYER')) ! if (!is_object('dbal_mysql4')) { ! //define('SQL_LAYER', 'mysql4'); ! include_once($mx_root_path . 'includes/db/dbal.' . $phpEx); ! $sql_db = 'dbal_' . $dbms; /** Index: firebird.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/firebird.php,v retrieving revision 1.8.2.2 retrieving revision 1.8.2.3 diff -C2 -d -r1.8.2.2 -r1.8.2.3 *** firebird.php 3 Feb 2008 19:23:01 -0000 1.8.2.2 --- firebird.php 10 Feb 2008 20:56:39 -0000 1.8.2.3 *************** *** 21,29 **** * @ignore */ ! if (!defined('SQL_LAYER')) { ! ! define('SQL_LAYER', 'firebird'); ! include($mx_root_path . 'includes/db/dbal.' . $phpEx); /** --- 21,30 ---- * @ignore */ ! //if (!defined('SQL_LAYER')) ! if (!is_object('dbal_firebird')) { ! //define('SQL_LAYER', 'firebird'); ! include_once($mx_root_path . 'includes/db/dbal.' . $phpEx); ! $sql_db = 'dbal_' . $dbms; // Repopulated for multiple db connections /** Index: mssql.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mssql.php,v retrieving revision 1.8.2.2 retrieving revision 1.8.2.3 diff -C2 -d -r1.8.2.2 -r1.8.2.3 *** mssql.php 3 Feb 2008 19:23:01 -0000 1.8.2.2 --- mssql.php 10 Feb 2008 20:56:39 -0000 1.8.2.3 *************** *** 21,29 **** * @ignore */ ! if (!defined('SQL_LAYER')) { ! ! define('SQL_LAYER', 'mssql'); ! include($mx_root_path . 'includes/db/dbal.' . $phpEx); /** --- 21,30 ---- * @ignore */ ! //if (!defined('SQL_LAYER')) ! if (!is_object('dbal_mssql')) { ! //define('SQL_LAYER', 'mssql'); ! include_once($mx_root_path . 'includes/db/dbal.' . $phpEx); ! $sql_db = 'dbal_' . $dbms; // Repopulated for multiple db connections /** Index: mysql.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mysql.php,v retrieving revision 1.8.2.2 retrieving revision 1.8.2.3 diff -C2 -d -r1.8.2.2 -r1.8.2.3 *** mysql.php 3 Feb 2008 19:23:02 -0000 1.8.2.2 --- mysql.php 10 Feb 2008 20:56:39 -0000 1.8.2.3 *************** *** 21,29 **** * @ignore */ ! if (!defined('SQL_LAYER')) { ! ! define('SQL_LAYER', 'mysql'); ! include($mx_root_path . 'includes/db/dbal.' . $phpEx); /** --- 21,30 ---- * @ignore */ ! //if (!defined('SQL_LAYER')) ! if (!is_object('dbal_mysql')) { ! //define('SQL_LAYER', 'mysql'); ! include_once($mx_root_path . 'includes/db/dbal.' . $phpEx); ! $sql_db = 'dbal_' . $dbms; // Repopulated for multiple db connections /** Index: oracle.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/oracle.php,v retrieving revision 1.8.2.2 retrieving revision 1.8.2.3 diff -C2 -d -r1.8.2.2 -r1.8.2.3 *** oracle.php 3 Feb 2008 19:23:04 -0000 1.8.2.2 --- oracle.php 10 Feb 2008 20:56:39 -0000 1.8.2.3 *************** *** 21,29 **** * @ignore */ ! if(!defined('SQL_LAYER')) { ! ! define('SQL_LAYER', 'oracle'); ! include($mx_root_path . 'includes/db/dbal.' . $phpEx); /** --- 21,30 ---- * @ignore */ ! //if (!defined('SQL_LAYER')) ! if (!is_object('dbal_oracle')) { ! //define('SQL_LAYER', 'oracle'); ! include_once($mx_root_path . 'includes/db/dbal.' . $phpEx); ! $sql_db = 'dbal_' . $dbms; // Repopulated for multiple db connections /** Index: mssql_odbc.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mssql_odbc.php,v retrieving revision 1.8.2.2 retrieving revision 1.8.2.3 diff -C2 -d -r1.8.2.2 -r1.8.2.3 *** mssql_odbc.php 3 Feb 2008 19:23:01 -0000 1.8.2.2 --- mssql_odbc.php 10 Feb 2008 20:56:39 -0000 1.8.2.3 *************** *** 21,29 **** * @ignore */ ! if (!defined('SQL_LAYER')) { ! ! define('SQL_LAYER', 'mssql_odbc'); ! include($mx_root_path . 'includes/db/dbal.' . $phpEx); /** --- 21,30 ---- * @ignore */ ! //if (!defined('SQL_LAYER')) ! if (!is_object('dbal_mssql_odbc')) { ! //define('SQL_LAYER', 'mssql_odbc'); ! include_once($mx_root_path . 'includes/db/dbal.' . $phpEx); ! $sql_db = 'dbal_' . $dbms; // Repopulated for multiple db connections /** |
