Menu
▾
▴
[mxbb-commits] core/includes/db firebird.php, 1.8, 1.9 mssql.php, 1.8, 1.9 mssql_odbc.php, 1.8, 1.9 mysql.php, 1.8, 1.9 mysql4.php, 1.8, 1.9 mysqli.php, 1.8, 1.9 oracle.php, 1.8, 1.9 postgres.php, 1.8, 1.9 sqlite.php, 1.8, 1.9
Update of /cvsroot/mxbb/core/includes/db In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19062 Modified Files: firebird.php mssql.php mssql_odbc.php mysql.php mysql4.php mysqli.php oracle.php postgres.php sqlite.php Log Message: function sql_server_info() Index: mysqli.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mysqli.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mysqli.php 6 Aug 2007 20:07:04 -0000 1.8 --- mysqli.php 15 Jan 2008 17:47:58 -0000 1.9 *************** *** 59,62 **** --- 59,70 ---- /** + * Version information about used database + */ + function sql_server_info() + { + return 'MySQL(i) ' . @mysqli_get_server_info($this->db_connect_id); + } + + /** * sql transaction */ Index: sqlite.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/sqlite.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** sqlite.php 6 Aug 2007 20:07:05 -0000 1.8 --- sqlite.php 15 Jan 2008 17:47:59 -0000 1.9 *************** *** 55,58 **** --- 55,66 ---- /** + * Version information about used database + */ + function sql_server_info() + { + return 'SQLite ' . @sqlite_libversion(); + } + + /** * sql transaction */ Index: postgres.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/postgres.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** postgres.php 6 Aug 2007 20:07:05 -0000 1.8 --- postgres.php 15 Jan 2008 17:47:59 -0000 1.9 *************** *** 88,91 **** --- 88,99 ---- /** + * Version information about used database + */ + function sql_server_info() + { + return 'PostgreSQL ' . $this->pgsql_version; + } + + /** * sql transaction */ Index: mysql4.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mysql4.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mysql4.php 6 Aug 2007 20:07:04 -0000 1.8 --- mysql4.php 15 Jan 2008 17:47:58 -0000 1.9 *************** *** 61,64 **** --- 61,72 ---- /** + * Version information about used database + */ + function sql_server_info() + { + return 'MySQL ' . $this->mysql_version; + } + + /** * sql transaction */ Index: firebird.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/firebird.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** firebird.php 6 Aug 2007 20:07:04 -0000 1.8 --- firebird.php 15 Jan 2008 17:47:57 -0000 1.9 *************** *** 52,55 **** --- 52,72 ---- /** + * Connect to server + */ + function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false) + { + $this->persistency = $persistency; + $this->user = $sqluser; + $this->server = $sqlserver . (($port) ? ':' . $port : ''); + $this->dbname = $database; + + $this->db_connect_id = ($this->persistency) ? @ibase_pconnect($this->server . ':' . $this->dbname, $this->user, $sqlpassword, false, false, 3) : @ibase_connect($this->server . ':' . $this->dbname, $this->user, $sqlpassword, false, false, 3); + + $this->service_handle = (function_exists('ibase_service_attach')) ? @ibase_service_attach($this->server, $this->user, $sqlpassword) : false; + + return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error(''); + } + + /** * sql transaction */ Index: mssql.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mssql.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mssql.php 6 Aug 2007 20:07:04 -0000 1.8 --- mssql.php 15 Jan 2008 17:47:57 -0000 1.9 *************** *** 59,62 **** --- 59,84 ---- /** + * Version information about used database + */ + function sql_server_info() + { + $result_id = @mssql_query("SELECT SERVERPROPERTY('productversion'), SERVERPROPERTY('productlevel'), SERVERPROPERTY('edition')", $this->db_connect_id); + + $row = false; + if ($result_id) + { + $row = @mssql_fetch_assoc($result_id); + @mssql_free_result($result_id); + } + + if ($row) + { + return 'MSSQL<br />' . implode(' ', $row); + } + + return 'MSSQL'; + } + + /** * sql transaction */ Index: mysql.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mysql.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mysql.php 6 Aug 2007 20:07:04 -0000 1.8 --- mysql.php 15 Jan 2008 17:47:58 -0000 1.9 *************** *** 59,62 **** --- 59,70 ---- /** + * Version information about used database + */ + function sql_server_info() + { + return 'MySQL ' . $this->mysql_version; + } + + /** * sql transaction */ Index: oracle.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/oracle.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** oracle.php 6 Aug 2007 20:07:05 -0000 1.8 --- oracle.php 15 Jan 2008 17:47:58 -0000 1.9 *************** *** 51,54 **** --- 51,62 ---- /** + * Version information about used database + */ + function sql_server_info() + { + return @ociserverversion($this->db_connect_id); + } + + /** * sql transaction */ Index: mssql_odbc.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mssql_odbc.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mssql_odbc.php 6 Aug 2007 20:07:04 -0000 1.8 --- mssql_odbc.php 15 Jan 2008 17:47:58 -0000 1.9 *************** *** 53,56 **** --- 53,78 ---- /** + * Version information about used database + */ + function sql_server_info() + { + $result_id = @odbc_exec($this->db_connect_id, "SELECT SERVERPROPERTY('productversion'), SERVERPROPERTY('productlevel'), SERVERPROPERTY('edition')"); + + $row = false; + if ($result_id) + { + $row = @odbc_fetch_array($result_id); + @odbc_free_result($result_id); + } + + if ($row) + { + return 'MSSQL (ODBC)<br />' . implode(' ', $row); + } + + return 'MSSQL (ODBC)'; + } + + /** * sql transaction */ |
