fernando/luos
1
0
Fork 0
Code Releases Activity

Merge pull request #2417 from luisfernandosl/BUG-14056-3

Browse Source 
BUG 14056 "Oracle Connection Parameters with TNS" SOLVED
This commit is contained in:
julceslauhub
2014-05-22 16:51:55 -04:00
parent 5dd3bea25d c935c261b0
commit b5e9beefa2
19 changed files with 705 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/model/DbSource.php
View File

@@ -68,8 +68,8 @@ class DbSource extends BaseDbSource
$oCriteria->addSelectColumn(DbSourcePeer::DBS_UID);
$oCriteria->addSelectColumn(DbSourcePeer::PRO_UID);
$oCriteria->addSelectColumn(DbSourcePeer::DBS_TYPE);
$oCriteria->addSelectColumn(DbSourcePeer::DBS_SERVER);
$oCriteria->addSelectColumn(DbSourcePeer::DBS_DATABASE_NAME);
$oCriteria->addAsColumn("DBS_SERVER", "CASE WHEN " . DbSourcePeer::DBS_TYPE . " = 'oracle' AND " . DbSourcePeer::DBS_CONNECTION_TYPE . " = 'TNS' THEN CONCAT('[', " . DbSourcePeer::DBS_TNS . ", ']') ELSE " . DbSourcePeer::DBS_SERVER . " END");
$oCriteria->addAsColumn("DBS_DATABASE_NAME", "CASE WHEN " . DbSourcePeer::DBS_TYPE . " = 'oracle' AND " . DbSourcePeer::DBS_CONNECTION_TYPE . " = 'TNS' THEN CONCAT('[', " . DbSourcePeer::DBS_TNS . ", ']') ELSE " . DbSourcePeer::DBS_DATABASE_NAME . " END");
$oCriteria->addSelectColumn(DbSourcePeer::DBS_USERNAME);
$oCriteria->addSelectColumn(DbSourcePeer::DBS_PASSWORD);
$oCriteria->addSelectColumn(DbSourcePeer::DBS_PORT);

4
workflow/engine/classes/model/map/DbSourceMapBuilder.php
View File

@@ -83,6 +83,10 @@ class DbSourceMapBuilder
$tMap->addColumn('DBS_ENCODE', 'DbsEncode', 'string', CreoleTypes::VARCHAR, false, 32);
$tMap->addColumn('DBS_CONNECTION_TYPE', 'DbsConnectionType', 'string', CreoleTypes::VARCHAR, false, 32);
$tMap->addColumn('DBS_TNS', 'DbsTns', 'string', CreoleTypes::VARCHAR, false, 256);
} // doBuild()
} // DbSourceMapBuilder

118
workflow/engine/classes/model/om/BaseDbSource.php
View File

