Solving conflicts

This commit is contained in:
Paula Quispe
2020-06-12 17:35:24 -04:00
57 changed files with 2311 additions and 592 deletions

View File

@@ -437,18 +437,6 @@ class ActionsByEmailCoreClass extends PMPlugin
return $emailSetup;
}
/**
* Define the properties in the task related the action by email configuration
*
* @return void
*/
private function defineTaskAbeProperties()
{
$actionEmailTable = new AbeConfiguration();
$properties = $actionEmailTable->getTaskConfiguration($this->getCasePropertiesKey('PRO_UID'), $this->getTask());
$this->setTaskAbeProperties($properties);
}
/**
* Define the email from
*
@@ -623,79 +611,94 @@ class ActionsByEmailCoreClass extends PMPlugin
self::validateAndSetValues($data);
$emailServerSetup = $this->getEmailServer($dataAbe['ABE_EMAIL_SERVER_UID']);
if (!empty($emailServerSetup)) {
$cases = new Cases();
$caseFields = $cases->loadCase($this->getAppUid(), $this->getIndex());
$this->setCaseProperties($caseFields);
$this->defineTaskAbeProperties();
$caseFields['APP_DATA']['PRO_ID'] = $this->getItemAbeProperties('PRO_ID');
$caseFields['APP_DATA']['TAS_ID'] = $this->getItemAbeProperties('TAS_ID');
if (!empty($this->getTaskAbeProperties())) {
$this->defineEmailTo($this->getItemAbeProperties('ABE_EMAIL_FIELD'), $caseFields['APP_DATA']);
if (!empty($this->getEmailTo())) {
$this->defineSubject($this->getItemAbeProperties('ABE_SUBJECT_FIELD'), $caseFields['APP_DATA']);
$request = [
'ABE_REQ_UID' => '',
'ABE_UID' => $this->getItemAbeProperties('ABE_UID'),
'APP_UID' => $this->getAppUid(),
'DEL_INDEX' => $this->getIndex(),
'ABE_REQ_SENT_TO' => $this->getEmailTo(),
'ABE_REQ_SUBJECT' => $this->getSubject(),
'ABE_REQ_BODY' => '',
'ABE_REQ_ANSWERED' => 0,
'ABE_REQ_STATUS' => 'PENDING'
];
$this->setAbeRequest($request);
$this->registerRequest();
if (!empty($this->getItemAbeProperties('ABE_TYPE'))) {
// Email
$_SESSION['CURRENT_DYN_UID'] = $this->getItemAbeProperties('DYN_UID');
$__ABE__ = '';
switch ($this->getItemAbeProperties('ABE_TYPE')) {
case 'CUSTOM':
$__ABE__ .= $this->getCustomTemplate();
break;
case 'RESPONSE':
$this->defineReplyTo($dataAbe['ABE_EMAIL_SERVER_RECEIVER_UID']);
$__ABE__ .= $this->getResponseTemplate();
break;
case 'LINK':
$__ABE__ .= $this->getServicePathTemplate();
break;
case 'FIELD':
$__ABE__ .= $this->getFieldTemplate();
break;
}
$__ABE__ = preg_replace('/\<img src=\"\/js\/maborak\/core\/images\/(.+?)\>/', '', $__ABE__);
$__ABE__ = preg_replace('/\<input\b[^>]*\/>/', '', $__ABE__);
$__ABE__ = preg_replace('/<select\b[^>]*>(.*?)<\/select>/is', "", $__ABE__);
$__ABE__ = preg_replace('/align=\"center\"/', '', $__ABE__);
$__ABE__ = preg_replace('/class="tableGrid_view" /', 'class="tableGrid_view" width="100%" ',
$__ABE__);
$caseFields['APP_DATA']['__ABE__'] = $__ABE__;
$this->defineEmailFrom($emailServerSetup);
$result = $this->abeSendMessage(
$this->getItemAbeProperties('ABE_TEMPLATE'),
$caseFields['APP_DATA'],
$emailServerSetup
);
$request = [];
$request['ABE_REQ_STATUS'] = ($result->status_code == 0 ? 'SENT' : 'ERROR');
$request['ABE_REQ_BODY'] = empty($result->getAppMessUid()) ? '' : AppMessage::getAppMsgBodyByKey($result->getAppMessUid());
$this->addItemAbeRequest($request);
$this->registerRequest();
}
}
} else {
throw new Exception('Task does not have an action by email configuration.');
}
if (empty($emailServerSetup)) {
return;
}
$cases = new Cases();
$caseFields = $cases->loadCase($this->getAppUid(), $this->getIndex());
$this->setCaseProperties($caseFields);
$actionEmailTable = new AbeConfiguration();
$properties = $actionEmailTable->getTaskConfiguration($this->getCasePropertiesKey('PRO_UID'), $this->getTask());
if (empty($properties)) {
throw new Exception('Task does not have an action by email configuration.');
}
$this->setTaskAbeProperties($properties);
$caseFields['APP_DATA']['PRO_ID'] = $this->getItemAbeProperties('PRO_ID');
$caseFields['APP_DATA']['TAS_ID'] = $this->getItemAbeProperties('TAS_ID');
$this->defineEmailTo($this->getItemAbeProperties('ABE_EMAIL_FIELD'), $caseFields['APP_DATA']);
if (empty($this->getEmailTo())) {
return;
}
$this->defineSubject($this->getItemAbeProperties('ABE_SUBJECT_FIELD'), $caseFields['APP_DATA']);
$request = [
'ABE_REQ_UID' => '',
'ABE_UID' => $this->getItemAbeProperties('ABE_UID'),
'APP_UID' => $this->getAppUid(),
'DEL_INDEX' => $this->getIndex(),
'ABE_REQ_SENT_TO' => $this->getEmailTo(),
'ABE_REQ_SUBJECT' => $this->getSubject(),
'ABE_REQ_BODY' => '',
'ABE_REQ_ANSWERED' => 0,
'ABE_REQ_STATUS' => 'PENDING'
];
$this->setAbeRequest($request);
$this->registerRequest();
if (empty($this->getItemAbeProperties('ABE_TYPE'))) {
return;
}
// Email
$_SESSION['CURRENT_DYN_UID'] = $this->getItemAbeProperties('DYN_UID');
$__ABE__ = '';
switch ($this->getItemAbeProperties('ABE_TYPE')) {
case 'CUSTOM':
$__ABE__ .= $this->getCustomTemplate();
break;
case 'RESPONSE':
$this->defineReplyTo($dataAbe['ABE_EMAIL_SERVER_RECEIVER_UID']);
$__ABE__ .= $this->getResponseTemplate();
break;
case 'LINK':
$__ABE__ .= $this->getServicePathTemplate();
break;
case 'FIELD':
$__ABE__ .= $this->getFieldTemplate();
break;
}
$__ABE__ = preg_replace('/\<img src=\"\/js\/maborak\/core\/images\/(.+?)\>/', '', $__ABE__);
$__ABE__ = preg_replace('/\<input\b[^>]*\/>/', '', $__ABE__);
$__ABE__ = preg_replace('/<select\b[^>]*>(.*?)<\/select>/is', "", $__ABE__);
$__ABE__ = preg_replace('/align=\"center\"/', '', $__ABE__);
$__ABE__ = preg_replace('/class="tableGrid_view" /', 'class="tableGrid_view" width="100%" ', $__ABE__);
$caseFields['APP_DATA']['__ABE__'] = $__ABE__;
$this->defineEmailFrom($emailServerSetup);
$params = [
$this->getItemAbeProperties('ABE_TEMPLATE'),
$caseFields['APP_DATA'],
$emailServerSetup
];
$result = $this->abeSendMessage(...$params);
$request = [
'ABE_REQ_STATUS' => $result->status_code == 0 ? 'SENT' : 'ERROR',
'ABE_REQ_BODY' => '',
];
if (!empty($result->getExtraParam('AppMessUid'))) {
$request['ABE_REQ_BODY'] = AppMessage::getAppMsgBodyByKey($result->getExtraParam('AppMessUid'));
}
$this->addItemAbeRequest($request);
$this->registerRequest();
} catch (Exception $error) {
throw $error;
}

View File

@@ -206,6 +206,7 @@ class DbConnections
});
foreach ($externalDbs as $externalDb) {
$conf['datasources'][$externalDb->DBS_UID] = [];
$laravelConfig = [];
$flagTns = ($externalDb->DBS_TYPE == "oracle" && $externalDb->DBS_CONNECTION_TYPE == "TNS")? 1 : 0;
// Build the appropriate items to add to our Propel configuration
// Let's grab the decrypted password
@@ -235,12 +236,26 @@ class DbConnections
. $externalDb->DBS_USERNAME . ':' . $passw . '@' . $externalDb->DBS_SERVER . $dbsPort . '/'
. $externalDb->DBS_DATABASE_NAME . $encoding;
}
$laravelConfig = [
'driver' => $externalDb->DBS_TYPE === 'mssql' ? 'sqlsrv' : $externalDb->DBS_TYPE, // MSSQL driver is not supported anymore, only SQLSRV
'host' => $externalDb->DBS_SERVER,
'port' => $externalDb->DBS_PORT == '' ? null : $externalDb->DBS_PORT,
'database' => $externalDb->DBS_DATABASE_NAME,
'username' => $externalDb->DBS_USERNAME,
'password' => $passw,
'charset' => trim($externalDb->DBS_ENCODE) == '' ? null : trim($externalDb->DBS_ENCODE),
'options' => [PDO::ATTR_STRINGIFY_FETCHES => true] // For keep the old behaviour, all values are transformed to strings
];
} else {
// Is oracle and TNS, let's provide a TNS based DSN
$conf["datasources"][$externalDb->DBS_UID]["connection"] = $externalDb->DBS_TYPE . "://"
. $externalDb->DBS_USERNAME . ":" . $passw . "@" . $externalDb->DBS_TNS;
}
$conf['datasources'][$externalDb->DBS_UID]['adapter'] = $externalDb->DBS_TYPE;
// Load the config for the external database into laravel
config([
'database.connections.' . $externalDb->DBS_UID => $laravelConfig
]);
}
Propel::initConfiguration($conf);
$lastProcessId = $_SESSION['PROCESS'];

View File

@@ -1741,8 +1741,7 @@ class PmDynaform
return false;
}
foreach ($result as $row) {
$dynaform = new PmDynaform(["CURRENT_DYNAFORM" => $row->DYN_UID]);
$json = G::json_decode($dynaform->record["DYN_CONTENT"]);
$json = G::json_decode($row->DYN_CONTENT);
if ($this->jsoni($json, $variable)) {
return $row->DYN_UID;
}

View File

@@ -1,6 +1,7 @@
<?php
use ProcessMaker\BusinessModel\EmailEvent;
use ProcessMaker\BusinessModel\Variable as BmVariable;
use ProcessMaker\Core\System;
class Processes
@@ -1863,8 +1864,21 @@ class Processes
$criteria = new Criteria(ProcessVariablesPeer::DATABASE_NAME);
$criteria->add(ProcessVariablesPeer::VAR_UID, $row['VAR_UID']);
$criteria->add(ProcessVariablesPeer::PRJ_UID, $row['PRJ_UID']);
// Load the PRO_ID
$process = new Process();
if ($process->processExists($row['PRJ_UID'])) {
$processRow = $process->load($row['PRJ_UID']);
$row['PRO_ID'] = $processRow['PRO_ID'];
if (!empty($row['PRO_ID'])) {
$criteria->add(ProcessVariablesPeer::PRO_ID, $row['PRO_ID']);
}
}
$criteria->add(ProcessVariablesPeer::VAR_NAME, $row['VAR_NAME']);
$criteria->add(ProcessVariablesPeer::VAR_FIELD_TYPE, $row['VAR_FIELD_TYPE']);
if (empty($row['VAR_FIELD_TYPE_ID'])) {
$row['VAR_FIELD_TYPE_ID'] = BmVariable::$varTypesValues[$row["VAR_FIELD_TYPE"]];
}
$criteria->add(ProcessVariablesPeer::VAR_FIELD_TYPE_ID, $row['VAR_FIELD_TYPE_ID']);
$criteria->add(ProcessVariablesPeer::VAR_FIELD_SIZE, $row['VAR_FIELD_SIZE']);
$criteria->add(ProcessVariablesPeer::VAR_LABEL, $row['VAR_LABEL']);
$criteria->add(ProcessVariablesPeer::VAR_DBCONNECTION, $row['VAR_DBCONNECTION']);
@@ -3609,6 +3623,8 @@ class Processes
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
while ($aRow = $oDataset->getRow()) {
unset($aRow['VAR_ID']);
unset($aRow['PRO_ID']);
$aVars[] = $aRow;
$oDataset->next();
}

View File

@@ -4260,6 +4260,57 @@ class WorkspaceTools
$con->commit();
CLI::logging("-> Populating APP_ASSIGN_SELF_SERVICE_VALUE.TAS_ID Done \n");
// Populating PROCESS_VARIABLES.PRO_ID
CLI::logging("-> Populating PROCESS_VARIABLES.PRO_ID \n");
$con->begin();
$stmt = $con->createStatement();
$rs = $stmt->executeQuery("UPDATE PROCESS_VARIABLES AS PV
INNER JOIN (
SELECT PROCESS.PRO_UID, PROCESS.PRO_ID
FROM PROCESS
) AS PRO
ON (PV.PRJ_UID = PRO.PRO_UID)
SET PV.PRO_ID = PRO.PRO_ID
WHERE PV.PRO_ID = 0");
$con->commit();
CLI::logging("-> Populating PROCESS_VARIABLES.PRO_ID Done \n");
// Populating PROCESS_VARIABLES.VAR_FIELD_TYPE_ID
CLI::logging("-> Populating PROCESS_VARIABLES.VAR_FIELD_TYPE_ID \n");
$con->begin();
$stmt = $con->createStatement();
$rs = $stmt->executeQuery("UPDATE PROCESS_VARIABLES
SET VAR_FIELD_TYPE_ID = (case
when VAR_FIELD_TYPE = 'string' then 1
when VAR_FIELD_TYPE = 'integer' then 2
when VAR_FIELD_TYPE = 'float' then 3
when VAR_FIELD_TYPE = 'boolean' then 4
when VAR_FIELD_TYPE = 'datetime' then 5
when VAR_FIELD_TYPE = 'grid' then 6
when VAR_FIELD_TYPE = 'array' then 7
when VAR_FIELD_TYPE = 'file' then 8
when VAR_FIELD_TYPE = 'multiplefile' then 9
when VAR_FIELD_TYPE = 'object' then 10
end)
WHERE VAR_FIELD_TYPE_ID = 0");
$con->commit();
CLI::logging("-> Populating PROCESS_VARIABLES.VAR_FIELD_TYPE_ID Done \n");
// Populating DB_SOURCE.PRO_ID
CLI::logging("-> Populating DB_SOURCE.PRO_ID \n");
$con->begin();
$stmt = $con->createStatement();
$rs = $stmt->executeQuery("UPDATE DB_SOURCE AS DS
INNER JOIN (
SELECT PROCESS.PRO_UID, PROCESS.PRO_ID
FROM PROCESS
) AS PRO
ON (DS.PRO_UID = PRO.PRO_UID)
SET DS.PRO_ID = PRO.PRO_ID
WHERE DS.PRO_ID = 0");
$con->commit();
CLI::logging("-> Populating DB_SOURCE.PRO_ID Done \n");
//Complete all migrations
CLI::logging("-> Migrating And Populating Indexing for avoiding the use of table APP_CACHE_VIEW Done \n");
}

View File

@@ -9,7 +9,6 @@ use ProcessMaker\ChangeLog\ChangeLog;
use ProcessMaker\Core\JobsManager;
use ProcessMaker\Core\System;
use ProcessMaker\Model\Delegation;
use ProcessMaker\Util\WsMessageResponse;
class WsBase
{
@@ -911,6 +910,7 @@ class WsBase
)
{
try {
$setup = [];
/*----------------------------------********---------------------------------*/
if (!empty($config)) {
@@ -973,9 +973,7 @@ class WsBase
if (!file_exists($fileTemplate)) {
$data['FILE_TEMPLATE'] = $fileTemplate;
$result = new WsResponse(28, G::LoadTranslation('ID_TEMPLATE_FILE_NOT_EXIST', SYS_LANG, $data));
return $result;
return new WsResponse(28, G::LoadTranslation('ID_TEMPLATE_FILE_NOT_EXIST', SYS_LANG, $data));
}
if ($appFields == null) {
@@ -1003,45 +1001,46 @@ class WsBase
(preg_match("/^.+\.html?$/i", $fileTemplate)) ? true : false,
isset($fieldsCase['APP_NUMBER']) ? $fieldsCase['APP_NUMBER'] : 0,
isset($fieldsCase['PRO_ID']) ? $fieldsCase['PRO_ID'] : 0,
$this->getTaskId() ?$this->getTaskId():(isset($oldFields['TAS_ID'])? $oldFields['TAS_ID'] : 0)
$this->getTaskId() ? $this->getTaskId() : (isset($oldFields['TAS_ID']) ? $oldFields['TAS_ID'] : 0)
);
$result = "";
if ($gmail != 1) {
// Create always the record in APP_MESSAGE table
if ($gmail === 1) {
return new WsResponse(0, G::loadTranslation('ID_PMGMAIL'));
}
// Create always the record in APP_MESSAGE table
$spool = new SpoolRun();
$spool->setConfig($setup);
$spool->create($messageArray);
// Get the data of the record created
$fileData = $spool->getFileData();
$fileData['spoolId'] = $spool->getSpoolId();
// Create the closure and send the required data
$closure = function() use ($setup, $fileData, $gmail, $to) {
$spool = new SpoolRun();
$spool->setConfig($setup);
$spool->create($messageArray);
// Get the data of the record created
$fileData = $spool->getFileData();
$fileData['spoolId'] = $spool->getSpoolId();
// Create the closure and send the required data
$closure = function() use ($setup, $fileData, $gmail, $to) {
$spool = new SpoolRun();
$spool->setConfig($setup);
$spool->setSpoolId($fileData['spoolId']);
$spool->setFileData($fileData);
$spool->sendMail();
return $spool;
};
$result = new WsMessageResponse(0, G::loadTranslation('ID_MESSAGE_SENT') . ": " . $to);
switch ($appMsgType) {
case WsBase::MESSAGE_TYPE_EMAIL_EVENT:
case WsBase::MESSAGE_TYPE_PM_FUNCTION:
JobsManager::getSingleton()->dispatch(EmailEvent::class, $closure);
break;
default :
$spool = $closure();
if ($spool->status == 'sent') {
$result = new WsMessageResponse(0, G::loadTranslation('ID_MESSAGE_SENT') . ": " . $to);
$result->setAppMessUid($spool->getSpoolId());
} else {
$result = new WsResponse(29, $spool->status . ' ' . $spool->error . PHP_EOL . print_r($setup, 1));
}
break;
}
$spool->setSpoolId($fileData['spoolId']);
$spool->setFileData($fileData);
$spool->sendMail();
return $spool;
};
switch ($appMsgType) {
case WsBase::MESSAGE_TYPE_EMAIL_EVENT:
case WsBase::MESSAGE_TYPE_PM_FUNCTION:
JobsManager::getSingleton()->dispatch(EmailEvent::class, $closure);
$result = new WsResponse(0, G::loadTranslation('ID_MESSAGE_SENT') . ": " . $to);
break;
default :
$spool = $closure();
if ($spool->status == 'sent') {
$result = new WsResponse(0, G::loadTranslation('ID_MESSAGE_SENT') . ": " . $to);
$result->addExtraParam('AppMessUid', $spool->getSpoolId());
} else {
$result = new WsResponse(29, $spool->status . ' ' . $spool->error . PHP_EOL . print_r($setup, 1));
}
break;
}
return $result;
} catch (Exception $e) {

View File

@@ -43,10 +43,11 @@ class WsResponse
* 36 ID_CASE_COULD_NOT_REASSIGNED
*
* 100 Exception
*/
*/
public $status_code = 0;
public $message = '';
public $timestamp = '';
private $extraParams = [];
/**
* Function __construct
@@ -56,11 +57,31 @@ class WsResponse
* @param string $message
* @return void
*/
function __construct ($status, $message)
public function __construct($status, $message)
{
$this->status_code = $status;
$this->message = $message;
$this->timestamp = date( 'Y-m-d H:i:s' );
$this->timestamp = date('Y-m-d H:i:s');
}
/**
* Get extra parameters for message response.
* @return mixed
*/
public function getExtraParam(string $name)
{
return isset($this->extraParams[$name]) ? $this->extraParams[$name] : '';
}
/**
* Add extra parameters for message response.
* @param string $name
* @param mixed $value
* @return void
*/
public function addExtraParam(string $name, $value): void
{
$this->extraParams[$name] = $value;
}
/**
@@ -69,13 +90,12 @@ class WsResponse
* @param string $operation
* @return string
*/
function getPayloadString ($operation)
public function getPayloadString($operation)
{
$res = "<$operation>\n";
$res .= "<status_code>" . $this->status_code . "</status_code>";
$res .= "<message>" . $this->message . "</message>";
$res .= "<timestamp>" . $this->timestamp . "</timestamp>";
// $res .= "<array>" . $this->timestamp . "</array>";
$res .= "<$operation>";
return $res;
}
@@ -85,9 +105,8 @@ class WsResponse
*
* @return array
*/
function getPayloadArray ()
public function getPayloadArray()
{
return array ("status_code" => $this->status_code,'message' => $this->message,'timestamp' => $this->timestamp
);
return ["status_code" => $this->status_code, 'message' => $this->message, 'timestamp' => $this->timestamp];
}
}

View File

@@ -32,6 +32,7 @@ use ProcessMaker\BusinessModel\Cases as BusinessModelCases;
use ProcessMaker\Core\System;
use ProcessMaker\Plugins\PluginRegistry;
use ProcessMaker\Util\ElementTranslation;
use Illuminate\Support\Facades\DB;
/**
* ProcessMaker has made a number of its PHP functions available be used in triggers and conditions.
@@ -243,8 +244,22 @@ function executeQuery ($SqlStatement, $DBConnectionUID = 'workflow', $aParameter
{
$sysSys = (!empty(config("system.workspace")))? config("system.workspace") : "Undefined";
$aContext = \Bootstrap::getDefaultContextLog();
$con = Propel::getConnection( $DBConnectionUID );
$con->begin();
// This means the DBConnectionUID is not loaded yet, so we'll force DbConnections::loadAdditionalConnections
if (is_null(config('database.connections.' . $DBConnectionUID . '.driver'))) {
// Force to load the external connections
DbConnections::loadAdditionalConnections();
if (config('database.connections.' . $DBConnectionUID . '.driver') !== 'oracle') {
// If the connections drivers are "mysql", "pgsql" or "sqlsrv" we're using Laravel
$con = DB::connection($DBConnectionUID);
$con->beginTransaction();
} else {
// If the connection driver is "oracle" we're using the native oci8 functions
$con = Propel::getConnection($DBConnectionUID);
$con->begin();
}
}
$blackList = System::getQueryBlackList();
$listQueries = explode('|', isset($blackList['queries']) ? $blackList['queries'] : '');
$aListAllTables = explode(
@@ -299,36 +314,34 @@ function executeQuery ($SqlStatement, $DBConnectionUID = 'workflow', $aParameter
$statement = str_replace( '(', '', $statement );
$result = false;
if (getEngineDataBaseName( $con ) != 'oracle') {
// Check to see if we're not running oracle, which is usually a safe default
if (config('database.connections.' . $DBConnectionUID . '.driver') != 'oracle') {
switch (true) {
case preg_match( "/^(SELECT|EXECUTE|EXEC|SHOW|DESCRIBE|EXPLAIN|BEGIN)\s/i", $statement ):
$rs = $con->executeQuery( $SqlStatement );
$result = Array ();
$i = 1;
while ($rs->next()) {
$result[$i ++] = $rs->getRow();
}
$rs->close();
$result = $con->select( $SqlStatement );
// Convert to 1 index key array of array results
$result = collect($result)->map(function($x) { return (array)$x; })->toArray();
array_unshift($result, []);
unset($result[0]);
$con->commit();
break;
case preg_match( "/^INSERT\s/i", $statement ):
$rs = $con->executeUpdate( $SqlStatement );
$result = $con->getUpdateCount();
$result = $con->insert( $SqlStatement );
$con->commit();
break;
case preg_match( "/^REPLACE\s/i", $statement ):
$rs = $con->executeUpdate( $SqlStatement );
$result = $con->getUpdateCount();
$result = $con->update( $SqlStatement );
$con->commit();
break;
case preg_match( "/^UPDATE\s/i", $statement ):
$rs = $con->executeUpdate( $SqlStatement );
$result = $con->getUpdateCount();
$result = $con->update( $SqlStatement );
$con->commit();
break;
case preg_match( "/^DELETE\s/i", $statement ):
$rs = $con->executeUpdate( $SqlStatement );
$result = $con->getUpdateCount();
$result = $con->delete( $SqlStatement );
$con->commit();
break;
}
@@ -947,9 +960,8 @@ function PMFSendMessage(
$delIndex = 0,
$config = []
) {
ini_set ( "pcre.backtrack_limit", 1000000 );
ini_set ( 'memory_limit', '-1' );
@set_time_limit ( 100000 );
ini_set("pcre.backtrack_limit", 1000000);
@set_time_limit(100000);
global $oPMScript;

View File

@@ -63,12 +63,16 @@ class DbSourceMapBuilder
$tMap = $this->dbMap->addTable('DB_SOURCE');
$tMap->setPhpName('DbSource');
$tMap->setUseIdGenerator(false);
$tMap->setUseIdGenerator(true);
$tMap->addColumn('DBS_ID', 'DbsId', 'int', CreoleTypes::INTEGER, true, null);
$tMap->addPrimaryKey('DBS_UID', 'DbsUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addPrimaryKey('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('PRO_ID', 'ProId', 'int', CreoleTypes::INTEGER, false, null);
$tMap->addColumn('DBS_TYPE', 'DbsType', 'string', CreoleTypes::VARCHAR, true, 8);
$tMap->addColumn('DBS_SERVER', 'DbsServer', 'string', CreoleTypes::VARCHAR, true, 100);

View File

@@ -63,16 +63,22 @@ class ProcessVariablesMapBuilder
$tMap = $this->dbMap->addTable('PROCESS_VARIABLES');
$tMap->setPhpName('ProcessVariables');
$tMap->setUseIdGenerator(false);
$tMap->setUseIdGenerator(true);
$tMap->addColumn('VAR_ID', 'VarId', 'int', CreoleTypes::INTEGER, true, null);
$tMap->addPrimaryKey('VAR_UID', 'VarUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('PRJ_UID', 'PrjUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('PRO_ID', 'ProId', 'int', CreoleTypes::INTEGER, false, null);
$tMap->addColumn('VAR_NAME', 'VarName', 'string', CreoleTypes::VARCHAR, false, 255);
$tMap->addColumn('VAR_FIELD_TYPE', 'VarFieldType', 'string', CreoleTypes::VARCHAR, false, 32);
$tMap->addColumn('VAR_FIELD_TYPE_ID', 'VarFieldTypeId', 'int', CreoleTypes::INTEGER, false, null);
$tMap->addColumn('VAR_FIELD_SIZE', 'VarFieldSize', 'int', CreoleTypes::INTEGER, false, null);
$tMap->addColumn('VAR_LABEL', 'VarLabel', 'string', CreoleTypes::VARCHAR, false, 255);

View File

@@ -27,6 +27,12 @@ abstract class BaseDbSource extends BaseObject implements Persistent
*/
protected static $peer;
/**
* The value for the dbs_id field.
* @var int
*/
protected $dbs_id;
/**
* The value for the dbs_uid field.
* @var string
@@ -39,6 +45,12 @@ abstract class BaseDbSource extends BaseObject implements Persistent
*/
protected $pro_uid = '0';
/**
* The value for the pro_id field.
* @var int
*/
protected $pro_id = 0;
/**
* The value for the dbs_type field.
* @var string
@@ -107,6 +119,17 @@ abstract class BaseDbSource extends BaseObject implements Persistent
*/
protected $alreadyInValidation = false;
/**
* Get the [dbs_id] column value.
*
* @return int
*/
public function getDbsId()
{
return $this->dbs_id;
}
/**
* Get the [dbs_uid] column value.
*
@@ -129,6 +152,17 @@ abstract class BaseDbSource extends BaseObject implements Persistent
return $this->pro_uid;
}
/**
* Get the [pro_id] column value.
*
* @return int
*/
public function getProId()
{
return $this->pro_id;
}
/**
* Get the [dbs_type] column value.
*
@@ -228,6 +262,28 @@ abstract class BaseDbSource extends BaseObject implements Persistent
return $this->dbs_tns;
}
/**
* Set the value of [dbs_id] column.
*
* @param int $v new value
* @return void
*/
public function setDbsId($v)
{
// Since the native PHP type for this column is integer,
// we will cast the input value to an int (if it is not).
if ($v !== null && !is_int($v) && is_numeric($v)) {
$v = (int) $v;
}
if ($this->dbs_id !== $v) {
$this->dbs_id = $v;
$this->modifiedColumns[] = DbSourcePeer::DBS_ID;
}
} // setDbsId()
/**
* Set the value of [dbs_uid] column.
*
@@ -272,6 +328,28 @@ abstract class BaseDbSource extends BaseObject implements Persistent
} // setProUid()
/**
* Set the value of [pro_id] column.
*
* @param int $v new value
* @return void
*/
public function setProId($v)
{
// Since the native PHP type for this column is integer,
// we will cast the input value to an int (if it is not).
if ($v !== null && !is_int($v) && is_numeric($v)) {
$v = (int) $v;
}
if ($this->pro_id !== $v || $v === 0) {
$this->pro_id = $v;
$this->modifiedColumns[] = DbSourcePeer::PRO_ID;
}
} // setProId()
/**
* Set the value of [dbs_type] column.
*
@@ -487,34 +565,38 @@ abstract class BaseDbSource extends BaseObject implements Persistent
{
try {
$this->dbs_uid = $rs->getString($startcol + 0);
$this->dbs_id = $rs->getInt($startcol + 0);
$this->pro_uid = $rs->getString($startcol + 1);
$this->dbs_uid = $rs->getString($startcol + 1);
$this->dbs_type = $rs->getString($startcol + 2);
$this->pro_uid = $rs->getString($startcol + 2);
$this->dbs_server = $rs->getString($startcol + 3);
$this->pro_id = $rs->getInt($startcol + 3);
$this->dbs_database_name = $rs->getString($startcol + 4);
$this->dbs_type = $rs->getString($startcol + 4);
$this->dbs_username = $rs->getString($startcol + 5);
$this->dbs_server = $rs->getString($startcol + 5);
$this->dbs_password = $rs->getString($startcol + 6);
$this->dbs_database_name = $rs->getString($startcol + 6);
$this->dbs_port = $rs->getInt($startcol + 7);
$this->dbs_username = $rs->getString($startcol + 7);
$this->dbs_encode = $rs->getString($startcol + 8);
$this->dbs_password = $rs->getString($startcol + 8);
$this->dbs_connection_type = $rs->getString($startcol + 9);
$this->dbs_port = $rs->getInt($startcol + 9);
$this->dbs_tns = $rs->getString($startcol + 10);
$this->dbs_encode = $rs->getString($startcol + 10);
$this->dbs_connection_type = $rs->getString($startcol + 11);
$this->dbs_tns = $rs->getString($startcol + 12);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 11; // 11 = DbSourcePeer::NUM_COLUMNS - DbSourcePeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 13; // 13 = DbSourcePeer::NUM_COLUMNS - DbSourcePeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating DbSource object", $e);
@@ -719,36 +801,42 @@ abstract class BaseDbSource extends BaseObject implements Persistent
{
switch($pos) {
case 0:
return $this->getDbsUid();
return $this->getDbsId();
break;
case 1:
return $this->getProUid();
return $this->getDbsUid();
break;
case 2:
return $this->getDbsType();
return $this->getProUid();
break;
case 3:
return $this->getDbsServer();
return $this->getProId();
break;
case 4:
return $this->getDbsDatabaseName();
return $this->getDbsType();
break;
case 5:
return $this->getDbsUsername();
return $this->getDbsServer();
break;
case 6:
return $this->getDbsPassword();
return $this->getDbsDatabaseName();
break;
case 7:
return $this->getDbsPort();
return $this->getDbsUsername();
break;
case 8:
return $this->getDbsEncode();
return $this->getDbsPassword();
break;
case 9:
return $this->getDbsConnectionType();
return $this->getDbsPort();
break;
case 10:
return $this->getDbsEncode();
break;
case 11:
return $this->getDbsConnectionType();
break;
case 12:
return $this->getDbsTns();
break;
default:
@@ -771,17 +859,19 @@ abstract class BaseDbSource extends BaseObject implements Persistent
{
$keys = DbSourcePeer::getFieldNames($keyType);
$result = array(
$keys[0] => $this->getDbsUid(),
$keys[1] => $this->getProUid(),
$keys[2] => $this->getDbsType(),
$keys[3] => $this->getDbsServer(),
$keys[4] => $this->getDbsDatabaseName(),
$keys[5] => $this->getDbsUsername(),
$keys[6] => $this->getDbsPassword(),
$keys[7] => $this->getDbsPort(),
$keys[8] => $this->getDbsEncode(),
$keys[9] => $this->getDbsConnectionType(),
$keys[10] => $this->getDbsTns(),
$keys[0] => $this->getDbsId(),
$keys[1] => $this->getDbsUid(),
$keys[2] => $this->getProUid(),
$keys[3] => $this->getProId(),
$keys[4] => $this->getDbsType(),
$keys[5] => $this->getDbsServer(),
$keys[6] => $this->getDbsDatabaseName(),
$keys[7] => $this->getDbsUsername(),
$keys[8] => $this->getDbsPassword(),
$keys[9] => $this->getDbsPort(),
$keys[10] => $this->getDbsEncode(),
$keys[11] => $this->getDbsConnectionType(),
$keys[12] => $this->getDbsTns(),
);
return $result;
}
@@ -814,36 +904,42 @@ abstract class BaseDbSource extends BaseObject implements Persistent
{
switch($pos) {
case 0:
$this->setDbsUid($value);
$this->setDbsId($value);
break;
case 1:
$this->setProUid($value);
$this->setDbsUid($value);
break;
case 2:
$this->setDbsType($value);
$this->setProUid($value);
break;
case 3:
$this->setDbsServer($value);
$this->setProId($value);
break;
case 4:
$this->setDbsDatabaseName($value);
$this->setDbsType($value);
break;
case 5:
$this->setDbsUsername($value);
$this->setDbsServer($value);
break;
case 6:
$this->setDbsPassword($value);
$this->setDbsDatabaseName($value);
break;
case 7:
$this->setDbsPort($value);
$this->setDbsUsername($value);
break;
case 8:
$this->setDbsEncode($value);
$this->setDbsPassword($value);
break;
case 9:
$this->setDbsConnectionType($value);
$this->setDbsPort($value);
break;
case 10:
$this->setDbsEncode($value);
break;
case 11:
$this->setDbsConnectionType($value);
break;
case 12:
$this->setDbsTns($value);
break;
} // switch()
@@ -870,47 +966,55 @@ abstract class BaseDbSource extends BaseObject implements Persistent
$keys = DbSourcePeer::getFieldNames($keyType);
if (array_key_exists($keys[0], $arr)) {
$this->setDbsUid($arr[$keys[0]]);
$this->setDbsId($arr[$keys[0]]);
}
if (array_key_exists($keys[1], $arr)) {
$this->setProUid($arr[$keys[1]]);
$this->setDbsUid($arr[$keys[1]]);
}
if (array_key_exists($keys[2], $arr)) {
$this->setDbsType($arr[$keys[2]]);
$this->setProUid($arr[$keys[2]]);
}
if (array_key_exists($keys[3], $arr)) {
$this->setDbsServer($arr[$keys[3]]);
$this->setProId($arr[$keys[3]]);
}
if (array_key_exists($keys[4], $arr)) {
$this->setDbsDatabaseName($arr[$keys[4]]);
$this->setDbsType($arr[$keys[4]]);
}
if (array_key_exists($keys[5], $arr)) {
$this->setDbsUsername($arr[$keys[5]]);
$this->setDbsServer($arr[$keys[5]]);
}
if (array_key_exists($keys[6], $arr)) {
$this->setDbsPassword($arr[$keys[6]]);
$this->setDbsDatabaseName($arr[$keys[6]]);
}
if (array_key_exists($keys[7], $arr)) {
$this->setDbsPort($arr[$keys[7]]);
$this->setDbsUsername($arr[$keys[7]]);
}
if (array_key_exists($keys[8], $arr)) {
$this->setDbsEncode($arr[$keys[8]]);
$this->setDbsPassword($arr[$keys[8]]);
}
if (array_key_exists($keys[9], $arr)) {
$this->setDbsConnectionType($arr[$keys[9]]);
$this->setDbsPort($arr[$keys[9]]);
}
if (array_key_exists($keys[10], $arr)) {
$this->setDbsTns($arr[$keys[10]]);
$this->setDbsEncode($arr[$keys[10]]);
}
if (array_key_exists($keys[11], $arr)) {
$this->setDbsConnectionType($arr[$keys[11]]);
}
if (array_key_exists($keys[12], $arr)) {
$this->setDbsTns($arr[$keys[12]]);
}
}
@@ -924,6 +1028,10 @@ abstract class BaseDbSource extends BaseObject implements Persistent
{
$criteria = new Criteria(DbSourcePeer::DATABASE_NAME);
if ($this->isColumnModified(DbSourcePeer::DBS_ID)) {
$criteria->add(DbSourcePeer::DBS_ID, $this->dbs_id);
}
if ($this->isColumnModified(DbSourcePeer::DBS_UID)) {
$criteria->add(DbSourcePeer::DBS_UID, $this->dbs_uid);
}
@@ -932,6 +1040,10 @@ abstract class BaseDbSource extends BaseObject implements Persistent
$criteria->add(DbSourcePeer::PRO_UID, $this->pro_uid);
}
if ($this->isColumnModified(DbSourcePeer::PRO_ID)) {
$criteria->add(DbSourcePeer::PRO_ID, $this->pro_id);
}
if ($this->isColumnModified(DbSourcePeer::DBS_TYPE)) {
$criteria->add(DbSourcePeer::DBS_TYPE, $this->dbs_type);
}
@@ -1034,6 +1146,10 @@ abstract class BaseDbSource extends BaseObject implements Persistent
public function copyInto($copyObj, $deepCopy = false)
{
$copyObj->setDbsId($this->dbs_id);
$copyObj->setProId($this->pro_id);
$copyObj->setDbsType($this->dbs_type);
$copyObj->setDbsServer($this->dbs_server);

View File

@@ -25,18 +25,24 @@ abstract class BaseDbSourcePeer
const CLASS_DEFAULT = 'classes.model.DbSource';
/** The total number of columns. */
const NUM_COLUMNS = 11;
const NUM_COLUMNS = 13;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
/** the column name for the DBS_ID field */
const DBS_ID = 'DB_SOURCE.DBS_ID';
/** the column name for the DBS_UID field */
const DBS_UID = 'DB_SOURCE.DBS_UID';
/** the column name for the PRO_UID field */
const PRO_UID = 'DB_SOURCE.PRO_UID';
/** the column name for the PRO_ID field */
const PRO_ID = 'DB_SOURCE.PRO_ID';
/** the column name for the DBS_TYPE field */
const DBS_TYPE = 'DB_SOURCE.DBS_TYPE';
@@ -75,10 +81,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', '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, )
BasePeer::TYPE_PHPNAME => array ('DbsId', 'DbsUid', 'ProUid', 'ProId', 'DbsType', 'DbsServer', 'DbsDatabaseName', 'DbsUsername', 'DbsPassword', 'DbsPort', 'DbsEncode', 'DbsConnectionType', 'DbsTns', ),
BasePeer::TYPE_COLNAME => array (DbSourcePeer::DBS_ID, DbSourcePeer::DBS_UID, DbSourcePeer::PRO_UID, DbSourcePeer::PRO_ID, 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_ID', 'DBS_UID', 'PRO_UID', 'PRO_ID', '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, 11, 12, )
);
/**
@@ -88,10 +94,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, '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, )
BasePeer::TYPE_PHPNAME => array ('DbsId' => 0, 'DbsUid' => 1, 'ProUid' => 2, 'ProId' => 3, 'DbsType' => 4, 'DbsServer' => 5, 'DbsDatabaseName' => 6, 'DbsUsername' => 7, 'DbsPassword' => 8, 'DbsPort' => 9, 'DbsEncode' => 10, 'DbsConnectionType' => 11, 'DbsTns' => 12, ),
BasePeer::TYPE_COLNAME => array (DbSourcePeer::DBS_ID => 0, DbSourcePeer::DBS_UID => 1, DbSourcePeer::PRO_UID => 2, DbSourcePeer::PRO_ID => 3, DbSourcePeer::DBS_TYPE => 4, DbSourcePeer::DBS_SERVER => 5, DbSourcePeer::DBS_DATABASE_NAME => 6, DbSourcePeer::DBS_USERNAME => 7, DbSourcePeer::DBS_PASSWORD => 8, DbSourcePeer::DBS_PORT => 9, DbSourcePeer::DBS_ENCODE => 10, DbSourcePeer::DBS_CONNECTION_TYPE => 11, DbSourcePeer::DBS_TNS => 12, ),
BasePeer::TYPE_FIELDNAME => array ('DBS_ID' => 0, 'DBS_UID' => 1, 'PRO_UID' => 2, 'PRO_ID' => 3, 'DBS_TYPE' => 4, 'DBS_SERVER' => 5, 'DBS_DATABASE_NAME' => 6, 'DBS_USERNAME' => 7, 'DBS_PASSWORD' => 8, 'DBS_PORT' => 9, 'DBS_ENCODE' => 10, 'DBS_CONNECTION_TYPE' => 11, 'DBS_TNS' => 12, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, )
);
/**
@@ -192,10 +198,14 @@ abstract class BaseDbSourcePeer
public static function addSelectColumns(Criteria $criteria)
{
$criteria->addSelectColumn(DbSourcePeer::DBS_ID);
$criteria->addSelectColumn(DbSourcePeer::DBS_UID);
$criteria->addSelectColumn(DbSourcePeer::PRO_UID);
$criteria->addSelectColumn(DbSourcePeer::PRO_ID);
$criteria->addSelectColumn(DbSourcePeer::DBS_TYPE);
$criteria->addSelectColumn(DbSourcePeer::DBS_SERVER);

View File

@@ -27,6 +27,12 @@ abstract class BaseProcessVariables extends BaseObject implements Persistent
*/
protected static $peer;
/**
* The value for the var_id field.
* @var int
*/
protected $var_id;
/**
* The value for the var_uid field.
* @var string
@@ -39,6 +45,12 @@ abstract class BaseProcessVariables extends BaseObject implements Persistent
*/
protected $prj_uid;
/**
* The value for the pro_id field.
* @var int
*/
protected $pro_id = 0;
/**
* The value for the var_name field.
* @var string
@@ -51,6 +63,12 @@ abstract class BaseProcessVariables extends BaseObject implements Persistent
*/
protected $var_field_type = '';
/**
* The value for the var_field_type_id field.
* @var int
*/
protected $var_field_type_id = 0;
/**
* The value for the var_field_size field.
* @var int
@@ -113,6 +131,17 @@ abstract class BaseProcessVariables extends BaseObject implements Persistent
*/
protected $alreadyInValidation = false;
/**
* Get the [var_id] column value.
*
* @return int
*/
public function getVarId()
{
return $this->var_id;
}
/**
* Get the [var_uid] column value.
*
@@ -135,6 +164,17 @@ abstract class BaseProcessVariables extends BaseObject implements Persistent
return $this->prj_uid;
}
/**
* Get the [pro_id] column value.
*
* @return int
*/
public function getProId()
{
return $this->pro_id;
}
/**
* Get the [var_name] column value.
*
@@ -157,6 +197,17 @@ abstract class BaseProcessVariables extends BaseObject implements Persistent
return $this->var_field_type;
}
/**
* Get the [var_field_type_id] column value.
*
* @return int
*/
public function getVarFieldTypeId()
{
return $this->var_field_type_id;
}
/**
* Get the [var_field_size] column value.
*
@@ -245,6 +296,28 @@ abstract class BaseProcessVariables extends BaseObject implements Persistent
return $this->inp_doc_uid;
}
/**
* Set the value of [var_id] column.
*
* @param int $v new value
* @return void
*/
public function setVarId($v)
{
// Since the native PHP type for this column is integer,
// we will cast the input value to an int (if it is not).
if ($v !== null && !is_int($v) && is_numeric($v)) {
$v = (int) $v;
}
if ($this->var_id !== $v) {
$this->var_id = $v;
$this->modifiedColumns[] = ProcessVariablesPeer::VAR_ID;
}
} // setVarId()
/**
* Set the value of [var_uid] column.
*
@@ -289,6 +362,28 @@ abstract class BaseProcessVariables extends BaseObject implements Persistent
} // setPrjUid()
/**
* Set the value of [pro_id] column.
*
* @param int $v new value
* @return void
*/
public function setProId($v)
{
// Since the native PHP type for this column is integer,
// we will cast the input value to an int (if it is not).
if ($v !== null && !is_int($v) && is_numeric($v)) {
$v = (int) $v;
}
if ($this->pro_id !== $v || $v === 0) {
$this->pro_id = $v;
$this->modifiedColumns[] = ProcessVariablesPeer::PRO_ID;
}
} // setProId()
/**
* Set the value of [var_name] column.
*
@@ -333,6 +428,28 @@ abstract class BaseProcessVariables extends BaseObject implements Persistent
} // setVarFieldType()
/**
* Set the value of [var_field_type_id] column.
*
* @param int $v new value
* @return void
*/
public function setVarFieldTypeId($v)
{
// Since the native PHP type for this column is integer,
// we will cast the input value to an int (if it is not).
if ($v !== null && !is_int($v) && is_numeric($v)) {
$v = (int) $v;
}
if ($this->var_field_type_id !== $v || $v === 0) {
$this->var_field_type_id = $v;
$this->modifiedColumns[] = ProcessVariablesPeer::VAR_FIELD_TYPE_ID;
}
} // setVarFieldTypeId()
/**
* Set the value of [var_field_size] column.
*
@@ -526,36 +643,42 @@ abstract class BaseProcessVariables extends BaseObject implements Persistent
{
try {
$this->var_uid = $rs->getString($startcol + 0);
$this->var_id = $rs->getInt($startcol + 0);
$this->prj_uid = $rs->getString($startcol + 1);
$this->var_uid = $rs->getString($startcol + 1);
$this->var_name = $rs->getString($startcol + 2);
$this->prj_uid = $rs->getString($startcol + 2);
$this->var_field_type = $rs->getString($startcol + 3);
$this->pro_id = $rs->getInt($startcol + 3);
$this->var_field_size = $rs->getInt($startcol + 4);
$this->var_name = $rs->getString($startcol + 4);
$this->var_label = $rs->getString($startcol + 5);
$this->var_field_type = $rs->getString($startcol + 5);
$this->var_dbconnection = $rs->getString($startcol + 6);
$this->var_field_type_id = $rs->getInt($startcol + 6);
$this->var_sql = $rs->getString($startcol + 7);
$this->var_field_size = $rs->getInt($startcol + 7);
$this->var_null = $rs->getInt($startcol + 8);
$this->var_label = $rs->getString($startcol + 8);
$this->var_default = $rs->getString($startcol + 9);
$this->var_dbconnection = $rs->getString($startcol + 9);
$this->var_accepted_values = $rs->getString($startcol + 10);
$this->var_sql = $rs->getString($startcol + 10);
$this->inp_doc_uid = $rs->getString($startcol + 11);
$this->var_null = $rs->getInt($startcol + 11);
$this->var_default = $rs->getString($startcol + 12);
$this->var_accepted_values = $rs->getString($startcol + 13);
$this->inp_doc_uid = $rs->getString($startcol + 14);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 12; // 12 = ProcessVariablesPeer::NUM_COLUMNS - ProcessVariablesPeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 15; // 15 = ProcessVariablesPeer::NUM_COLUMNS - ProcessVariablesPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating ProcessVariables object", $e);
@@ -760,39 +883,48 @@ abstract class BaseProcessVariables extends BaseObject implements Persistent
{
switch($pos) {
case 0:
return $this->getVarUid();
return $this->getVarId();
break;
case 1:
return $this->getPrjUid();
return $this->getVarUid();
break;
case 2:
return $this->getVarName();
return $this->getPrjUid();
break;
case 3:
return $this->getVarFieldType();
return $this->getProId();
break;
case 4:
return $this->getVarFieldSize();
return $this->getVarName();
break;
case 5:
return $this->getVarLabel();
return $this->getVarFieldType();
break;
case 6:
return $this->getVarDbconnection();
return $this->getVarFieldTypeId();
break;
case 7:
return $this->getVarSql();
return $this->getVarFieldSize();
break;
case 8:
return $this->getVarNull();
return $this->getVarLabel();
break;
case 9:
return $this->getVarDefault();
return $this->getVarDbconnection();
break;
case 10:
return $this->getVarAcceptedValues();
return $this->getVarSql();
break;
case 11:
return $this->getVarNull();
break;
case 12:
return $this->getVarDefault();
break;
case 13:
return $this->getVarAcceptedValues();
break;
case 14:
return $this->getInpDocUid();
break;
default:
@@ -815,18 +947,21 @@ abstract class BaseProcessVariables extends BaseObject implements Persistent
{
$keys = ProcessVariablesPeer::getFieldNames($keyType);
$result = array(
$keys[0] => $this->getVarUid(),
$keys[1] => $this->getPrjUid(),
$keys[2] => $this->getVarName(),
$keys[3] => $this->getVarFieldType(),
$keys[4] => $this->getVarFieldSize(),
$keys[5] => $this->getVarLabel(),
$keys[6] => $this->getVarDbconnection(),
$keys[7] => $this->getVarSql(),
$keys[8] => $this->getVarNull(),
$keys[9] => $this->getVarDefault(),
$keys[10] => $this->getVarAcceptedValues(),
$keys[11] => $this->getInpDocUid(),
$keys[0] => $this->getVarId(),
$keys[1] => $this->getVarUid(),
$keys[2] => $this->getPrjUid(),
$keys[3] => $this->getProId(),
$keys[4] => $this->getVarName(),
$keys[5] => $this->getVarFieldType(),
$keys[6] => $this->getVarFieldTypeId(),
$keys[7] => $this->getVarFieldSize(),
$keys[8] => $this->getVarLabel(),
$keys[9] => $this->getVarDbconnection(),
$keys[10] => $this->getVarSql(),
$keys[11] => $this->getVarNull(),
$keys[12] => $this->getVarDefault(),
$keys[13] => $this->getVarAcceptedValues(),
$keys[14] => $this->getInpDocUid(),
);
return $result;
}
@@ -859,39 +994,48 @@ abstract class BaseProcessVariables extends BaseObject implements Persistent
{
switch($pos) {
case 0:
$this->setVarUid($value);
$this->setVarId($value);
break;
case 1:
$this->setPrjUid($value);
$this->setVarUid($value);
break;
case 2:
$this->setVarName($value);
$this->setPrjUid($value);
break;
case 3:
$this->setVarFieldType($value);
$this->setProId($value);
break;
case 4:
$this->setVarFieldSize($value);
$this->setVarName($value);
break;
case 5:
$this->setVarLabel($value);
$this->setVarFieldType($value);
break;
case 6:
$this->setVarDbconnection($value);
$this->setVarFieldTypeId($value);
break;
case 7:
$this->setVarSql($value);
$this->setVarFieldSize($value);
break;
case 8:
$this->setVarNull($value);
$this->setVarLabel($value);
break;
case 9:
$this->setVarDefault($value);
$this->setVarDbconnection($value);
break;
case 10:
$this->setVarAcceptedValues($value);
$this->setVarSql($value);
break;
case 11:
$this->setVarNull($value);
break;
case 12:
$this->setVarDefault($value);
break;
case 13:
$this->setVarAcceptedValues($value);
break;
case 14:
$this->setInpDocUid($value);
break;
} // switch()
@@ -918,51 +1062,63 @@ abstract class BaseProcessVariables extends BaseObject implements Persistent
$keys = ProcessVariablesPeer::getFieldNames($keyType);
if (array_key_exists($keys[0], $arr)) {
$this->setVarUid($arr[$keys[0]]);
$this->setVarId($arr[$keys[0]]);
}
if (array_key_exists($keys[1], $arr)) {
$this->setPrjUid($arr[$keys[1]]);
$this->setVarUid($arr[$keys[1]]);
}
if (array_key_exists($keys[2], $arr)) {
$this->setVarName($arr[$keys[2]]);
$this->setPrjUid($arr[$keys[2]]);
}
if (array_key_exists($keys[3], $arr)) {
$this->setVarFieldType($arr[$keys[3]]);
$this->setProId($arr[$keys[3]]);
}
if (array_key_exists($keys[4], $arr)) {
$this->setVarFieldSize($arr[$keys[4]]);
$this->setVarName($arr[$keys[4]]);
}
if (array_key_exists($keys[5], $arr)) {
$this->setVarLabel($arr[$keys[5]]);
$this->setVarFieldType($arr[$keys[5]]);
}
if (array_key_exists($keys[6], $arr)) {
$this->setVarDbconnection($arr[$keys[6]]);
$this->setVarFieldTypeId($arr[$keys[6]]);
}
if (array_key_exists($keys[7], $arr)) {
$this->setVarSql($arr[$keys[7]]);
$this->setVarFieldSize($arr[$keys[7]]);
}
if (array_key_exists($keys[8], $arr)) {
$this->setVarNull($arr[$keys[8]]);
$this->setVarLabel($arr[$keys[8]]);
}
if (array_key_exists($keys[9], $arr)) {
$this->setVarDefault($arr[$keys[9]]);
$this->setVarDbconnection($arr[$keys[9]]);
}
if (array_key_exists($keys[10], $arr)) {
$this->setVarAcceptedValues($arr[$keys[10]]);
$this->setVarSql($arr[$keys[10]]);
}
if (array_key_exists($keys[11], $arr)) {
$this->setInpDocUid($arr[$keys[11]]);
$this->setVarNull($arr[$keys[11]]);
}
if (array_key_exists($keys[12], $arr)) {
$this->setVarDefault($arr[$keys[12]]);
}
if (array_key_exists($keys[13], $arr)) {
$this->setVarAcceptedValues($arr[$keys[13]]);
}
if (array_key_exists($keys[14], $arr)) {
$this->setInpDocUid($arr[$keys[14]]);
}
}
@@ -976,6 +1132,10 @@ abstract class BaseProcessVariables extends BaseObject implements Persistent
{
$criteria = new Criteria(ProcessVariablesPeer::DATABASE_NAME);
if ($this->isColumnModified(ProcessVariablesPeer::VAR_ID)) {
$criteria->add(ProcessVariablesPeer::VAR_ID, $this->var_id);
}
if ($this->isColumnModified(ProcessVariablesPeer::VAR_UID)) {
$criteria->add(ProcessVariablesPeer::VAR_UID, $this->var_uid);
}
@@ -984,6 +1144,10 @@ abstract class BaseProcessVariables extends BaseObject implements Persistent
$criteria->add(ProcessVariablesPeer::PRJ_UID, $this->prj_uid);
}
if ($this->isColumnModified(ProcessVariablesPeer::PRO_ID)) {
$criteria->add(ProcessVariablesPeer::PRO_ID, $this->pro_id);
}
if ($this->isColumnModified(ProcessVariablesPeer::VAR_NAME)) {
$criteria->add(ProcessVariablesPeer::VAR_NAME, $this->var_name);
}
@@ -992,6 +1156,10 @@ abstract class BaseProcessVariables extends BaseObject implements Persistent
$criteria->add(ProcessVariablesPeer::VAR_FIELD_TYPE, $this->var_field_type);
}
if ($this->isColumnModified(ProcessVariablesPeer::VAR_FIELD_TYPE_ID)) {
$criteria->add(ProcessVariablesPeer::VAR_FIELD_TYPE_ID, $this->var_field_type_id);
}
if ($this->isColumnModified(ProcessVariablesPeer::VAR_FIELD_SIZE)) {
$criteria->add(ProcessVariablesPeer::VAR_FIELD_SIZE, $this->var_field_size);
}
@@ -1078,12 +1246,18 @@ abstract class BaseProcessVariables extends BaseObject implements Persistent
public function copyInto($copyObj, $deepCopy = false)
{
$copyObj->setVarId($this->var_id);
$copyObj->setPrjUid($this->prj_uid);
$copyObj->setProId($this->pro_id);
$copyObj->setVarName($this->var_name);
$copyObj->setVarFieldType($this->var_field_type);
$copyObj->setVarFieldTypeId($this->var_field_type_id);
$copyObj->setVarFieldSize($this->var_field_size);
$copyObj->setVarLabel($this->var_label);

View File

@@ -25,24 +25,33 @@ abstract class BaseProcessVariablesPeer
const CLASS_DEFAULT = 'classes.model.ProcessVariables';
/** The total number of columns. */
const NUM_COLUMNS = 12;
const NUM_COLUMNS = 15;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
/** the column name for the VAR_ID field */
const VAR_ID = 'PROCESS_VARIABLES.VAR_ID';
/** the column name for the VAR_UID field */
const VAR_UID = 'PROCESS_VARIABLES.VAR_UID';
/** the column name for the PRJ_UID field */
const PRJ_UID = 'PROCESS_VARIABLES.PRJ_UID';
/** the column name for the PRO_ID field */
const PRO_ID = 'PROCESS_VARIABLES.PRO_ID';
/** the column name for the VAR_NAME field */
const VAR_NAME = 'PROCESS_VARIABLES.VAR_NAME';
/** the column name for the VAR_FIELD_TYPE field */
const VAR_FIELD_TYPE = 'PROCESS_VARIABLES.VAR_FIELD_TYPE';
/** the column name for the VAR_FIELD_TYPE_ID field */
const VAR_FIELD_TYPE_ID = 'PROCESS_VARIABLES.VAR_FIELD_TYPE_ID';
/** the column name for the VAR_FIELD_SIZE field */
const VAR_FIELD_SIZE = 'PROCESS_VARIABLES.VAR_FIELD_SIZE';
@@ -78,10 +87,10 @@ abstract class BaseProcessVariablesPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('VarUid', 'PrjUid', 'VarName', 'VarFieldType', 'VarFieldSize', 'VarLabel', 'VarDbconnection', 'VarSql', 'VarNull', 'VarDefault', 'VarAcceptedValues', 'InpDocUid', ),
BasePeer::TYPE_COLNAME => array (ProcessVariablesPeer::VAR_UID, ProcessVariablesPeer::PRJ_UID, ProcessVariablesPeer::VAR_NAME, ProcessVariablesPeer::VAR_FIELD_TYPE, ProcessVariablesPeer::VAR_FIELD_SIZE, ProcessVariablesPeer::VAR_LABEL, ProcessVariablesPeer::VAR_DBCONNECTION, ProcessVariablesPeer::VAR_SQL, ProcessVariablesPeer::VAR_NULL, ProcessVariablesPeer::VAR_DEFAULT, ProcessVariablesPeer::VAR_ACCEPTED_VALUES, ProcessVariablesPeer::INP_DOC_UID, ),
BasePeer::TYPE_FIELDNAME => array ('VAR_UID', 'PRJ_UID', 'VAR_NAME', 'VAR_FIELD_TYPE', 'VAR_FIELD_SIZE', 'VAR_LABEL', 'VAR_DBCONNECTION', 'VAR_SQL', 'VAR_NULL', 'VAR_DEFAULT', 'VAR_ACCEPTED_VALUES', 'INP_DOC_UID', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, )
BasePeer::TYPE_PHPNAME => array ('VarId', 'VarUid', 'PrjUid', 'ProId', 'VarName', 'VarFieldType', 'VarFieldTypeId', 'VarFieldSize', 'VarLabel', 'VarDbconnection', 'VarSql', 'VarNull', 'VarDefault', 'VarAcceptedValues', 'InpDocUid', ),
BasePeer::TYPE_COLNAME => array (ProcessVariablesPeer::VAR_ID, ProcessVariablesPeer::VAR_UID, ProcessVariablesPeer::PRJ_UID, ProcessVariablesPeer::PRO_ID, ProcessVariablesPeer::VAR_NAME, ProcessVariablesPeer::VAR_FIELD_TYPE, ProcessVariablesPeer::VAR_FIELD_TYPE_ID, ProcessVariablesPeer::VAR_FIELD_SIZE, ProcessVariablesPeer::VAR_LABEL, ProcessVariablesPeer::VAR_DBCONNECTION, ProcessVariablesPeer::VAR_SQL, ProcessVariablesPeer::VAR_NULL, ProcessVariablesPeer::VAR_DEFAULT, ProcessVariablesPeer::VAR_ACCEPTED_VALUES, ProcessVariablesPeer::INP_DOC_UID, ),
BasePeer::TYPE_FIELDNAME => array ('VAR_ID', 'VAR_UID', 'PRJ_UID', 'PRO_ID', 'VAR_NAME', 'VAR_FIELD_TYPE', 'VAR_FIELD_TYPE_ID', 'VAR_FIELD_SIZE', 'VAR_LABEL', 'VAR_DBCONNECTION', 'VAR_SQL', 'VAR_NULL', 'VAR_DEFAULT', 'VAR_ACCEPTED_VALUES', 'INP_DOC_UID', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, )
);
/**
@@ -91,10 +100,10 @@ abstract class BaseProcessVariablesPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('VarUid' => 0, 'PrjUid' => 1, 'VarName' => 2, 'VarFieldType' => 3, 'VarFieldSize' => 4, 'VarLabel' => 5, 'VarDbconnection' => 6, 'VarSql' => 7, 'VarNull' => 8, 'VarDefault' => 9, 'VarAcceptedValues' => 10, 'InpDocUid' => 11, ),
BasePeer::TYPE_COLNAME => array (ProcessVariablesPeer::VAR_UID => 0, ProcessVariablesPeer::PRJ_UID => 1, ProcessVariablesPeer::VAR_NAME => 2, ProcessVariablesPeer::VAR_FIELD_TYPE => 3, ProcessVariablesPeer::VAR_FIELD_SIZE => 4, ProcessVariablesPeer::VAR_LABEL => 5, ProcessVariablesPeer::VAR_DBCONNECTION => 6, ProcessVariablesPeer::VAR_SQL => 7, ProcessVariablesPeer::VAR_NULL => 8, ProcessVariablesPeer::VAR_DEFAULT => 9, ProcessVariablesPeer::VAR_ACCEPTED_VALUES => 10, ProcessVariablesPeer::INP_DOC_UID => 11, ),
BasePeer::TYPE_FIELDNAME => array ('VAR_UID' => 0, 'PRJ_UID' => 1, 'VAR_NAME' => 2, 'VAR_FIELD_TYPE' => 3, 'VAR_FIELD_SIZE' => 4, 'VAR_LABEL' => 5, 'VAR_DBCONNECTION' => 6, 'VAR_SQL' => 7, 'VAR_NULL' => 8, 'VAR_DEFAULT' => 9, 'VAR_ACCEPTED_VALUES' => 10, 'INP_DOC_UID' => 11, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, )
BasePeer::TYPE_PHPNAME => array ('VarId' => 0, 'VarUid' => 1, 'PrjUid' => 2, 'ProId' => 3, 'VarName' => 4, 'VarFieldType' => 5, 'VarFieldTypeId' => 6, 'VarFieldSize' => 7, 'VarLabel' => 8, 'VarDbconnection' => 9, 'VarSql' => 10, 'VarNull' => 11, 'VarDefault' => 12, 'VarAcceptedValues' => 13, 'InpDocUid' => 14, ),
BasePeer::TYPE_COLNAME => array (ProcessVariablesPeer::VAR_ID => 0, ProcessVariablesPeer::VAR_UID => 1, ProcessVariablesPeer::PRJ_UID => 2, ProcessVariablesPeer::PRO_ID => 3, ProcessVariablesPeer::VAR_NAME => 4, ProcessVariablesPeer::VAR_FIELD_TYPE => 5, ProcessVariablesPeer::VAR_FIELD_TYPE_ID => 6, ProcessVariablesPeer::VAR_FIELD_SIZE => 7, ProcessVariablesPeer::VAR_LABEL => 8, ProcessVariablesPeer::VAR_DBCONNECTION => 9, ProcessVariablesPeer::VAR_SQL => 10, ProcessVariablesPeer::VAR_NULL => 11, ProcessVariablesPeer::VAR_DEFAULT => 12, ProcessVariablesPeer::VAR_ACCEPTED_VALUES => 13, ProcessVariablesPeer::INP_DOC_UID => 14, ),
BasePeer::TYPE_FIELDNAME => array ('VAR_ID' => 0, 'VAR_UID' => 1, 'PRJ_UID' => 2, 'PRO_ID' => 3, 'VAR_NAME' => 4, 'VAR_FIELD_TYPE' => 5, 'VAR_FIELD_TYPE_ID' => 6, 'VAR_FIELD_SIZE' => 7, 'VAR_LABEL' => 8, 'VAR_DBCONNECTION' => 9, 'VAR_SQL' => 10, 'VAR_NULL' => 11, 'VAR_DEFAULT' => 12, 'VAR_ACCEPTED_VALUES' => 13, 'INP_DOC_UID' => 14, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, )
);
/**
@@ -195,14 +204,20 @@ abstract class BaseProcessVariablesPeer
public static function addSelectColumns(Criteria $criteria)
{
$criteria->addSelectColumn(ProcessVariablesPeer::VAR_ID);
$criteria->addSelectColumn(ProcessVariablesPeer::VAR_UID);
$criteria->addSelectColumn(ProcessVariablesPeer::PRJ_UID);
$criteria->addSelectColumn(ProcessVariablesPeer::PRO_ID);
$criteria->addSelectColumn(ProcessVariablesPeer::VAR_NAME);
$criteria->addSelectColumn(ProcessVariablesPeer::VAR_FIELD_TYPE);
$criteria->addSelectColumn(ProcessVariablesPeer::VAR_FIELD_TYPE_ID);
$criteria->addSelectColumn(ProcessVariablesPeer::VAR_FIELD_SIZE);
$criteria->addSelectColumn(ProcessVariablesPeer::VAR_LABEL);