merge from 1.5.1.8

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10157 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-02-21 07:42:16 +00:00
parent 2d3dfe7bc7
commit 90c18a8bb8
42 changed files with 3249 additions and 149 deletions

View file

@ -5,7 +5,7 @@
* @brief Cubrid DBMS to use the class
* @version 1.0
*
* Works with CUBRID up to 8.4.0
* Works with CUBRID up to 8.4.1
**/
class DBCubrid extends DB
@ -67,7 +67,7 @@
**/
function __connect($connection)
{
// attempts to connect
// attempts to connect
$result = @cubrid_connect($connection["db_hostname"], $connection["db_port"], $connection["db_database"], $connection["db_userid"], $connection["db_password"]);
// check connections
@ -75,7 +75,15 @@
$this->setError (-1, 'database connect fail');
return;
}
return $result;
if(!defined('__CUBRID_VERSION__')) {
$cubrid_version = cubrid_get_server_info($result);
$cubrid_version_elem = explode('.', $cubrid_version);
$cubrid_version = $cubrid_version_elem[0] . '.' . $cubrid_version_elem[1] . '.' . $cubrid_version_elem[2];
define('__CUBRID_VERSION__', $cubrid_version);
}
return $result;
}
/**