@@ -81,6 +81,18 @@ abstract class BaseDbSource extends BaseObject implements Persistent
*/
protected $dbs_encode = '';
/**
* The value for the dbs_connection_type field.
* @var string
*/
protected $dbs_connection_type = 'NORMAL';
/**
* The value for the dbs_tns field.
* @var string
*/
protected $dbs_tns = '';
/**
* Flag to prevent endless save loop, if this object is referenced
* by another object which falls in this transaction.
@@ -194,6 +206,28 @@ abstract class BaseDbSource extends BaseObject implements Persistent
return $this->dbs_encode;
}
/**
* Get the [dbs_connection_type] column value.
*
* @return string
*/
public function getDbsConnectionType()
{
return $this->dbs_connection_type;
}
/**
* Get the [dbs_tns] column value.
*
* @return string
*/
public function getDbsTns()
{
return $this->dbs_tns;
}
/**
* Set the value of [dbs_uid] column.
*
@@ -392,6 +426,50 @@ abstract class BaseDbSource extends BaseObject implements Persistent
} // setDbsEncode()
/**
* Set the value of [dbs_connection_type] column.
*
* @param string $v new value
* @return void
*/
public function setDbsConnectionType($v)
{
// Since the native PHP type for this column is string,
// we will cast the input to a string (if it is not).
if ($v !== null && !is_string($v)) {
$v = (string) $v;
}
if ($this->dbs_connection_type !== $v || $v === 'NORMAL') {
$this->dbs_connection_type = $v;
$this->modifiedColumns[] = DbSourcePeer::DBS_CONNECTION_TYPE;
}
} // setDbsConnectionType()
/**
* Set the value of [dbs_tns] column.
*
* @param string $v new value
* @return void
*/
public function setDbsTns($v)
{
// Since the native PHP type for this column is string,
// we will cast the input to a string (if it is not).
if ($v !== null && !is_string($v)) {
$v = (string) $v;
}
if ($this->dbs_tns !== $v || $v === '') {
$this->dbs_tns = $v;
$this->modifiedColumns[] = DbSourcePeer::DBS_TNS;
}
} // setDbsTns()
/**
* Hydrates (populates) the object variables with values from the database resultset.
*
@@ -427,12 +505,16 @@ abstract class BaseDbSource extends BaseObject implements Persistent
$this->dbs_encode = $rs->getString($startcol + 8);
$this->dbs_connection_type = $rs->getString($startcol + 9);
$this->dbs_tns = $rs->getString($startcol + 10);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 9; // 9 = DbSourcePeer::NUM_COLUMNS - DbSourcePeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 11; // 11 = DbSourcePeer::NUM_COLUMNS - DbSourcePeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating DbSource object", $e);
@@ -663,6 +745,12 @@ abstract class BaseDbSource extends BaseObject implements Persistent
case 8:
return $this->getDbsEncode();
break;
case 9:
return $this->getDbsConnectionType();
break;
case 10:
return $this->getDbsTns();
break;
default:
return null;
break;
@@ -692,6 +780,8 @@ abstract class BaseDbSource extends BaseObject implements Persistent
$keys[6] => $this->getDbsPassword(),
$keys[7] => $this->getDbsPort(),
$keys[8] => $this->getDbsEncode(),
$keys[9] => $this->getDbsConnectionType(),
$keys[10] => $this->getDbsTns(),
);
return $result;
}
@@ -750,6 +840,12 @@ abstract class BaseDbSource extends BaseObject implements Persistent
case 8:
$this->setDbsEncode($value);
break;
case 9:
$this->setDbsConnectionType($value);
break;
case 10:
$this->setDbsTns($value);
break;
} // switch()
}
@@ -809,6 +905,14 @@ abstract class BaseDbSource extends BaseObject implements Persistent
$this->setDbsEncode($arr[$keys[8]]);
}
if (array_key_exists($keys[9], $arr)) {
$this->setDbsConnectionType($arr[$keys[9]]);
}
if (array_key_exists($keys[10], $arr)) {
$this->setDbsTns($arr[$keys[10]]);
}
}
/**
@@ -856,6 +960,14 @@ abstract class BaseDbSource extends BaseObject implements Persistent
$criteria->add(DbSourcePeer::DBS_ENCODE, $this->dbs_encode);
}
if ($this->isColumnModified(DbSourcePeer::DBS_CONNECTION_TYPE)) {
$criteria->add(DbSourcePeer::DBS_CONNECTION_TYPE, $this->dbs_connection_type);
}
if ($this->isColumnModified(DbSourcePeer::DBS_TNS)) {
$criteria->add(DbSourcePeer::DBS_TNS, $this->dbs_tns);
}
return $criteria;
}
@@ -936,6 +1048,10 @@ abstract class BaseDbSource extends BaseObject implements Persistent
$copyObj->setDbsEncode($this->dbs_encode);
$copyObj->setDbsConnectionType($this->dbs_connection_type);
$copyObj->setDbsTns($this->dbs_tns);
$copyObj->setNew(true);

28
workflow/engine/classes/model/om/BaseDbSourcePeer.php
View File

@@ -25,7 +25,7 @@ abstract class BaseDbSourcePeer
const CLASS_DEFAULT = 'classes.model.DbSource';
/** The total number of columns. */
const NUM_COLUMNS = 9;
const NUM_COLUMNS = 11;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -58,6 +58,12 @@ abstract class BaseDbSourcePeer
/** the column name for the DBS_ENCODE field */
const DBS_ENCODE = 'DB_SOURCE.DBS_ENCODE';
/** the column name for the DBS_CONNECTION_TYPE field */
const DBS_CONNECTION_TYPE = 'DB_SOURCE.DBS_CONNECTION_TYPE';
/** the column name for the DBS_TNS field */
const DBS_TNS = 'DB_SOURCE.DBS_TNS';
/** The PHP to DB Name Mapping */
private static $phpNameMap = null;
@@ -69,10 +75,10 @@ abstract class BaseDbSourcePeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('DbsUid', 'ProUid', 'DbsType', 'DbsServer', 'DbsDatabaseName', 'DbsUsername', 'DbsPassword', 'DbsPort', 'DbsEncode', ),
BasePeer::TYPE_COLNAME => array (DbSourcePeer::DBS_UID, DbSourcePeer::PRO_UID, DbSourcePeer::DBS_TYPE, DbSourcePeer::DBS_SERVER, DbSourcePeer::DBS_DATABASE_NAME, DbSourcePeer::DBS_USERNAME, DbSourcePeer::DBS_PASSWORD, DbSourcePeer::DBS_PORT, DbSourcePeer::DBS_ENCODE, ),
BasePeer::TYPE_FIELDNAME => array ('DBS_UID', 'PRO_UID', 'DBS_TYPE', 'DBS_SERVER', 'DBS_DATABASE_NAME', 'DBS_USERNAME', 'DBS_PASSWORD', 'DBS_PORT', 'DBS_ENCODE', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, )
BasePeer::TYPE_PHPNAME => array ('DbsUid', 'ProUid', 'DbsType', 'DbsServer', 'DbsDatabaseName', 'DbsUsername', 'DbsPassword', 'DbsPort', 'DbsEncode', 'DbsConnectionType', 'DbsTns', ),
BasePeer::TYPE_COLNAME => array (DbSourcePeer::DBS_UID, DbSourcePeer::PRO_UID, DbSourcePeer::DBS_TYPE, DbSourcePeer::DBS_SERVER, DbSourcePeer::DBS_DATABASE_NAME, DbSourcePeer::DBS_USERNAME, DbSourcePeer::DBS_PASSWORD, DbSourcePeer::DBS_PORT, DbSourcePeer::DBS_ENCODE, DbSourcePeer::DBS_CONNECTION_TYPE, DbSourcePeer::DBS_TNS, ),
BasePeer::TYPE_FIELDNAME => array ('DBS_UID', 'PRO_UID', 'DBS_TYPE', 'DBS_SERVER', 'DBS_DATABASE_NAME', 'DBS_USERNAME', 'DBS_PASSWORD', 'DBS_PORT', 'DBS_ENCODE', 'DBS_CONNECTION_TYPE', 'DBS_TNS', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, )
);
/**
@@ -82,10 +88,10 @@ abstract class BaseDbSourcePeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('DbsUid' => 0, 'ProUid' => 1, 'DbsType' => 2, 'DbsServer' => 3, 'DbsDatabaseName' => 4, 'DbsUsername' => 5, 'DbsPassword' => 6, 'DbsPort' => 7, 'DbsEncode' => 8, ),
BasePeer::TYPE_COLNAME => array (DbSourcePeer::DBS_UID => 0, DbSourcePeer::PRO_UID => 1, DbSourcePeer::DBS_TYPE => 2, DbSourcePeer::DBS_SERVER => 3, DbSourcePeer::DBS_DATABASE_NAME => 4, DbSourcePeer::DBS_USERNAME => 5, DbSourcePeer::DBS_PASSWORD => 6, DbSourcePeer::DBS_PORT => 7, DbSourcePeer::DBS_ENCODE => 8, ),
BasePeer::TYPE_FIELDNAME => array ('DBS_UID' => 0, 'PRO_UID' => 1, 'DBS_TYPE' => 2, 'DBS_SERVER' => 3, 'DBS_DATABASE_NAME' => 4, 'DBS_USERNAME' => 5, 'DBS_PASSWORD' => 6, 'DBS_PORT' => 7, 'DBS_ENCODE' => 8, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, )
BasePeer::TYPE_PHPNAME => array ('DbsUid' => 0, 'ProUid' => 1, 'DbsType' => 2, 'DbsServer' => 3, 'DbsDatabaseName' => 4, 'DbsUsername' => 5, 'DbsPassword' => 6, 'DbsPort' => 7, 'DbsEncode' => 8, 'DbsConnectionType' => 9, 'DbsTns' => 10, ),
BasePeer::TYPE_COLNAME => array (DbSourcePeer::DBS_UID => 0, DbSourcePeer::PRO_UID => 1, DbSourcePeer::DBS_TYPE => 2, DbSourcePeer::DBS_SERVER => 3, DbSourcePeer::DBS_DATABASE_NAME => 4, DbSourcePeer::DBS_USERNAME => 5, DbSourcePeer::DBS_PASSWORD => 6, DbSourcePeer::DBS_PORT => 7, DbSourcePeer::DBS_ENCODE => 8, DbSourcePeer::DBS_CONNECTION_TYPE => 9, DbSourcePeer::DBS_TNS => 10, ),
BasePeer::TYPE_FIELDNAME => array ('DBS_UID' => 0, 'PRO_UID' => 1, 'DBS_TYPE' => 2, 'DBS_SERVER' => 3, 'DBS_DATABASE_NAME' => 4, 'DBS_USERNAME' => 5, 'DBS_PASSWORD' => 6, 'DBS_PORT' => 7, 'DBS_ENCODE' => 8, 'DBS_CONNECTION_TYPE' => 9, 'DBS_TNS' => 10, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, )
);
/**
@@ -204,6 +210,10 @@ abstract class BaseDbSourcePeer
$criteria->addSelectColumn(DbSourcePeer::DBS_ENCODE);
$criteria->addSelectColumn(DbSourcePeer::DBS_CONNECTION_TYPE);
$criteria->addSelectColumn(DbSourcePeer::DBS_TNS);
}
const COUNT = 'COUNT(DB_SOURCE.DBS_UID)';