Skip to content

Commit

Permalink
Merge branch 'feature/3517' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
weierophinney committed Jan 22, 2013
2 parents dcc3c04 + 14ed79e commit f5e47e7
Show file tree
Hide file tree
Showing 15 changed files with 1,874 additions and 2 deletions.
7 changes: 5 additions & 2 deletions library/Zend/Db/Adapter/Adapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
use Zend\Db\ResultSet;

/**
*
* @property Driver\DriverInterface $driver
* @property Platform\PlatformInterface $platform
*/
Expand Down Expand Up @@ -245,6 +244,9 @@ protected function createDriverFromParameters(array $parameters)
case 'pgsql':
$driver = new Driver\Pgsql\Pgsql($parameters);
break;
case 'ibmdb2':
$driver = new Driver\IbmDb2\IbmDb2($parameters);
break;
case 'pdo':
default:
if ($driverName == 'pdo' || strpos($driverName, 'pdo') === 0) {
Expand Down Expand Up @@ -278,9 +280,10 @@ protected function createPlatformFromDriver(Driver\DriverInterface $driver)
return new Platform\Sqlite();
case 'Postgresql':
return new Platform\Postgresql();
case 'IbmDb2':
return new Platform\IbmDb2();
default:
return new Platform\Sql92();
}
}

}
244 changes: 244 additions & 0 deletions library/Zend/Db/Adapter/Driver/IbmDb2/Connection.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,244 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

namespace Zend\Db\Adapter\Driver\IbmDb2;

use Zend\Db\Adapter\Driver\ConnectionInterface;
use Zend\Db\Adapter\Exception;

class Connection implements ConnectionInterface
{
/** @var IbmDb2 */
protected $driver = null;
protected $connectionParameters = null;
protected $resource = null;

/**
* Constructor
*
* @param array|resource|null $connectionParameters (ibm_db2 connection resource)
* @throws Exception\InvalidArgumentException
*/
public function __construct($connectionParameters = null)
{
if (is_array($connectionParameters)) {
$this->setConnectionParameters($connectionParameters);
} elseif (is_resource($connectionParameters)) {
$this->setResource($connectionParameters);
} elseif (null !== $connectionParameters) {
throw new Exception\InvalidArgumentException(
'$connection must be an array of parameters, a db2 connection resource or null'
);
}
}

/**
* Set driver
*
* @param IbmDb2 $driver
* @return Connection
*/
public function setDriver(IbmDb2 $driver)
{
$this->driver = $driver;
return $this;
}

/**
* @param array $connectionParameters
* @return Connection
*/
public function setConnectionParameters(array $connectionParameters)
{
$this->connectionParameters = $connectionParameters;
return $this;
}

/**
* @return array
*/
public function getConnectionParameters()
{
return $this->connectionParameters;
}

/**
* @param resource $resource DB2 resource
* @return Connection
*/
public function setResource($resource)
{
if (!is_resource($resource) || get_resource_type($resource) !== 'DB2 Connection') {
throw new Exception\InvalidArgumentException('The resource provided must be of type "DB2 Connection"');
}
$this->resource = $resource;
return $this;
}

/**
* Get current schema
*
* @return string
*/
public function getCurrentSchema()
{
if (!$this->isConnected()) {
$this->connect();
}

$info = db2_server_info($this->resource);
return (isset($info->DB_NAME) ? $info->DB_NAME : '');
}

/**
* Get resource
*
* @return mixed
*/
public function getResource()
{
return $this->resource;
}

/**
* Connect
*
* @return ConnectionInterface
*/
public function connect()
{
if (is_resource($this->resource)) {
return;
}

// localize
$p = $this->connectionParameters;

// given a list of key names, test for existence in $p
$findParameterValue = function(array $names) use ($p) {
foreach ($names as $name) {
if (isset($p[$name])) {
return $p[$name];
}
}
return null;
};

$connection = array();
$connection['database'] = $findParameterValue(array('database', 'db'));
$connection['username'] = $findParameterValue(array('username', 'uid', 'UID'));
$connection['password'] = $findParameterValue(array('password', 'pwd', 'PWD'));
$connection['options'] = (isset($p['driver_options']) ? $p['driver_options'] : array());

$this->resource = db2_connect(
$connection['database'],
$connection['username'],
$connection['password'],
$connection['options']
);

if ($this->resource === false) {
throw new Exception\RuntimeException(sprintf(
'%s: Unable to connect to database',
__METHOD__
));
}
return $this;
}

/**
* Is connected
*
* @return bool
*/
public function isConnected()
{
return ($this->resource !== null);
}

/**
* Disconnect
*
* @return ConnectionInterface
*/
public function disconnect()
{
if ($this->resource) {
db2_close($this->resource);
$this->resource = null;
}
return $this;
}

/**
* Begin transaction
*
* @return ConnectionInterface
*/
public function beginTransaction()
{
// TODO: Implement beginTransaction() method.
}

/**
* Commit
*
* @return ConnectionInterface
*/
public function commit()
{
// TODO: Implement commit() method.
}

/**
* Rollback
*
* @return ConnectionInterface
*/
public function rollback()
{
// TODO: Implement rollback() method.
}

/**
* Execute
*
* @param string $sql
* @return ResultInterface
*/
public function execute($sql)
{
if (!$this->isConnected()) {
$this->connect();
}

set_error_handler(function () {}, E_WARNING); // suppress warnings
$resultResource = db2_exec($this->resource, $sql);
restore_error_handler();

// if the returnValue is something other than a pg result resource, bypass wrapping it
if ($resultResource === false) {
throw new Exception\InvalidQueryException(db2_stmt_errormsg());
}

$resultPrototype = $this->driver->createResult(($resultResource === true) ? $this->resource : $resultResource);
return $resultPrototype;
}

/**
* Get last generated id
*
* @param null $name Ignored
* @return integer
*/
public function getLastGeneratedValue($name = null)
{
return db2_last_insert_id($this->resource);
}
}
Loading

0 comments on commit f5e47e7

Please sign in to comment.