From 1f8410794c8213d87227fabae2114a3be8033ece Mon Sep 17 00:00:00 2001 From: wei <> Date: Thu, 18 May 2006 08:16:21 +0000 Subject: Moved adodb to 3rdParty directory. --- framework/DataAccess/SQLMap/TSqlMapper.php | 2 +- framework/DataAccess/TAdodb.php | 334 ++++++++++++++++++++++++++++ framework/DataAccess/TAdodbProvider.php | 343 ----------------------------- framework/DataAccess/TCreoleProvider.php | 83 ------- framework/DataAccess/TDatabaseProvider.php | 40 +++- 5 files changed, 364 insertions(+), 438 deletions(-) create mode 100644 framework/DataAccess/TAdodb.php delete mode 100644 framework/DataAccess/TAdodbProvider.php delete mode 100644 framework/DataAccess/TCreoleProvider.php (limited to 'framework/DataAccess') diff --git a/framework/DataAccess/SQLMap/TSqlMapper.php b/framework/DataAccess/SQLMap/TSqlMapper.php index 26e6c115..2c760c1e 100644 --- a/framework/DataAccess/SQLMap/TSqlMapper.php +++ b/framework/DataAccess/SQLMap/TSqlMapper.php @@ -7,7 +7,7 @@ Prado::using('System.Collections.*'); Prado::using('System.DataAccess.SQLMap.DataMapper.TTypeHandlerFactory'); Prado::using('System.DataAccess.SQLMap.DataMapper.TSqlMapCache'); Prado::using('System.DataAccess.SQLMap.DataMapper.TDataMapperException'); -Prado::using('System.DataAccess.TAdodbProvider'); +Prado::using('System.DataAccess.TAdodb'); /** * DataMapper client, a facade to provide access the rest of the DataMapper diff --git a/framework/DataAccess/TAdodb.php b/framework/DataAccess/TAdodb.php new file mode 100644 index 00000000..f6b486e4 --- /dev/null +++ b/framework/DataAccess/TAdodb.php @@ -0,0 +1,334 @@ + + * $provider = new TAdodb; + * $provider->setConnectionString($dsn); $ + * connection = $provider->getConnection(); + * $resultSet = $connection->execute('....'); + * + * + * @author Wei Zhuo + * @version $Revision: $ $Date: $ + * @package System.DataAccess + * @since 3.0 + */ +class TAdodb extends TDatabaseProvider +{ + const FETCH_ASSOCIATIVE='associative'; + const FETCH_NUMERIC='numeric'; + const FETCH_BOTH='both'; + const FETCH_DEFAULT='default'; + + private $_connection = null; + private $_cachedir=''; + private $_fetchMode = 'associative'; + + public function getConnection() + { + $this->initialize(); + return $this->_connection; + } + + public function initialize() + { + if(!class_exists('ADOConnection', false)) + $this->importAdodbLibrary(); + if(is_null($this->_connection)) + $this->_connection = new TAdodbConnection($this); + } + + public function enableActiveRecords() + { + $conn = $this->getConnection(); + if(is_null($conn->getInternalConnection()) && $conn->open()) + { + Prado::using('System.DataAccess.TActiveRecord'); + TActiveRecord::setDatabaseAdapter($conn->getInternalConnection()); + } + } + + protected function getAdodbLibrary() + { + return Prado::getPathOfNamespace('System.3rdParty.adodb'); + } + + protected function importAdodbLibrary() + { + $path = $this->getAdodbLibrary(); + require($path.'/adodb-exceptions.inc.php'); + require($path.'/adodb.inc.php'); + } + + /** + * @return string the cache directory for adodb module + */ + public function getCacheDir() + { + return $this->_cachedir; + } + + /** + * Sets the cache directory for ADODB (in adodb it is + * called to $ADODB_CACHE_DIR) + * @param string the cache directory for adodb module + */ + public function setCacheDir($value) + { + $this->_cachedir=$value; + } + + /** + * @return string fetch mode of query data + */ + public function getFetchMode() + { + return $this->_fetchMode; + } + + /** + * Sets the fetch mode of query data: Associative, Numeric, Both, Default (default) + * @param string the fetch mode of query data + */ + public function setFetchMode($value) + { + $value = strtolower($value); + if($value===self::FETCH_ASSOCIATIVE || $value===self::FETCH_NUMERIC + || $value===self::FETCH_BOTH) + $this->_fetchMode=$value; + else + $this->_fetchMode=self::FETCH_DEFAULT; + } + +} + +/** + * TAdodbConnection is a wrapper class of the ADODB ADOConnection class. + * For more information about the ADODB library, see {@link http://adodb.sourceforge.net/}. + * + * You can call any method implemented in ADOConnection class via TAdodbConnection, + * such as TAdodbConnection::FetchRow(), and so on. The method calls + * will be passed to ADOConnection class. + * + * @author Wei Zhuo + * @version $Revision: $ $Date: $ + * @package System.DataAccess + * @since 3.0 + */ +class TAdodbConnection extends TDbConnection +{ + private $_connection; + + /** + * Gets the internal connection. + */ + public function getInternalConnection() + { + return $this->_connection; + } + + /** + * Constructor, initialize a new Adodb connection. + * @param string|TAdodb DSN connection string or a TAdodb + */ + public function __construct($provider=null) + { + parent::__construct($provider); + if(is_string($provider)) + $this->initProvider($provider); + } + + /** + * Create a new provider for this connection using the DSN string. + * @param string DSN connection string. + */ + protected function initProvider($connectionString) + { + $provider = new TAdodb(); + $provider->setConnectionString($connectionString); + $this->setProvider($provider); + } + + /** + * Cleanup work before serializing. + * This is a PHP defined magic method. + * @return array the names of instance-variables to serialize. + */ + public function __sleep() + { + //close any open connections before serializing. + $this->close(); + $this->_connection = null; + return array_keys(get_object_vars($this)); + } + + /** + * This method will be automatically called when unserialization happens. + * This is a PHP defined magic method. + */ + public function __wakeup() + { + } + + /** + * PHP magic function. + * This method will pass all method calls to ADOConnection class + * provided in the ADODB library. + * @param mixed method name + * @param mixed method call parameters + * @param mixed return value of the method call + */ + public function __call($method, $params) + { + if(is_null($this->_connection) || !$this->_connection->IsConnected()) + $this->open(); + return call_user_func_array(array($this->_connection,$method),$params); + } + + public function getIsClosed() + { + return is_null($this->_connection) || !$this->_connection->IsConnected(); + } + + public function prepare($statement) + { + return $this->_connection->prepare($statement); + } + + public function execute($sql, $parameters=array()) + { + return $this->_connection->execute($sql, $parameters); + } + + /** + * Start a transaction on this connection. + */ + public function beginTransaction() + { + return $this->_connection->StartTrans(); + } + + /** + * Finish and cleanup transactions. + */ + public function completeTransaction() + { + return $this->connection->CompleteTrans(); + } + + + public function commit() + { + return $this->connection->CommitTrans(); + } + + + public function rollback() + { + return $this->connection->RollbackTrans(); + } + + /** + * Establishes a DB connection. + * An ADOConnection instance will be created if none. + */ + public function open() + { + if($this->getIsClosed()) + { + $provider = $this->getProvider(); + $provider->initialize(); + if(strlen($provider->getConnectionString()) < 1) + { + if(strlen($provider->getDriver()) < 1) + throw new TDbConnectionException('db_driver_required'); + $this->_connection=ADONewConnection($provider->getDriver()); + $this->initConnection(); + } + else + $this->_connection=ADONewConnection($provider->getConnectionString()); + $this->initFetchMode(); + $this->initCacheDir(); + } + return $this->_connection->IsConnected(); + } + + /** + * Complete the database connection. + */ + protected function initConnection() + { + $provider = $this->getProvider(); + + if($provider->getUsePersistentConnection()) + { + $this->_connection->PConnect($provider->getHost(), + $provider->getUsername(),$provider->getPassword(), + $provider->getDatabase()); + } + else + { + $this->_connection->Connect($provider->getHost(), + $provider->getUsername(),$provider->getPassword(), + $provider->getDatabase()); + } + } + + /** + * Initialize the fetch mode. + */ + protected function initFetchMode() + { + global $ADODB_FETCH_MODE; + $provider = $this->getProvider(); + if($provider->getFetchMode()===TAdodb::FETCH_ASSOCIATIVE) + $ADODB_FETCH_MODE=ADODB_FETCH_ASSOC; + else if($provider->fetchMode===TAdodb::FETCH_NUMERIC) + $ADODB_FETCH_MODE=ADODB_FETCH_NUM; + else if($provider->fetchMode===TAdodb::FETCH_BOTH) + $ADODB_FETCH_MODE=ADODB_FETCH_BOTH; + else + $ADODB_FETCH_MODE=ADODB_FETCH_DEFAULT; + } + + /** + * Initialize the cache directory. + */ + protected function initCacheDir() + { + global $ADODB_CACHE_DIR; + $provider = $this->getProvider(); + if($provider->getCacheDir()!=='') + $ADODB_CACHE_DIR=$provider->getCacheDir(); + } + + /** + * Closes the DB connection. + * You are not required to call this method as PHP will automatically + * to close any DB connections when exiting a script. + */ + public function close() + { + if(!is_null($this->_connection) && $this->_connection->IsConnected()) + $this->_connection->Close(); + } + + /** + * @param string quote a string to be sent to the database. + * @param boolean if true it ensure that the variable is not quoted twice, + * once by quote and once by the magic_quotes_gpc. + * @return string database specified quoted string + */ + public function quote($string, $magic_quotes=false) + { + return $this->_connection->qstr($string, $magic_quotes); + } + +} + +?> \ No newline at end of file diff --git a/framework/DataAccess/TAdodbProvider.php b/framework/DataAccess/TAdodbProvider.php deleted file mode 100644 index 9d9453f9..00000000 --- a/framework/DataAccess/TAdodbProvider.php +++ /dev/null @@ -1,343 +0,0 @@ - - * $provider = new TAdodbProvider; - * $provider->setConnectionString($dsn); - * $connection = $provider->getConnection(); - * $resultSet = $connection->execute('....'); - * - * - * @author Wei Zhuo - * @version $Revision: $ $Date: $ - * @package System.DataAccess - * @since 3.0 - */ -class TAdodbProvider extends TDatabaseProvider -{ - const FETCH_ASSOCIATIVE='associative'; - const FETCH_NUMERIC='numeric'; - const FETCH_BOTH='both'; - const FETCH_DEFAULT='default'; - - private $_connection = null; - private $_cachedir=''; - private $_fetchMode = 'associative'; - - private static $_hasImported=false; - - private $_adodbLibrary=''; - - public function getConnection() - { - if(is_null($this->_connection) || is_null($this->_connection->getProvider())) - { - $this->importAdodbLibrary(); - $this->_connection = new TAdodbConnection($this); - } - return $this->_connection; - } - - /** - * @return string the cache directory for adodb module - */ - public function getCacheDir() - { - return $this->_cachedir; - } - - public function getAdodbLibrary() - { - if(strlen($this->_adodbLibrary) < 1) - return dirname(__FILE__).'/adodb'; - else - return $this->_adodbLibrary; - } - - public function setAdodbLibrary($path) - { - $this->_adodbLibrary = Prado::getPathOfNamespace($path); - } - - public function importAdodbLibrary() - { - if(!self::$_hasImported) - { - require($this->getAdodbLibrary().'/adodb-exceptions.inc.php'); - require($this->getAdodbLibrary().'/adodb.inc.php'); - self::$_hasImported = true; - } - } - - /** - * Sets the cache directory for ADODB (in adodb it is - * called to $ADODB_CACHE_DIR) - * @param string the cache directory for adodb module - */ - public function setCacheDir($value) - { - $this->_cachedir=$value; - } - - /** - * @return string fetch mode of query data - */ - public function getFetchMode() - { - return $this->_fetchMode; - } - - /** - * Sets the fetch mode of query data: Associative, Numeric, Both, Default (default) - * @param string the fetch mode of query data - */ - public function setFetchMode($value) - { - $value = strtolower($value); - if($value===self::FETCH_ASSOCIATIVE || $value===self::FETCH_NUMERIC - || $value===self::FETCH_BOTH) - $this->_fetchMode=$value; - else - $this->_fetchMode=self::FETCH_DEFAULT; - } - -} - -/** - * TAdodbConnection is a wrapper class of the ADODB ADOConnection class. - * For more information about the ADODB library, see {@link http://adodb.sourceforge.net/}. - * - * You can call any method implemented in ADOConnection class via TAdodbConnection, - * such as TAdodbConnection::FetchRow(), and so on. The method calls - * will be passed to ADOConnection class. - * - * @author Wei Zhuo - * @version $Revision: $ $Date: $ - * @package System.DataAccess - * @since 3.0 - */ -class TAdodbConnection extends TDbConnection -{ - private $_connection; - - /** - * Constructor, initialize a new Adodb connection. - * @param string|TAdodbProvider DSN connection string or a TAdodbProvider - */ - public function __construct($provider=null) - { - parent::__construct($provider); - if(is_string($provider)) - $this->initProvider($provider); - } - - /** - * Create a new provider for this connection using the DSN string. - * @param string DSN connection string. - */ - protected function initProvider($connectionString) - { - $provider = new TAdodbProvider(); - $provider->setConnectionString($connectionString); - $this->setProvider($provider); - } - - /** - * Cleanup work before serializing. - * This is a PHP defined magic method. - * @return array the names of instance-variables to serialize. - */ - public function __sleep() - { - //close any open connections before serializing. - $this->close(); - $this->_connection = null; - return array_keys(get_object_vars($this)); - } - - /** - * This method will be automatically called when unserialization happens. - * This is a PHP defined magic method. - */ - public function __wakeup() - { - } - - /** - * PHP magic function. - * This method will pass all method calls to ADOConnection class - * provided in the ADODB library. - * @param mixed method name - * @param mixed method call parameters - * @param mixed return value of the method call - */ - public function __call($method, $params) - { - if(is_null($this->_connection) || !$this->_connection->IsConnected()) - $this->open(); - return call_user_func_array(array($this->_connection,$method),$params); - } - - public function getIsClosed() - { - return is_null($this->_connection) || !$this->_connection->IsConnected(); - } - - public function prepare($statement) - { - return $this->_connection->prepare($statement); - } - - public function execute($sql, $parameters=array()) - { - return $this->_connection->execute($sql, $parameters); - } - - /** - * Start a transaction on this connection. - */ - public function beginTransaction() - { - return $this->_connection->StartTrans(); - } - - /** - * Finish and cleanup transactions. - */ - public function completeTransaction() - { - return $this->connection->CompleteTrans(); - } - - /** - * Fail the current transaction. - */ - public function failTransaction() - { - return $this->connection->FailTrans(); - } - - /** - * @return boolean true if transaction has failed. - */ - public function getHasTransactionFailed() - { - return $this->connection->HasFailedTrans(); - } - - public function commit() - { - return $this->connection->CommitTrans(); - } - - - public function rollback() - { - return $this->connection->RollbackTrans(); - } - - /** - * Establishes a DB connection. - * An ADOConnection instance will be created if none. - */ - public function open() - { - if($this->getIsClosed()) - { - $provider = $this->getProvider(); - $provider->importAdodbLibrary(); - if(strlen($provider->getConnectionString()) < 1) - { - if(strlen($provider->getDriver()) < 1) - throw new TDbConnectionException('db_driver_required'); - - $this->_connection=ADONewConnection($provider->getDriver()); - $this->initConnection(); - } - else - $this->_connection=ADONewConnection($provider->getConnectionString()); - $this->initFetchMode(); - $this->initCacheDir(); - } - return $this->_connection->IsConnected(); - } - - /** - * Complete the database connection. - */ - protected function initConnection() - { - $provider = $this->getProvider(); - - if($provider->getUsePersistentConnection()) - { - $this->_connection->PConnect($provider->getHost(), - $provider->getUsername(),$provider->getPassword(), - $provider->getDatabase()); - } - else - { - $this->_connection->Connect($provider->getHost(), - $provider->getUsername(),$provider->getPassword(), - $provider->getDatabase()); - } - } - - /** - * Initialize the fetch mode. - */ - protected function initFetchMode() - { - global $ADODB_FETCH_MODE; - $provider = $this->getProvider(); - if($provider->getFetchMode()===TAdodbProvider::FETCH_ASSOCIATIVE) - $ADODB_FETCH_MODE=ADODB_FETCH_ASSOC; - else if($provider->fetchMode===TAdodbProvider::FETCH_NUMERIC) - $ADODB_FETCH_MODE=ADODB_FETCH_NUM; - else if($provider->fetchMode===TAdodbProvider::FETCH_BOTH) - $ADODB_FETCH_MODE=ADODB_FETCH_BOTH; - else - $ADODB_FETCH_MODE=ADODB_FETCH_DEFAULT; - } - - /** - * Initialize the cache directory. - */ - protected function initCacheDir() - { - global $ADODB_CACHE_DIR; - $provider = $this->getProvider(); - if($provider->getCacheDir()!=='') - $ADODB_CACHE_DIR=$provider->getCacheDir(); - } - - /** - * Closes the DB connection. - * You are not required to call this method as PHP will automatically - * to close any DB connections when exiting a script. - */ - public function close() - { - if(!is_null($this->_connection) && $this->_connection->IsConnected()) - $this->_connection->Close(); - } - - /** - * @param string quote a string to be sent to the database. - * @param boolean if true it ensure that the variable is not quoted twice, - * once by quote and once by the magic_quotes_gpc. - * @return string database specified quoted string - */ - public function quote($string, $magic_quotes=false) - { - return $this->_connection->qstr($string, $magic_quotes); - } - -} - -?> \ No newline at end of file diff --git a/framework/DataAccess/TCreoleProvider.php b/framework/DataAccess/TCreoleProvider.php deleted file mode 100644 index f4ccd4c2..00000000 --- a/framework/DataAccess/TCreoleProvider.php +++ /dev/null @@ -1,83 +0,0 @@ -_connection)) - $this->_connection = new TCreoleConnection($this); - return $this->_connection; - } - - public function getConnectionString() - { - if(strlen(parent::getConnectionString()) > 0) - return parent::getConnectionString(); - else - return $this->generateConnectionString(); - } - - protected function generateConnectionString() - { - $driver = $this->getDriver(); - $user = $this->getUsername(); - $pass = $this->getPassword(); - $host = $this->getHost(); - $database = $this->getDatabase(); - - $pass = strlen($pass) > 0 ? ':'.$pass : ''; - $username_password = strlen($user) > 0 ? $user.$pass.'@' : ''; - $database = strlen($database) > 0 ? '/'.$database : ''; - - return "{$driver}://{$username_password}{$host}{$database}"; - } -} - -class TCreoleConnection extends TDbConnection -{ - private $_connection = null; - - protected function beginDbTransaction() - { - } - - /** - * Closes the connection to the database. - */ - public function close() - { - $this->_connection->close(); - } - - public function prepare($statement) - { - return $this->_connection->prepareStatement($statement); - } - - //public function execute($sql, - - /** - * Opens a database connection with settings provided in the ConnectionString. - */ - public function open() - { - if(is_null($this->_connection)) - { - $connectionString = $this->getProvider()->getConnectionString(); - if(strlen($connectionString) < 1 || strcmp($connectionString,'://') === 0) - throw new TDbConnectionException('db_driver_required'); - $class = 'System.DataAccess.creole.creole.Creole'; - $creole = Prado::createComponent($class); - $this->_connection = $creole->getConnection($connectionString); - } - return $this->_connection; - } -} - -?> \ No newline at end of file diff --git a/framework/DataAccess/TDatabaseProvider.php b/framework/DataAccess/TDatabaseProvider.php index ac637d83..2a62c03a 100644 --- a/framework/DataAccess/TDatabaseProvider.php +++ b/framework/DataAccess/TDatabaseProvider.php @@ -52,11 +52,16 @@ abstract class TDatabaseProvider extends TModule } /** + * If the driver is sqlite, the host must be dot path to the sqlite + * file. * @return string the DB host name/IP (and port number) in the format "host[:port]" */ public function getHost() { - return $this->_host; + if(strtolower($this->getDriver()) == "sqlite") + return Prado::getPathOfNamespace($this->_host); + else + return $this->_host; } /** @@ -136,6 +141,24 @@ abstract class TDatabaseProvider extends TModule $this->_persistent=$value; } + protected function buildDsn() + { + $driver = $this->getDriver().'://'; + $user = $this->getUsername(); + $pass = rawurlencode($this->getPassword()); + $pass = strlen($pass) > 0 ? ':'.$pass : $pass; + $host = $this->getHost().'/'; + if(strtolower($this->getDriver()) == 'sqlite') + $host = rawurlencode($host); + else + $host = '@'.$host; + $db = $this->getDatabase(); + $db = strlen($db) > 0 ? '/'.$db : $db; + $persist = $this->getUsePersistentConnection() ? '': '?persit'; + + return $driver.$user.$pass.$host.$persist; + } + /** * @return TDbConnection a database connection */ @@ -193,16 +216,6 @@ interface IDbConnection */ public function completeTransaction(); - /** - * Fail the current transaction. - */ - public function failTransaction(); - - /** - * @return boolean true if transaction has failed. - */ - public function getHasTransactionFailed(); - /** * Makes all changes made since the previous commit/rollback permanent and * releases any database locks. @@ -253,6 +266,11 @@ abstract class TDbConnection extends TComponent implements IDbConnection { return $this->_provider; } + + public function __destruct() + { + $this->close(); + } } ?> \ No newline at end of file -- cgit v1.2.3