From f8aba2ab032d4ee196b5a12b0e5c91809255602f Mon Sep 17 00:00:00 2001 From: Roly Gutierrez Date: Fri, 3 Apr 2020 10:59:24 -0400 Subject: [PATCH] PMCORE-876 The files are not shown, when we create a PM_Table from an external DB --- .../factories/AdditionalTablesFactory.php | 5 +- tests/resources/BasePmtTableName.tpl | 684 ++++++++++++++++++ tests/resources/BasePmtTableNamePeer.tpl | 592 +++++++++++++++ tests/resources/PmtTableName.tpl | 19 + tests/resources/PmtTableNameMapBuilder.tpl | 78 ++ tests/resources/PmtTableNamePeer.tpl | 23 + .../workflow/engine/classes/SpoolRunTest.php | 4 + .../classes/model/AdditionalTablesTest.php | 172 +++++ thirdparty/phing/parser/Location.php | 4 +- .../phing/system/io/Win32FileSystem.php | 2 +- .../engine/classes/model/AdditionalTables.php | 24 + .../src/ProcessMaker/Core/MultiProcOpen.php | 3 + 12 files changed, 1605 insertions(+), 5 deletions(-) create mode 100644 tests/resources/BasePmtTableName.tpl create mode 100644 tests/resources/BasePmtTableNamePeer.tpl create mode 100644 tests/resources/PmtTableName.tpl create mode 100644 tests/resources/PmtTableNameMapBuilder.tpl create mode 100644 tests/resources/PmtTableNamePeer.tpl diff --git a/database/factories/AdditionalTablesFactory.php b/database/factories/AdditionalTablesFactory.php index 03325eeb7..184bfe1b3 100644 --- a/database/factories/AdditionalTablesFactory.php +++ b/database/factories/AdditionalTablesFactory.php @@ -3,10 +3,11 @@ use Faker\Generator as Faker; $factory->define(\ProcessMaker\Model\AdditionalTables::class, function(Faker $faker) { + $name = $faker->regexify("/[a-zA-Z]{6}/"); return [ 'ADD_TAB_UID' => G::generateUniqueID(), - 'ADD_TAB_NAME' => $faker->name, - 'ADD_TAB_CLASS_NAME' => $faker->name, + 'ADD_TAB_NAME' => 'PMT_' . strtoupper($name), + 'ADD_TAB_CLASS_NAME' => 'Pmt' . $name, 'ADD_TAB_DESCRIPTION' => $faker->text, 'ADD_TAB_SDW_LOG_INSERT' => 0, 'ADD_TAB_SDW_LOG_UPDATE' => 0, diff --git a/tests/resources/BasePmtTableName.tpl b/tests/resources/BasePmtTableName.tpl new file mode 100644 index 000000000..956981f17 --- /dev/null +++ b/tests/resources/BasePmtTableName.tpl @@ -0,0 +1,684 @@ +app_uid; + } + + /** + * Get the [app_number] column value. + * + * @return int + */ + public function getAppNumber() + { + + return $this->app_number; + } + + /** + * Get the [app_status] column value. + * + * @return string + */ + public function getAppStatus() + { + + return $this->app_status; + } + + /** + * Get the [var1] column value. + * + * @return string + */ + public function getVar1() + { + + return $this->var1; + } + + /** + * Set the value of [app_uid] column. + * + * @param string $v new value + * @return void + */ + public function setAppUid($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->app_uid !== $v) { + $this->app_uid = $v; + $this->modifiedColumns[] = {tableName}Peer::APP_UID; + } + + } // setAppUid() + + /** + * Set the value of [app_number] column. + * + * @param int $v new value + * @return void + */ + public function setAppNumber($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->app_number !== $v) { + $this->app_number = $v; + $this->modifiedColumns[] = {tableName}Peer::APP_NUMBER; + } + + } // setAppNumber() + + /** + * Set the value of [app_status] column. + * + * @param string $v new value + * @return void + */ + public function setAppStatus($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->app_status !== $v) { + $this->app_status = $v; + $this->modifiedColumns[] = {tableName}Peer::APP_STATUS; + } + + } // setAppStatus() + + /** + * Set the value of [var1] column. + * + * @param string $v new value + * @return void + */ + public function setVar1($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->var1 !== $v) { + $this->var1 = $v; + $this->modifiedColumns[] = {tableName}Peer::VAR1; + } + + } // setVar1() + + /** + * Hydrates (populates) the object variables with values from the database resultset. + * + * An offset (1-based "start column") is specified so that objects can be hydrated + * with a subset of the columns in the resultset rows. This is needed, for example, + * for results of JOIN queries where the resultset row includes columns from two or + * more tables. + * + * @param ResultSet $rs The ResultSet class with cursor advanced to desired record pos. + * @param int $startcol 1-based offset column which indicates which restultset column to start with. + * @return int next starting column + * @throws PropelException - Any caught Exception will be rewrapped as a PropelException. + */ + public function hydrate(ResultSet $rs, $startcol = 1) + { + try { + + $this->app_uid = $rs->getString($startcol + 0); + + $this->app_number = $rs->getInt($startcol + 1); + + $this->app_status = $rs->getString($startcol + 2); + + $this->var1 = $rs->getString($startcol + 3); + + $this->resetModified(); + + $this->setNew(false); + + // FIXME - using NUM_COLUMNS may be clearer. + return $startcol + 4; // 4 = {tableName}Peer::NUM_COLUMNS - {tableName}Peer::NUM_LAZY_LOAD_COLUMNS). + + } catch (Exception $e) { + throw new PropelException("Error populating {tableName} object", $e); + } + } + + /** + * Removes this object from datastore and sets delete attribute. + * + * @param Connection $con + * @return void + * @throws PropelException + * @see BaseObject::setDeleted() + * @see BaseObject::isDeleted() + */ + public function delete($con = null) + { + if ($this->isDeleted()) { + throw new PropelException("This object has already been deleted."); + } + + if ($con === null) { + $con = Propel::getConnection({tableName}Peer::DATABASE_NAME); + } + + try { + $con->begin(); + {tableName}Peer::doDelete($this, $con); + $this->setDeleted(true); + $con->commit(); + } catch (PropelException $e) { + $con->rollback(); + throw $e; + } + } + + /** + * Stores the object in the database. If the object is new, + * it inserts it; otherwise an update is performed. This method + * wraps the doSave() worker method in a transaction. + * + * @param Connection $con + * @return int The number of rows affected by this insert/update + * @throws PropelException + * @see doSave() + */ + public function save($con = null) + { + if ($this->isDeleted()) { + throw new PropelException("You cannot save an object that has been deleted."); + } + + if ($con === null) { + $con = Propel::getConnection({tableName}Peer::DATABASE_NAME); + } + + try { + $con->begin(); + $affectedRows = $this->doSave($con); + $con->commit(); + return $affectedRows; + } catch (PropelException $e) { + $con->rollback(); + throw $e; + } + } + + /** + * Stores the object in the database. + * + * If the object is new, it inserts it; otherwise an update is performed. + * All related objects are also updated in this method. + * + * @param Connection $con + * @return int The number of rows affected by this insert/update and any referring + * @throws PropelException + * @see save() + */ + protected function doSave($con) + { + $affectedRows = 0; // initialize var to track total num of affected rows + if (!$this->alreadyInSave) { + $this->alreadyInSave = true; + + + // If this object has been modified, then save it to the database. + if ($this->isModified()) { + if ($this->isNew()) { + $pk = {tableName}Peer::doInsert($this, $con); + $affectedRows += 1; // we are assuming that there is only 1 row per doInsert() which + // should always be true here (even though technically + // BasePeer::doInsert() can insert multiple rows). + + $this->setNew(false); + } else { + $affectedRows += {tableName}Peer::doUpdate($this, $con); + } + $this->resetModified(); // [HL] After being saved an object is no longer 'modified' + } + + $this->alreadyInSave = false; + } + return $affectedRows; + } // doSave() + + /** + * Array of ValidationFailed objects. + * @var array ValidationFailed[] + */ + protected $validationFailures = array(); + + /** + * Gets any ValidationFailed objects that resulted from last call to validate(). + * + * + * @return array ValidationFailed[] + * @see validate() + */ + public function getValidationFailures() + { + return $this->validationFailures; + } + + /** + * Validates the objects modified field values and all objects related to this table. + * + * If $columns is either a column name or an array of column names + * only those columns are validated. + * + * @param mixed $columns Column name or an array of column names. + * @return boolean Whether all columns pass validation. + * @see doValidate() + * @see getValidationFailures() + */ + public function validate($columns = null) + { + $res = $this->doValidate($columns); + if ($res === true) { + $this->validationFailures = array(); + return true; + } else { + $this->validationFailures = $res; + return false; + } + } + + /** + * This function performs the validation work for complex object models. + * + * In addition to checking the current object, all related objects will + * also be validated. If all pass then true is returned; otherwise + * an aggreagated array of ValidationFailed objects will be returned. + * + * @param array $columns Array of column names to validate. + * @return mixed true if all validations pass; + array of ValidationFailed objects otherwise. + */ + protected function doValidate($columns = null) + { + if (!$this->alreadyInValidation) { + $this->alreadyInValidation = true; + $retval = null; + + $failureMap = array(); + + + if (($retval = {tableName}Peer::doValidate($this, $columns)) !== true) { + $failureMap = array_merge($failureMap, $retval); + } + + + + $this->alreadyInValidation = false; + } + + return (!empty($failureMap) ? $failureMap : true); + } + + /** + * Retrieves a field from the object by name passed in as a string. + * + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TYPE_PHPNAME, + * TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM + * @return mixed Value of field. + */ + public function getByName($name, $type = BasePeer::TYPE_PHPNAME) + { + $pos = {tableName}Peer::translateFieldName($name, $type, BasePeer::TYPE_NUM); + return $this->getByPosition($pos); + } + + /** + * Retrieves a field from the object by Position as specified in the xml schema. + * Zero-based. + * + * @param int $pos position in xml schema + * @return mixed Value of field at $pos + */ + public function getByPosition($pos) + { + switch($pos) { + case 0: + return $this->getAppUid(); + break; + case 1: + return $this->getAppNumber(); + break; + case 2: + return $this->getAppStatus(); + break; + case 3: + return $this->getVar1(); + break; + default: + return null; + break; + } // switch() + } + + /** + * Exports the object as an array. + * + * You can specify the key type of the array by passing one of the class + * type constants. + * + * @param string $keyType One of the class type constants TYPE_PHPNAME, + * TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM + * @return an associative array containing the field names (as keys) and field values + */ + public function toArray($keyType = BasePeer::TYPE_PHPNAME) + { + $keys = {tableName}Peer::getFieldNames($keyType); + $result = array( + $keys[0] => $this->getAppUid(), + $keys[1] => $this->getAppNumber(), + $keys[2] => $this->getAppStatus(), + $keys[3] => $this->getVar1(), + ); + return $result; + } + + /** + * Sets a field from the object by name passed in as a string. + * + * @param string $name peer name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TYPE_PHPNAME, + * TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM + * @return void + */ + public function setByName($name, $value, $type = BasePeer::TYPE_PHPNAME) + { + $pos = {tableName}Peer::translateFieldName($name, $type, BasePeer::TYPE_NUM); + return $this->setByPosition($pos, $value); + } + + /** + * Sets a field from the object by Position as specified in the xml schema. + * Zero-based. + * + * @param int $pos position in xml schema + * @param mixed $value field value + * @return void + */ + public function setByPosition($pos, $value) + { + switch($pos) { + case 0: + $this->setAppUid($value); + break; + case 1: + $this->setAppNumber($value); + break; + case 2: + $this->setAppStatus($value); + break; + case 3: + $this->setVar1($value); + break; + } // switch() + } + + /** + * Populates the object using an array. + * + * This is particularly useful when populating an object from one of the + * request arrays (e.g. $_POST). This method goes through the column + * names, checking to see whether a matching key exists in populated + * array. If so the setByName() method is called for that column. + * + * You can specify the key type of the array by additionally passing one + * of the class type constants TYPE_PHPNAME, TYPE_COLNAME, TYPE_FIELDNAME, + * TYPE_NUM. The default key type is the column's phpname (e.g. 'authorId') + * + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. + * @return void + */ + public function fromArray($arr, $keyType = BasePeer::TYPE_PHPNAME) + { + $keys = {tableName}Peer::getFieldNames($keyType); + + if (array_key_exists($keys[0], $arr)) { + $this->setAppUid($arr[$keys[0]]); + } + + if (array_key_exists($keys[1], $arr)) { + $this->setAppNumber($arr[$keys[1]]); + } + + if (array_key_exists($keys[2], $arr)) { + $this->setAppStatus($arr[$keys[2]]); + } + + if (array_key_exists($keys[3], $arr)) { + $this->setVar1($arr[$keys[3]]); + } + + } + + /** + * Build a Criteria object containing the values of all modified columns in this object. + * + * @return Criteria The Criteria object containing all modified values. + */ + public function buildCriteria() + { + $criteria = new Criteria({tableName}Peer::DATABASE_NAME); + + if ($this->isColumnModified({tableName}Peer::APP_UID)) { + $criteria->add({tableName}Peer::APP_UID, $this->app_uid); + } + + if ($this->isColumnModified({tableName}Peer::APP_NUMBER)) { + $criteria->add({tableName}Peer::APP_NUMBER, $this->app_number); + } + + if ($this->isColumnModified({tableName}Peer::APP_STATUS)) { + $criteria->add({tableName}Peer::APP_STATUS, $this->app_status); + } + + if ($this->isColumnModified({tableName}Peer::VAR1)) { + $criteria->add({tableName}Peer::VAR1, $this->var1); + } + + + return $criteria; + } + + /** + * Builds a Criteria object containing the primary key for this object. + * + * Unlike buildCriteria() this method includes the primary key values regardless + * of whether or not they have been modified. + * + * @return Criteria The Criteria object containing value(s) for primary key(s). + */ + public function buildPkeyCriteria() + { + $criteria = new Criteria({tableName}Peer::DATABASE_NAME); + + $criteria->add({tableName}Peer::APP_UID, $this->app_uid); + + return $criteria; + } + + /** + * Returns the primary key for this object (row). + * @return string + */ + public function getPrimaryKey() + { + return $this->getAppUid(); + } + + /** + * Generic method to set the primary key (app_uid column). + * + * @param string $key Primary key. + * @return void + */ + public function setPrimaryKey($key) + { + $this->setAppUid($key); + } + + /** + * Sets contents of passed object to values from current object. + * + * If desired, this method can also make copies of all associated (fkey referrers) + * objects. + * + * @param object $copyObj An object of {tableName} (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @throws PropelException + */ + public function copyInto($copyObj, $deepCopy = false) + { + + $copyObj->setAppNumber($this->app_number); + + $copyObj->setAppStatus($this->app_status); + + $copyObj->setVar1($this->var1); + + + $copyObj->setNew(true); + + $copyObj->setAppUid(NULL); // this is a pkey column, so set to default value + + } + + /** + * Makes a copy of this object that will be inserted as a new row in table when saved. + * It creates a new object filling in the simple attributes, but skipping any primary + * keys that are defined for the table. + * + * If desired, this method can also make copies of all associated (fkey referrers) + * objects. + * + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return {tableName} Clone of current object. + * @throws PropelException + */ + public function copy($deepCopy = false) + { + // we use get_class(), because this might be a subclass + $clazz = get_class($this); + $copyObj = new $clazz(); + $this->copyInto($copyObj, $deepCopy); + return $copyObj; + } + + /** + * Returns a peer instance associated with this om. + * + * Since Peer classes are not to have any instance attributes, this method returns the + * same instance for all member of this class. The method could therefore + * be static, but this would prevent one from overriding the behavior. + * + * @return {tableName}Peer + */ + public function getPeer() + { + if (self::$peer === null) { + self::$peer = new {tableName}Peer(); + } + return self::$peer; + } +} + diff --git a/tests/resources/BasePmtTableNamePeer.tpl b/tests/resources/BasePmtTableNamePeer.tpl new file mode 100644 index 000000000..9abf79726 --- /dev/null +++ b/tests/resources/BasePmtTableNamePeer.tpl @@ -0,0 +1,592 @@ + array ('AppUid', 'AppNumber', 'AppStatus', 'Var1', 'Var2', 'Var3', ), + BasePeer::TYPE_COLNAME => array ({tableName}Peer::APP_UID, {tableName}Peer::APP_NUMBER, {tableName}Peer::APP_STATUS, {tableName}Peer::VAR1, {tableName}Peer::VAR2, {tableName}Peer::VAR3, ), + BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'APP_NUMBER', 'APP_STATUS', 'VAR1', 'VAR2', 'VAR3', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, ) + ); + + /** + * holds an array of keys for quick access to the fieldnames array + * + * first dimension keys are the type constants + * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 + */ + private static $fieldKeys = array ( + BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'AppNumber' => 1, 'AppStatus' => 2, 'Var1' => 3, 'Var2' => 4, 'Var3' => 5, ), + BasePeer::TYPE_COLNAME => array ({tableName}Peer::APP_UID => 0, {tableName}Peer::APP_NUMBER => 1, {tableName}Peer::APP_STATUS => 2, {tableName}Peer::VAR1 => 3, {tableName}Peer::VAR2 => 4, {tableName}Peer::VAR3 => 5, ), + BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'APP_NUMBER' => 1, 'APP_STATUS' => 2, 'VAR1' => 3, 'VAR2' => 4, 'VAR3' => 5, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, ) + ); + + /** + * @return MapBuilder the map builder for this peer + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function getMapBuilder() + { + include_once 'classes/map/{tableName}MapBuilder.php'; + return BasePeer::getMapBuilder('classes.map.{tableName}MapBuilder'); + } + /** + * Gets a map (hash) of PHP names to DB column names. + * + * @return array The PHP to DB name map for this peer + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + * @deprecated Use the getFieldNames() and translateFieldName() methods instead of this. + */ + public static function getPhpNameMap() + { + if (self::$phpNameMap === null) { + $map = {tableName}Peer::getTableMap(); + $columns = $map->getColumns(); + $nameMap = array(); + foreach ($columns as $column) { + $nameMap[$column->getPhpName()] = $column->getColumnName(); + } + self::$phpNameMap = $nameMap; + } + return self::$phpNameMap; + } + /** + * Translates a fieldname to another type + * + * @param string $name field name + * @param string $fromType One of the class type constants TYPE_PHPNAME, + * TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM + * @param string $toType One of the class type constants + * @return string translated name of the field. + */ + static public function translateFieldName($name, $fromType, $toType) + { + $toNames = self::getFieldNames($toType); + $key = isset(self::$fieldKeys[$fromType][$name]) ? self::$fieldKeys[$fromType][$name] : null; + if ($key === null) { + throw new PropelException("'$name' could not be found in the field names of type '$fromType'. These are: " . print_r(self::$fieldKeys[$fromType], true)); + } + return $toNames[$key]; + } + + /** + * Returns an array of of field names. + * + * @param string $type The type of fieldnames to return: + * One of the class type constants TYPE_PHPNAME, + * TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM + * @return array A list of field names + */ + + static public function getFieldNames($type = BasePeer::TYPE_PHPNAME) + { + if (!array_key_exists($type, self::$fieldNames)) { + throw new PropelException('Method getFieldNames() expects the parameter $type to be one of the class constants TYPE_PHPNAME, TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM. ' . $type . ' was given.'); + } + return self::$fieldNames[$type]; + } + + /** + * Convenience method which changes table.column to alias.column. + * + * Using this method you can maintain SQL abstraction while using column aliases. + * + * $c->addAlias("alias1", TablePeer::TABLE_NAME); + * $c->addJoin(TablePeer::alias("alias1", TablePeer::PRIMARY_KEY_COLUMN), TablePeer::PRIMARY_KEY_COLUMN); + * + * @param string $alias The alias for the current table. + * @param string $column The column name for current table. (i.e. {tableName}Peer::COLUMN_NAME). + * @return string + */ + public static function alias($alias, $column) + { + return str_replace({tableName}Peer::TABLE_NAME.'.', $alias.'.', $column); + } + + /** + * Add all the columns needed to create a new object. + * + * Note: any columns that were marked with lazyLoad="true" in the + * XML schema will not be added to the select list and only loaded + * on demand. + * + * @param criteria object containing the columns to add. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function addSelectColumns(Criteria $criteria) + { + + $criteria->addSelectColumn({tableName}Peer::APP_UID); + + $criteria->addSelectColumn({tableName}Peer::APP_NUMBER); + + $criteria->addSelectColumn({tableName}Peer::APP_STATUS); + + $criteria->addSelectColumn({tableName}Peer::VAR1); + + $criteria->addSelectColumn({tableName}Peer::VAR2); + + $criteria->addSelectColumn({tableName}Peer::VAR3); + + } + + const COUNT = 'COUNT({tableName2}.APP_UID)'; + const COUNT_DISTINCT = 'COUNT(DISTINCT {tableName2}.APP_UID)'; + + /** + * Returns the number of rows matching criteria. + * + * @param Criteria $criteria + * @param boolean $distinct Whether to select only distinct columns (You can also set DISTINCT modifier in Criteria). + * @param Connection $con + * @return int Number of matching rows. + */ + public static function doCount(Criteria $criteria, $distinct = false, $con = null) + { + // we're going to modify criteria, so copy it first + $criteria = clone $criteria; + + // clear out anything that might confuse the ORDER BY clause + $criteria->clearSelectColumns()->clearOrderByColumns(); + if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { + $criteria->addSelectColumn({tableName}Peer::COUNT_DISTINCT); + } else { + $criteria->addSelectColumn({tableName}Peer::COUNT); + } + + // just in case we're grouping: add those columns to the select statement + foreach ($criteria->getGroupByColumns() as $column) { + $criteria->addSelectColumn($column); + } + + $rs = {tableName}Peer::doSelectRS($criteria, $con); + if ($rs->next()) { + return $rs->getInt(1); + } else { + // no rows returned; we infer that means 0 matches. + return 0; + } + } + /** + * Method to select one object from the DB. + * + * @param Criteria $criteria object used to create the SELECT statement. + * @param Connection $con + * @return {tableName} + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doSelectOne(Criteria $criteria, $con = null) + { + $critcopy = clone $criteria; + $critcopy->setLimit(1); + $objects = {tableName}Peer::doSelect($critcopy, $con); + if ($objects) { + return $objects[0]; + } + return null; + } + /** + * Method to do selects. + * + * @param Criteria $criteria The Criteria object used to build the SELECT statement. + * @param Connection $con + * @return array Array of selected Objects + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doSelect(Criteria $criteria, $con = null) + { + return {tableName}Peer::populateObjects({tableName}Peer::doSelectRS($criteria, $con)); + } + /** + * Prepares the Criteria object and uses the parent doSelect() + * method to get a ResultSet. + * + * Use this method directly if you want to just get the resultset + * (instead of an array of objects). + * + * @param Criteria $criteria The Criteria object used to build the SELECT statement. + * @param Connection $con the connection to use + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + * @return ResultSet The resultset object with numerically-indexed fields. + * @see BasePeer::doSelect() + */ + public static function doSelectRS(Criteria $criteria, $con = null) + { + if ($con === null) { + $con = Propel::getConnection(self::DATABASE_NAME); + } + + if (!$criteria->getSelectColumns()) { + $criteria = clone $criteria; + {tableName}Peer::addSelectColumns($criteria); + } + + // Set the correct dbName + $criteria->setDbName(self::DATABASE_NAME); + + // BasePeer returns a Creole ResultSet, set to return + // rows indexed numerically. + return BasePeer::doSelect($criteria, $con); + } + /** + * The returned array will contain objects of the default type or + * objects that inherit from the default. + * + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function populateObjects(ResultSet $rs) + { + $results = array(); + + // set the class once to avoid overhead in the loop + $cls = {tableName}Peer::getOMClass(); + $cls = Propel::import($cls); + // populate the object(s) + while ($rs->next()) { + + $obj = new $cls(); + $obj->hydrate($rs); + $results[] = $obj; + + } + return $results; + } + /** + * Returns the TableMap related to this peer. + * This method is not needed for general use but a specific application could have a need. + * @return TableMap + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function getTableMap() + { + return Propel::getDatabaseMap(self::DATABASE_NAME)->getTable(self::TABLE_NAME); + } + + /** + * The class that the Peer will make instances of. + * + * This uses a dot-path notation which is tranalted into a path + * relative to a location on the PHP include_path. + * (e.g. path.to.MyClass -> 'path/to/MyClass.php') + * + * @return string path.to.ClassName + */ + public static function getOMClass() + { + return {tableName}Peer::CLASS_DEFAULT; + } + + /** + * Method perform an INSERT on the database, given a {tableName} or Criteria object. + * + * @param mixed $values Criteria or {tableName} object containing data that is used to create the INSERT statement. + * @param Connection $con the connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doInsert($values, $con = null) + { + if ($con === null) { + $con = Propel::getConnection(self::DATABASE_NAME); + } + + if ($values instanceof Criteria) { + $criteria = clone $values; // rename for clarity + } else { + $criteria = $values->buildCriteria(); // build Criteria from {tableName} object + } + + + // Set the correct dbName + $criteria->setDbName(self::DATABASE_NAME); + + try { + // use transaction because $criteria could contain info + // for more than one table (I guess, conceivably) + $con->begin(); + $pk = BasePeer::doInsert($criteria, $con); + $con->commit(); + } catch (PropelException $e) { + $con->rollback(); + throw $e; + } + + return $pk; + } + + /** + * Method perform an UPDATE on the database, given a {tableName} or Criteria object. + * + * @param mixed $values Criteria or {tableName} object containing data create the UPDATE statement. + * @param Connection $con The connection to use (specify Connection exert more control over transactions). + * @return int The number of affected rows (if supported by underlying database driver). + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doUpdate($values, $con = null) + { + if ($con === null) { + $con = Propel::getConnection(self::DATABASE_NAME); + } + + $selectCriteria = new Criteria(self::DATABASE_NAME); + + if ($values instanceof Criteria) { + $criteria = clone $values; // rename for clarity + + $comparison = $criteria->getComparison({tableName}Peer::APP_UID); + $selectCriteria->add({tableName}Peer::APP_UID, $criteria->remove({tableName}Peer::APP_UID), $comparison); + + } else { + $criteria = $values->buildCriteria(); // gets full criteria + $selectCriteria = $values->buildPkeyCriteria(); // gets criteria w/ primary key(s) + } + + // set the correct dbName + $criteria->setDbName(self::DATABASE_NAME); + + return BasePeer::doUpdate($selectCriteria, $criteria, $con); + } + + /** + * Method to DELETE all rows from the {tableName2} table. + * + * @return int The number of affected rows (if supported by underlying database driver). + */ + public static function doDeleteAll($con = null) + { + if ($con === null) { + $con = Propel::getConnection(self::DATABASE_NAME); + } + $affectedRows = 0; // initialize var to track total num of affected rows + try { + // use transaction because $criteria could contain info + // for more than one table or we could emulating ON DELETE CASCADE, etc. + $con->begin(); + $affectedRows += BasePeer::doDeleteAll({tableName}Peer::TABLE_NAME, $con); + $con->commit(); + return $affectedRows; + } catch (PropelException $e) { + $con->rollback(); + throw $e; + } + } + + /** + * Method perform a DELETE on the database, given a {tableName} or Criteria object OR a primary key value. + * + * @param mixed $values Criteria or {tableName} object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param Connection $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). + * This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doDelete($values, $con = null) + { + if ($con === null) { + $con = Propel::getConnection({tableName}Peer::DATABASE_NAME); + } + + if ($values instanceof Criteria) { + $criteria = clone $values; // rename for clarity + } elseif ($values instanceof {tableName}) { + + $criteria = $values->buildPkeyCriteria(); + } else { + // it must be the primary key + $criteria = new Criteria(self::DATABASE_NAME); + $criteria->add({tableName}Peer::APP_UID, (array) $values, Criteria::IN); + } + + // Set the correct dbName + $criteria->setDbName(self::DATABASE_NAME); + + $affectedRows = 0; // initialize var to track total num of affected rows + + try { + // use transaction because $criteria could contain info + // for more than one table or we could emulating ON DELETE CASCADE, etc. + $con->begin(); + + $affectedRows += BasePeer::doDelete($criteria, $con); + $con->commit(); + return $affectedRows; + } catch (PropelException $e) { + $con->rollback(); + throw $e; + } + } + + /** + * Validates all modified columns of given {tableName} object. + * If parameter $columns is either a single column name or an array of column names + * than only those columns are validated. + * + * NOTICE: This does not apply to primary or foreign keys for now. + * + * @param {tableName} $obj The object to validate. + * @param mixed $cols Column name or array of column names. + * + * @return mixed TRUE if all columns are valid or the error message of the first invalid column. + */ + public static function doValidate({tableName} $obj, $cols = null) + { + $columns = array(); + + if ($cols) { + $dbMap = Propel::getDatabaseMap({tableName}Peer::DATABASE_NAME); + $tableMap = $dbMap->getTable({tableName}Peer::TABLE_NAME); + + if (! is_array($cols)) { + $cols = array($cols); + } + + foreach ($cols as $colName) { + if ($tableMap->containsColumn($colName)) { + $get = 'get' . $tableMap->getColumn($colName)->getPhpName(); + $columns[$colName] = $obj->$get(); + } + } + } else { + + } + + return BasePeer::doValidate({tableName}Peer::DATABASE_NAME, {tableName}Peer::TABLE_NAME, $columns); + } + + /** + * Retrieve a single object by pkey. + * + * @param mixed $pk the primary key. + * @param Connection $con the connection to use + * @return {tableName} + */ + public static function retrieveByPK($pk, $con = null) + { + if ($con === null) { + $con = Propel::getConnection(self::DATABASE_NAME); + } + + $criteria = new Criteria({tableName}Peer::DATABASE_NAME); + + $criteria->add({tableName}Peer::APP_UID, $pk); + + + $v = {tableName}Peer::doSelect($criteria, $con); + + return !empty($v) > 0 ? $v[0] : null; + } + + /** + * Retrieve multiple objects by pkey. + * + * @param array $pks List of primary keys + * @param Connection $con the connection to use + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function retrieveByPKs($pks, $con = null) + { + if ($con === null) { + $con = Propel::getConnection(self::DATABASE_NAME); + } + + $objs = null; + if (empty($pks)) { + $objs = array(); + } else { + $criteria = new Criteria(); + $criteria->add({tableName}Peer::APP_UID, $pks, Criteria::IN); + $objs = {tableName}Peer::doSelect($criteria, $con); + } + return $objs; + } +} + + +// static code to register the map builder for this Peer with the main Propel class +if (Propel::isInit()) { + // the MapBuilder classes register themselves with Propel during initialization + // so we need to load them here. + try { + Base{tableName}Peer::getMapBuilder(); + } catch (Exception $e) { + Propel::log('Could not initialize Peer: ' . $e->getMessage(), Propel::LOG_ERR); + } +} else { + // even if Propel is not yet initialized, the map builder class can be registered + // now and then it will be loaded when Propel initializes. + require_once 'classes/map/{tableName}MapBuilder.php'; + Propel::registerMapBuilder('classes.map.{tableName}MapBuilder'); +} + diff --git a/tests/resources/PmtTableName.tpl b/tests/resources/PmtTableName.tpl new file mode 100644 index 000000000..68485cd9d --- /dev/null +++ b/tests/resources/PmtTableName.tpl @@ -0,0 +1,19 @@ +dbMap !== null); + } + + /** + * Gets the databasemap this map builder built. + * + * @return the databasemap + */ + public function getDatabaseMap() + { + return $this->dbMap; + } + + /** + * The doBuild() method builds the DatabaseMap + * + * @return void + * @throws PropelException + */ + public function doBuild() + { + $this->dbMap = Propel::getDatabaseMap('workflow'); + + $tMap = $this->dbMap->addTable('{tableName}'); + $tMap->setPhpName('{tableName}'); + + $tMap->setUseIdGenerator(false); + + $tMap->addPrimaryKey('APP_UID', 'AppUid', 'string', CreoleTypes::VARCHAR, true, 32); + + $tMap->addColumn('APP_NUMBER', 'AppNumber', 'int', CreoleTypes::INTEGER, true, 11); + + $tMap->addColumn('APP_STATUS', 'AppStatus', 'string', CreoleTypes::VARCHAR, true, 10); + + $tMap->addColumn('VAR1', 'Var1', 'string', CreoleTypes::VARCHAR, false, 255); + + } // doBuild() + +} // {tableName}MapBuilder diff --git a/tests/resources/PmtTableNamePeer.tpl b/tests/resources/PmtTableNamePeer.tpl new file mode 100644 index 000000000..58f265468 --- /dev/null +++ b/tests/resources/PmtTableNamePeer.tpl @@ -0,0 +1,23 @@ +markTestIncomplete($string . " not found"); + } $appMsgUid = G::generateUniqueID(); factory(AppMessage::class)->create([ 'APP_MSG_UID' => $appMsgUid diff --git a/tests/unit/workflow/engine/classes/model/AdditionalTablesTest.php b/tests/unit/workflow/engine/classes/model/AdditionalTablesTest.php index fbfa82cba..be2e7bd61 100644 --- a/tests/unit/workflow/engine/classes/model/AdditionalTablesTest.php +++ b/tests/unit/workflow/engine/classes/model/AdditionalTablesTest.php @@ -5,6 +5,9 @@ namespace Tests\unit\workflow\engine\classes\model; use AdditionalTables; use Exception; use G; +use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Schema; +use ProcessMaker\BusinessModel\ReportTable; use ProcessMaker\Model\AdditionalTables as AdditionalTablesModel; use Tests\TestCase; @@ -106,4 +109,173 @@ class AdditionalTablesTest extends TestCase $additionalTables = new AdditionalTables(); $additionalTables->update($expected); } + + /** + * It tries to getAll() method. + * @test + * @covers \AdditionalTables::getAll() + */ + public function it_should_get_all_registries() + { + $proUid = factory(\ProcessMaker\Model\Process::class)->create()->PRO_UID; + + //local connections + $additionalTables = factory(AdditionalTablesModel::class, 3); + $dbSource = factory(\ProcessMaker\Model\DbSource::class)->create([ + 'PRO_UID' => $proUid, + 'DBS_SERVER' => env('DB_HOST'), + 'DBS_DATABASE_NAME' => env('DB_DATABASE'), + 'DBS_USERNAME' => env('DB_USERNAME'), + 'DBS_PASSWORD' => G::encrypt(env('DB_PASSWORD'), env('DB_DATABASE')) . "_2NnV3ujj3w", + 'DBS_PORT' => '3306', + 'DBS_CONNECTION_TYPE' => 'NORMAL' + ]); + $additionalTable = factory(AdditionalTablesModel::class)->create([ + 'PRO_UID' => $proUid, + 'DBS_UID' => $dbSource->DBS_UID, + ]); + $tableName = $additionalTable->ADD_TAB_NAME; + $name = $additionalTable->ADD_TAB_CLASS_NAME; + $this->createSchema($dbSource->DBS_DATABASE_NAME, $tableName, $name, $dbSource->DBS_UID); + + //external connection + $dbSource = factory(\ProcessMaker\Model\DbSource::class)->create([ + 'PRO_UID' => $proUid, + 'DBS_SERVER' => config('database.connections.testexternal.host'), + 'DBS_DATABASE_NAME' => config('database.connections.testexternal.database'), + 'DBS_USERNAME' => config('database.connections.testexternal.username'), + 'DBS_PASSWORD' => G::encrypt(config('database.connections.testexternal.password'), config('database.connections.testexternal.database')) . "_2NnV3ujj3w", + 'DBS_PORT' => '3306', + 'DBS_CONNECTION_TYPE' => 'NORMAL' + ]); + $additionalTable = factory(AdditionalTablesModel::class)->create([ + 'PRO_UID' => $proUid, + 'DBS_UID' => $dbSource->DBS_UID, + ]); + $tableName = $additionalTable->ADD_TAB_NAME; + $name = $additionalTable->ADD_TAB_CLASS_NAME; + $this->createSchema($dbSource->DBS_DATABASE_NAME, $tableName, $name, $dbSource->DBS_UID); + + //expected + $expected = AdditionalTablesModel::select() + ->get() + ->toArray(); + $expected = array_column($expected, 'ADD_TAB_UID'); + + //assertions + $additionalTables = new AdditionalTables(); + + $actual = $additionalTables->getAll(); + $actual = array_column($actual['rows'], 'ADD_TAB_UID'); + $this->assertContains($actual[0], $expected, false); + + $actual = $additionalTables->getAll(0, 20, 'a'); + $actual = array_column($actual['rows'], 'ADD_TAB_UID'); + $this->assertContains($actual[0], $expected, false); + + $actual = $additionalTables->getAll(0, 20, '', ['equal' => $proUid]); + $actual = array_column($actual['rows'], 'ADD_TAB_UID'); + $this->assertContains($actual[0], $expected, false); + + $_POST['sort'] = 'ADD_TAB_NAME'; + $_POST['dir'] = 'ASC'; + $actual = $additionalTables->getAll(0, 20, '', ['notequal' => $proUid]); + $actual = array_column($actual['rows'], 'ADD_TAB_UID'); + $this->assertContains($actual[0], $expected, false); + + $_POST['sort'] = 'NUM_ROWS'; + $_POST['dir'] = 'DESC'; + $actual = $additionalTables->getAll(0, 20, '', ['notequal' => $proUid]); + $actual = array_column($actual['rows'], 'ADD_TAB_UID'); + $this->assertContains($actual[0], $expected, false); + + $actual = $additionalTables->getAll(0, 20, '', ['equal' => $proUid]); + $actual = array_column($actual['rows'], 'ADD_TAB_UID'); + $this->assertContains($actual[0], $expected, false); + + $actual = $additionalTables->getAll(0, 20, $tableName); + $actual = array_column($actual['rows'], 'ADD_TAB_UID'); + $this->assertContains($actual[0], $expected, false); + } + + /** + * This gets the content from template file. + * @param string $pathData + * @param string $tableName + * @param string $tableName2 + * @param string $database + * @return string + */ + private function getTemplate(string $pathData, string $tableName, string $tableName2 = "", string $database = ""): string + { + $pathData = PATH_TRUNK . "/tests/resources/{$pathData}"; + $result = file_get_contents($pathData); + $result = str_replace("{tableName}", $tableName, $result); + if (!empty($tableName2)) { + $result = str_replace("{tableName2}", $tableName2, $result); + } + if (!empty($database)) { + $result = str_replace("{database}", $database, $result); + } + return $result; + } + + /** + * Create directory if not exist. + * @param string $path + * @return string + */ + private function createDirectory(string $path): string + { + if (!is_dir($path)) { + mkdir($path); + } + return $path; + } + + /** + * Create the schema of the table. + * @param string $connection + * @param string $tableName + * @param string $className + * @param string $dbsUid + */ + private function createSchema(string $connection, string $tableName, string $className, string $dbsUid = 'workflow') + { + $query = "" + . "CREATE TABLE IF NOT EXISTS `{$tableName}` (" + . "`APP_UID` varchar(32) NOT NULL," + . "`APP_NUMBER` int(11) NOT NULL," + . "`APP_STATUS` varchar(10) NOT NULL," + . "`VAR1` varchar(255) DEFAULT NULL," + . "`VAR2` varchar(255) DEFAULT NULL," + . "`VAR3` varchar(255) DEFAULT NULL," + . "PRIMARY KEY (`APP_UID`)," + . "KEY `indexTable` (`APP_UID`))"; + if (!empty(config("database.connections.{$connection}"))) { + DB::connection($connection)->statement($query); + } else { + DB::statement($query); + } + + $this->createDirectory(PATH_DB); + $this->createDirectory(PATH_DB . env('MAIN_SYS_SYS')); + + $pathClasses = PATH_DB . env('MAIN_SYS_SYS') . "/classes"; + $this->createDirectory($pathClasses); + $this->createDirectory("{$pathClasses}/om"); + $this->createDirectory("{$pathClasses}/map"); + + $template1 = $this->getTemplate("PmtTableName.tpl", $className); + $template2 = $this->getTemplate("PmtTableNamePeer.tpl", $className); + $template3 = $this->getTemplate("BasePmtTableName.tpl", $className); + $template4 = $this->getTemplate("BasePmtTableNamePeer.tpl", $className, $tableName, $dbsUid); + $template5 = $this->getTemplate("PmtTableNameMapBuilder.tpl", $className); + + file_put_contents("{$pathClasses}/{$className}.php", $template1); + file_put_contents("{$pathClasses}/{$className}Peer.php", $template2); + file_put_contents("{$pathClasses}/om/Base{$className}.php", $template3); + file_put_contents("{$pathClasses}/om/Base{$className}Peer.php", $template4); + file_put_contents("{$pathClasses}/map/{$className}MapBuilder.php", $template5); + } } diff --git a/thirdparty/phing/parser/Location.php b/thirdparty/phing/parser/Location.php index 2be1bc863..fc8807a25 100644 --- a/thirdparty/phing/parser/Location.php +++ b/thirdparty/phing/parser/Location.php @@ -23,7 +23,7 @@ * Stores the file name and line number of a XML file * * @author Andreas Aderhold - * @copyright © 2001,2002 THYRELL. All rights reserved + * @copyright 2001,2002 THYRELL. All rights reserved * @version $Revision: 1.6 $ $Date: 2003/12/24 13:02:09 $ * @access public * @package phing.parser @@ -43,7 +43,7 @@ class Location { * @param integer the column number * @access public */ - function Location($fileName = null, $lineNumber = null, $columnNumber = null) { + function __construct($fileName = null, $lineNumber = null, $columnNumber = null) { $this->fileName = $fileName; $this->lineNumber = $lineNumber; $this->columnNumber = $columnNumber; diff --git a/thirdparty/phing/system/io/Win32FileSystem.php b/thirdparty/phing/system/io/Win32FileSystem.php index 3af4b9ed5..936b94e93 100644 --- a/thirdparty/phing/system/io/Win32FileSystem.php +++ b/thirdparty/phing/system/io/Win32FileSystem.php @@ -446,7 +446,7 @@ class Win32FileSystem extends FileSystem { /* -- Basic infrastructure -- */ /** compares file paths lexicographically */ - function compare(PhingFile $f1, PhingFile $f2) { + function compare($f1, $f2) { $f1Path = $f1->getPath(); $f2Path = $f2->getPath(); return (boolean) strcasecmp((string) $f1Path, (string) $f2Path); diff --git a/workflow/engine/classes/model/AdditionalTables.php b/workflow/engine/classes/model/AdditionalTables.php index 22c1f967a..71d729b6d 100644 --- a/workflow/engine/classes/model/AdditionalTables.php +++ b/workflow/engine/classes/model/AdditionalTables.php @@ -1010,6 +1010,9 @@ class AdditionalTables extends BaseAdditionalTables . ")"; $buildNumberRows = clone $criteria; $buildNumberRows->clear(); + $buildNumberRows->addSelectColumn(AdditionalTablesPeer::PRO_UID); + $buildNumberRows->addSelectColumn(AdditionalTablesPeer::DBS_UID); + $buildNumberRows->addSelectColumn(AdditionalTablesPeer::ADD_TAB_CLASS_NAME); $buildNumberRows->addSelectColumn(AdditionalTablesPeer::ADD_TAB_NAME); $buildNumberRows->addAsColumn("EXISTS_TABLE", $stringSql); $dataset1 = AdditionalTablesPeer::doSelectRS($buildNumberRows); @@ -1020,6 +1023,27 @@ class AdditionalTables extends BaseAdditionalTables if ($row["EXISTS_TABLE"] === "1") { $stringCount = "(SELECT COUNT(*) FROM " . $row["ADD_TAB_NAME"] . ")"; } + if ($row["EXISTS_TABLE"] === "0") { + $className = $row['ADD_TAB_CLASS_NAME']; + $pathWorkspace = PATH_DB . config("system.workspace") . PATH_SEP; + if (file_exists($pathWorkspace . 'classes/' . $className . '.php')) { + $_SESSION['PROCESS'] = $row['PRO_UID']; //is required by method Propel::getConnection() + require_once $pathWorkspace . 'classes/' . $className . '.php'; + $externalCriteria = new Criteria(PmTable::resolveDbSource($row['DBS_UID'])); + $externalCriteria->addSelectColumn(($className . "Peer")::COUNT); + //if the external database is not available we catch the exception. + try { + $externalResultSet = ($className . "Peer")::doSelectRS($externalCriteria); + if ($externalResultSet->next()) { + $stringCount = $externalResultSet->getInt(1); + } + } catch (Exception $externalException) { + $context = Bootstrap::getDefaultContextLog(); + $context = array_merge($context, $row); + Bootstrap::registerMonolog("additional tables", 400, $externalException->getMessage(), $context); + } + } + } $stringBuild = $stringBuild . "WHEN '" . $row["ADD_TAB_NAME"] . "' THEN " . $stringCount diff --git a/workflow/engine/src/ProcessMaker/Core/MultiProcOpen.php b/workflow/engine/src/ProcessMaker/Core/MultiProcOpen.php index f288b781d..6962f35c7 100644 --- a/workflow/engine/src/ProcessMaker/Core/MultiProcOpen.php +++ b/workflow/engine/src/ProcessMaker/Core/MultiProcOpen.php @@ -63,6 +63,9 @@ class MultiProcOpen sleep($this->sleepTime); //this sleep is very important $i = 0; $n = count($processes); + if ($n === 0) { + return []; + } $outputs = []; do { $index = $i % $n;